From cfe2cbd3818abbefd983ac10986473673cc79130 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 21:59:56 +0200 Subject: [PATCH] add some battle interface, berry blender and contest files, fix up label --- asm/battle_anim_80A22E8.s | 4 +- data/graphics.s | 148 ++++++++++++++++-- graphics/battle_interface/ball_status_bar.png | Bin 0 -> 174 bytes .../battle_interface/enemy_mon_shadow.png | Bin 0 -> 154 bytes graphics/berry_blender/center.png | Bin 0 -> 1374 bytes graphics/berry_blender/outer.png | Bin 0 -> 1880 bytes graphics/berry_blender/outer_map.bin | Bin 0 -> 2048 bytes graphics/contest/applause_meter.png | Bin 0 -> 184 bytes graphics/contest/nextturn.png | Bin 0 -> 195 bytes graphics/unknown/unknown_E7CFB0.bin | Bin 0 -> 1280 bytes 10 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 graphics/battle_interface/ball_status_bar.png create mode 100644 graphics/battle_interface/enemy_mon_shadow.png create mode 100644 graphics/berry_blender/center.png create mode 100644 graphics/berry_blender/outer.png create mode 100644 graphics/berry_blender/outer_map.bin create mode 100644 graphics/contest/applause_meter.png create mode 100644 graphics/contest/nextturn.png create mode 100644 graphics/unknown/unknown_E7CFB0.bin diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index c7048f9e4..e61ff48ad 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -18915,7 +18915,7 @@ _080AB45C: .4byte gUnknown_8E809CC _080AB460: .4byte gUnknown_2037F02 _080AB464: .4byte gUnknown_8E81CEC _080AB468: - ldr r0, _080AB4E0 @ =gUnknown_8E7BAB0 + ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18973,7 +18973,7 @@ _080AB476: strh r0, [r7, 0xE] b _080AB552 .align 2, 0 -_080AB4E0: .4byte gUnknown_8E7BAB0 +_080AB4E0: .4byte gFile_graphics_battle_anims_backgrounds_water_muddy_palette _080AB4E4: .4byte sub_80AB79C _080AB4E8: .4byte gTasks _080AB4EC: .4byte 0x0000ffb0 diff --git a/data/graphics.s b/data/graphics.s index 62dd2c823..0c79f58e2 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13575,45 +13575,173 @@ gUnknown_8E7A880:: @ 8E7A880 .align 2 gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC .incbin "graphics/contest/nextturn_numbers.4bpp" - @ .incbin "baserom.gba", 0xE7A8DC, 0x0080 .align 2 gFile_graphics_contest_nextturn_random:: @ 8E7A95C .incbin "graphics/contest/nextturn_random.4bpp" - @ .incbin "baserom.gba", 0xE7A95C, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_264_sheet:: @ 8E7A97C .incbin "graphics/battle_anims/sprites/264.4bpp.lz" - @ .incbin "baserom.gba", 0xE7A97C, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_264_palette:: @ 8E7A99C .incbin "graphics/battle_anims/sprites/264.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A99C, 0x0018 .align 2 gFile_graphics_battle_anims_sprites_265_palette:: @ 8E7A9B4 .incbin "graphics/battle_anims/sprites/265.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9B4, 0x0018 .align 2 gFile_graphics_battle_anims_sprites_067_palette:: @ 8E7A9CC .incbin "graphics/battle_anims/sprites/067.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9CC, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_068_palette:: @ 8E7A9EC .incbin "graphics/battle_anims/sprites/068.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9EC, 0x0020 .align 2 gUnknown_8E7AA0C:: @ 8E7AA0C - .incbin "baserom.gba", 0xE7AA0C, 0x10A4 + .incbin "baserom.gba", 0xE7AA0C, 0x12C -gUnknown_8E7BAB0:: @ 8E7BAB0 - .incbin "baserom.gba", 0xE7BAB0, 0x3744 + .align 2 +gFile_graphics_contest_applause_meter:: @ 8E7AB38 + .incbin "graphics/contest/applause_meter.4bpp" + .align 2 +gFile_graphics_contest_nextturn:: @ 8E7ABB8 + .incbin "graphics/contest/nextturn.gbapal" + + .align 2 +gFile_graphics_battle_anims_sprites_272_sheet:: @ 8E7ABD8 + .incbin "graphics/battle_anims/sprites/272.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_272_palette:: @ 8E7ADF4 + .incbin "graphics/battle_anims/sprites/272.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_273_sheet:: @ 8E7AE18 + .incbin "graphics/battle_anims/sprites/273.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_269_sheet:: @ 8E7AE40 + .incbin "graphics/battle_anims/sprites/269.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_269_palette:: @ 8E7AE94 + .incbin "graphics/battle_anims/sprites/269.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_274_sheet:: @ 8E7AEAC + .incbin "graphics/battle_anims/sprites/274.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_275_sheet:: @ 8E7B02C + .incbin "graphics/battle_anims/sprites/275.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_276_sheet:: @ 8E7B198 + .incbin "graphics/battle_anims/sprites/276.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_274_palette:: @ 8E7B300 + .incbin "graphics/battle_anims/sprites/274.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_sheet:: @ 8E7B328 + .incbin "graphics/battle_anims/backgrounds/17.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_palette:: @ 8E7B484 + .incbin "graphics/battle_anims/backgrounds/17.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_tilemap:: @ 8E7B4AC + .incbin "graphics/battle_anims/backgrounds/17.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_280_sheet:: @ 8E7B694 + .incbin "graphics/battle_anims/sprites/280.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_280_palette:: @ 8E7BA90 + .incbin "graphics/battle_anims/sprites/280.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_muddy_palette:: @ 8E7BAB0 + .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" + + .align 2 +gFile_graphics_battle_interface_enemy_mon_shadow_sheet:: @ 8E7BAD4 + .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" + + .align 2 +gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04 + .incbin "graphics/battle_interface/ball_status_bar.4bpp.lz" + + + .align 2 +gUnknown_8E7BBB8:: @ 8E7BB88 + .incbin "baserom.gba", 0xE7BB88, 0x400 + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_sheet:: @ 8E7BF88 + .incbin "graphics/battle_anims/backgrounds/02.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_palette:: @ 8E7CC50 + .incbin "graphics/battle_anims/backgrounds/02.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_tilemap:: @ 8E7CC6C + .incbin "graphics/battle_anims/backgrounds/02.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_287_palette:: @ 8E7CF60 + .incbin "graphics/battle_anims/sprites/287.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_24_palette:: @ 8E7CF88 + .incbin "graphics/battle_anims/backgrounds/24.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_E7CFB0_tilemap:: @ 8E7CFB0 + .incbin "graphics/unknown/unknown_E7CFB0.bin.lz" + + .align 2 +gFile_graphics_berry_blender_center_sheet:: @ 8E7D4AC + .incbin "graphics/berry_blender/center.8bpp.lz" + + .align 2 +gFile_graphics_berry_blender_outer_sheet:: @ 8E7DCCC + .incbin "graphics/berry_blender/outer.4bpp.lz" + + .align 2 +gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700 + .incbin "graphics/berry_blender/outer_map.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_palette:: @ 8E7EA14 + .incbin "graphics/battle_anims/backgrounds/16.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_sheet:: @ 8E7EA3C + .incbin "graphics/battle_anims/backgrounds/16.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_tilemap:: @ 8E7EC9C + .incbin "graphics/battle_anims/backgrounds/16.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 + .incbin "graphics/battle_anims/sprites/277.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 + .incbin "graphics/battle_anims/sprites/277.4bpp.lz" + + .align 2 gUnknown_8E7F1F4:: @ 8E7F1F4 .incbin "baserom.gba", 0xE7F1F4, 0x2B8 diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..b947a7803a93d36dc0c993d8776f6f5235072a70 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^4M5Dn!VDx2e}3f)qznRlLR^8gqod>h|M%`)-Ewqq zarKnupsXYXO9smz$N$e5{?D1>c=kU7!+$Vj$eQw>-|C(aP>-dji(`n!#N>p81dsFu zJWHkruaZ~KU~l46IKj|lqQJr26ri9GR$s{~(7=h|M%`)-Ewqq zarKnupsXYXO9smz$N$e5{?D1>c=kU7!+$Vj$eQw>-|C(aP>-soi(?4K%;W?Hrfnt$ w9tjN%CMpdRS{qr~OiUUy8y2!24k*cH>^r1>)Ao4EOrQn^Pgg&ebxsLQ02<3O`v3p{ literal 0 HcmV?d00001 diff --git a/graphics/berry_blender/center.png b/graphics/berry_blender/center.png new file mode 100644 index 0000000000000000000000000000000000000000..1da3629d4c6ed19a9f1e39875d334efd0edf6170 GIT binary patch literal 1374 zcmV-k1)=(hP)nT{#$d|NOkAg(0GohYBI z0K7o-fPp?W$*TYWVGy`J7@dj+Uat&bCZeqmhtP*D8>j$gBH92>fJEv6%|s^f1_*+X z711hyeQ4^O>dz4tPEZfq=+|1Okq#58=A5Crx}601q<)31Uzt zg7XLIuk$=DKzd9BHK-Bbnf^QhzzDFCKJhUTR0ITY{dry7!q5An=OzIGLJz-W7QjGz zJ|MVmtg7E|{sRI_$V(jZ8Ni-}L)AZW00H+IAP4=!O~D#xB4_}#^TG9@0wxyr{fHHi87VYiKnQqD5PX}vKv-zU!Fp~| zYM5GKJ{Vmv$OGwVL_UyO03^sGagU($tOPIu9m=%BZi7J&@xj*_G$$JTD7j0-8np8c z4*{VAq#yGIehzTaWkD0CdU3*B4}pRbdkJsMz9YTct?=gY^CN&D%=9)uTA1qdj8wa= zCfFdDwQ`Y7FDQaaFcPq)mDb2seZzq!v;o;U%tE`&m#>wSfwJFJgrHtXRKm6^1OCW= z1tD2zFAnpP7#lztFaXH{0isw>h6aWf_~adJ19^zp7N~dvSq3($n_;0P60OX!H$Y9* zTVOAg*r&+5ycy6I(!y&dbw>E!0Jq>L@{EW%_qYMF;8A_&rFVj)E~xqh$XkY$nnC1L g`RiBz%YPgA2lUgB&OC%IZ2$lO07*qoM6N<$f-m%F(EtDd literal 0 HcmV?d00001 diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png new file mode 100644 index 0000000000000000000000000000000000000000..d8040b02205fe71a8e56137b79744d7399d3a6d6 GIT binary patch literal 1880 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 PUsG!O!E^`yhYtJ$n8XS4 literal 0 HcmV?d00001 diff --git a/graphics/contest/applause_meter.png b/graphics/contest/applause_meter.png new file mode 100644 index 0000000000000000000000000000000000000000..8a4fce8c08e105c10962437030b861cb5a88a870 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV!VDzu-cxxDqznRlLR^9Llqi93dyD_yEB^m~ z&VNIRs{#z)=G^v#3yZU*i>HgT35$yhuVIN0 zTf?`A*+qhxu~|XDK!L$!+nyt>2lp<%+q!Vk;>9f5jMG?GAI_Fz@ZnQ5?40CU1+v7` L)z4*}Q$iB}qKz@L literal 0 HcmV?d00001 diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png new file mode 100644 index 0000000000000000000000000000000000000000..1d79d0608c66f019ffd9e2149f320affacdbbdce GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nWMo!VDyL`#gCAqznRlLR^9Llqi93dyD_yEB^m~ z&VNIRs{#z)=G^zopr0Ep;7eE)aa+rMp)y3KIg#&8?kaGT*a!)=D^1h*LwBrvu?u)qu_ zFvAHf+wcVT3S*F)+??E;@BQ!I6Gj-74C`twt(MicI#$=REZcG{*YYgi3arqItk_Dd z#1*?DSLg~{zRPpDF2`lNEEneS530J=u$m@Iv?NP5vlL6UG;@}28J208F2kie=h9rN zOL69sU6MEW3d)z@m9?eEWuTC@h;BAx)>MjqFkhlaN({D z|Cg1ua#r3dn2%L7U-L763$Q>7vS16bPz!Y-F4zURKo{WrouBh{6`hZ(pz2+0th6CU_uBbR3QphkOCDTfBDH*73HG`yNBIVm8n8i!igY~D58lW zmN??6Mgj?{rg+6ERxyfJlp+*l~0tzXjm=a15m3u5y&EER}ML?$u*F z&J#SzQ`DnA4QNOs8qQ61D??bKFn)LN~yj%!|(vd??$3%tlnbfY^x=t(bn z(}%wFqdx-}p#JKozUrgi>ZP9Qq3-IYYh33uKKIy{d4*Sbjn^5-AOQORf9boWJG{$#yw3-G$aH2flUdAW4s)5ud={{fg<7Ebny0y%quH9JnVO;L zy3c;ib}xgE_?S=ll*KGzDa%;S3Rbd;)vRGHYqdtJwMr|sLd&&GOSMFcz5VaA_cQ#0 zFZs&5#d