Almost finish decompiling intro

7 files changed, 71 insertions, 27 deletions

diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index 1847b688f..0364c38bc 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -623,23 +623,6 @@
 #define TIMER_INTR_ENABLE 0x40
 #define TIMER_ENABLE      0x80
 
-// BGCNT
-#define BGCNT_PRIORITY(n)          (n) // Values 0 - 3. Lower priority BGs will be drawn on top of higher priority BGs.
-#define BGCNT_CHARBASE(n)   ((n) << 2) // Values 0 - 3. Base block for tile pixel data.
-#define BGCNT_MOSAIC            0x0040
-#define BGCNT_16COLOR           0x0000 // 4 bits per pixel
-#define BGCNT_256COLOR          0x0080 // 8 bits per pixel
-#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for tile map.
-#define BGCNT_WRAP              0x2000 // Only affects affine BGs. Text BGs wrap by default.
-#define BGCNT_TXT256x256        0x0000 // Internal screen size size of text mode BG in pixels.
-#define BGCNT_TXT512x256        0x4000
-#define BGCNT_TXT256x512        0x8000
-#define BGCNT_TXT512x512        0xC000
-#define BGCNT_AFF128x128        0x0000 // Internal screen size size of affine mode BG in pixels.
-#define BGCNT_AFF256x256        0x4000
-#define BGCNT_AFF512x512        0x8000
-#define BGCNT_AFF1024x1024      0xC000
-
 // serial
 #define SIO_ID             0x0030 // Communication ID
 
diff --git a/include/graphics.h b/include/graphics.h
index 6e5de9ef4..76eaff28f 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2725,4 +2725,24 @@ extern const u16 gBagScreenFemale_Pal[];
 extern const u16 gBagScreenMale_Pal[];
 extern const u8 gBagMenuHMIcon_Gfx[];
 
+//intro graphics
+extern const u8 gIntro3GroudonGfx[];
+extern const u8 gIntro3GroudonTilemap[];
+extern const u8 gIntro3LegendBgGfx[];
+extern const u8 gIntro3GroudonBgTilemap[];
+extern const u8 gIntro3GroudonBgTilemap[];
+extern const u8 gIntro3BgPal[0x200];
+extern const u8 gIntro3KyogreGfx[];
+extern const u8 gIntro3KyogreTilemap[];
+extern const u8 gIntro3KyogreBgTilemap[];
+extern const u8 gIntro3CloudsGfx[];
+extern const u8 gIntro3Clouds1Tilemap[];
+extern const u8 gIntro3Clouds2Tilemap[];
+extern const u8 gIntro3Clouds3Tilemap[];
+extern const u8 gIntro3Clouds4Tilemap[];
+extern const u8 gIntro3RayquazaTilemap[];
+extern const u8 gIntro3RayquazaGfx[];
+extern const u8 gIntro3Clouds2Gfx[];
+extern const u16 gIntro1GameFreakTextFadePal[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/intro.h b/include/intro.h
index aae3438fe..b1bfe20a4 100644
--- a/include/intro.h
+++ b/include/intro.h
@@ -6,7 +6,7 @@
 // Exported RAM declarations
 
 // Exported ROM declarations
-void c2_copyright_1(void);
+void CB2_InitCopyrightScreenAfterBootup(void);
 void CB2_InitCopyrightScreenAfterBootup(void);
 void CB2_InitCopyrightScreenAfterTitleScreen(void);
 void sub_816F2A8(u16, u16, u16, u16);
diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h
new file mode 100644
index 000000000..c63861d87
--- /dev/null
+++ b/include/intro_credits_graphics.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_INTRO_CREDITS_GRAPHICS_H
+#define GUARD_INTRO_CREDITS_GRAPHICS_H
+
+extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[];
+extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[];
+extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[];
+extern const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[];
+extern const struct SpritePalette gUnknown_085F530C[];
+
+void load_intro_part2_graphics(u8 a);
+void sub_817B150(u8 a);
+u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d);
+void sub_817B540(u8);
+u8 intro_create_brendan_sprite(s16 a, s16 b);
+u8 intro_create_may_sprite(s16 a, s16 b);
+u8 intro_create_flygon_sprite(s16 a, s16 b);
+
+#endif // GUARD_INTRO_CREDITS_GRAPHICS_H
diff --git a/include/libgcnmultiboot.h b/include/libgcnmultiboot.h
new file mode 100644
index 000000000..7d347df05
--- /dev/null
+++ b/include/libgcnmultiboot.h
@@ -0,0 +1,17 @@
+#ifndef GUARD_LIBGCMMULTIBOOT_H
+#define GUARD_LIBGCNMULTIBOOT_H
+
+struct GcmbStruct
+{
+    u16 gcmb_field_0;
+    vu8 gcmb_field_2;
+    u8 filler3[0x2C - 0x3];
+};
+
+void GameCubeMultiBoot_Main(struct GcmbStruct *pStruct);
+void GameCubeMultiBoot_ExecuteProgram(struct GcmbStruct *pStruct);
+void GameCubeMultiBoot_Init(struct GcmbStruct *pStruct);
+void GameCubeMultiBoot_HandleSerialInterrupt(struct GcmbStruct *pStruct);
+void GameCubeMultiBoot_Quit(void);
+
+#endif // GUARD_LIBGCNMULTIBOOT_H
diff --git a/include/multiboot_pokemon_colosseum.h b/include/multiboot_pokemon_colosseum.h
new file mode 100644
index 000000000..33e4bc33c
--- /dev/null
+++ b/include/multiboot_pokemon_colosseum.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MULTIBOOT_POKEMON_COLOSSEUM_H
+#define GUARD_MULTIBOOT_POKEMON_COLOSSEUM_H
+
+extern const u16 gMultiBootProgram_PokemonColosseum_Start[0x14000];
+
+#endif // GUARD_MULTIBOOT_POKEMON_COLOSSEUM_H
diff --git a/include/save.h b/include/save.h
index 3bd1ff8cf..f06db2955 100644
--- a/include/save.h
+++ b/include/save.h
@@ -47,19 +47,19 @@ enum
 // Do save types
 enum
 {
-    NORMAL_SAVE,
-    LINK_SAVE,
-    //EREADER_SAVE, // depreciated in Emerald
-	LINK2_SAVE, // unknown 2nd link save
-    HOF_SAVE,
-    DIFFERENT_FILE_SAVE,
-    HOF_DELETE_SAVE // unused
+    SAVE_NORMAL,
+    SAVE_LINK,
+    //EREADER_SAVE, // deprecated in Emerald
+	SAVE_LINK2, // unknown 2nd link save
+    SAVE_HALL_OF_FAME,
+    SAVE_OVERWRITE_DIFFERENT_FILE,
+    SAVE_HALL_OF_FAME_ERASE_BEFORE // unused
 };
 
 #define SECTION_ID_RECORDED_BATTLE  31
 
 void ClearSaveData(void);
-void ResetSaveCounters(void);
+void Save_ResetSaveCounters(void);
 bool32 SetDamagedSectorBits(u8 op, u8 bit);
 u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location);
 u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location);
@@ -88,7 +88,7 @@ u8 sub_81533E0(void);
 u8 sub_8153408(void);
 u8 sub_8153430(void);
 bool8 sub_8153474(void);
-u8 sub_81534D0(u8 a1);
+u8 Save_LoadGameData(u8 a1);
 u16 sub_815355C(void);
 u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
 u32 sub_8153634(u8 sector, u8* src);