Clean up naming of scenes and modes

.clang-format

@@ -10,6 +10,7 @@ BraceWrapping:
   AfterControlStatement: MultiLine
 InsertBraces: true
 AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortEnumsOnASingleLine: false
 IndentCaseLabels: false

config/GALE01/splits.txt

@@ -4705,14 +4705,14 @@ melee/vi/vi0501.c:
 	.sdata2     start:0x804DE060 end:0x804DE090
 
 melee/vi/vi0502.c:
-	.text       start:0x8031E110 end:0x8031E6CC
+	.text       start:0x8031E110 end:0x8031E6EC
 	.data       start:0x804000D0 end:0x80400108
 	.sdata      start:0x804D5AE8 end:0x804D5AF8
 	.sbss       start:0x804D6F90 end:0x804D6FB0
 	.sdata2     start:0x804DE090 end:0x804DE0A8
 
 melee/vi/vi0601.c:
-	.text       start:0x8031E6CC end:0x8031ED70
+	.text       start:0x8031E6EC end:0x8031ED70
 	.data       start:0x80400108 end:0x80400128
 	.sdata      start:0x804D5AF8 end:0x804D5B08
 	.sbss       start:0x804D6FB0 end:0x804D6FB8

configure.py

@@ -162,6 +162,17 @@
     default="off",
     help="warning level (default 'off')",
 )
+parser.add_argument(
+    "--lint-all",
+    action="store_true",
+    help="do not disable any clang warnings",
+)
+parser.add_argument(
+    "--no-lint-error",
+    dest="lint_error",
+    action="store_false",
+    help="do not treat clang warnings as errors",
+)
 parser.add_argument(
     "--require-protos",
     dest="require_protos",
@@ -248,7 +259,7 @@
 config.ldflags = [
     "-fp hardware",
     "-nodefaults",
-    "-warn off",
+    f"-warn {args.warn}",
 ]
 if args.debug:
     config.ldflags.append("-g")  # Or -gdwarf-2 for Wii linkers
@@ -373,7 +384,6 @@
 clang_warnings = [
     "all",
     "extra",
-    "error",
     "c2x-extensions",
     "implicit-function-declaration",
     "implicit-int",
@@ -383,6 +393,9 @@
     "typedef-redefinition",
 ]
 
+if args.lint_error:
+    clang_warnings.append("error")
+
 clang_disabled_warnings = [
     "bitfield-constant-conversion",
     "integer-overflow",
@@ -409,9 +422,10 @@
     *[f"-I{s}" for s in clang_includes],
     *[f"-isystem{s}" for s in clang_system_includes],
     *[f"-W{s}" for s in clang_warnings],
-    *[f"-Wno-{s}" for s in clang_disabled_warnings],
 ]
 
+if not args.lint_all:
+    clang_flags_base.extend(f"-Wno-{s}" for s in clang_disabled_warnings),
 
 config.extra_clang_flags.extend(clang_flags_base)
 

src/MSL/printf.c

@@ -510,8 +510,7 @@ static void round_decimal(decimal* dec, int new_length)
     if (c == 5) {
         char* q = &((char*) dec->sig.text)[dec->sig.length];
 
-        while (--q > p && *q == '0')
-            ;
+        while (--q > p && *q == '0');
         carry = (q == p) ? p[-1] & 1 : 1;
     } else {
         carry = (c > 5);

src/melee/gm/forward.h

@@ -46,7 +46,7 @@ typedef enum GameModeKind {
     /* 27 */ GM_PROGRESSIVE_SCAN,
     /* 28 */ GM_BOOT,
     /* 29 */ GM_MEMCARD,
-    /* 2A */ GM_FIXED_CAMERA_VS,
+    /* 2A */ GM_CAMERA_VS,
     /* 2B */ GM_EVENT,
     /* 2C */ GM_SINGLE_BUTTON_VS,
     /* 2D */ GM_COUNT,
@@ -57,13 +57,13 @@ typedef enum GameSceneKind {
     /* +01 */ GS_MENU,
     /* +02 */ GS_VS,
     /* +03 */ GS_SUDDEN_DEATH,
-    /* +04 */ GS_TRAINING_MODE,
+    /* +04 */ GS_TRAINING,
     /* +05 */ GS_RESULTS,
     /* +06 */ GS_0x6, ///< Unused? It is skipped in the table entirely
     /* +07 */ GS_DEBUG_MENU,
     /* +08 */ GS_CSS,
     /* +09 */ GS_SSS,
-    /* +0A */ GS_0xA, ///< Unused? Empty in the table
+    /* +0A */ GS_UNK10, ///< Unused? Empty in the table
     /* +0B */ GS_TOY_GALLERY,
     /* +0C */ GS_TOY_LOTTERY,
     /* +0D */ GS_TOY_COLLECTION,
@@ -136,8 +136,8 @@ typedef struct datetime datetime;
 typedef struct DebugGameOverData DebugGameOverData;
 typedef struct GameMode GameMode;
 typedef struct GameRules GameRules;
+typedef struct GameModeState GameModeState;
 typedef struct GameScene GameScene;
-typedef struct GameSceneHandler GameSceneHandler;
 typedef struct GameSceneInfo GameSceneInfo;
 typedef struct gm_8016A92C_arg0_t gm_8016A92C_arg0_t;
 typedef struct gm_8017DB6C_arg0_t gm_8017DB6C_arg0_t;

src/melee/gm/gm_16AE.c

@@ -1424,7 +1424,7 @@ static inline int fn_8016CBE8_inline(void)
     return -1;
 }
 
-void gm_8016D32C_OnFrame(void)
+void gm_Scene_Training_OnFrame(void)
 {
     int i;
     lbl_8046B6A0_t* tmp = &lbl_8046B6A0;
@@ -1524,7 +1524,7 @@ void fn_8016D634(void)
     }
 }
 
-void gm_8016D800(void)
+void gm_Scene_Vs_OnFrame(void)
 {
     PAD_STACK(8);
     if (lbl_8046B6A0.x24C8.x48 != NULL) {
@@ -2031,7 +2031,7 @@ void fn_8016E730(StartMeleeData* arg0)
     }
 }
 
-void gm_8016E934_OnEnter(void* arg0)
+void gm_Scene_Vs_OnEnter(void* arg0)
 {
     StartMeleeData* tmp = arg0;
     fn_8016E730(tmp);
@@ -2061,15 +2061,15 @@ static inline bool gm_8016E9C8_inline(void)
     case GM_TINY_VS:
     case GM_GIANT_VS:
     case GM_STAMINA_VS:
-    case GM_FIXED_CAMERA_VS:
+    case GM_CAMERA_VS:
     case GM_SINGLE_BUTTON_VS:
         return true;
     default:
         return false;
     }
 }
 
-void gm_8016E9C8(void* user_data)
+void gm_Scene_Vs_OnExit(void* user_data)
 {
     struct EndMeleeData* data = user_data;
     lbl_8046B6A0_t* tmp = &lbl_8046B6A0;
@@ -2114,7 +2114,7 @@ void gm_8016E9C8(void* user_data)
     }
 }
 
-void gm_8016EBC0_OnEnter(void* user_data)
+void gm_Scene_SuddenDeath_OnEnter(void* user_data)
 {
     StartMeleeData* data = user_data;
     data->rules.x6 = true;
@@ -2124,7 +2124,7 @@ void gm_8016EBC0_OnEnter(void* user_data)
     ifStatus_802F665C(data->rules.x0_3);
 }
 
-void gm_8016EC28_OnEnter(void* user_data)
+void gm_Scene_Training_OnEnter(void* user_data)
 {
     StartMeleeData* data = user_data;
     struct lbl_8046B6A0_t* tmp2;

src/melee/gm/gm_16AE.h

@@ -90,21 +90,21 @@
 /* 16CD98 */ void fn_8016CD98(lbl_8046B6A0_t*);
 /* 16CF4C */ void fn_8016CF4C(int, MatchOutcome);
 /* 16CFE0 */ void fn_8016CFE0(void);
-/* 16D32C */ void gm_8016D32C_OnFrame(void);
+/* 16D32C */ void gm_Scene_Training_OnFrame(void);
 /* 16D538 */ bool fn_8016D538(void);
 /* 16D634 */ void fn_8016D634(void);
-/* 16D800 */ void gm_8016D800(void);
+/* 16D800 */ void gm_Scene_Vs_OnFrame(void);
 /* 16D8AC */ void fn_8016D8AC(int, struct PlayerInitData*);
 /* 16DCC0 */ void fn_8016DCC0(struct StartMeleeData*);
 /* 16DEEC */ void fn_8016DEEC(void);
 /* 16E124 */ void fn_8016E124(void);
 /* 16E2BC */ void fn_8016E2BC(void);
 /* 16E5C0 */ bool fn_8016E5C0(struct StartMeleeData*);
 /* 16E730 */ void fn_8016E730(struct StartMeleeData*);
-/* 16E934 */ void gm_8016E934_OnEnter(void*);
-/* 16E9C8 */ void gm_8016E9C8(void*);
-/* 16EBC0 */ void gm_8016EBC0_OnEnter(void*);
-/* 16EC28 */ void gm_8016EC28_OnEnter(void*);
+/* 16E934 */ void gm_Scene_Vs_OnEnter(void*);
+/* 16E9C8 */ void gm_Scene_Vs_OnExit(void*);
+/* 16EBC0 */ void gm_Scene_SuddenDeath_OnEnter(void*);
+/* 16EC28 */ void gm_Scene_Training_OnEnter(void*);
 /* 16ECE8 */ float gm_8016ECE8(void);
 /* 16EDDC */ bool gm_8016EDDC(int, struct PlayerInitData*);
 /* 16EF98 */ bool fn_8016EF98(int);

src/melee/gm/gm_16F1.h

@@ -98,7 +98,7 @@ struct lbl_804D65A8_t;
 /* 1736E8 */ void gm_801736E8(u8, u8, u8, u8, u8, u8);
 /* 173754 */ bool gm_80173754(u8, u8);
 /* 1737D8 */ u8 gm_801737D8(void);
-/* 1737E8 */ void gm_801737E8_OnLoad(void);
+/* 1737E8 */ void gm_Mode_ChallengerApproach_OnLoad(void);
 /* 173834 */ UNK_RET fn_80173834(u8 ckind, u8 major, bool);
 /* 17390C */ UNK_RET gm_8017390C(int, int);
 /* 173AA4 */ UNK_RET gm_80173AA4(UNK_PARAMS);

src/melee/gm/gm_1736.c

@@ -59,7 +59,7 @@ u8 gm_801737D8(void)
     return challenger_data.x6;
 }
 
-void gm_801737E8_OnLoad(void)
+void gm_Mode_ChallengerApproach_OnLoad(void)
 {
     challenger_data.x6 = gm_GetPreviousGameMode();
     if (challenger_data.x0 == CHKIND_NONE) {

src/melee/gm/gm_1832.c

@@ -1188,7 +1188,7 @@ void fn_80186634(void* arg0)
     lbAudioAx_80023F28(0x2D);
 }
 
-void gm_80186DFC_OnFrame(void)
+void gm_Scene_IntroEasy_OnFrame(void)
 {
     if (lbl_804735A8.x0 != 0) {
         lbAudioAx_800236DC();
@@ -1226,7 +1226,7 @@ typedef struct ClassicModeEnterData {
     /* 0x1C */ int x1C;
 } ClassicModeEnterData;
 
-void gm_80186E30_OnEnter(void* arg0_)
+void gm_Scene_IntroEasy_OnEnter(void* arg0_)
 {
     ClassicModeEnterData* arg0 = arg0_;
 
@@ -1423,7 +1423,7 @@ void fn_80187714(void)
 #pragma pop
 #endif
 
-void gm_8018776C_OnFrame(void)
+void gm_Scene_IntroAllstar_OnFrame(void)
 {
     if (lbl_804736B0.x0 != 0) {
         lbArchive_80016EFC(lbl_804D6610);
@@ -1436,7 +1436,7 @@ void gm_8018776C_OnFrame(void)
 #pragma push
 #pragma dont_inline on
 #endif
-void gm_801877A8_OnEnter(void* arg0_)
+void gm_Scene_IntroAllstar_OnEnter(void* arg0_)
 {
     struct enterdata* arg0 = arg0_;
     HSD_GObj* temp_r30;
@@ -1858,19 +1858,19 @@ static inline void gm_80187F48_OnEnter_inline(gm_80187F48_EnterData* arg0)
     lbAudioAx_80023F28(0x2E);
 }
 
-void gm_80187F48_OnEnter(void* arg0)
+void gm_Scene_IntroNormal_OnEnter(void* arg0)
 {
     PAD_STACK(32);
     gm_80187F48_OnEnter_inline(arg0);
 }
 
-void gm_80188364_OnLeave(void* arg0)
+void gm_Scene_IntroNormal_OnLeave(void* arg0)
 {
     HSD_Archive** var = &lbl_804D6620;
     lbArchive_80016EFC(*var);
 }
 
-void gm_8018838C_OnFrame(void)
+void gm_Scene_IntroNormal_OnFrame(void)
 {
     if (lbl_804736C0.x36.done) {
         gm_801A4B60();

src/melee/gm/gm_1832.h

@@ -30,23 +30,23 @@
 /* 1861B8 */ UNK_RET fn_801861B8(UNK_PARAMS);
 /* 186400 */ UNK_RET fn_80186400(UNK_PARAMS);
 /* 186634 */ void fn_80186634(void*);
-/* 186DFC */ void gm_80186DFC_OnFrame(void);
-/* 186E30 */ void gm_80186E30_OnEnter(void*);
+/* 186DFC */ void gm_Scene_IntroEasy_OnFrame(void);
+/* 186E30 */ void gm_Scene_IntroEasy_OnEnter(void*);
 /* 186EFC */ void fn_80186EFC(HSD_GObj*);
 /* 186F6C */ void fn_80186F6C(HSD_GObj*);
 /* 1873F0 */ HSD_GObjProc* fn_801873F0(void);
 /* 187494 */ void fn_80187494(HSD_GObj*, int);
 /* 1874FC */ UNK_RET fn_801874FC(UNK_PARAMS);
 /* 187714 */ UNK_RET fn_80187714(UNK_PARAMS);
-/* 18776C */ void gm_8018776C_OnFrame(void);
-/* 1877A8 */ void gm_801877A8_OnEnter(UNK_T);
+/* 18776C */ void gm_Scene_IntroAllstar_OnFrame(void);
+/* 1877A8 */ void gm_Scene_IntroAllstar_OnEnter(UNK_T);
 /* 187910 */ void fn_80187910(HSD_GObj*);
 /* 187AB4 */ void fn_80187AB4(HSD_GObj*);
 /* 187C9C */ void fn_80187C9C(HSD_GObj*, int);
 /* 187CF4 */ void fn_80187CF4(HSD_GObj*);
-/* 187F48 */ void gm_80187F48_OnEnter(UNK_T);
-/* 188364 */ void gm_80188364_OnLeave(UNK_T);
-/* 18838C */ void gm_8018838C_OnFrame(void);
+/* 187F48 */ void gm_Scene_IntroNormal_OnEnter(UNK_T);
+/* 188364 */ void gm_Scene_IntroNormal_OnLeave(UNK_T);
+/* 18838C */ void gm_Scene_IntroNormal_OnFrame(void);
 /* 1883C0 */ f32 gm_801883C0(void);
 /* 18841C */ bool gm_8018841C(void);
 

src/melee/gm/gm_19EF.c

@@ -610,7 +610,7 @@ void fn_8019F9C4(u32 arg0)
     }
 }
 
-void gm_801A0A10_OnEnter(void* arg0_)
+void gm_Scene_GOver_OnEnter(void* arg0_)
 {
     DebugGameOverData* arg0 = arg0_;
 
@@ -638,7 +638,7 @@ void gm_801A0A10_OnEnter(void* arg0_)
     fn_8019F9C4(arg0->ckind);
 }
 
-void gm_801A0B18_OnLeave(void* arg0_)
+void gm_Scene_GOver_OnExit(void* arg0_)
 {
     DebugGameOverData* arg0 = arg0_;
     arg0->x4 = lbl_80479A98.x8;
@@ -670,7 +670,7 @@ static void fn_801A0B60(HSD_GObj* gobj)
     }
 }
 
-void gm_801A0C6C_OnEnter(void* unused)
+void gm_Scene_ComingSoon_OnEnter(void* unused)
 {
     SceneDesc* sp10;
     HSD_GObj* temp_r30;
@@ -706,7 +706,7 @@ void gm_801A0C6C_OnEnter(void* unused)
     lb_80011E24(temp_r3, &lbl_804D66F4, 1, -1);
 }
 
-void gm_801A0E0C_OnLeave(void* unused)
+void gm_Scene_ComingSoon_OnExit(void* unused)
 {
     lbArchive_80016EFC(lbl_804D66F0);
     lbAudioAx_800236DC();

src/melee/gm/gm_19EF.h

@@ -4,10 +4,10 @@
 #include <platform.h>
 
 /* 19F9C4 */ void fn_8019F9C4(u32);
-/* 1A0A10 */ void gm_801A0A10_OnEnter(void*);
-/* 1A0B18 */ void gm_801A0B18_OnLeave(void*);
+/* 1A0A10 */ void gm_Scene_GOver_OnEnter(void*);
+/* 1A0B18 */ void gm_Scene_GOver_OnExit(void*);
 
-/* 1A0C6C */ void gm_801A0C6C_OnEnter(void*);
-/* 1A0E0C */ void gm_801A0E0C_OnLeave(void*);
+/* 1A0C6C */ void gm_Scene_ComingSoon_OnEnter(void*);
+/* 1A0E0C */ void gm_Scene_ComingSoon_OnExit(void*);
 
 #endif