6 files changed, 21 insertions, 22 deletions
diff --git a/include/credits.h b/include/credits.h
deleted file mode 100644
index c8a19bbeb..000000000
--- a/include/credits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_CREDITS_H
-#define GUARD_CREDITS_H
-
-
-
-#endif //GUARD_CREDITS_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 3e544b106..794472f43 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -16,6 +16,6 @@ void PlayRainStoppingSoundEffect(void);
 bool8 sub_807AA70(void);
 void SetWeatherScreenFadeOut(void);
 void sub_807B070(void);
-void sub_807A944(u8, u8, u32);
+void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32);
 
 #endif // GUARD_WEATHER_H
diff --git a/include/graphics.h b/include/graphics.h
index 50daf7661..6139869c9 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -975,11 +975,11 @@ extern const u16 gGraphics_TitleScreen_FirePals[];
 extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
 
 // credits
-extern const u32 gUnknown_8EAAB98[];
-extern const u32 gUnknown_8EAB30C[];
-extern const u16 gUnknown_8EAAB18[][16];
-extern const u16 gUnknown_8EAE528[];
-extern const u8 gUnknown_8EAE548[];
-extern const u8 gUnknown_8EAE900[];
+extern const u32 gCreditsPokeballBgGfxTiles[];
+extern const u32 gCreditsPokeballBgGfxMap[];
+extern const u16 gCreditsMonBackdropPals[][16];
+extern const u16 gCreditsAllRightsReservedGfxPal[];
+extern const u8 gCreditsAllRightsReservedGfxTiles[];
+extern const u8 gCreditsAllRightsReservedGfxMap[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/include/overworld.h b/include/overworld.h
index f27a4dbd3..472ebf544 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_ROM4_H
-#define GUARD_ROM4_H
+#ifndef GUARD_OVERWORLD_H
+#define GUARD_OVERWORLD_H
 
 #include "global.h"
 #include "main.h"
@@ -30,6 +30,11 @@ struct CreditsOverworldCmd
     u16 unk_4;
 };
 
+/* gDisableMapMusicChangeOnMapLoad */
+#define MUSIC_DISABLE_OFF 0
+#define MUSIC_DISABLE_STOP 1
+#define MUSIC_DISABLE_KEEP 2
+
 extern struct UCoords32 gDirectionToVectors[];
 
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
@@ -104,7 +109,7 @@ void ResetInitialPlayerAvatarState(void);
 void sub_8055D40(u16 mapDataId);
 void CleanupOverworldWindowsAndTilemaps(void);
 
-extern u8 gUnknown_2031DD8;
+extern u8 gDisableMapMusicChangeOnMapLoad;
 extern u8 gUnknown_2036E28;
 
 extern void (*gFieldCallback)(void);
@@ -126,7 +131,7 @@ bool32 sub_8055C9C(void);
 void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
 
-void sub_80574A4(void);
-bool32 sub_805750C(u8 *, const struct CreditsOverworldCmd *, u8);
+void Overworld_CreditsMainCB(void);
+bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
 
-#endif //GUARD_ROM4_H
+#endif //GUARD_OVERWORLD_H
diff --git a/include/strings.h b/include/strings.h
index 001f08f61..9f521a65e 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -210,8 +210,8 @@ extern const u8 gString_SlotMachineControls[];
 
 // credits
 extern const u8 gUnknown_84161CD[];
-extern const u8 gUnknown_841D198[]; // FR
-extern const u8 gUnknown_841D1B8[]; // LG
+extern const u8 gString_PokemonFireRed_Staff[]; // FR
+extern const u8 gString_PokemonLeafGreen_Staff[]; // LG
 extern const u8 gUnknown_841D1D8[];
 extern const u8 gUnknown_841D1E8[];
 extern const u8 gUnknown_841D200[];
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h
index dfd716176..db32623bf 100644
--- a/include/trainer_pokemon_sprites.h
+++ b/include/trainer_pokemon_sprites.h
@@ -14,6 +14,6 @@ u8 sub_818D97C(u8 a0, u8 a1);
 u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 FreeAndDestroyTrainerPicSprite(u16);
 u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
-u16 sub_810C228(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
+u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
 
 #endif // GUARD_TRAINER_POKEMON_SPRITES_H