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 | |
parent | 5f62529525a672c6342b3a53d29364c8f432b540 (diff) |
Finish aligning assets in LG
-rw-r--r-- | data/graphics.s | 40 | ||||
-rw-r--r-- | graphics/pokemon/deoxys/back_def.png | bin | 0 -> 1106 bytes | |||
-rw-r--r-- | graphics/pokemon/deoxys/front_def.png | bin | 0 -> 1650 bytes | |||
-rw-r--r-- | graphics/pokemon/deoxys/icon_defense.png | bin | 0 -> 414 bytes | |||
-rw-r--r-- | graphics/slot_machine/unk_lg_846535c.png | bin | 0 -> 1605 bytes | |||
-rw-r--r-- | graphics/slot_machine/unk_lg_8465ab8.bin | bin | 0 -> 1280 bytes | |||
-rw-r--r-- | graphics/slot_machine/unk_lg_8465f00.png | bin | 0 -> 842 bytes | |||
-rw-r--r-- | graphics/slot_machine/unk_lg_8466278.bin | bin | 0 -> 1280 bytes | |||
-rw-r--r-- | graphics/title_screen/unk_lg_8eab744.pal | 259 | ||||
-rw-r--r-- | graphics/title_screen/unk_lg_8eab944.png | bin | 0 -> 5875 bytes | |||
-rw-r--r-- | graphics/title_screen/unk_lg_8ead508.bin | bin | 0 -> 1280 bytes | |||
-rw-r--r-- | graphics/title_screen/unk_lg_8ead768.pal | 19 | ||||
-rw-r--r-- | graphics/title_screen/unk_lg_8ead788.png | bin | 0 -> 2031 bytes | |||
-rw-r--r-- | graphics/title_screen/unk_lg_8eae1ec.bin | bin | 0 -> 1280 bytes | |||
-rw-r--r-- | graphics_file_rules.mk | 3 |
15 files changed, 321 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" diff --git a/graphics/pokemon/deoxys/back_def.png b/graphics/pokemon/deoxys/back_def.png Binary files differnew file mode 100644 index 000000000..8e8bb8730 --- /dev/null +++ b/graphics/pokemon/deoxys/back_def.png diff --git a/graphics/pokemon/deoxys/front_def.png b/graphics/pokemon/deoxys/front_def.png Binary files differnew file mode 100644 index 000000000..1db6acdc7 --- /dev/null +++ b/graphics/pokemon/deoxys/front_def.png diff --git a/graphics/pokemon/deoxys/icon_defense.png b/graphics/pokemon/deoxys/icon_defense.png Binary files differnew file mode 100644 index 000000000..8c423d14b --- /dev/null +++ b/graphics/pokemon/deoxys/icon_defense.png diff --git a/graphics/slot_machine/unk_lg_846535c.png b/graphics/slot_machine/unk_lg_846535c.png Binary files differnew file mode 100644 index 000000000..dc1799f37 --- /dev/null +++ b/graphics/slot_machine/unk_lg_846535c.png diff --git a/graphics/slot_machine/unk_lg_8465ab8.bin b/graphics/slot_machine/unk_lg_8465ab8.bin Binary files differnew file mode 100644 index 000000000..11450307c --- /dev/null +++ b/graphics/slot_machine/unk_lg_8465ab8.bin diff --git a/graphics/slot_machine/unk_lg_8465f00.png b/graphics/slot_machine/unk_lg_8465f00.png Binary files differnew file mode 100644 index 000000000..56ce87fce --- /dev/null +++ b/graphics/slot_machine/unk_lg_8465f00.png diff --git a/graphics/slot_machine/unk_lg_8466278.bin b/graphics/slot_machine/unk_lg_8466278.bin Binary files differnew file mode 100644 index 000000000..73c6985f3 --- /dev/null +++ b/graphics/slot_machine/unk_lg_8466278.bin diff --git a/graphics/title_screen/unk_lg_8eab744.pal b/graphics/title_screen/unk_lg_8eab744.pal new file mode 100644 index 000000000..7a87d6ae0 --- /dev/null +++ b/graphics/title_screen/unk_lg_8eab744.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 255 41 +0 0 0 +255 238 16 +246 222 41 +246 238 246 +255 246 24 +246 246 41 +246 246 246 +246 255 255 +255 246 255 +32 0 255 +106 65 156 +32 0 238 +246 222 24 +246 222 32 +255 238 41 +255 238 49 +255 255 16 +255 255 24 +255 255 246 +255 255 255 +123 106 156 +24 41 32 +32 32 74 +32 0 230 +115 82 164 +16 0 246 +106 82 172 +246 238 32 +255 230 24 +246 230 41 +246 238 41 +246 230 49 +246 238 49 +255 246 32 +255 246 41 +255 255 32 +255 255 41 +32 24 32 +32 32 41 +197 156 41 +197 164 41 +156 156 156 +164 164 156 +172 172 172 +180 189 180 +41 0 230 +189 189 189 +197 189 189 +197 197 197 +205 205 213 +8 8 197 +246 230 24 +246 230 32 +255 238 24 +255 238 32 +32 32 32 +32 41 32 +41 32 32 +41 41 32 +49 32 32 +49 41 32 +41 32 41 +49 32 41 +24 41 41 +32 32 90 +16 24 106 +24 32 98 +41 32 82 +41 32 98 +41 41 82 +41 41 98 +0 0 115 +8 8 131 +32 24 115 +32 24 131 +32 41 115 +41 41 115 +32 41 131 +41 41 131 +57 41 41 +57 41 49 +57 49 41 +57 57 57 +65 41 41 +74 41 41 +65 57 57 +74 57 57 +57 74 74 +65 65 74 +82 74 82 +82 57 131 +82 90 82 +90 90 90 +90 98 98 +98 98 106 +115 106 106 +131 98 115 +139 98 106 +139 115 98 +180 139 57 +172 131 65 +156 115 90 +156 131 82 +115 82 139 +123 82 131 +115 98 131 +131 98 123 +115 123 123 +123 123 131 +139 131 139 +148 123 131 +205 172 24 +213 172 16 +205 164 32 +213 172 32 +222 189 24 +230 189 16 +213 189 32 +222 189 32 +230 205 24 +230 205 32 +230 213 32 +238 222 32 +180 148 57 +189 156 49 +180 148 74 +180 172 90 +156 148 123 +139 148 139 +164 148 115 +172 156 106 +197 156 49 +205 180 49 +197 172 90 +205 189 82 +222 205 49 +230 222 49 +205 205 74 +222 213 65 +49 0 230 +213 213 213 +222 230 230 +222 230 230 +255 0 246 +255 0 255 +16 8 197 +16 16 189 +32 16 164 +41 16 164 +32 16 180 +41 16 189 +8 8 205 +8 16 205 +24 8 213 +24 16 205 +41 8 213 +41 16 213 +49 8 213 +57 16 213 +16 8 230 +24 8 230 +24 16 230 +24 24 230 +8 8 246 +8 16 246 +16 8 246 +16 16 246 +32 8 230 +32 16 230 +32 8 238 +32 8 246 +41 8 230 +41 16 230 +49 16 230 +49 8 238 +32 32 156 +24 32 172 +41 41 156 +41 32 164 +74 49 180 +82 49 172 +82 65 164 +90 74 164 +24 32 189 +57 41 189 +41 32 213 +57 32 213 +74 41 189 +90 57 189 +74 49 197 +74 41 205 +205 205 205 +41 41 41 +189 189 189 +172 172 172 +246 246 246 +123 123 123 +156 156 156 +139 139 139 +238 238 238 +16 16 16 +98 98 98 +82 82 82 +222 222 222 +57 57 57 +0 0 0 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/title_screen/unk_lg_8eab944.png b/graphics/title_screen/unk_lg_8eab944.png Binary files differnew file mode 100644 index 000000000..c34738121 --- /dev/null +++ b/graphics/title_screen/unk_lg_8eab944.png diff --git a/graphics/title_screen/unk_lg_8ead508.bin b/graphics/title_screen/unk_lg_8ead508.bin Binary files differnew file mode 100644 index 000000000..6ce2f1b91 --- /dev/null +++ b/graphics/title_screen/unk_lg_8ead508.bin diff --git a/graphics/title_screen/unk_lg_8ead768.pal b/graphics/title_screen/unk_lg_8ead768.pal new file mode 100644 index 000000000..2d8915888 --- /dev/null +++ b/graphics/title_screen/unk_lg_8ead768.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 148 98 +0 0 0 +246 148 98 +255 0 255 +255 0 255 +255 0 255 +0 32 32 +0 49 41 +0 65 49 +0 82 57 +16 98 74 +24 115 90 +41 148 115 +74 180 139 +98 205 156 +131 230 172 diff --git a/graphics/title_screen/unk_lg_8ead788.png b/graphics/title_screen/unk_lg_8ead788.png Binary files differnew file mode 100644 index 000000000..f496b62a8 --- /dev/null +++ b/graphics/title_screen/unk_lg_8ead788.png diff --git a/graphics/title_screen/unk_lg_8eae1ec.bin b/graphics/title_screen/unk_lg_8eae1ec.bin Binary files differnew file mode 100644 index 000000000..666c158ca --- /dev/null +++ b/graphics/title_screen/unk_lg_8eae1ec.bin diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 57fcb3c2e..cd74933aa 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -506,6 +506,9 @@ $(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png $(TITLESCREENGFXDIR)/unk_8ead608.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 135 +$(TITLESCREENGFXDIR)/unk_lg_8ead788.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 123 + $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 |