Merge branch 'master' into doc-factscreen
This commit is contained in:
GriffinR
@@ -3180,11 +3180,12 @@ extern const u32 gDecorIconPalette_RegiceDoll[];
|
||||
extern const u32 gDecorIcon_RegisteelDoll[];
|
||||
extern const u32 gDecorIconPalette_RegisteelDoll[];
|
||||
|
||||
extern const u32 gWallclock_Gfx[];
|
||||
extern const u16 gWallclockMale_Pal[];
|
||||
extern const u16 gWallclockFemale_Pal[];
|
||||
extern const u32 gUnknown_08DCC648[];
|
||||
extern const u32 gUnknown_08DCC908[];
|
||||
extern const u32 gWallClock_Gfx[];
|
||||
extern const u16 gWallClockMale_Pal[];
|
||||
extern const u16 gWallClockFemale_Pal[];
|
||||
extern const u32 gWallClockStart_Tilemap[];
|
||||
extern const u32 gWallClockView_Tilemap[];
|
||||
|
||||
extern const u32 gBerryFixGameboy_Gfx[];
|
||||
extern const u32 gBerryFixGameboy_Tilemap[];
|
||||
extern const u16 gBerryFixGameboy_Pal[];
|
||||
@@ -3309,57 +3310,57 @@ extern const u32 gBerryTag_Gfx[];
|
||||
extern const u32 gBerryTag_Pal[];
|
||||
|
||||
// rayquaza scene gfx
|
||||
extern const u32 gRaySceneGroudon_Gfx[];
|
||||
extern const u32 gRaySceneGroudon2_Gfx[];
|
||||
extern const u32 gRaySceneGroudon3_Gfx[];
|
||||
extern const u32 gRaySceneKyogre_Gfx[];
|
||||
extern const u32 gRaySceneKyogre2_Gfx[];
|
||||
extern const u32 gRaySceneKyogre3_Gfx[];
|
||||
extern const u32 gRaySceneGroudon_Pal[];
|
||||
extern const u32 gRaySceneKyogre_Pal[];
|
||||
extern const u32 gRaySceneSmoke_Gfx[];
|
||||
extern const u32 gRaySceneSmoke_Pal[];
|
||||
extern const u32 gRaySceneRayquaza_Pal[];
|
||||
extern const u32 gRaySceneRayquazaFly1_Gfx[];
|
||||
extern const u32 gRaySceneRayquazaTail_Gfx[];
|
||||
extern const u32 gRaySceneGroudonLeft_Gfx[];
|
||||
extern const u32 gRaySceneGroudonTail_Gfx[];
|
||||
extern const u32 gRaySceneKyogreRight_Gfx[];
|
||||
extern const u32 gRaySceneRayquazaHover_Gfx[];
|
||||
extern const u32 gRaySceneRayquazaFlyIn_Gfx[];
|
||||
extern const u32 gRaySceneOvercast_Gfx[];
|
||||
extern const u32 gRaySceneOvercast_Tilemap[];
|
||||
extern const u32 gRaySceneRayquaza_Gfx[];
|
||||
extern const u32 gRaySceneRayquaza_Tilemap[];
|
||||
extern const u32 gRaySceneSplash_Gfx[];
|
||||
extern const u32 gRaySceneGroudonLeft_Pal[];
|
||||
extern const u32 gRaySceneKyogreRight_Pal[];
|
||||
extern const u32 gRaySceneRayquazaHover_Pal[];
|
||||
extern const u32 gRaySceneSplash_Pal[];
|
||||
extern const u32 gRaySceneClouds_Gfx[];
|
||||
extern const u32 gRaySceneClouds_Pal[];
|
||||
extern const u32 gRaySceneClouds2_Tilemap[];
|
||||
extern const u32 gRaySceneClouds1_Tilemap[];
|
||||
extern const u32 gRaySceneClouds3_Tilemap[];
|
||||
extern const u32 gRaySceneRayquazaLight_Gfx[];
|
||||
extern const u32 gRaySceneRayquazaLight_Tilemap[];
|
||||
extern const u32 gRaySceneOvercast2_Gfx[];
|
||||
extern const u32 gRaySceneOvercast2_Tilemap[];
|
||||
extern const u32 gRaySceneOvercast2_Pal[];
|
||||
extern const u32 gRaySceneRayquazaChase_Gfx[];
|
||||
extern const u32 gRaySceneChaseStreaks_Gfx[];
|
||||
extern const u32 gRaySceneChaseBg_Gfx[];
|
||||
extern const u32 gRayChaseRayquazaChase2_Tilemap[];
|
||||
extern const u32 gRayChaseRayquazaChase_Tilemap[];
|
||||
extern const u32 gRaySceneChaseStreaks_Tilemap[];
|
||||
extern const u32 gRaySceneChaseBg_Tilemap[];
|
||||
extern const u32 gRaySceneChase_Pal[];
|
||||
extern const u32 gRaySceneHushRing_Tilemap[];
|
||||
extern const u32 gRaySceneHushBg_Tilemap[];
|
||||
extern const u32 gRaySceneHushRing_Map[];
|
||||
extern const u32 gRaySceneHushBg_Pal[];
|
||||
extern const u32 gRaySceneHushBg_Gfx[];
|
||||
extern const u32 gRaySceneHushRing_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_Groudon_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_GroudonShoulder_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_GroudonClaw_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_Kyogre_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_KyogrePectoralFin_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_KyogreDorsalFin_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_Groudon_Pal[];
|
||||
extern const u32 gRaySceneDuoFight_Kyogre_Pal[];
|
||||
extern const u32 gRaySceneDuoFight_Clouds_Gfx[];
|
||||
extern const u32 gRaySceneDuoFight_Clouds_Pal[];
|
||||
extern const u32 gRaySceneDuoFight_Clouds1_Tilemap[];
|
||||
extern const u32 gRaySceneDuoFight_Clouds2_Tilemap[];
|
||||
extern const u32 gRaySceneDuoFight_Clouds3_Tilemap[];
|
||||
extern const u32 gRaySceneTakesFlight_Smoke_Gfx[];
|
||||
extern const u32 gRaySceneTakesFlight_Smoke_Pal[];
|
||||
extern const u32 gRaySceneTakesFlight_Rayquaza_Pal[];
|
||||
extern const u32 gRaySceneTakesFlight_Bg_Gfx[];
|
||||
extern const u32 gRaySceneTakesFlight_Bg_Tilemap[];
|
||||
extern const u32 gRaySceneTakesFlight_Rayquaza_Gfx[];
|
||||
extern const u32 gRaySceneTakesFlight_Rayquaza_Tilemap[];
|
||||
extern const u32 gRaySceneDescends_Rayquaza_Gfx[];
|
||||
extern const u32 gRaySceneDescends_RayquazaTail_Gfx[];
|
||||
extern const u32 gRaySceneDescends_Light_Gfx[];
|
||||
extern const u32 gRaySceneDescends_Light_Tilemap[];
|
||||
extern const u32 gRaySceneDescends_Bg_Gfx[];
|
||||
extern const u32 gRaySceneDescends_Bg_Tilemap[];
|
||||
extern const u32 gRaySceneDescends_Bg_Pal[];
|
||||
extern const u32 gRaySceneCharges_Rayquaza_Gfx[];
|
||||
extern const u32 gRaySceneCharges_Streaks_Gfx[];
|
||||
extern const u32 gRaySceneCharges_Bg_Gfx[];
|
||||
extern const u32 gRaySceneCharges_Orbs_Tilemap[];
|
||||
extern const u32 gRaySceneCharges_Rayquaza_Tilemap[];
|
||||
extern const u32 gRaySceneCharges_Streaks_Tilemap[];
|
||||
extern const u32 gRaySceneCharges_Bg_Tilemap[];
|
||||
extern const u32 gRaySceneCharges_Bg_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_Groudon_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_GroudonTail_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_Kyogre_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_Rayquaza_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_RayquazaTail_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_KyogreSplash_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_Groudon_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_Kyogre_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_Rayquaza_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_KyogreSplash_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_Bg_Tilemap[];
|
||||
extern const u32 gRaySceneChasesAway_Light_Tilemap[];
|
||||
extern const u32 gRaySceneChasesAway_Ring_Tilemap[];
|
||||
extern const u32 gRaySceneChasesAway_Bg_Pal[];
|
||||
extern const u32 gRaySceneChasesAway_Light_Gfx[];
|
||||
extern const u32 gRaySceneChasesAway_Ring_Gfx[];
|
||||
|
||||
// Pokeballs
|
||||
extern const u32 gItemIcon_MasterBall[];
|
||||
@@ -4893,11 +4894,11 @@ extern const u32 gWallpaperTilemap_Horizontal[];
|
||||
extern const u16 gWallpaperPalettes_Horizontal[][16];
|
||||
|
||||
// Cable Car
|
||||
extern const u32 gUnknown_08DBA5B8[];
|
||||
extern const u16 gUnknown_08DBA518[];
|
||||
extern const u32 gCableCarBg_Gfx[];
|
||||
extern const u16 gCableCarBg_Pal[];
|
||||
extern const u32 gCableCar_Gfx[];
|
||||
extern const u32 gCableCarDoor_Gfx[];
|
||||
extern const u32 gCableCarCord_Gfx[];
|
||||
extern const u32 gCableCarCable_Gfx[];
|
||||
extern const u16 gCableCar_Pal[];
|
||||
|
||||
// Trade
|
||||
@@ -5018,4 +5019,10 @@ extern const u8 gFrontierFactorySelectMenu_Gfx[];
|
||||
extern const u8 gFrontierFactorySelectMenu_Tilemap[];
|
||||
extern const u16 gFrontierFactorySelectMenu_Pal[];
|
||||
|
||||
// Object event pals
|
||||
extern const u16 gObjectEventPal_Brendan[];
|
||||
extern const u16 gObjectEventPal_May[];
|
||||
extern const u16 gObjectEventPal_RubySapphireBrendan[];
|
||||
extern const u16 gObjectEventPal_RubySapphireMay[];
|
||||
|
||||
#endif //GUARD_GRAPHICS_H
|
||||
|
||||
Reference in New Issue
Block a user