Decompile titleRenderRarePresents

src/include/game/data/data_000000.h

@@ -192,7 +192,7 @@ extern u32 var80061460;
 extern u32 var80061468;
 extern s32 g_FootstepSounds[];
 extern u16 var800615a0[][2];
-extern u32 var80061630;
+extern f32 var80061630;
 extern u32 var80061634;
 extern u32 var80061640;
 extern u32 var80061644;

src/include/game/data/data_0083d0.h

@@ -73,7 +73,7 @@ extern u32 var80062810;
 extern f32 var80062814;
 extern u32 var80062818;
 extern u32 var80062858;
-extern s32 *g_TitleAudioHandle;
+extern struct audiohandle *g_TitleAudioHandle;
 extern u32 var80062868;
 extern u32 var80062870;
 extern u32 var8006287c;

src/include/game/data/data_00e460.h

@@ -26,7 +26,7 @@ extern u8 var80069860[8];
 extern struct coord var80069868;
 extern struct coord var80069874;
 extern u32 var800698c0;
-extern s32 g_AlarmAudioHandle;
+extern struct audiohandle *g_AlarmAudioHandle;
 extern f32 g_AlarmSpeakerWeight;
 extern f32 g_AlarmSpeakerDirection;
 extern f32 var800698e4;

src/include/game/data/data_020df0.h

@@ -281,7 +281,7 @@ extern s32 g_MpTimeElapsed;
 extern s32 g_MpTimeLimit;
 extern s32 g_MpScoreLimit;
 extern s32 g_MpTeamScoreLimit;
-extern void *g_MiscAudioHandle;
+extern struct audiohandle *g_MiscAudioHandle;
 extern s32 var80084038;
 extern f32 g_Uptime;
 extern bool var80084040;

src/include/game/game_016100.h

@@ -21,7 +21,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl);
 void titleInitRarePresents(void);
 void titleExitRarePresents(void);
 void titleTickRarePresents(void);
-u32 func0f018ebc(void);
+Gfx *func0f018ebc(Gfx *gdl, s32 *x, s32 *y, u32 textnum, s32 timer, s32 *arg5);
 Gfx *titleRenderRarePresents(Gfx *gdl);
 void titleInitNintendoLogo(void);
 void titleExitNintendoLogo(void);

src/include/game/game_141820.h

@@ -19,7 +19,7 @@ u32 func0f143678(void);
 Gfx *hudRenderEyespyUi(Gfx *gdl);
 Gfx *func0f1472fc(Gfx *gdl);
 Gfx *func0f147578(Gfx *gdl);
-u32 func0f147cf8(void);
+Gfx *func0f147cf8(Gfx *gdl);
 Gfx *hudRenderHorizonScanner(Gfx *gdl);
 Gfx *func0f14886c(Gfx *gdl);
 u32 func0f148b40(void);

src/include/lib/lib_0e9d0.h

@@ -31,9 +31,9 @@ void func0000fe50(void);
 void func0000fe88(void);
 u32 func00010360(void);
 u32 func0001036c(void);
-void audioAdjust(s32 *handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
+void audioAdjust(struct audiohandle **handle, u32 arg1, u32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
 void func00010718(s32 *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
-s32 audioStart(s32 arg0, s16 sound, s32 *handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
+s32 audioStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
 u32 func00010ae4(void);
 void func00010db0(s32 room_id);
 void func00010de0(s32 room_id);

src/include/lib/lib_317f0.h

@@ -13,9 +13,9 @@ u32 func00033378(void);
 u32 func00033390(void);
 u32 func00033634(void);
 u32 func0003364c(void);
-u32 func000337f0(s32 *handle);
+u32 func000337f0(struct audiohandle *handle);
 u32 func00033820(void);
-void audioStop(s32 *handle);
+void audioStop(struct audiohandle *handle);
 u32 func00033bc0(void);
 u32 func00033c30(void);
 u32 func00033cf0(void);

src/include/types.h

@@ -1172,6 +1172,10 @@ struct eyespy {
 	/*0x7c*/ s32 pitch;
 };
 
+struct audiohandle {
+	u32 unk00;
+};
+
 /**
  * List of guns that the player has equipped and the amount of time they've been
  * equipped for. It's used to determine the weapon of choice for the endscreen.
@@ -1671,7 +1675,7 @@ struct hand {
 	/*0x0d74*/ u16 unk0d74[4];
 	/*0x0d7c*/ u32 unk0d7c;
 	/*0x0d80*/ u32 unk0d80;
-	/*0x0d84*/ s32 *audiohandle;
+	/*0x0d84*/ struct audiohandle *audiohandle;
 	/*0x0d88*/ u32 unk0d88;
 	/*0x0d8c*/ u32 unk0d8c;
 	/*0x0d90*/ u32 unk0d90;
@@ -5353,7 +5357,7 @@ struct weatherdata {
 	/*0x28*/ u32 unk28;
 	/*0x2c*/ u32 unk2c;
 	/*0x30*/ u32 unk30;
-	/*0x34*/ s32 *audiohandles[4];
+	/*0x34*/ struct audiohandle *audiohandles[4];
 	/*0x44*/ s32 unk44;
 	/*0x48*/ s32 unk48;
 	/*0x4c*/ s32 unk4c;