diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-20 09:39:55 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-20 09:39:55 -0500 |
| commit | 3770909be050ae93c5f83ac8b1e9deb2ef3f4ca6 (patch) | |
| tree | 5960f702dff76378cf3ad8b8e68449629c7ec75a /data/graphics.s | |
| parent | 5f62529525a672c6342b3a53d29364c8f432b540 (diff) | |
Finish aligning assets in LG
Diffstat (limited to 'data/graphics.s')
| -rw-r--r-- | data/graphics.s | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/data/graphics.s b/data/graphics.s index 570b73636..35c729824 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -11885,7 +11885,13 @@ gMonFootprint_Jirachi:: @ 8E3956C .align 2 gMonFrontPic_Deoxys:: @ 8E3958C + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/front.4bpp.lz" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/front_def.4bpp.lz" + .endif + .endif .align 2 gMonPalette_Deoxys:: @ 8E39D48 @@ -11893,7 +11899,13 @@ gMonPalette_Deoxys:: @ 8E39D48 .align 2 gMonBackPic_Deoxys:: @ 8E39D70 + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/back.4bpp.lz" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/back_def.4bpp.lz" + .endif + .endif .align 2 gMonShinyPalette_Deoxys:: @ 8E3A360 @@ -11903,7 +11915,13 @@ gMonShinyPalette_Deoxys:: @ 8E3A360 gMonIcon_Deoxys:: @ 8E3A388 .incbin "graphics/pokemon/deoxys/icon.4bpp" @ Referenced as part of the same array as normal deoxys + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/icon_attack.4bpp" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/icon_defense.4bpp" + .endif + .endif .align 2 gMonFootprint_Deoxys:: @ 8E3AB88 @@ -16512,6 +16530,7 @@ gCreditsPokeballBgGfxMap:: @ 8EAB30C .incbin "graphics/credits/unk_8EAB30C.bin.lz" @ title_screen + .ifdef FIRERED gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 .incbin "graphics/title_screen/unk_8eab6c4.gbapal" @@ -16529,6 +16548,27 @@ gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_8eadee4.bin.lz" + .else + .ifdef LEAFGREEN +gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 + .incbin "graphics/title_screen/unk_lg_8eab744.gbapal" + +gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 + .incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz" + +gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 + .incbin "graphics/title_screen/unk_lg_8ead508.bin.lz" + +gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 + .incbin "graphics/title_screen/unk_lg_8ead768.gbapal" + +gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 + .incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz" + +gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 + .incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz" + .endif + .endif gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 .incbin "graphics/title_screen/unk_8eae094.gbapal" |