5 files changed, 76 insertions, 65 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 11a7c7fc5..51ef0c015 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -346,4 +346,6 @@
 #define NUM_MALE_LINK_FACILITY_CLASSES   8
 #define NUM_FEMALE_LINK_FACILITY_CLASSES 8
 
+#define MON_PIC_SIZE (64 * 64 / 2)
+
 #endif // GUARD_CONSTANTS_POKEMON_H
diff --git a/include/credits.h b/include/credits.h
index f7dfa9997..2e8c7e0c3 100644
--- a/include/credits.h
+++ b/include/credits.h
@@ -1,12 +1,8 @@
 #ifndef GUARD_CREDITS_H
 #define GUARD_CREDITS_H
 
-// Exported type declarations
-
-// Exported RAM declarations
 extern EWRAM_DATA bool8 gHasHallOfFameRecords;
 
-// Exported ROM declarations
 void CB2_StartCreditsSequence(void);
 
 #endif // GUARD_CREDITS_H
diff --git a/include/graphics.h b/include/graphics.h
index 9be05f38e..7c36b9cf5 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3874,46 +3874,43 @@ extern const u32 gBagPalette[];
 extern const u32 gBerryCheckCircle_Gfx[];
 
 //intro graphics
-extern const u32 gIntro1SparkleGfx[];
-extern const u32 gIntro1FlygonGfx[];
-extern const u16 gIntro3LightningPal[];
+extern const u32 gIntroSparkle_Gfx[];
+extern const u32 gIntroFlygonSilhouette_Gfx[];
+extern const u32 gIntroLightning_Gfx[];
+extern const u16 gIntroLightning_Pal[];
 extern const u32 gIntroCopyright_Gfx[];
 extern const u32 gIntroCopyright_Tilemap[];
 extern const u16 gIntroCopyright_Pal[16];
-extern const u32 gIntro2VolbeatGfx[];
-extern const u32 gIntro2TorchicGfx[];
-extern const u32 gIntro2ManectricGfx[];
-extern const u16 gIntro2VolbeatPal[];
-extern const u16 gIntro2TorchicPal[];
-extern const u16 gIntro2ManectricPal[];
-extern const u32 gIntro2BubblesGfx[];
-extern const u16 gIntro2BubblesPal[];
-extern const u32 gIntro3LightningGfx[];
-extern const u32 gIntro3GroudonGfx[];
-extern const u32 gIntro3GroudonTilemap[];
-extern const u32 gIntro3LegendBgGfx[];
-extern const u32 gIntro3GroudonBgTilemap[];
-extern const u32 gIntro3GroudonBgTilemap[];
-extern const u8 gIntro3BgPal[0x200];
-extern const u32 gIntro3KyogreGfx[];
-extern const u32 gIntro3KyogreTilemap[];
-extern const u32 gIntro3KyogreBgTilemap[];
-extern const u32 gIntro3CloudsGfx[];
-extern const u32 gIntro3Clouds1Tilemap[];
-extern const u32 gIntro3Clouds2Tilemap[];
-extern const u32 gIntro3Clouds3Tilemap[];
-extern const u32 gIntro3Clouds4Tilemap[];
-extern const u32 gIntro3RayquazaTilemap[];
-extern const u32 gIntro3RayquazaGfx[];
-extern const u32 gIntro3Clouds2Gfx[];
-extern const u16 gIntro1GameFreakTextFadePal[];
-
-//intro/credits graphics
-extern const u32 gIntro2BrendanNoTurnGfx[];
-extern const u32 gIntro2MayNoTurnGfx[];
-extern const u16 gIntro2BrendanNoTurnPal[];
-extern const u16 gIntro2FlygonPal[];
-extern const u32 gIntro2FlygonGfx[];
+extern const u32 gIntroVolbeat_Gfx[];
+extern const u16 gIntroVolbeat_Pal[];
+extern const u32 gIntroTorchic_Gfx[];
+extern const u16 gIntroTorchic_Pal[];
+extern const u32 gIntroManectric_Gfx[];
+extern const u16 gIntroManectric_Pal[];
+extern const u32 gIntroBubbles_Gfx[];
+extern const u16 gIntroBubbles_Pal[];
+extern const u32 gIntroGroudon_Gfx[];
+extern const u32 gIntroGroudon_Tilemap[];
+extern const u32 gIntroLegendBg_Gfx[];
+extern const u32 gIntroGroudonBg_Tilemap[];
+extern const u8 gIntro3Bg_Pal[0x200];
+extern const u32 gIntroKyogre_Gfx[];
+extern const u32 gIntroKyogre_Tilemap[];
+extern const u32 gIntroKyogreBg_Tilemap[];
+extern const u32 gIntroClouds_Gfx[];
+extern const u32 gIntroCloudsLeft_Tilemap[];
+extern const u32 gIntroCloudsRight_Tilemap[];
+extern const u32 gIntroCloudsSun_Tilemap[];
+extern const u32 gIntroRayquaza_Tilemap[];
+extern const u32 gIntroRayquaza_Gfx[];
+extern const u32 gIntroRayquazaClouds_Gfx[];
+extern const u32 gIntroRayquazaClouds_Tilemap[];
+extern const u16 gIntroGameFreakTextFade_Pal[];
+extern const u32 gIntroBrendan_Gfx[];
+extern const u32 gIntroMay_Gfx[];
+extern const u16 gIntroPlayer_Pal[];
+extern const u16 gIntroFlygon_Pal[];
+extern const u32 gIntroFlygon_Gfx[];
 
 // party menu graphics
 extern const u32 gPartyMenuBg_Gfx[];
diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h
index 2c7ceaf57..bed30ffe8 100644
--- a/include/intro_credits_graphics.h
+++ b/include/intro_credits_graphics.h
@@ -1,30 +1,46 @@
 #ifndef GUARD_INTRO_CREDITS_GRAPHICS_H
 #define GUARD_INTRO_CREDITS_GRAPHICS_H
 
-extern u16 gUnknown_0203BD24;
-extern s16 gUnknown_0203BD26;
-extern s16 gUnknown_0203BD28;
+// States for gIntroCredits_MovingSceneryState
+enum {
+    INTROCRED_SCENERY_NORMAL,
+    INTROCRED_SCENERY_DESTROY,
+    INTROCRED_SCENERY_FROZEN,
+};
 
-extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[];
-extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[];
-extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[];
-extern const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[];
-extern const struct SpritePalette gIntroBikeAndFlygonPalette[];
-extern const struct CompressedSpriteSheet gUnknown_085F5334[];
-extern const struct CompressedSpriteSheet gUnknown_085F5344[];
-extern const struct CompressedSpriteSheet gUnknown_085F5354[];
-extern const struct CompressedSpriteSheet gUnknown_085F53AC[];
-extern const struct CompressedSpriteSheet gUnknown_085F53BC[];
-extern const struct SpritePalette gUnknown_085F5384[];
+// Scenes for the Credits sequence
+enum {
+    SCENE_OCEAN_MORNING,
+    SCENE_OCEAN_SUNSET,
+    SCENE_FOREST_RIVAL_ARRIVE,
+    SCENE_FOREST_CATCH_RIVAL,
+    SCENE_CITY_NIGHT,
+};
 
-void load_intro_part2_graphics(u8 a);
-void sub_817B150(u8 a);
-void sub_817B1C8(u8);
-void sub_817B3A8(u8);
-u8 CreateBicycleAnimationTask(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);
+extern u16 gIntroCredits_MovingSceneryVBase;
+extern s16 gIntroCredits_MovingSceneryVOffset;
+extern s16 gIntroCredits_MovingSceneryState;
+
+extern const struct CompressedSpriteSheet gSpriteSheet_IntroBrendan[];
+extern const struct CompressedSpriteSheet gSpriteSheet_IntroMay[];
+extern const struct CompressedSpriteSheet gSpriteSheet_IntroBicycle[];
+extern const struct CompressedSpriteSheet gSpriteSheet_IntroFlygon[];
+extern const struct SpritePalette gSpritePalettes_IntroPlayerFlygon[];
+extern const struct CompressedSpriteSheet gSpriteSheet_CreditsBrendan[];
+extern const struct CompressedSpriteSheet gSpriteSheet_CreditsMay[];
+extern const struct CompressedSpriteSheet gSpriteSheet_CreditsBicycle[];
+extern const struct CompressedSpriteSheet gSpriteSheet_CreditsRivalBrendan[];
+extern const struct CompressedSpriteSheet gSpriteSheet_CreditsRivalMay[];
+extern const struct SpritePalette gSpritePalettes_Credits[];
+
+void LoadIntroPart2Graphics(u8 scene);
+void SetIntroPart2BgCnt(u8 a);
+void LoadCreditsSceneGraphics(u8);
+void SetCreditsSceneBgCnt(u8);
+u8 CreateBicycleBgAnimationTask(u8 a, u16 b, u16 c, u16 d);
+void CycleSceneryPalette(u8);
+u8 CreateIntroBrendanSprite(s16 x, s16 y);
+u8 CreateIntroMaySprite(s16 x, s16 y);
+u8 CreateIntroFlygonSprite(s16 x, s16 y);
 
 #endif // GUARD_INTRO_CREDITS_GRAPHICS_H
diff --git a/include/title_screen.h b/include/title_screen.h
index b7100f124..0c80db5bf 100644
--- a/include/title_screen.h
+++ b/include/title_screen.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TITLE_SCREEN_H
 #define GUARD_TITLE_SCREEN_H
 
-extern const u16 gIntroWaterDropAlphaBlend[];
+extern const u16 gTitleScreenAlphaBlend[64];
 
 void CB2_InitTitleScreen(void);