Merge branch 'master' of https://github.com/pret/pokeemerald into menu

This commit is contained in:
Diegoisawesome
2018-02-07 18:06:59 -06:00
385 changed files with 26738 additions and 46633 deletions

View File

@@ -2654,6 +2654,12 @@ extern const u8 gBattleTerrainPalette_StadiumWallace[];
extern const u8 gPokedexMenu2_Gfx[];
extern const u8 gPokedexText_Pal[];
// berry tag screen
extern const u8 gUnknown_08D9BB44[];
extern const u8 gUnknown_08D9BF98[];
extern const u8 gUnknown_08D9C13C[];
extern const u8 gUnknown_08D9BEF0[];
// rayquaza scene gfx
extern const u8 gRaySceneGroudon_Gfx[];
extern const u8 gRaySceneGroudon2_Gfx[];
@@ -2673,11 +2679,39 @@ extern const u8 gRaySceneGroudonTail_Gfx[];
extern const u8 gRaySceneKyogreRight_Gfx[];
extern const u8 gRaySceneRayquazaHover_Gfx[];
extern const u8 gRaySceneRayquazaFlyIn_Gfx[];
extern const u8 gRaySceneOvercast_Gfx[];
extern const u8 gRaySceneOvercast_Tilemap[];
extern const u8 gRaySceneRayquaza_Gfx[];
extern const u8 gRaySceneRayquaza_Tilemap[];
extern const u8 gRaySceneSplash_Gfx[];
extern const u8 gRaySceneGroudonLeft_Pal[];
extern const u8 gRaySceneKyogreRight_Pal[];
extern const u8 gRaySceneRayquazaHover_Pal[];
extern const u8 gRaySceneSplash_Pal[];
extern const u8 gRaySceneClouds_Gfx[];
extern const u8 gRaySceneClouds_Pal[];
extern const u8 gRaySceneClouds2_Tilemap[];
extern const u8 gRaySceneClouds1_Tilemap[];
extern const u8 gRaySceneClouds3_Tilemap[];
extern const u8 gRaySceneRayquazaLight_Gfx[];
extern const u8 gRaySceneRayquazaLight_Tilemap[];
extern const u8 gRaySceneOvercast2_Gfx[];
extern const u8 gRaySceneOvercast2_Tilemap[];
extern const u8 gRaySceneOvercast2_Pal[];
extern const u8 gRaySceneRayquazaChase_Gfx[];
extern const u8 gRaySceneChaseStreaks_Gfx[];
extern const u8 gRaySceneChaseBg_Gfx[];
extern const u8 gRayChaseRayquazaChase2_Tilemap[];
extern const u8 gRayChaseRayquazaChase_Tilemap[];
extern const u8 gRaySceneChaseStreaks_Tilemap[];
extern const u8 gRaySceneChaseBg_Tilemap[];
extern const u8 gRaySceneChase_Pal[];
extern const u8 gRaySceneHushRing_Tilemap[];
extern const u8 gRaySceneHushBg_Tilemap[];
extern const u8 gRaySceneHushRing_Map[];
extern const u8 gRaySceneHushBg_Pal[];
extern const u8 gRaySceneHushBg_Gfx[];
extern const u8 gRaySceneHushRing_Gfx[];
//menu graphics
extern const u16 gFireRedMenuElements1_Pal[16];