Skip to content

Commit b6c4637

Browse files
MegaMechgithub-actions[bot]
authored andcommitted
Clang Format
1 parent 1c957fb commit b6c4637

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

src/code_80091750.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8068,7 +8068,10 @@ void func_800A66A8(struct_8018D9E0_entry* arg0, Unk_D_800E70A0* arg1) {
80688068
z2 += z1;
80698069

80708070
// clang-format off
8071-
if (x2); if (y2); if (z2);
8071+
if (x2) {;
8072+
}if (y2) {;
8073+
}if (z2) {;
8074+
}
80728075
// clang-format on
80738076

80748077
guScale(mtx, 1.2f, 1.2f, 1.2f);

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)