Decompile a chunk of titlescreen.s

3 files changed, 44 insertions, 17 deletions

diff --git a/include/m4a.h b/include/m4a.h
index 5953794..1a68f8c 100755
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -12,15 +12,13 @@ void m4aSongNumStart(u16);
 void m4aSongNumStop(u16 n);
 void m4aMPlayAllStop(void);
 void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
+void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
 void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct MusicPlayerInfo gMPlayInfo_SE1;
-extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern struct MusicPlayerInfo gMPlayInfo_SE3;
+extern struct MusicPlayerInfo gMPlayInfo_02032EE0;
 extern struct SoundInfo gSoundInfo;
 
 #endif //GUARD_M4A_H
diff --git a/include/main.h b/include/main.h
index 6cc29c5..0d4de6f 100755
--- a/include/main.h
+++ b/include/main.h
@@ -7,16 +7,23 @@ typedef void (*StateFunc)(void);
 
 struct Main
 {
-    /*0x00*/u8 filler0[0x2];
-    /*0x02*/u8 mainState;
-    /*0x03*/u8 subState;
-    /*0x04*/u8 filler4[0x12];
-    /*0x16*/u16 unk16;
-    /*0x18*/u8 filler18[0x28];
-    /*0x40*/int unk40;
+    /*0x00*/ u8 filler0[0x2];
+    /*0x02*/ u8 mainState;
+    /*0x03*/ u8 subState;
+    /*0x04*/ u8 filler4[0x9];
+    /*0x0D*/ u8 unkD;
+    /*0x0E*/ u8 fillerE[0x8];
+    /*0x16*/ u16 unk16;
+    /*0x18*/ u16 newKeys;
+    /*0x1A*/ u16 releasedKeys;
+    /*0x1C*/ u16 heldKeys;
+    /*0x1E*/ u8 filler1E[0x22];
+    /*0x40*/ int unk40;
 };
 
 extern struct Main gMain;
 extern StateFunc gMainFuncs[];
 
+void SetMainGameState(u16);
+
 #endif // GUARD_MAIN_H
diff --git a/include/titlescreen.h b/include/titlescreen.h
index 0fcbe8d..65d790e 100755
--- a/include/titlescreen.h
+++ b/include/titlescreen.h
@@ -1,16 +1,38 @@
 #ifndef GUARD_TITLESCREEN_H
 #define GUARD_TITLESCREEN_H
 
-struct UnkStruct2002888
+struct TitlescreenStruct
 {
-    /*0x00*/u8 filler0[0x9];
-    /*0x09*/u8 unk9;
-    /*0x0A*/u8 fillerA[0x1];
-    /*0x0B*/u8 unkB;
+    /*0x00*/ s8 menuCursorIndex;
+    /*0x02*/ s16 unk2;
+    /*0x04*/ s16 unk4;
+    /*0x06*/ s8 unk6;
+    /*0x07*/ u8 unk7;
+    /*0x08*/ s8 unk8;
+    /*0x09*/ u8 unk9;
+    /*0x0A*/ u8 unkA;
+    /*0x0B*/ u8 unkB;
+    /*0x0C*/ u8 unkC;
+    /*0x0D*/ u8 unkD;
+    /*0x0E*/ u8 unkE;
+    /*0x0F*/ u8 unkF;
+    /*0x10*/ u8 unk10;
+    /*0x11*/ u8 unk11;
+    /*0x12*/ s16 idleFadeoutCounter;
+    /*0x14*/ s16 idleFramesCounter;
 };
 
-extern struct UnkStruct2002888 gUnknown_2002888;
+extern struct TitlescreenStruct gTitlescreen;
 extern s8 gAutoDisplayTitlescreenMenu;
 extern u8 gUnknown_202BE24;
+extern u16 gUnknown_0202C588;
+extern s8 gUnknown_020028A0;
+extern s8 gUnknown_020028A1;
+extern u8 gUnknown_020028A2;
+extern u8 gUnknown_020028A3;
+extern s8 gUnknown_020028A4;
+extern s8 gUnknown_020028A5;
+extern const u8 *gUnknown_0201C190[];
+extern const u8 *gUnknown_0202BE00[];
 
 #endif // GUARD_TITLESCREEN_H