Merge branch 'master' into battle

This commit is contained in:
PikalaxALT authored and GitHub committed 2019-09-25 13:49:16 -04:00
commit 0e217e22d8
67 files changed
+3363 -3782

No files matched your search

+8
View File
@@ -990,4 +990,12 @@ extern const u32 gSubstituteDollGfx[];
extern const u32 gSubstituteDollTilemap[];
extern const u32 gSubstituteDollPal[];
// credits
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