Merge remote-tracking branch 'upstream/master'

include/functions.h

@@ -138,7 +138,7 @@ extern void sub_0801AFE4(void);
 extern u32 sub_08060354(void);
 extern void sub_08057E64(void);
 extern void LoadAssetAsync(void*, u32, u32);
-extern void LoadPalettesByPaletteGroupIndex(u32);
+extern void LoadPaletteGroup(u32);
 extern void sub_0809F814(u32);
 extern void sub_080300E8(void);
 extern void sub_0801DA90(u32);
@@ -168,16 +168,10 @@ extern void sub_080AF2E4(void);
 extern void sub_0805ADD8(u32);
 extern void sub_0804F578(void);
 extern void sub_08059994(void);
-extern u32 sub_080AD84C();
-extern void sub_0801D7EC(u32);
+extern void LoadGfxGroup(u32);
 extern s32 sub_0801CFA8(u32);
-extern void sub_080AD670();
 extern void sub_080A3210();
-extern void sub_080AD6AC();
-extern void sub_080AD76C();
-extern void sub_080AD644();
 extern void sub_080ADA14(u32, u32);
-extern void sub_080AD89C();
 extern void sub_0801E1B8(u32, u32);
 extern void sub_0801E1EC(s32, s32, s32);
 extern void sub_08050008(void);
@@ -244,6 +238,12 @@ extern void sub_0807921C();
 extern void sub_0807A1B8();
 extern void sub_08079938();
 extern void sub_0807ACCC(Entity*);
+extern void HandleIntroScreen(void);
+extern void HandleChooseFileScreen(void);
+extern void HandleGameplayScreen(void);
+extern void HandleGameOverScreen(void);
+extern void HandleCreditsScreen(void);
+extern void HandleDebugTextScreen(void);
 extern void sub_080A2BE4(Entity*, u32);
 extern u32 sub_08097ADC(Entity*);
 extern void sub_08097B24(Entity*);

include/main.h

@@ -20,6 +20,7 @@ enum {
     SCREEN_GAMEPLAY,
     SCREEN_GAME_OVER,
     SCREEN_CREDITS,
+    SCREEN_DEBUG_TEXT,
 };
 
 typedef struct {

include/menu.h

@@ -36,8 +36,9 @@ typedef struct {
     u8 unk16;
     u8 filler17[0x13];
     u8 unk2a;
-    u32 field_0x2c;
+    int field_0x2c;
 } Menu;
 
 extern Menu gMenu;
+
 #endif

include/screen.h

@@ -4,19 +4,25 @@
 #include "global.h"
 
 typedef struct {
-    u16 lcdControl2;
-    u16 unk2;
-    u32 unk;
-    u16 lcdControl1;
+    u16 displayControl;
+    u8 filler2[0x2];
+    u16 unk4;
+    u16 unk6;
 } LcdControls;
 
 typedef struct {
     u16 bg0Control;
+    u16 bg1Control;
+    u16 bg2Control;
+    u16 bg3Control;
     u16 bg0xOffset;
     u16 bg0yOffset;
-    u16 bg0Updated;
-    u16 unk;
-    u16 unk2;
+    u16 bg1xOffset;
+    u16 bg1yOffset;
+    u16 bg2xOffset;
+    u16 bg2yOffset;
+    u16 bg3xOffset;
+    u16 bg3yOffset;
 } BgSettings;
 
 typedef struct {
@@ -63,11 +69,10 @@ typedef struct {
 } BgControls;
 
 typedef struct {
-    LcdControls lcd;
-    BgSettings bg1;
-    BgSettings bg2;
-    BgAffSettings affine;
-    BgControls controls;
+    /*0x00*/ LcdControls lcd;
+    /*0x08*/ BgSettings bg;
+    /*0x20*/ BgAffSettings affine;
+    /*0x38*/ BgControls controls;
 } Screen;
 
 extern BgControls gBgControls;

include/structures.h

@@ -28,7 +28,7 @@ typedef struct {
 typedef struct {
     u8 filler0[0x4];
     u8 field_0x4;
-    u8 field_0x5;
+    u8 listenForKeyPresses;
 } struct_02000010;
 
 extern struct_02000010 gUnk_02000010;
@@ -107,4 +107,23 @@ typedef struct {
 
 extern struct_02019EE0 gUnk_02019EE0;
 
+typedef struct {
+    u8 active;
+    u8 field_0x1;
+    u8 field_0x2;
+    u8 field_0x3;
+    u32 field_0x4;
+    u16 fadeType; // fade in or out, are there others?
+    u16 fadeSpeed; // subtracted from duration
+    u16 fadeDuration;
+    u16 field_0xe;
+    s16 field_0x10;
+    s16 field_0x12;
+    s16 field_0x14;
+    u16 field_0x16;
+    u16 field_0x18;
+} struct_03000FD0;
+
+extern struct_03000FD0 gFadeControl;
+
 #endif