Skip to content

Commit 9dca729

Browse files
MegaMechgithub-actions[bot]
authored andcommitted
Clang Format
1 parent 1b10da7 commit 9dca729

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/menu_items.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3602,7 +3602,8 @@ void func_80099958(MenuTexture* addr, s32 arg1, s32 arg2) {
36023602
size = ((size / 8) * 8) + 8;
36033603
}
36043604
dma_copy_mio0_segment(texAddr->textureData, size, gMenuCompressedBuffer);
3605-
mio0decode((u8*) gMenuCompressedBuffer, (u8*) D_802BFB80.arraySize4[arg2][arg1 / 2][(arg1 % 2) + 2].pixel_index_array);
3605+
mio0decode((u8*) gMenuCompressedBuffer,
3606+
(u8*) D_802BFB80.arraySize4[arg2][arg1 / 2][(arg1 % 2) + 2].pixel_index_array);
36063607
texAddr++;
36073608
}
36083609
}
@@ -3796,8 +3797,9 @@ void func_80099EC4(void) {
37963797
osPiStartDma(&sp68, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(temp_s2->textureData)],
37973798
gMenuCompressedBuffer + 0x1400, var_s0, &gDmaMesgQueue);
37983799
}
3799-
mio0decode((u8*) gMenuCompressedBuffer,
3800-
(u8*) D_802BFB80.arraySize4[var_s1->unk6][var_s1->unk4 / 2][(var_s1->unk4 % 2) + 2].pixel_index_array);
3800+
mio0decode(
3801+
(u8*) gMenuCompressedBuffer,
3802+
(u8*) D_802BFB80.arraySize4[var_s1->unk6][var_s1->unk4 / 2][(var_s1->unk4 % 2) + 2].pixel_index_array);
38013803
var_s1->mk64Texture = NULL;
38023804
var_s1++;
38033805
if (var_s4 != 0)
@@ -3820,8 +3822,9 @@ void func_80099EC4(void) {
38203822
osPiStartDma(&sp68, 0, 0, (uintptr_t) &_textures_0aSegmentRomStart[SEGMENT_OFFSET(temp_s2->textureData)],
38213823
gMenuCompressedBuffer, var_s0, &gDmaMesgQueue);
38223824
}
3823-
mio0decode((u8*) gMenuCompressedBuffer + 0x1400,
3824-
(u8*) D_802BFB80.arraySize4[var_s1->unk6][var_s1->unk4 / 2][(var_s1->unk4 % 2) + 2].pixel_index_array);
3825+
mio0decode(
3826+
(u8*) gMenuCompressedBuffer + 0x1400,
3827+
(u8*) D_802BFB80.arraySize4[var_s1->unk6][var_s1->unk4 / 2][(var_s1->unk4 % 2) + 2].pixel_index_array);
38253828
var_s1->mk64Texture = NULL;
38263829
var_s1++;
38273830
if (var_s4 != 0)

src/menus.h

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ enum SubMenuSelectionType {
4747
SUB_MENU_ERASE_QUIT = SUB_MENU_ERASE_MIN,
4848
SUB_MENU_ERASE_ERASE,
4949
SUB_MENU_ERASE_MAX = SUB_MENU_ERASE_ERASE, // 0x1F
50-
SUB_MENU_SAVE_DATA_ERASED, // 0x20
50+
SUB_MENU_SAVE_DATA_ERASED, // 0x20
5151
SUB_MENU_COPY_PAK_FROM_GHOST_MIN = 0x28,
5252
SUB_MENU_COPY_PAK_FROM_GHOST1_1P = SUB_MENU_COPY_PAK_FROM_GHOST_MIN,
5353
SUB_MENU_COPY_PAK_FROM_GHOST2_1P,
5454
SUB_MENU_COPY_PAK_FROM_GHOST_MAX = SUB_MENU_COPY_PAK_FROM_GHOST2_1P, // 0x29
55-
SUB_MENU_COPY_PAK_ERROR_2P_MIN, // 0x2A
55+
SUB_MENU_COPY_PAK_ERROR_2P_MIN, // 0x2A
5656
SUB_MENU_COPY_PAK_ERROR_NO_GHOST_DATA = SUB_MENU_COPY_PAK_ERROR_2P_MIN,
5757
SUB_MENU_COPY_PAK_ERROR_NO_GAME_DATA,
5858
SUB_MENU_COPY_PAK_ERROR_NO_PAK_2P,
@@ -93,10 +93,10 @@ enum MainMenuSelectionType {
9393
MAIN_MENU_OPTION,
9494
MAIN_MENU_DATA,
9595
MAIN_MENU_PLAYER_SELECT,
96-
MAIN_MENU_MODE_SELECT, // Mario GP - T. Trials - VS - Battle
97-
MAIN_MENU_MODE_SUB_SELECT, // CC Selection and T.Trials options (Begin, Data)
98-
MAIN_MENU_OK_SELECT, // OK option after selecting a submode
99-
MAIN_MENU_OK_SELECT_GO_BACK, // OK option after going back from player select
96+
MAIN_MENU_MODE_SELECT, // Mario GP - T. Trials - VS - Battle
97+
MAIN_MENU_MODE_SUB_SELECT, // CC Selection and T.Trials options (Begin, Data)
98+
MAIN_MENU_OK_SELECT, // OK option after selecting a submode
99+
MAIN_MENU_OK_SELECT_GO_BACK, // OK option after going back from player select
100100
MAIN_MENU_MODE_SUB_SELECT_GO_BACK // Used in T.Trials after going back to Data option from course data
101101
};
102102

@@ -106,7 +106,7 @@ enum MainMenuSelectionType {
106106
enum PlayerSelectMenuSelectionTypes {
107107
PLAYER_SELECT_MENU_NONE,
108108
PLAYER_SELECT_MENU_MAIN,
109-
PLAYER_SELECT_MENU_OK, // OK option after selecting characters
109+
PLAYER_SELECT_MENU_OK, // OK option after selecting characters
110110
PLAYER_SELECT_MENU_OK_GO_BACK // OK option after going back from map select
111111
};
112112

@@ -176,11 +176,7 @@ enum DebugGotoSceneTypes {
176176
/**
177177
* @brief Options for gFadeModeSelection
178178
*/
179-
enum FadeModeSelectionTypes {
180-
FADE_MODE_NONE,
181-
FADE_MODE_MAIN,
182-
FADE_MODE_LOGO
183-
};
179+
enum FadeModeSelectionTypes { FADE_MODE_NONE, FADE_MODE_MAIN, FADE_MODE_LOGO };
184180

185181
/**
186182
* @brief Options for gControllerPakScrollDirection
@@ -191,7 +187,6 @@ enum ControllerPakScrollDirectionTypes {
191187
CONTROLLER_PAK_SCROLL_DIR_UP
192188
};
193189

194-
195190
/* functions */
196191
void update_menus(void);
197192
void options_menu_act(struct Controller*, u16);

0 commit comments

Comments
 (0)