From c3ffefa6c284b60ef9aa439029dc7870c364e472 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:38:10 +0200 Subject: [PATCH] replace some interface baseroms, fix labels --- asm/party_menu.s | 4 +- data/graphics.s | 37 ++++++++++++++++-- graphics/interface/bag_swap.png | Bin 0 -> 159 bytes graphics/interface/party_menu_misc.bin | Bin 0 -> 2048 bytes graphics/interface/party_menu_pokeball.png | Bin 0 -> 330 bytes .../interface/party_menu_pokeball_small.png | Bin 0 -> 261 bytes graphics/interface/status_icons.png | Bin 0 -> 455 bytes 7 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 graphics/interface/bag_swap.png create mode 100644 graphics/interface/party_menu_misc.bin create mode 100644 graphics/interface/party_menu_pokeball.png create mode 100644 graphics/interface/party_menu_pokeball_small.png create mode 100644 graphics/interface/status_icons.png diff --git a/asm/party_menu.s b/asm/party_menu.s index 224fedb1d..5ba1481ea 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -667,13 +667,13 @@ _0811EFB4: lsls r0, 24 cmp r0, 0 bne _0811F030 - ldr r0, _0811EFCC @ =gUnknown_8E82AB0 + ldr r0, _0811EFCC @ =gFile_graphics_interface_party_menu_misc_tilemap ldr r1, _0811EFD0 @ =gUnknown_203B0BC ldr r1, [r1] bl LZDecompressWram b _0811F016 .align 2, 0 -_0811EFCC: .4byte gUnknown_8E82AB0 +_0811EFCC: .4byte gFile_graphics_interface_party_menu_misc_tilemap _0811EFD0: .4byte gUnknown_203B0BC _0811EFD4: ldr r0, _0811EFF4 @ =gUnknown_8E829C8 diff --git a/data/graphics.s b/data/graphics.s index 98e0939b4..47838ad01 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13882,9 +13882,31 @@ gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 gUnknown_8E829C8:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 -gUnknown_8E82AB0:: @ 8E82AB0 - .incbin "baserom.gba", 0xE82AB0, 0x61C + .align 2 +gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0 + .incbin "graphics/interface/party_menu_misc.bin.lz" + .align 2 +gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8 + .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" + + .align 2 +gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68 + .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" + + .align 2 +gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C + .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" + + .align 2 +gUnknown_8E82EA0:: @ 8E82EA0 + .incbin "baserom.gba", 0xE82EA0, 0x204 + + .align 2 +gFile_graphics_interface_status_icons_palette:: @ 8E830A4 + .incbin "graphics/interface/status_icons.gbapal.lz" + + .align 2 gUnknown_8E830CC:: @ 8E830CC .incbin "baserom.gba", 0xE830CC, 0x1F4 @@ -13898,8 +13920,17 @@ gUnknown_8E835B4:: @ 8E835B4 .incbin "baserom.gba", 0xE835B4, 0x50 gUnknown_8E83604:: @ 8E83604 - .incbin "baserom.gba", 0xE83604, 0xFD4 + .incbin "baserom.gba", 0xE83604, 0xF84 + + .align 2 +gFile_graphics_interface_bag_swap_sheet:: @ 8E84588 + .incbin "graphics/interface/bag_swap.4bpp.lz" + .align 2 +gFile_graphics_interface_bag_swap_palette:: @ 8E845C8 + .incbin "graphics/interface/bag_swap.gbapal.lz" + + .align 2 gUnknown_8E845D8:: @ 8E845D8 .incbin "baserom.gba", 0xE845D8, 0x44C diff --git a/graphics/interface/bag_swap.png b/graphics/interface/bag_swap.png new file mode 100644 index 0000000000000000000000000000000000000000..a9bed1e8affebd0d39be57b9be404bcef95e270d GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt!7}BEg(FbM9#}2&}sK z9;iXf)5S4FVrp{20p@>)CFK)({udmx7H~-W)9h*6V07=H@$6j>WJMGtLYNr-ZC1TM TefGnXAZt8b{an^LB{Ts5_LnC0 literal 0 HcmV?d00001 diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin new file mode 100644 index 0000000000000000000000000000000000000000..d6ff1114d1161f5b54afcfeb1b35d483e3ee790f GIT binary patch literal 2048 zcmeH{y9$6X3`Mp0t}PesAQ+*bga7}9zDQ@AK^)3ibGYFWqM%Tq6p?3nrcS?t6~VsD zwn+Zdf9g-xK)Ro=@5g`w#&Q4c>+j(}6XSwkqY-iC$1!^fEI!V?rdLlpvkCkTI?&($ TFK&kcdSXU_AD5P<|KGp?HnU1V literal 0 HcmV?d00001 diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png new file mode 100644 index 0000000000000000000000000000000000000000..2aad54de84f082c809f773099db85f39b3f8c4e7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+DOuXMs#)kd@W^ZA&!} z-Fx;9h_*N~91UXFviB?yd3hz}M`Zp2s=n&!;uvDldv$^#U$X&^>&%F1S2gZJfg_$q zPq=vYG6eYxJY}0A8+hGM^yzGlmC3)^wd;P`cV0G$e|c=r+$!&i`OmGJ9jg?N9x4`! zW{%KWz?pX9!zP=!^Rf*ZENdCAi8^w8>}a3C#WBZgUzk~F;cg~P=FXf>1AFdHgSx+t zSH=HLj9T>WO0?5olU^3Km#re)zMd((2`d}aIuw*&7Z%tuO#B|TzG2fr$MCa@iUqcQ z>xr>HQ0;DVVkc{bm+E|t*;?0Q8>ck7Y!hj=3(?=izjpuKFZ&mmt0z8eDYh?-1_g(w LtDnm{r-UW|2-$xj literal 0 HcmV?d00001 diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png new file mode 100644 index 0000000000000000000000000000000000000000..d2eec4d45bb94812fbb5e4c48233bfa801c877d1 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=!VDyz{eM3hNErn9gt%%pp9M0JK~`4tw=LB` zbnn?aAll-{a5RWv%igm<a_}+jk&*Kda*H%@x2k!*`S(4R zP~*@8(F@hPg!WuG_=u%uPQPDhnpgaF1q+UX;vLGK3xW*Yz4l%HmB0S$;*P#uE7mBT sQEE^NaG&)+UB)8r@XJ5F-qZhG7uWPJ?oGaT_7un`p00i_>zopr0Ja!tIRF3v literal 0 HcmV?d00001 diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png new file mode 100644 index 0000000000000000000000000000000000000000..fe802d7f66659b1fdb5ca33e5fffcf920ab29145 GIT binary patch literal 455 zcmV;&0XY7NP)f$}&4cPmsZ^Og%s*voSJvbQfmE%tqn> zopOM{2`ZkO=hUgi&Xe-w{PaGSR}@9D(j1S)6dMJtgwo=HLDO3(C4^2uX_7NQ2TCjG zKYomplOBy x_+}V~al{aE0u2^`vB@e@I7Wy=v$g*regTrm{cS=+310vJ002ovPDHLkV1hL5#PR?D literal 0 HcmV?d00001