From 6cc1ec7bb160a32052930465e58c38ff0e0230df Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 26 Sep 2017 23:06:25 -0500 Subject: [PATCH] Extract intro gfx from graphics.s --- data/graphics.s | 68 +++++++++++------- data/intro.s | 32 ++++----- graphics/intro/droplet_sparkle.png | Bin 0 -> 206 bytes graphics/intro/flygon_silhouette.png | Bin 0 -> 234 bytes ...lying_shadow.pal => flying_silhouette.pal} | 0 graphics/intro/kyogre_bubbles.pal | 19 +++++ graphics/intro/kyogre_bubbles.png | Bin 0 -> 402 bytes graphics/intro/manectric.pal | 19 +++++ graphics/intro/manectric.png | Bin 0 -> 1670 bytes graphics/intro/rayquaza_lightning.pal | 19 +++++ graphics/intro/rayquaza_lightning.png | Bin 0 -> 476 bytes graphics/intro/torchic.pal | 19 +++++ graphics/intro/torchic.png | Bin 0 -> 742 bytes graphics/intro/volbeat.pal | 19 +++++ graphics/intro/volbeat.png | Bin 0 -> 500 bytes 15 files changed, 155 insertions(+), 40 deletions(-) create mode 100644 graphics/intro/droplet_sparkle.png create mode 100644 graphics/intro/flygon_silhouette.png rename graphics/intro/{flying_shadow.pal => flying_silhouette.pal} (100%) create mode 100644 graphics/intro/kyogre_bubbles.pal create mode 100644 graphics/intro/kyogre_bubbles.png create mode 100644 graphics/intro/manectric.pal create mode 100644 graphics/intro/manectric.png create mode 100644 graphics/intro/rayquaza_lightning.pal create mode 100644 graphics/intro/rayquaza_lightning.png create mode 100644 graphics/intro/torchic.pal create mode 100644 graphics/intro/torchic.png create mode 100644 graphics/intro/volbeat.pal create mode 100644 graphics/intro/volbeat.png diff --git a/data/graphics.s b/data/graphics.s index 4bff14d97..79ef25aeb 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -356,26 +356,36 @@ gUnknown_08D85E72:: @ 8D85E72 gUnknown_08D85E7C:: @ 8D85E7C .incbin "baserom.gba", 0xd85e7c, 0x54 -gUnknown_08D85ED0:: @ 8D85ED0 - .incbin "baserom.gba", 0xd85ed0, 0x20 + .align 2 +gIntroVolbeatPal:: @ 8D85ED0 + .incbin "graphics/intro/volbeat.gbapal" -gUnknown_08D85EF0:: @ 8D85EF0 - .incbin "baserom.gba", 0xd85ef0, 0x20 + .align 2 +gIntroTorchicPal:: @ 8D85EF0 + .incbin "graphics/intro/torchic.gbapal" -gUnknown_08D85F10:: @ 8D85ED0 - .incbin "baserom.gba", 0xd85f10, 0x20 + .align 2 +gIntroManectricPal:: @ 8D85ED0 + .incbin "graphics/intro/manectric.gbapal" + .align 2 gUnknown_08D85F30:: @ 8D85ED0 .incbin "baserom.gba", 0xd85f30, 0x20 -gUnknown_08D85F50:: @ 8D85F50 - .incbin "baserom.gba", 0xd85f50, 0x1e0 + .align 2 +gIntroVolbeatGfx:: @ 8D85F50 + .incbin "graphics/intro/volbeat.4bpp.lz" -gUnknown_08D86130:: @ 8D86130 - .incbin "baserom.gba", 0xd86130, 0x420 + .align 2 +gIntroTorchicGfx:: @ 8D86130 + .incbin "graphics/intro/torchic.4bpp.lz" -gUnknown_08D86550:: @ 8D86550 - .incbin "baserom.gba", 0xd86550, 0x1f44 + .align 2 +gIntroManectricGfx:: @ 8D86550 + .incbin "graphics/intro/manectric.4bpp.lz" + + .align 2 + .incbin "baserom.gba", 0xd8702c, 0x1468 gUnknown_08D88494:: @ 8D88494 .incbin "baserom.gba", 0xd88494, 0x8ac @@ -410,12 +420,15 @@ gUnknown_08D8B440:: @ 8D8B440 gUnknown_08D8B6E8:: @ 8D8B6E8 .incbin "baserom.gba", 0xd8b6e8, 0x124 -gUnknown_08D8B80C:: @ 8D8B80C - .incbin "baserom.gba", 0xd8b80c, 0x248 + .align 2 +gIntroRayquazaLightningGfx:: @ 8D8B80C + .incbin "graphics/intro/rayquaza_lightning.4bpp.lz" -gUnknown_08D8BA54:: @ 8D8BA54 - .incbin "baserom.gba", 0xd8ba54, 0x20 + .align 2 +gIntroRayquazaLightningPal:: @ 8D8BA54 + .incbin "graphics/intro/rayquaza_lightning.gbapal" + .align 2 gUnknown_08D8BA74:: @ 8D8BA74 .incbin "baserom.gba", 0xd8ba74, 0x6f8 @@ -428,17 +441,24 @@ gUnknown_08D8C838:: @ 8D8C838 gUnknown_08D8CCC8:: @ 8D8CCC8 .incbin "baserom.gba", 0xd8ccc8, 0x27c -gUnknown_08D8CF44:: @ 8D8CF44 - .incbin "baserom.gba", 0xd8cf44, 0x1cc + .align 2 +gIntroKyogreBubblesGfx:: @ 8D8CF44 + .incbin "graphics/intro/kyogre_bubbles.4bpp.lz" -gUnknown_08D8D110:: @ 8D8D110 - .incbin "baserom.gba", 0xd8d110, 0x20 + .align 2 +gIntroKyogreBubblesPal:: @ 8D8D110 + .incbin "graphics/intro/kyogre_bubbles.gbapal" -gUnknown_08D8D130:: @ 8D8D130 - .incbin "baserom.gba", 0xd8d130, 0xd8 + .align 2 +gIntroFlygonSilhouette:: @ 8D8D130 + .incbin "graphics/intro/flygon_silhouette.4bpp.lz" -gUnknown_08D8D208:: @ 8D8D208 - .incbin "baserom.gba", 0xd8d208, 0x208 + .align 2 +gIntroLeavesDropletSparkleGfx:: @ 8D8D208 + .incbin "graphics/intro/droplet_sparkle.4bpp.lz" + + .align 2 + .incbin "baserom.gba", 0xd8d2a4, 0x16c gUnknown_08D8D410:: @ 8D8D410 .incbin "baserom.gba", 0xd8d410, 0x17c diff --git a/data/intro.s b/data/intro.s index acd1164b6..ea6223c7e 100644 --- a/data/intro.s +++ b/data/intro.s @@ -72,8 +72,8 @@ gIntroBattleCircleGfx:: @ 85E45B0 .incbin "graphics/intro/battle_circle.4bpp.lz" .align 2 -gIntroFlyingPkmnShadowPal:: @ 85E492C - .incbin "graphics/intro/flying_shadow.gbapal" +gIntroFlyingPkmnSilhouettePal:: @ 85E492C + .incbin "graphics/intro/flying_silhouette.gbapal" .align 2 .incbin "graphics/intro/latis.4bpp.lz" @@ -90,12 +90,12 @@ gIntroFlyingPkmnShadowPal:: @ 85E492C .align 2 gUnknown_085E4A74:: @ 85E4A74 - obj_tiles gUnknown_08D8D208, 0x0400, 0x05e1 + obj_tiles gIntroLeavesDropletSparkleGfx, 0x0400, 0x05e1 null_obj_tiles .align 2 gUnknown_085E4A84:: @ 85E4A84 - obj_pal gUnknown_08D8BA54, 0x05e1 + obj_pal gIntroRayquazaLightningPal, 0x05e1 null_obj_pal .align 2 @@ -122,16 +122,16 @@ gUnknown_085E4AD0:: @ 85E4AD0 .align 2 gUnknown_085E4AE8:: @ 85E4AE8 - obj_tiles gUnknown_08D85F50, 0x0400, 0x05dc - obj_tiles gUnknown_08D86130, 0x0c00, 0x05dd - obj_tiles gUnknown_08D86550, 0x2000, 0x05de + obj_tiles gIntroVolbeatGfx, 0x0400, 0x05dc + obj_tiles gIntroTorchicGfx, 0x0c00, 0x05dd + obj_tiles gIntroManectricGfx, 0x2000, 0x05de null_obj_tiles .align 2 gUnknown_085E4B08:: @ 85E4B08 - obj_pal gUnknown_08D85ED0, 0x05dc - obj_pal gUnknown_08D85EF0, 0x05dd - obj_pal gUnknown_08D85F10, 0x05de + obj_pal gIntroVolbeatPal, 0x05dc + obj_pal gIntroTorchicPal, 0x05dd + obj_pal gIntroManectricPal, 0x05de null_obj_pal .align 2 @@ -194,12 +194,12 @@ gUnknown_085E4BDC:: @ 85E4BDC .align 2 gUnknown_085E4BF4:: @ 85E4BF4 - obj_tiles gUnknown_08D8B80C, 0x0c00, 0x05df + obj_tiles gIntroRayquazaLightningGfx, 0x0c00, 0x05df null_obj_tiles .align 2 gUnknown_085E4C04:: @ 85E4C04 - obj_pal gUnknown_08D8BA54, 0x05df + obj_pal gIntroRayquazaLightningPal, 0x05df null_obj_pal .align 2 @@ -236,12 +236,12 @@ gUnknown_085E4C64:: @ 85E4C64 .align 2 gUnknown_085E4C88:: @ 85E4C88 - obj_tiles gUnknown_08D8CF44, 0x0600, 0x05e0 + obj_tiles gIntroKyogreBubblesGfx, 0x0600, 0x05e0 null_obj_tiles .align 2 gUnknown_085E4C98:: @ 85E4C98 - obj_pal gUnknown_08D8D110, 0x05e0 + obj_pal gIntroKyogreBubblesPal, 0x05e0 null_obj_pal .align 2 @@ -492,14 +492,14 @@ gUnknown_085E4FDC:: @ 85E4FDC null_obj_tiles gUnknown_085E4FEC:: @ 85E4FEC - obj_tiles gUnknown_08D8D130, 0x0400, 0x07d2 + obj_tiles gIntroFlygonSilhouette, 0x0400, 0x07d2 null_obj_tiles .align 2 gUnknown_085E4FFC:: @ 85E4FFC obj_pal gIntroLeavesDropsPal, 0x07d0 obj_pal gIntroLeavesGFLogoPal, 0x07d1 - obj_pal gIntroFlyingPkmnShadowPal, 0x07d2 + obj_pal gIntroFlyingPkmnSilhouettePal, 0x07d2 null_obj_pal .align 2 diff --git a/graphics/intro/droplet_sparkle.png b/graphics/intro/droplet_sparkle.png new file mode 100644 index 0000000000000000000000000000000000000000..f8db885ec00007231c1274162e89ca2f0e0e9788 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0zllr!VDxo?EWGMqznRlLR`J}uKE9e%KxhjXZITZ z|NlS8%d0pmXi9g|mMz6suQmf!p@Hk`^9q4Nk)AG&Ar`&K2@51PSS&EkV2nuMVV7az zGhp=jeqc$#Y)97z4d)uHnp=+^J$jJwYGT1}LrE4!v8f!2>=Nvr9R)uO4#>Q9I8gD4 oky~ls11F2ShntpUiST$cFs!}F!5MF|;Vj5rPgg&ebxsLQ0B6`mo&W#< literal 0 HcmV?d00001 diff --git a/graphics/intro/flygon_silhouette.png b/graphics/intro/flygon_silhouette.png new file mode 100644 index 0000000000000000000000000000000000000000..080ab1a65aa563a46f119fc10d88202cb359dff2 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A8$%L^n;BgnPbV$pkcaw1=Y0!QmZwu1ks*>Y7>7Tvsd$o|*8_65NW|5+~;GekDsYRa>Uo|83W zMow@RL))5c&#*(BvI{-uzE@=wx-WQU<@;NY?z9(dd!(dpcE;?$qCZjm@(h<$g03#v qqb{3V&w4?L^}+ooY8$@l-#f-AZ^UnwdNX({$gQ5PelF{r5}E*srAGz; literal 0 HcmV?d00001 diff --git a/graphics/intro/flying_shadow.pal b/graphics/intro/flying_silhouette.pal similarity index 100% rename from graphics/intro/flying_shadow.pal rename to graphics/intro/flying_silhouette.pal diff --git a/graphics/intro/kyogre_bubbles.pal b/graphics/intro/kyogre_bubbles.pal new file mode 100644 index 000000000..85c483666 --- /dev/null +++ b/graphics/intro/kyogre_bubbles.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 98 +0 41 82 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 172 255 +106 148 222 +82 123 189 +49 98 156 +24 74 123 +0 49 98 +180 0 0 diff --git a/graphics/intro/kyogre_bubbles.png b/graphics/intro/kyogre_bubbles.png new file mode 100644 index 0000000000000000000000000000000000000000..d1f18701c414bbf69693297d6c7376c342633ed8 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC#g&9cxfBdf&NErn9gt%r+Nn+3p`v3nwPyh{d zulb)fgw*)T9L%6hsuhFJ8zo#dUzV#wiAefsUqX?Mgk zZ;EHkbY^wFIWym+Gi{>B$E0VbHyjvmfBW69u~0@_AT02L?$qsS2V#Go4L`a|h)3Z~ z;%95!xfk}Hcc=*eYhUFex=vKkS(eSw#d^`Jv@*T|*=vp)lo?w#zhiv6Ms=%Hn+s!B zulv^-ZzFh>*4)cget6|$-@X%FhblYy3a;8k=Wsq?5%qk;8m?u}Rr-x}v*z6Cy+;=t z@p(Pd;(0u8r^@_UPfqUJIOXH&+uF}B-pF?mR?K6%|d)1PK9zJ5O4 p@n?Bhty&fD$`@;&{{PeXnK7*S*z$;#D;9tP)YH|^Wt~$(69Cuks;dA1 literal 0 HcmV?d00001 diff --git a/graphics/intro/manectric.pal b/graphics/intro/manectric.pal new file mode 100644 index 000000000..c6bf97aa3 --- /dev/null +++ b/graphics/intro/manectric.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 189 172 +82 74 74 +139 139 123 +197 189 222 +255 255 255 +230 49 0 +246 148 0 +0 0 0 +255 255 180 +246 246 90 +205 213 49 +148 123 8 +131 164 255 +106 106 255 +41 74 213 +0 0 0 diff --git a/graphics/intro/manectric.png b/graphics/intro/manectric.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb054d7b381fb49a2bb25024a35474f571cef13 GIT binary patch literal 1670 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