ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize intro gfx names

Browse Source
This commit is contained in:
GriffinR 2021-03-29 20:31:21 -04:00
parent 09ff1524b4
commit dea07dc865
15 changed files with 158 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/intro/scene_3/clouds1.bin → graphics/intro/scene_3/clouds_left.bin
View File

0
graphics/intro/scene_3/clouds2.bin → graphics/intro/scene_3/clouds_right.bin
View File

0
graphics/intro/scene_3/clouds3.bin → graphics/intro/scene_3/clouds_sun.bin
View File

0
graphics/intro/scene_3/legend_bg1.bin → graphics/intro/scene_3/groudon_bg.bin
View File

0
graphics/intro/scene_3/legend_bg2.bin → graphics/intro/scene_3/kyogre_bg.bin
View File

0
graphics/intro/scene_3/misc2.pal → graphics/intro/scene_3/misc.pal
View File

0
graphics/intro/scene_3/clouds4.bin → graphics/intro/scene_3/rayquaza_clouds.bin
View File

0
graphics/intro/scene_3/clouds2.png → graphics/intro/scene_3/rayquaza_clouds.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

0
graphics/intro/scene_3/misc1.pal → graphics/intro/scene_3/rayquaza_orb.pal
View File

0
graphics/unknown/unknown_D8C374.bin → graphics/intro/scene_3/unused_1.bin
View File

0
graphics/unknown/unknown_D8C5C4.bin → graphics/intro/scene_3/unused_2.bin
View File

69
include/graphics.h
View File

@ -3874,44 +3874,43 @@ extern const u32 gBagPalette[];
extern const u32 gBerryCheckCircle_Gfx[]; extern const u32 gBerryCheckCircle_Gfx[];
//intro graphics //intro graphics
extern const u32 gIntro1Sparkle_Gfx[]; extern const u32 gIntroSparkle_Gfx[];
extern const u32 gIntro1Flygon_Gfx[]; extern const u32 gIntroFlygonSilhouette_Gfx[];
extern const u16 gIntro3LightningPal[]; extern const u32 gIntroLightning_Gfx[];
extern const u16 gIntroLightning_Pal[];
extern const u32 gIntroCopyright_Gfx[]; extern const u32 gIntroCopyright_Gfx[];
extern const u32 gIntroCopyright_Tilemap[]; extern const u32 gIntroCopyright_Tilemap[];
extern const u16 gIntroCopyright_Pal[16]; extern const u16 gIntroCopyright_Pal[16];
extern const u32 gIntro2VolbeatGfx[]; extern const u32 gIntroVolbeat_Gfx[];
extern const u32 gIntro2TorchicGfx[]; extern const u16 gIntroVolbeat_Pal[];
extern const u32 gIntro2ManectricGfx[]; extern const u32 gIntroTorchic_Gfx[];
extern const u16 gIntro2VolbeatPal[]; extern const u16 gIntroTorchic_Pal[];
extern const u16 gIntro2TorchicPal[]; extern const u32 gIntroManectric_Gfx[];
extern const u16 gIntro2ManectricPal[]; extern const u16 gIntroManectric_Pal[];
extern const u32 gIntro3Bubbles_Gfx[]; extern const u32 gIntroBubbles_Gfx[];
extern const u16 gIntro3Bubbles_Pal[]; extern const u16 gIntroBubbles_Pal[];
extern const u32 gIntro3LightningGfx[]; extern const u32 gIntroGroudon_Gfx[];
extern const u32 gIntro3GroudonGfx[]; extern const u32 gIntroGroudon_Tilemap[];
extern const u32 gIntro3GroudonTilemap[]; extern const u32 gIntroLegendBg_Gfx[];
extern const u32 gIntro3LegendBgGfx[]; extern const u32 gIntroGroudonBg_Tilemap[];
extern const u32 gIntro3GroudonBgTilemap[]; extern const u8 gIntro3Bg_Pal[0x200];
extern const u32 gIntro3GroudonBgTilemap[]; extern const u32 gIntroKyogre_Gfx[];
extern const u8 gIntro3BgPal[0x200]; extern const u32 gIntroKyogre_Tilemap[];
extern const u32 gIntro3KyogreGfx[]; extern const u32 gIntroKyogreBg_Tilemap[];
extern const u32 gIntro3KyogreTilemap[]; extern const u32 gIntroClouds_Gfx[];
extern const u32 gIntro3KyogreBgTilemap[]; extern const u32 gIntroCloudsLeft_Tilemap[];
extern const u32 gIntro3CloudsGfx[]; extern const u32 gIntroCloudsRight_Tilemap[];
extern const u32 gIntro3Clouds1Tilemap[]; extern const u32 gIntroCloudsSun_Tilemap[];
extern const u32 gIntro3Clouds2Tilemap[]; extern const u32 gIntroRayquaza_Tilemap[];
extern const u32 gIntro3Clouds3Tilemap[]; extern const u32 gIntroRayquaza_Gfx[];
extern const u32 gIntro3Clouds4Tilemap[]; extern const u32 gIntroRayquazaClouds_Gfx[];
extern const u32 gIntro3RayquazaTilemap[]; extern const u32 gIntroRayquazaClouds_Tilemap[];
extern const u32 gIntro3RayquazaGfx[]; extern const u16 gIntroGameFreakTextFade_Pal[];
extern const u32 gIntro3Clouds2Gfx[]; extern const u32 gIntroBrendan_Gfx[];
extern const u16 gIntro1GameFreakTextFadePal[]; extern const u32 gIntroMay_Gfx[];
extern const u32 gIntro2BrendanGfx[]; extern const u16 gIntroPlayer_Pal[];
extern const u32 gIntro2MayGfx[]; extern const u16 gIntroFlygon_Pal[];
extern const u16 gIntro2PlayerPal[]; extern const u32 gIntroFlygon_Gfx[];
extern const u16 gIntro2FlygonPal[];
extern const u32 gIntro2FlygonGfx[];
// party menu graphics // party menu graphics
extern const u32 gPartyMenuBg_Gfx[]; extern const u32 gPartyMenuBg_Gfx[];

73
src/data/graphics/intro_scene.h
View File

@ -1,48 +1,47 @@
const u16 gIntro1GameFreakTextFadePal[] = INCBIN_U16("graphics/intro/scene_1/text.gbapal"); // game freak text blue fade const u16 gIntroGameFreakTextFade_Pal[] = INCBIN_U16("graphics/intro/scene_1/text.gbapal"); // game freak text blue fade
const u16 gIntro2PlayerPal[] = INCBIN_U16("graphics/intro/scene_2/player.gbapal"); const u16 gIntroPlayer_Pal[] = INCBIN_U16("graphics/intro/scene_2/player.gbapal");
const u16 gIntro3BgPal[] = INCBIN_U16("graphics/intro/scene_3/bg.gbapal"); const u16 gIntro3Bg_Pal[] = INCBIN_U16("graphics/intro/scene_3/bg.gbapal");
const u16 gIntro2VolbeatPal[] = INCBIN_U16("graphics/intro/scene_2/volbeat.gbapal"); const u16 gIntroVolbeat_Pal[] = INCBIN_U16("graphics/intro/scene_2/volbeat.gbapal");
const u16 gIntro2TorchicPal[] = INCBIN_U16("graphics/intro/scene_2/torchic.gbapal"); const u16 gIntroTorchic_Pal[] = INCBIN_U16("graphics/intro/scene_2/torchic.gbapal");
const u16 gIntro2ManectricPal[] = INCBIN_U16("graphics/intro/scene_2/manectric.gbapal"); const u16 gIntroManectric_Pal[] = INCBIN_U16("graphics/intro/scene_2/manectric.gbapal");
const u16 gIntro2FlygonPal[] = INCBIN_U16("graphics/intro/scene_2/flygon.gbapal"); const u16 gIntroFlygon_Pal[] = INCBIN_U16("graphics/intro/scene_2/flygon.gbapal");
const u32 gIntro2VolbeatGfx[] = INCBIN_U32("graphics/intro/scene_2/volbeat.4bpp.lz"); const u32 gIntroVolbeat_Gfx[] = INCBIN_U32("graphics/intro/scene_2/volbeat.4bpp.lz");
const u32 gIntro2TorchicGfx[] = INCBIN_U32("graphics/intro/scene_2/torchic.4bpp.lz"); const u32 gIntroTorchic_Gfx[] = INCBIN_U32("graphics/intro/scene_2/torchic.4bpp.lz");
const u32 gIntro2ManectricGfx[] = INCBIN_U32("graphics/intro/scene_2/manectric.4bpp.lz"); const u32 gIntroManectric_Gfx[] = INCBIN_U32("graphics/intro/scene_2/manectric.4bpp.lz");
const u32 gIntro2FlygonGfx[] = INCBIN_U32("graphics/intro/scene_2/flygon.4bpp.lz"); const u32 gIntroFlygon_Gfx[] = INCBIN_U32("graphics/intro/scene_2/flygon.4bpp.lz");
const u32 gIntro2BrendanGfx[] = INCBIN_U32("graphics/intro/scene_2/brendan.4bpp.lz"); const u32 gIntroBrendan_Gfx[] = INCBIN_U32("graphics/intro/scene_2/brendan.4bpp.lz");
const u32 gIntro2MayGfx[] = INCBIN_U32("graphics/intro/scene_2/may.4bpp.lz"); const u32 gIntroMay_Gfx[] = INCBIN_U32("graphics/intro/scene_2/may.4bpp.lz");
const u32 gIntro3GroudonGfx[] = INCBIN_U32("graphics/intro/scene_3/groudon.8bpp.lz"); const u32 gIntroGroudon_Gfx[] = INCBIN_U32("graphics/intro/scene_3/groudon.8bpp.lz");
const u32 gIntro3GroudonTilemap[] = INCBIN_U32("graphics/intro/scene_3/groudon.bin.lz"); const u32 gIntroGroudon_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/groudon.bin.lz");
const u32 gIntro3KyogreGfx[] = INCBIN_U32("graphics/intro/scene_3/kyogre.8bpp.lz"); const u32 gIntroKyogre_Gfx[] = INCBIN_U32("graphics/intro/scene_3/kyogre.8bpp.lz");
const u32 gIntro3KyogreTilemap[] = INCBIN_U32("graphics/intro/scene_3/kyogre.bin.lz"); const u32 gIntroKyogre_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/kyogre.bin.lz");
const u32 gIntro3LegendBgGfx[] = INCBIN_U32("graphics/intro/scene_3/legend_bg.4bpp.lz"); // groudon/kyogre bg const u32 gIntroLegendBg_Gfx[] = INCBIN_U32("graphics/intro/scene_3/legend_bg.4bpp.lz"); // groudon/kyogre bg
const u32 gIntroGroudonBg_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/groudon_bg.bin.lz");
const u32 gIntroKyogreBg_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/kyogre_bg.bin.lz");
const u32 gIntro3GroudonBgTilemap[] = INCBIN_U32("graphics/intro/scene_3/legend_bg1.bin.lz"); const u32 gIntroClouds_Gfx[] = INCBIN_U32("graphics/intro/scene_3/clouds.4bpp.lz");
const u32 gIntro3KyogreBgTilemap[] = INCBIN_U32("graphics/intro/scene_3/legend_bg2.bin.lz"); const u32 gIntroCloudsLeft_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_left.bin.lz");
const u32 gIntroCloudsRight_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_right.bin.lz");
const u32 gIntroCloudsSun_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_sun.bin.lz");
const u32 gIntro3CloudsGfx[] = INCBIN_U32("graphics/intro/scene_3/clouds.4bpp.lz"); const u32 gIntroLightning_Gfx[] = INCBIN_U32("graphics/intro/scene_3/lightning.4bpp.lz");
const u32 gIntro3Clouds1Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds1.bin.lz"); const u16 gIntroLightning_Pal[] = INCBIN_U16("graphics/intro/scene_3/lightning.gbapal");
const u32 gIntro3Clouds2Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds2.bin.lz");
const u32 gIntro3Clouds3Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds3.bin.lz");
const u32 gIntro3LightningGfx[] = INCBIN_U32("graphics/intro/scene_3/lightning.4bpp.lz"); const u32 gIntroRayquaza_Gfx[] = INCBIN_U32("graphics/intro/scene_3/rayquaza.4bpp.lz");
const u16 gIntro3LightningPal[] = INCBIN_U16("graphics/intro/scene_3/lightning.gbapal"); const u32 gIntroRayquaza_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/rayquaza.bin.lz");
const u32 gIntro3RayquazaGfx[] = INCBIN_U32("graphics/intro/scene_3/rayquaza.4bpp.lz"); const u32 gIntroUnused1_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/unused_1.bin.lz");
const u32 gIntro3RayquazaTilemap[] = INCBIN_U32("graphics/intro/scene_3/rayquaza.bin.lz"); const u32 gIntroUnused2_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/unused_2.bin.lz");
const u32 gUnknown_D8C374[] = INCBIN_U32("graphics/unknown/unknown_D8C374.bin.lz"); const u32 gIntroRayquazaClouds_Gfx[] = INCBIN_U32("graphics/intro/scene_3/rayquaza_clouds.4bpp.lz");
const u32 gUnknown_D8C5C4[] = INCBIN_U32("graphics/unknown/unknown_D8C5C4.bin.lz"); const u32 gIntroRayquazaClouds_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/rayquaza_clouds.bin.lz");
const u32 gIntro3Clouds2Gfx[] = INCBIN_U32("graphics/intro/scene_3/clouds2.4bpp.lz"); // during the rayquaza flash const u32 gIntroBubbles_Gfx[] = INCBIN_U32("graphics/intro/scene_3/bubbles.4bpp.lz");
const u32 gIntro3Clouds4Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds4.bin.lz"); const u16 gIntroBubbles_Pal[] = INCBIN_U16("graphics/intro/scene_3/bubbles.gbapal");
const u32 gIntro3Bubbles_Gfx[] = INCBIN_U32("graphics/intro/scene_3/bubbles.4bpp.lz"); const u32 gIntroFlygonSilhouette_Gfx[] = INCBIN_U32("graphics/intro/scene_1/flygon.4bpp.lz");
const u16 gIntro3Bubbles_Pal[] = INCBIN_U16("graphics/intro/scene_3/bubbles.gbapal"); const u32 gIntroSparkle_Gfx[] = INCBIN_U32("graphics/intro/scene_1/sparkle.4bpp.lz");
const u32 gIntro1Flygon_Gfx[] = INCBIN_U32("graphics/intro/scene_1/flygon.4bpp.lz");
const u32 gIntro1Sparkle_Gfx[] = INCBIN_U32("graphics/intro/scene_1/sparkle.4bpp.lz");

148
src/intro.c
View File

@ -175,26 +175,26 @@ static EWRAM_DATA u16 sFlygonYOffset = 0;
u32 gIntroFrameCounter; u32 gIntroFrameCounter;
struct GcmbStruct gMultibootProgramStruct; struct GcmbStruct gMultibootProgramStruct;
static const u16 sIntro1DropsPal[] = INCBIN_U16("graphics/intro/scene_1/drops.gbapal"); static const u16 sIntroDrops_Pal[] = INCBIN_U16("graphics/intro/scene_1/drops.gbapal");
static const u16 sIntro1Logo_Pal[] = INCBIN_U16("graphics/intro/scene_1/logo.gbapal"); static const u16 sIntroLogo_Pal[] = INCBIN_U16("graphics/intro/scene_1/logo.gbapal");
static const u32 sIntro1DropsLogo_Gfx[] = INCBIN_U32("graphics/intro/scene_1/drops_logo.4bpp.lz"); static const u32 sIntroDropsLogo_Gfx[] = INCBIN_U32("graphics/intro/scene_1/drops_logo.4bpp.lz");
static const u16 sIntro1Bg_Pal[16][16] = INCBIN_U16("graphics/intro/scene_1/bg.gbapal"); static const u16 sIntro1Bg_Pal[16][16] = INCBIN_U16("graphics/intro/scene_1/bg.gbapal");
static const u32 sIntro1Bg0_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg0_map.bin.lz"); static const u32 sIntro1Bg0_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg0_map.bin.lz");
static const u32 sIntro1Bg1_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg1_map.bin.lz"); static const u32 sIntro1Bg1_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg1_map.bin.lz");
static const u32 sIntro1Bg2_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg2_map.bin.lz"); static const u32 sIntro1Bg2_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg2_map.bin.lz");
static const u32 sIntro1Bg3_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg3_map.bin.lz"); static const u32 sIntro1Bg3_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg3_map.bin.lz");
static const u32 sIntro1Bg_Gfx[] = INCBIN_U32("graphics/intro/scene_1/bg.4bpp.lz"); static const u32 sIntro1Bg_Gfx[] = INCBIN_U32("graphics/intro/scene_1/bg.4bpp.lz");
static const u16 sIntro3Pokeball_Pal[] = INCBIN_U16("graphics/intro/scene_3/pokeball.gbapal"); static const u16 sIntroPokeball_Pal[] = INCBIN_U16("graphics/intro/scene_3/pokeball.gbapal");
static const u32 sIntro3Pokeball_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/pokeball_map.bin.lz"); static const u32 sIntroPokeball_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/pokeball_map.bin.lz");
static const u32 sIntro3Pokeball_Gfx[] = INCBIN_U32("graphics/intro/scene_3/pokeball.8bpp.lz"); static const u32 sIntroPokeball_Gfx[] = INCBIN_U32("graphics/intro/scene_3/pokeball.8bpp.lz");
static const u16 sIntro3Streaks_Pal[] = INCBIN_U16("graphics/intro/scene_3/streaks.gbapal"); // Unused static const u16 sIntroStreaks_Pal[] = INCBIN_U16("graphics/intro/scene_3/streaks.gbapal"); // Unused
static const u32 sIntro3Streaks_Gfx[] = INCBIN_U32("graphics/intro/scene_3/streaks.4bpp.lz"); // Unused static const u32 sIntroStreaks_Gfx[] = INCBIN_U32("graphics/intro/scene_3/streaks.4bpp.lz"); // Unused
static const u32 sIntro3Streaks_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/streaks_map.bin.lz"); // Unused static const u32 sIntroStreaks_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/streaks_map.bin.lz"); // Unused
static const u16 sIntro3Misc1_Pal[] = INCBIN_U16("graphics/intro/scene_3/misc1.gbapal"); static const u16 sIntroRayquzaOrb_Pal[] = INCBIN_U16("graphics/intro/scene_3/rayquaza_orb.gbapal");
static const u16 sIntro3Misc2_Pal[] = INCBIN_U16("graphics/intro/scene_3/misc2.gbapal"); // Unused static const u16 sIntroMisc_Pal[] = INCBIN_U16("graphics/intro/scene_3/misc.gbapal"); // Unused
static const u32 sIntro3Misc_Gfx[] = INCBIN_U32("graphics/intro/scene_3/misc.4bpp.lz"); static const u32 sIntroMisc_Gfx[] = INCBIN_U32("graphics/intro/scene_3/misc.4bpp.lz"); // Rayquza orb, and misc unused gfx
static const u16 sIntro1Flygon_Pal[] = INCBIN_U16("graphics/intro/scene_1/flygon.gbapal"); static const u16 sIntroFlygonSilhouette_Pal[] = INCBIN_U16("graphics/intro/scene_1/flygon.gbapal");
static const u32 sIntro1Lati_Gfx[] = INCBIN_U32("graphics/intro/scene_1/lati.4bpp.lz"); // Unused static const u32 sIntroLati_Gfx[] = INCBIN_U32("graphics/intro/scene_1/lati.4bpp.lz"); // Unused
static const u8 sUnusedData[] = { static const u8 sUnusedData[] = {
0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D,
0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F,
@ -203,12 +203,12 @@ static const u8 sUnusedData[] = {
}; };
static const struct CompressedSpriteSheet sSpriteSheet_Sparkle[] = static const struct CompressedSpriteSheet sSpriteSheet_Sparkle[] =
{ {
{gIntro1Sparkle_Gfx, 0x400, TAG_SPARKLE}, {gIntroSparkle_Gfx, 0x400, TAG_SPARKLE},
{}, {},
}; };
static const struct SpritePalette sSpritePalette_Sparkle[] = static const struct SpritePalette sSpritePalette_Sparkle[] =
{ {
{gIntro3LightningPal, TAG_SPARKLE}, // Lightning palette re-used {gIntroLightning_Pal, TAG_SPARKLE}, // Lightning palette re-used
{}, {},
}; };
static const struct OamData sOamData_Sparkle = static const struct OamData sOamData_Sparkle =
@ -267,16 +267,16 @@ static const u8 sSparkleCoords[][2] =
}; };
static const struct CompressedSpriteSheet sSpriteSheet_RunningPokemon[] = static const struct CompressedSpriteSheet sSpriteSheet_RunningPokemon[] =
{ {
{gIntro2VolbeatGfx, 0x400, TAG_VOLBEAT}, {gIntroVolbeat_Gfx, 0x400, TAG_VOLBEAT},
{gIntro2TorchicGfx, 0xC00, TAG_TORCHIC}, {gIntroTorchic_Gfx, 0xC00, TAG_TORCHIC},
{gIntro2ManectricGfx, 0x2000, TAG_MANECTRIC}, {gIntroManectric_Gfx, 0x2000, TAG_MANECTRIC},
{}, {},
}; };
static const struct SpritePalette sSpritePalettes_RunningPokemon[] = static const struct SpritePalette sSpritePalettes_RunningPokemon[] =
{ {
{gIntro2VolbeatPal, TAG_VOLBEAT}, {gIntroVolbeat_Pal, TAG_VOLBEAT},
{gIntro2TorchicPal, TAG_TORCHIC}, {gIntroTorchic_Pal, TAG_TORCHIC},
{gIntro2ManectricPal, TAG_MANECTRIC}, {gIntroManectric_Pal, TAG_MANECTRIC},
{}, {},
}; };
static const struct OamData sOamData_Volbeat = static const struct OamData sOamData_Volbeat =
@ -415,12 +415,12 @@ static const struct SpriteTemplate sSpriteTemplate_Manectric =
}; };
static const struct CompressedSpriteSheet sSpriteSheet_Lightning[] = static const struct CompressedSpriteSheet sSpriteSheet_Lightning[] =
{ {
{gIntro3LightningGfx, 0xC00, TAG_LIGHTNING}, {gIntroLightning_Gfx, 0xC00, TAG_LIGHTNING},
{}, {},
}; };
static const struct SpritePalette sSpritePalette_Lightning[] = static const struct SpritePalette sSpritePalette_Lightning[] =
{ {
{gIntro3LightningPal, TAG_LIGHTNING}, {gIntroLightning_Pal, TAG_LIGHTNING},
{}, {},
}; };
static const struct OamData sOamData_Lightning = static const struct OamData sOamData_Lightning =
@ -486,12 +486,12 @@ static const s16 sGroudonRockData[][3] =
}; };
static const struct CompressedSpriteSheet sSpriteSheet_Bubbles[] = static const struct CompressedSpriteSheet sSpriteSheet_Bubbles[] =
{ {
{gIntro3Bubbles_Gfx, 0x600, TAG_BUBBLES}, {gIntroBubbles_Gfx, 0x600, TAG_BUBBLES},
{}, {},
}; };
static const struct SpritePalette sSpritePalette_Bubbles[] = static const struct SpritePalette sSpritePalette_Bubbles[] =
{ {
{gIntro3Bubbles_Pal, TAG_BUBBLES}, {gIntroBubbles_Pal, TAG_BUBBLES},
{}, {},
}; };
#define NUM_BUBBLES_IN_SET 6 #define NUM_BUBBLES_IN_SET 6
@ -963,19 +963,19 @@ static const struct SpriteTemplate sSpriteTemplate_FlygonSilhouette =
}; };
static const struct CompressedSpriteSheet sSpriteSheet_WaterDropsAndLogo[] = static const struct CompressedSpriteSheet sSpriteSheet_WaterDropsAndLogo[] =
{ {
{sIntro1DropsLogo_Gfx, 0x1400, GFXTAG_DROPS_LOGO}, {sIntroDropsLogo_Gfx, 0x1400, GFXTAG_DROPS_LOGO},
{}, {},
}; };
static const struct CompressedSpriteSheet sSpriteSheet_FlygonSilhouette[] = static const struct CompressedSpriteSheet sSpriteSheet_FlygonSilhouette[] =
{ {
{gIntro1Flygon_Gfx, 0x400, TAG_FLYGON_SILHOUETTE}, {gIntroFlygonSilhouette_Gfx, 0x400, TAG_FLYGON_SILHOUETTE},
{}, {},
}; };
static const struct SpritePalette sSpritePalettes_Intro1[] = static const struct SpritePalette sSpritePalettes_Intro1[] =
{ {
{sIntro1DropsPal, PALTAG_DROPS}, {sIntroDrops_Pal, PALTAG_DROPS},
{sIntro1Logo_Pal, PALTAG_LOGO}, {sIntroLogo_Pal, PALTAG_LOGO},
{sIntro1Flygon_Pal, TAG_FLYGON_SILHOUETTE}, {sIntroFlygonSilhouette_Pal, TAG_FLYGON_SILHOUETTE},
{}, {},
}; };
static const struct OamData sOamData_RayquazaOrb = static const struct OamData sOamData_RayquazaOrb =
@ -1015,12 +1015,12 @@ static const struct SpriteTemplate sSpriteTemplate_RayquazaOrb =
}; };
static const struct CompressedSpriteSheet sSpriteSheet_RayquazaOrb[] = static const struct CompressedSpriteSheet sSpriteSheet_RayquazaOrb[] =
{ {
{sIntro3Misc_Gfx, 0xA00, TAG_RAYQUAZA_ORB}, {sIntroMisc_Gfx, 0xA00, TAG_RAYQUAZA_ORB},
{}, {},
}; };
static const struct SpritePalette sSpritePalette_RayquazaOrb[] = static const struct SpritePalette sSpritePalette_RayquazaOrb[] =
{ {
{sIntro3Misc1_Pal, TAG_RAYQUAZA_ORB}, {sIntroRayquzaOrb_Pal, TAG_RAYQUAZA_ORB},
{}, {},
}; };
@ -1715,9 +1715,9 @@ static void SpriteCB_Manectric(struct Sprite *sprite)
static void Task_Scene3_Load(u8 taskId) static void Task_Scene3_Load(u8 taskId)
{ {
IntroResetGpuRegs(); IntroResetGpuRegs();
LZ77UnCompVram(sIntro3Pokeball_Gfx, (void *)VRAM); LZ77UnCompVram(sIntroPokeball_Gfx, (void *)VRAM);
LZ77UnCompVram(sIntro3Pokeball_Tilemap, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(sIntroPokeball_Tilemap, (void *)(BG_CHAR_ADDR(1)));
LoadPalette(sIntro3Pokeball_Pal, 0, sizeof(sIntro3Pokeball_Pal)); LoadPalette(sIntroPokeball_Pal, 0, sizeof(sIntroPokeball_Pal));
gTasks[taskId].tAlpha = 0; gTasks[taskId].tAlpha = 0;
gTasks[taskId].tZoomDiv = 0; gTasks[taskId].tZoomDiv = 0;
gTasks[taskId].tZoomDivSpeed = 0; gTasks[taskId].tZoomDivSpeed = 0;
@ -1770,13 +1770,13 @@ static void Task_Scene3_LoadGroudon(u8 taskId)
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
gReservedSpritePaletteCount = 8; gReservedSpritePaletteCount = 8;
LZDecompressVram(gIntro3GroudonGfx, (void *)VRAM); LZDecompressVram(gIntroGroudon_Gfx, (void *)VRAM);
LZDecompressVram(gIntro3GroudonTilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntroGroudon_Tilemap, (void *)(BG_CHAR_ADDR(3)));
LZDecompressVram(gIntro3LegendBgGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntroLegendBg_Gfx, (void *)(BG_CHAR_ADDR(1)));
LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(BG_SCREEN_ADDR(28))); LZDecompressVram(gIntroGroudonBg_Tilemap, (void *)(BG_SCREEN_ADDR(28)));
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]);
CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal)); CpuCopy16(gIntro3Bg_Pal, gPlttBufferUnfaded, sizeof(gIntro3Bg_Pal));
gTasks[taskId].func = Task_Scene3_InitGroudonBg; gTasks[taskId].func = Task_Scene3_InitGroudonBg;
} }
} }
@ -1884,7 +1884,7 @@ static void Task_Scene3_Groudon(u8 taskId)
if (--tDelay == 0) if (--tDelay == 0)
{ {
tDelay = 2; tDelay = 2;
CpuCopy16(&gIntro3BgPal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16)); CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16));
tPalIdx += 2; tPalIdx += 2;
if (tPalIdx == 0x1EC) if (tPalIdx == 0x1EC)
tState++; tState++;
@ -1901,7 +1901,7 @@ static void Task_Scene3_Groudon(u8 taskId)
if (--tDelay == 0) if (--tDelay == 0)
{ {
tDelay = 2; tDelay = 2;
CpuCopy16(&gIntro3BgPal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16)); CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[31], sizeof(u16));
tPalIdx -= 2; tPalIdx -= 2;
if (tPalIdx == 0x1E0) if (tPalIdx == 0x1E0)
{ {
@ -2045,9 +2045,9 @@ static void SpriteCB_GroudonRocks(struct Sprite *sprite)
static void Task_Scene3_LoadKyogre(u8 taskId) static void Task_Scene3_LoadKyogre(u8 taskId)
{ {
ResetSpriteData(); ResetSpriteData();
LZDecompressVram(gIntro3KyogreGfx, (void *)VRAM); LZDecompressVram(gIntroKyogre_Gfx, (void *)VRAM);
LZDecompressVram(gIntro3KyogreTilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntroKyogre_Tilemap, (void *)(BG_CHAR_ADDR(3)));
LZDecompressVram(gIntro3KyogreBgTilemap, (void *)(BG_SCREEN_ADDR(28))); LZDecompressVram(gIntroKyogreBg_Tilemap, (void *)(BG_SCREEN_ADDR(28)));
LoadCompressedSpriteSheet(sSpriteSheet_Bubbles); LoadCompressedSpriteSheet(sSpriteSheet_Bubbles);
LoadSpritePalette(sSpritePalette_Bubbles); LoadSpritePalette(sSpritePalette_Bubbles);
BeginNormalPaletteFade(PALETTES_ALL & ~1, 0, 16, 0, RGB_WHITEALPHA); BeginNormalPaletteFade(PALETTES_ALL & ~1, 0, 16, 0, RGB_WHITEALPHA);
@ -2143,7 +2143,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
if (--tDelay == 0) if (--tDelay == 0)
{ {
tDelay = 4; tDelay = 4;
CpuCopy16(&gIntro3BgPal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16)); CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16));
tPalIdx -= 2; tPalIdx -= 2;
if (tPalIdx == 0x1E0) if (tPalIdx == 0x1E0)
tState++; tState++;
@ -2161,7 +2161,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
if (--tDelay == 0) if (--tDelay == 0)
{ {
tDelay = 4; tDelay = 4;
CpuCopy16(&gIntro3BgPal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16)); CpuCopy16(&gIntro3Bg_Pal[tPalIdx], &gPlttBufferFaded[47], sizeof(u16));
tPalIdx += 2; tPalIdx += 2;
if (tPalIdx == 0x1EE) if (tPalIdx == 0x1EE)
{ {
@ -2353,16 +2353,16 @@ static void Task_Scene3_LoadClouds1(u8 taskId)
SetGpuReg(REG_OFFSET_BG1VOFS, 0); SetGpuReg(REG_OFFSET_BG1VOFS, 0);
SetGpuReg(REG_OFFSET_BG2HOFS, 0); SetGpuReg(REG_OFFSET_BG2HOFS, 0);
SetGpuReg(REG_OFFSET_BG2VOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0);
LZDecompressVram(gIntro3CloudsGfx, (void *)VRAM); LZDecompressVram(gIntroClouds_Gfx, (void *)VRAM);
LZDecompressVram(gIntro3CloudsGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntroClouds_Gfx, (void *)(BG_CHAR_ADDR(1)));
LZDecompressVram(gIntro3Clouds3Tilemap, (void *)(BG_SCREEN_ADDR(28))); LZDecompressVram(gIntroCloudsSun_Tilemap, (void *)(BG_SCREEN_ADDR(28)));
gTasks[taskId].func = Task_Scene3_LoadClouds2; gTasks[taskId].func = Task_Scene3_LoadClouds2;
} }
static void Task_Scene3_LoadClouds2(u8 taskId) static void Task_Scene3_LoadClouds2(u8 taskId)
{ {
LZDecompressVram(gIntro3Clouds1Tilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntroCloudsLeft_Tilemap, (void *)(BG_CHAR_ADDR(3)));
LZDecompressVram(gIntro3Clouds2Tilemap, (void *)(BG_SCREEN_ADDR(26))); LZDecompressVram(gIntroCloudsRight_Tilemap, (void *)(BG_SCREEN_ADDR(26)));
gTasks[taskId].func = Task_Scene3_InitClouds; gTasks[taskId].func = Task_Scene3_InitClouds;
} }
@ -2420,10 +2420,10 @@ static void Task_Scene3_Clouds(u8 taskId)
static void Task_Scene3_LoadLightning(u8 taskId) static void Task_Scene3_LoadLightning(u8 taskId)
{ {
LZDecompressVram(gIntro3RayquazaTilemap, (void *)(BG_SCREEN_ADDR(28))); LZDecompressVram(gIntroRayquaza_Tilemap, (void *)(BG_SCREEN_ADDR(28)));
LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntroRayquazaClouds_Tilemap, (void *)(BG_CHAR_ADDR(3)));
LZDecompressVram(gIntro3RayquazaGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntroRayquaza_Gfx, (void *)(BG_CHAR_ADDR(1)));
LZDecompressVram(gIntro3Clouds2Gfx, (void *)VRAM); LZDecompressVram(gIntroRayquazaClouds_Gfx, (void *)VRAM);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0
| DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_1D_MAP
| DISPCNT_BG0_ON | DISPCNT_BG0_ON
@ -2492,7 +2492,7 @@ static void SpriteCB_Lightning(struct Sprite *sprite)
sprite->sPalIdx = 0x1C2; sprite->sPalIdx = 0x1C2;
sprite->sState++; sprite->sState++;
case 1: case 1:
CpuCopy16(&gIntro3BgPal[sprite->sPalIdx], &gPlttBufferFaded[93], 2); CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[93], 2);
sprite->sPalIdx += 2; sprite->sPalIdx += 2;
if (sprite->sPalIdx != 0x1CE) if (sprite->sPalIdx != 0x1CE)
break; break;
@ -2503,7 +2503,7 @@ static void SpriteCB_Lightning(struct Sprite *sprite)
if (--sprite->sDelay == 0) if (--sprite->sDelay == 0)
{ {
sprite->sDelay = 4; sprite->sDelay = 4;
CpuCopy16(&gIntro3BgPal[sprite->sPalIdx], &gPlttBufferFaded[93], 2); CpuCopy16(&gIntro3Bg_Pal[sprite->sPalIdx], &gPlttBufferFaded[93], 2);
sprite->sPalIdx -= 2; sprite->sPalIdx -= 2;
if (sprite->sPalIdx == 0x1C0) if (sprite->sPalIdx == 0x1C0)
DestroySprite(sprite); DestroySprite(sprite);
@ -2606,7 +2606,7 @@ static void Task_RayquazaAttack(u8 taskId)
case 0: case 0:
if ((data[2] & 1) != 0) if ((data[2] & 1) != 0)
{ {
CpuCopy16(&gIntro3BgPal[0x1A2 + data[1] * 2], &gPlttBufferFaded[94], 2); CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[94], 2);
data[1]++; data[1]++;
} }
if (data[1] == 6) if (data[1] == 6)
@ -2621,7 +2621,7 @@ static void Task_RayquazaAttack(u8 taskId)
{ {
if ((data[2] & 1) != 0) if ((data[2] & 1) != 0)
{ {
CpuCopy16(&gIntro3BgPal[0x1A2 + data[1] * 2], &gPlttBufferFaded[88], 2); CpuCopy16(&gIntro3Bg_Pal[0x1A2 + data[1] * 2], &gPlttBufferFaded[88], 2);
data[1]++; data[1]++;
} }
if (data[1] == 6) if (data[1] == 6)
@ -2640,7 +2640,7 @@ static void Task_RayquazaAttack(u8 taskId)
{ {
if ((data[2] & 1) != 0) if ((data[2] & 1) != 0)
{ {
CpuCopy16(&gIntro3BgPal[0x182 + data[1] * 2], &gPlttBufferFaded[92], 2); CpuCopy16(&gIntro3Bg_Pal[0x182 + data[1] * 2], &gPlttBufferFaded[92], 2);
data[1]++; data[1]++;
} }
if (data[1] == 6) if (data[1] == 6)
@ -2664,9 +2664,9 @@ static void Task_RayquazaAttack(u8 taskId)
if (--data[3] != 0) if (--data[3] != 0)
{ {
BlendPalette(0x50, 16, data[3], RGB(9, 10, 10)); BlendPalette(0x50, 16, data[3], RGB(9, 10, 10));
CpuCopy16(&gIntro3BgPal[0x1AC], &gPlttBufferFaded[94], 2); CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[94], 2);
CpuCopy16(&gIntro3BgPal[0x1AC], &gPlttBufferFaded[88], 2); CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[88], 2);
CpuCopy16(&gIntro3BgPal[0x18C], &gPlttBufferFaded[92], 2); CpuCopy16(&gIntro3Bg_Pal[0x18C], &gPlttBufferFaded[92], 2);
} }
else else
{ {
@ -3197,16 +3197,16 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite)
sprite->sColorDelay = 2; sprite->sColorDelay = 2;
if (sprite->sTimer != 0) if (sprite->sTimer != 0)
{ {
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2);
sprite->sTimer--; sprite->sTimer--;
} }
else else
{ {
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2);
sprite->sState++; sprite->sState++;
} }
} }
@ -3226,9 +3226,9 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite)
sprite->sColorDelay = 2; sprite->sColorDelay = 2;
if (sprite->sTimer <= COLOR_CHANGES) if (sprite->sTimer <= COLOR_CHANGES)
{ {
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer], &gPlttBufferFaded[0x11F], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 16], &gPlttBufferFaded[0x114], 2);
CpuCopy16(&gIntro1GameFreakTextFadePal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2); CpuCopy16(&gIntroGameFreakTextFade_Pal[sprite->sTimer + 32], &gPlttBufferFaded[0x11A], 2);
sprite->sTimer++; sprite->sTimer++;
} }
else else

16
src/intro_credits_graphics.c
View File

@ -579,7 +579,7 @@ static const struct SpriteTemplate sSpriteTemplate_FlygonLatias =
const struct CompressedSpriteSheet gSpriteSheet_IntroBrendan[] = const struct CompressedSpriteSheet gSpriteSheet_IntroBrendan[] =
{ {
{ {
.data = gIntro2BrendanGfx, .data = gIntroBrendan_Gfx,
.size = 0x2000, .size = 0x2000,
.tag = TAG_BRENDAN .tag = TAG_BRENDAN
}, },
@ -589,7 +589,7 @@ const struct CompressedSpriteSheet gSpriteSheet_IntroBrendan[] =
const struct CompressedSpriteSheet gSpriteSheet_IntroMay[] = const struct CompressedSpriteSheet gSpriteSheet_IntroMay[] =
{ {
{ {
.data = gIntro2MayGfx, .data = gIntroMay_Gfx,
.size = 0x2000, .size = 0x2000,
.tag = TAG_MAY .tag = TAG_MAY
}, },
@ -610,7 +610,7 @@ const struct CompressedSpriteSheet gSpriteSheet_IntroBicycle[] =
static const struct CompressedSpriteSheet sSpriteSheet_IntroFlygon_Unused[] = static const struct CompressedSpriteSheet sSpriteSheet_IntroFlygon_Unused[] =
{ {
{ {
.data = gIntro2FlygonGfx, .data = gIntroFlygon_Gfx,
.size = 0x1000, .size = 0x1000,
.tag = TAG_FLYGON_LATIOS .tag = TAG_FLYGON_LATIOS
}, },
@ -620,7 +620,7 @@ static const struct CompressedSpriteSheet sSpriteSheet_IntroFlygon_Unused[] =
const struct CompressedSpriteSheet gSpriteSheet_IntroFlygon[] = const struct CompressedSpriteSheet gSpriteSheet_IntroFlygon[] =
{ {
{ {
.data = gIntro2FlygonGfx, .data = gIntroFlygon_Gfx,
.size = 0x1000, .size = 0x1000,
.tag = TAG_FLYGON_LATIAS .tag = TAG_FLYGON_LATIAS
}, },
@ -629,10 +629,10 @@ const struct CompressedSpriteSheet gSpriteSheet_IntroFlygon[] =
const struct SpritePalette gSpritePalettes_IntroPlayerFlygon[] = const struct SpritePalette gSpritePalettes_IntroPlayerFlygon[] =
{ {
{ .data = gIntro2PlayerPal, .tag = TAG_BRENDAN }, { .data = gIntroPlayer_Pal, .tag = TAG_BRENDAN },
{ .data = gIntro2PlayerPal, .tag = TAG_MAY }, { .data = gIntroPlayer_Pal, .tag = TAG_MAY },
{ .data = gIntro2FlygonPal, .tag = TAG_FLYGON_LATIOS }, { .data = gIntroFlygon_Pal, .tag = TAG_FLYGON_LATIOS },
{ .data = gIntro2FlygonPal, .tag = TAG_FLYGON_LATIAS }, { .data = gIntroFlygon_Pal, .tag = TAG_FLYGON_LATIAS },
{} {}
}; };