Rename heaps of title related symbols and discover AI commands for changing the title mode

src/include/commands.h

@@ -3818,18 +3818,21 @@
 	mkshort(0x01c7), \
 	value,
 
-// Only used in test levels. Value can be 0-4.
-// Looks up the index in a pointer array and calls the function at the pointer.
-// If passed a value > 4, sets 800624b8 to -1.
-// Related to cmd01c9
-#define cmd01c8(value) \
+/**
+ * Sets the title mode (legal, Rare logo, etc). This is an unused feature - it
+ * appears that at one point the title screen could be controlled via AI
+ * commands.
+ *
+ * Expects a TITLEAIMODE constant.
+ */
+#define title_init_mode(mode) \
 	mkshort(0x01c8), \
-	value,
+	mode,
 
-// Test levels only. Checks if value at 800624b8 is >= 0.
-// If so, runs some function and goes to label.
-// Related to cmd01c8.
-#define cmd01c9(label) \
+/**
+ * Exits the title screen. This is an unused feature.
+ */
+#define try_exit_title(label) \
 	mkshort(0x01c9), \
 	label,
 

src/include/constants.h

@@ -2610,15 +2610,21 @@
 #define TILEFLAG_0020 0x0020
 #define TILEFLAG_0200 0x0200
 
-#define TITLEMODE_LEGAL         0
-#define TITLEMODE_1             1
-#define TITLEMODE_PDLOGO        2
-#define TITLEMODE_NINTENDOLOGO  3
-#define TITLEMODE_RARELOGO      4
-#define TITLEMODE_5             5
-#define TITLEMODE_NOCONTROLLER  6
-#define TITLEMODE_RAREPRESENTS1 7
-#define TITLEMODE_RAREPRESENTS2 8
+#define TITLEMODE_LEGAL            0
+#define TITLEMODE_CHECKCONTROLLERS 1
+#define TITLEMODE_PDLOGO           2
+#define TITLEMODE_NINTENDOLOGO     3
+#define TITLEMODE_RARELOGO         4
+#define TITLEMODE_SKIP             5
+#define TITLEMODE_NOCONTROLLER     6
+#define TITLEMODE_RAREPRESENTS1    7
+#define TITLEMODE_RAREPRESENTS2    8
+
+#define TITLEAIMODE_RAREPRESENTS1 1
+#define TITLEAIMODE_RARELOGO      2
+#define TITLEAIMODE_NINTENDOLOGO  3
+#define TITLEAIMODE_RAREPRESENTS2 4
+#define TITLEAIMODE_PDLOGO        5
 
 #define VISIONMODE_NORMAL       0
 #define VISIONMODE_XRAY         1

src/include/game/chr/chraicommands.h

@@ -419,8 +419,8 @@
 /*0x01c5*/ bool ai01c5(void);
 /*0x01c6*/ bool aiSetDodgeRating(void);
 /*0x01c7*/ bool aiSetUnarmedDodgeRating(void);
-/*0x01c8*/ bool ai01c8(void);
-/*0x01c9*/ bool ai01c9(void);
+/*0x01c8*/ bool aiTitleInitMode(void);
+/*0x01c9*/ bool aiTryExitTitle(void);
 /*0x01ca*/ bool aiChrSetCutsceneWeapon(void);
 /*0x01cb*/ bool aiFadeScreen(void);
 /*0x01cc*/ bool aiIfFadeComplete(void);

src/include/game/data/data_0083d0.h

@@ -22,9 +22,9 @@ extern u32 var800624a8;
 extern u32 var800624ac;
 extern u32 var800624b0;
 extern s32 g_TitleMode;
-extern s32 var800624b8;
-extern u32 var800624bc;
-extern s32 var800624c0;
+extern s32 g_TitleNextMode;
+extern u32 g_TitleDelayedTimer;
+extern s32 g_TitleDelayedMode;
 extern s32 g_TitleTimer;
 extern u32 var800624e0;
 extern s32 var800624e4;

src/include/game/game_016100.h

@@ -5,50 +5,50 @@
 
 char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot);
 u32 func0f01616c(void);
-void func0f016404(void);
-void func0f01644c(void);
-void func0f0164c8(void);
-void func0f0164f0(void);
-void func0f016524(void);
-Gfx *titleRenderMode1(Gfx *gdl);
+void titleInitLegal(void);
+void titleTickLegal(void);
+void titleInitCheckControllers(void);
+void titleExitCheckControllers(void);
+void titleTickCheckControllers(void);
+Gfx *titleRenderCheckControllers(Gfx *gdl);
 Gfx *titleRenderLegal(Gfx *gdl);
-void func0f016d34(void);
-void func0f01706c(void);
-void func0f0170bc(void);
+void titleInitPdLogo(void);
+void titleExitPdLogo(void);
+void titleTickPdLogo(void);
 u32 func0f017248(void);
 u32 func0f017980(void);
 Gfx *titleRenderPdLogo(Gfx *gdl);
-void func0f018db0(void);
-void func0f018ddc(void);
-void func0f018e1c(void);
+void titleInitRarePresents(void);
+void titleExitRarePresents(void);
+void titleTickRarePresents(void);
 u32 func0f018ebc(void);
 Gfx *titleRenderRarePresents(Gfx *gdl);
-void func0f0193fc(void);
-void func0f0194e0(void);
-void func0f01950c(void);
+void titleInitNintendoLogo(void);
+void titleExitNintendoLogo(void);
+void titleTickNintendoLogo(void);
 Gfx *titleRenderNintendoLogo(Gfx *gdl);
-void func0f019a80(void);
-void func0f019b74(void);
-void func0f019ba0(void);
+void titleInitRareLogo(void);
+void titleExitRareLogo(void);
+void titleTickRareLogo(void);
 u32 func0f019d0c(void);
 Gfx *titleRenderRareLogo(Gfx *gdl);
-u32 func0f01a3b8(void);
-void func0f01a494(void);
-void func0f01a4a8(void);
+void titleInitModeSkip(void);
+void titleInitNoController(void);
+void titleTickNoController(void);
 Gfx *titleRenderNoController(Gfx *gdl);
-void func0f01a7e4(s32 arg0);
-void func0f01a810(void);
-bool func0f01ab94(void);
-bool func0f01aba8(void);
-void func0f01abf0(void);
-void func0f01aca8(u32 arg0);
+void titleSetNextMode(s32 mode);
+void titleTick(void);
+bool titleIsChangingMode(void);
+bool titleIsKeepingMode(void);
+void titleExit(void);
+void titleInitFromAiCmd(u32 arg0);
 bool func0f01ad5c(void);
 void func0f01adb8(void);
 void func0f01ae30(void);
 Gfx *titleRender(Gfx *gdl);
-void func0f016444(void);
+void titleExitLegal(void);
 s32 getNumPlayers(void);
 void setNumPlayers(s32 numplayers);
-void func0f01a4a0(void);
+void titleExitNoController(void);
 
 #endif

src/include/lib/lib_09660.h

@@ -16,7 +16,7 @@ u32 func00009ab0(void);
 u32 func00009b50(void);
 u32 func00009bf8(void);
 u32 func00009c3c(void);
-void func00009ec4(s32 arg0);
+void func00009ec4(bool arg0);
 u32 func00009ed4(void);
 u32 func0000a044(void);
 u32 func0000aa50(void);