From e150a620450a17bb2ab3905c04c33777dc6bf0cc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 14:07:10 +0800 Subject: [PATCH] battle transition data decomp --- data/data_83F5738.s | 123 +--- data/field_map_obj.s | 8 +- graphics/battle_transitions/agatha_bg.pal | 19 + .../big_pokeball_tilemap.bin | Bin 0 -> 1200 bytes .../big_pokeball_tileset.png | Bin 0 -> 553 bytes graphics/battle_transitions/blue_bg.pal | 19 + graphics/battle_transitions/bruno_bg.pal | 19 + graphics/battle_transitions/green_bg.pal | 19 + .../grid_square_tilemap.bin | Bin 0 -> 480 bytes graphics/battle_transitions/lance_bg.pal | 19 + graphics/battle_transitions/lorelei_bg.pal | 19 + graphics/battle_transitions/red_bg.pal | 19 + .../battle_transitions/sliding_pokeball.pal | 19 + .../battle_transitions/sliding_pokeball.png | Bin 0 -> 309 bytes .../sliding_pokeball_tilemap.bin | Bin 0 -> 64 bytes .../battle_transitions/unused_brendan.png | Bin 0 -> 475 bytes graphics/battle_transitions/unused_lass.png | Bin 0 -> 412 bytes .../battle_transitions/unused_trainer.pal | 19 + graphics/battle_transitions/vsbar_tilemap.bin | Bin 0 -> 1280 bytes graphics/battle_transitions/vsbar_tileset.png | Bin 0 -> 158 bytes include/battle_transition.h | 10 +- ld_script.txt | 2 + src/battle_transition.c | 577 ++++++++++++++++++ sym_ewram.txt | 5 +- 24 files changed, 765 insertions(+), 131 deletions(-) create mode 100644 graphics/battle_transitions/agatha_bg.pal create mode 100644 graphics/battle_transitions/big_pokeball_tilemap.bin create mode 100644 graphics/battle_transitions/big_pokeball_tileset.png create mode 100644 graphics/battle_transitions/blue_bg.pal create mode 100644 graphics/battle_transitions/bruno_bg.pal create mode 100644 graphics/battle_transitions/green_bg.pal create mode 100644 graphics/battle_transitions/grid_square_tilemap.bin create mode 100644 graphics/battle_transitions/lance_bg.pal create mode 100644 graphics/battle_transitions/lorelei_bg.pal create mode 100644 graphics/battle_transitions/red_bg.pal create mode 100644 graphics/battle_transitions/sliding_pokeball.pal create mode 100644 graphics/battle_transitions/sliding_pokeball.png create mode 100644 graphics/battle_transitions/sliding_pokeball_tilemap.bin create mode 100644 graphics/battle_transitions/unused_brendan.png create mode 100644 graphics/battle_transitions/unused_lass.png create mode 100644 graphics/battle_transitions/unused_trainer.pal create mode 100644 graphics/battle_transitions/vsbar_tilemap.bin create mode 100644 graphics/battle_transitions/vsbar_tileset.png create mode 100644 src/battle_transition.c diff --git a/data/data_83F5738.s b/data/data_83F5738.s index 12fa41711..dc09b0532 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -133,128 +133,7 @@ gUnknown_83F846D:: @ 83F846D gUnknown_83F847D:: @ 83F847D .incbin "baserom.gba", 0x3F847D, 0x323 -sBigPokeballTileset:: @ 83F87A0 - .incbin "baserom.gba", 0x3F87A0, 0x580 - -sSlidingPokeballTilemap:: @ 83F8D20 - .incbin "baserom.gba", 0x3F8D20, 0x240 - -sVsBarTileset:: @ 83F8F60 - .incbin "baserom.gba", 0x3F8F60, 0x11E0 - -sGridSquareTilemap:: @ 83FA140 - .incbin "baserom.gba", 0x3FA140, 0x1E0 - -sBT_Phase1Tasks:: @ 83FA320 - .incbin "baserom.gba", 0x3FA320, 0x48 - -sBT_Phase2Tasks:: @ 83FA368 - .incbin "baserom.gba", 0x3FA368, 0x48 - -sBT_MainPhases:: @ 83FA3B0 - .incbin "baserom.gba", 0x3FA3B0, 0x10 - -sBT_Phase2BlurFuncs:: @ 83FA3C0 - .incbin "baserom.gba", 0x3FA3C0, 0xC - -sBT_Phase2DistortedWaveFuncs:: @ 83FA3CC - .incbin "baserom.gba", 0x3FA3CC, 0x8 - -sBT_Phase2HorizontalCorrugateFuncs:: @ 83FA3D4 - .incbin "baserom.gba", 0x3FA3D4, 0x8 - -sBT_Phase2BigPokeballFuncs:: @ 83FA3DC - .incbin "baserom.gba", 0x3FA3DC, 0x18 - -sBT_Phase2SlidingPokeballsFuncs:: @ 83FA3F4 - .incbin "baserom.gba", 0x3FA3F4, 0xC - -gUnknown_83FA400:: @ 83FA400 - .incbin "baserom.gba", 0x3FA400, 0x4 - -gUnknown_83FA404:: @ 83FA404 - .incbin "baserom.gba", 0x3FA404, 0xA - -gUnknown_83FA40E:: @ 83FA40E - .incbin "baserom.gba", 0x3FA40E, 0x6 - -sBT_Phase2ClockwiseBlackFadeFuncs:: @ 83FA414 - .incbin "baserom.gba", 0x3FA414, 0x1C - -sBT_Phase2FullScreenWaveFuncs:: @ 83FA430 - .incbin "baserom.gba", 0x3FA430, 0x8 - -sBT_Phase2BlackWaveToRightFuncs:: @ 83FA438 - .incbin "baserom.gba", 0x3FA438, 0xC - -gUnknown_83FA444:: @ 83FA444 - .incbin "baserom.gba", 0x3FA444, 0x20 - -sBT_Phase2AntiClockwiseSpiralFuncs:: @ 83FA464 - .incbin "baserom.gba", 0x3FA464, 0x8 - -sBT_Phase2MugshotFuncs:: @ 83FA46C - .incbin "baserom.gba", 0x3FA46C, 0x28 - -sMugshotsTrainerPicIDsTable:: @ 83FA494 - .incbin "baserom.gba", 0x3FA494, 0x6 - -sMugshotsOpponentRotationScales:: @ 83FA49A - .incbin "baserom.gba", 0x3FA49A, 0x14 - -sMugshotsOpponentCoords:: @ 83FA4AE - .incbin "baserom.gba", 0x3FA4AE, 0x16 - -sBT_Phase2MugshotSpriteFuncs:: @ 83FA4C4 - .incbin "baserom.gba", 0x3FA4C4, 0x1C - -sMugShotSlideVelocity:: @ 83FA4E0 - .incbin "baserom.gba", 0x3FA4E0, 0x4 - -sMugShotSlideDeceleration:: @ 83FA4E4 - .incbin "baserom.gba", 0x3FA4E4, 0x4 - -sBT_Phase2SlicedScreenFuncs:: @ 83FA4E8 - .incbin "baserom.gba", 0x3FA4E8, 0xC - -sBT_Phase2WhiteFadeInStripesFuncs:: @ 83FA4F4 - .incbin "baserom.gba", 0x3FA4F4, 0x14 - -sWhiteStripeDelay:: @ 83FA508 - .incbin "baserom.gba", 0x3FA508, 0xC - -sBT_Phase2GridSquaresFuncs:: @ 83FA514 - .incbin "baserom.gba", 0x3FA514, 0xC - -sBT_Phase2BlackDoodlesFuncs:: @ 83FA520 - .incbin "baserom.gba", 0x3FA520, 0x14 - -sBlackDoodlesSegments:: @ 83FA534 - .incbin "baserom.gba", 0x3FA534, 0x46 - -sBlackDoodlesDelay:: @ 83FA57A - .incbin "baserom.gba", 0x3FA57A, 0xE - -sBT_Phase1FadeFuncs:: @ 83FA588 - .incbin "baserom.gba", 0x3FA588, 0x44 - -sSpriteTemplate_SlidingPokeball:: @ 83FA5CC - .incbin "baserom.gba", 0x3FA5CC, 0x6C - -sSlidingPokeballBigPokeballPalette:: @ 83FA638 - .incbin "baserom.gba", 0x3FA638, 0x108 - -sVsBarOpponentPalettes:: @ 83FA740 - .incbin "baserom.gba", 0x3FA740, 0x14 - -sVsBarPlayerPalettes:: @ 83FA754 - .incbin "baserom.gba", 0x3FA754, 0x30 - -sBigPokeballTilemap:: @ 83FA784 - .incbin "baserom.gba", 0x3FA784, 0x4B0 - -sVsBarTilemap:: @ 83FAC34 - .incbin "baserom.gba", 0x3FAC34, 0x500 + .section .rodata.83FB134 gUnknown_83FB134:: @ 83FB134 .incbin "baserom.gba", 0x3FB134, 0xA80 diff --git a/data/field_map_obj.s b/data/field_map_obj.s index d12de7aa9..72d20cd4e 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010 .incbin "baserom.gba", 0x3A0010, 0x3688 gUnknown_83A3698:: @ 83A3698 - .incbin "baserom.gba", 0x3A3698, 0x1AC0 + .incbin "baserom.gba", 0x3A3698, 0x80 + +gEventObjectBaseOam_32x32:: @ 83A3718 + .incbin "baserom.gba", 0x3A3718, 0x8 + +gUnknown_83A3720:: @ 83A3720 + .incbin "baserom.gba", 0x3A3720, 0x1a38 gUnknown_83A5158:: @ 83A5158 .incbin "baserom.gba", 0x3A5158, 0xB0 diff --git a/graphics/battle_transitions/agatha_bg.pal b/graphics/battle_transitions/agatha_bg.pal new file mode 100644 index 000000000..4aac79fec --- /dev/null +++ b/graphics/battle_transitions/agatha_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +255 82 172 +255 98 189 +255 115 205 +255 131 222 +255 148 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/big_pokeball_tilemap.bin b/graphics/battle_transitions/big_pokeball_tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..691e16ef7a9e80f4ddd8541400262278d24703f5 GIT binary patch literal 1200 zcmd7R$Bu(Q5Jl13_H&kV&N=`8|Bc%oO0aOjViwa^0wHv|KmzzrtBj~nrK*agvR;>; zavriqod)5P!mEbrsui$JT8WG2w~fb^no+x}ot7yZ)XuRTx?gQq9d~XoD>HM0damuK z?1?jHo$QT+`mP-?v@Tq^>Y|}FaP5e(b>q%mH;t{4YbTVf2Tz`QsANrCJ2m;chq<`J z)U`9_S)H$-pzy6v}(`deJD=!)vECJ(h z{P^P}0I&tN$OhFu4DbaY%>XI2G$bOJya9;2Cr)#p-C$Nf-OI=Uf+UTW~8m#9D& zM@^tS*3s0A;3cejtz zUZfrgD1NodAW(}@cHjzma1LyhLJkK_Ar-%>O^}v>p+B|;O%LU0--9VHGhlMeKz1`v zKri!s0=DJ%Jp8G={vkBx7x_kfgt)@Rz`}19>Amu1yH6+jiBU$O@$~#YamJbzaKLYj zHwKre;HJvysTm9wEgyyI4uq2}R?-xRtK{J`ZQ#pNL2_*zR}F#d)7ohWYlDXi(hwF1 rt4r2Svf8s`u18HGh`wwk=PUgKeSm<1APZGU00000NkvXXu0mjfrQ-Az literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/blue_bg.pal b/graphics/battle_transitions/blue_bg.pal new file mode 100644 index 000000000..30da9c5f9 --- /dev/null +++ b/graphics/battle_transitions/blue_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +197 197 65 +213 213 82 +230 230 98 +246 246 115 +255 255 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/bruno_bg.pal b/graphics/battle_transitions/bruno_bg.pal new file mode 100644 index 000000000..b55e6a6cd --- /dev/null +++ b/graphics/battle_transitions/bruno_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +8 213 8 +32 238 32 +49 246 49 +74 255 74 +123 255 123 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +230 123 139 diff --git a/graphics/battle_transitions/green_bg.pal b/graphics/battle_transitions/green_bg.pal new file mode 100644 index 000000000..8ebd38309 --- /dev/null +++ b/graphics/battle_transitions/green_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 123 139 +246 139 156 +255 156 172 +255 172 189 +255 189 205 +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 diff --git a/graphics/battle_transitions/grid_square_tilemap.bin b/graphics/battle_transitions/grid_square_tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..7f67463eb394909323c1ac2e8a0bd14da1f4f8cf GIT binary patch literal 480 zcma)%0S*8W5Ci?d|9|NRwAffeSCcx)bR?IOPDRvW@`BB^ijy%J?yZB4^Mmu9t%v_) ceFqmmy6R=ShrGa_HOGGy<1WKxRU&@44FlFGUH||9 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/lance_bg.pal b/graphics/battle_transitions/lance_bg.pal new file mode 100644 index 000000000..6717a90bd --- /dev/null +++ b/graphics/battle_transitions/lance_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +0 0 131 +16 16 148 +32 32 164 +49 49 180 +65 65 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_transitions/lorelei_bg.pal b/graphics/battle_transitions/lorelei_bg.pal new file mode 100644 index 000000000..1f30ed062 --- /dev/null +++ b/graphics/battle_transitions/lorelei_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 49 49 +115 115 115 +148 148 148 +180 180 180 +213 213 213 +189 0 189 +205 16 205 +222 32 222 +238 49 238 +255 65 255 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 255 +255 255 255 diff --git a/graphics/battle_transitions/red_bg.pal b/graphics/battle_transitions/red_bg.pal new file mode 100644 index 000000000..e43b0f74c --- /dev/null +++ b/graphics/battle_transitions/red_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 180 213 +123 197 230 +139 213 246 +156 230 255 +172 246 255 +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 diff --git a/graphics/battle_transitions/sliding_pokeball.pal b/graphics/battle_transitions/sliding_pokeball.pal new file mode 100644 index 000000000..6190709ed --- /dev/null +++ b/graphics/battle_transitions/sliding_pokeball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +246 8 0 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +148 0 0 +197 197 197 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +0 0 0 diff --git a/graphics/battle_transitions/sliding_pokeball.png b/graphics/battle_transitions/sliding_pokeball.png new file mode 100644 index 0000000000000000000000000000000000000000..3802a915b98341c15232a8951dac84b97e202dee GIT binary patch literal 309 zcmV-50m}Y~P)$-pzy6v}(D>A241?AmP6Pz<&zwuWL+2C-}!kY&-J|LLHf0)P`-I6i<6CwH0I zV;bfA2LZ#r9w&`H3Rf}4Szlc(u8IzVC``f^G>ubVUo zdD}ySl`cpFzQfdZG?wxXsWq5-vainzCSE`8+qs*n_3!WnnQ@ETPDvh=00000NkvXX Hu0mjfk&KKl literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/sliding_pokeball_tilemap.bin b/graphics/battle_transitions/sliding_pokeball_tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..6cdeb0d170b0da948cb4d19de798c13c368850da GIT binary patch literal 64 NcmZQzzz_Zt000h7AK?H1 literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/unused_brendan.png b/graphics/battle_transitions/unused_brendan.png new file mode 100644 index 0000000000000000000000000000000000000000..926ba0ff725d1ad10716efb37172001da948a85f GIT binary patch literal 475 zcmV<10VMv3P)5Fk0;=I;N+TD_cF|6*FjK|%lj{{R30ViWUa0004I zNkln|&17F< zJC;-W*0yh zuQ-|J6>wFxF>IKK_@_Vu$pl9c0C`!+MAVO~xB-w?f;DGSKh6QVZcdQ5vUv96XSfDf zw?eRN&SCHYNXRULB`-J!6l;J5ewJT@1bzaLta=*nWc8CJ-Udk=@8WCV-g}4lS1~M_ z##(!^%ro#`va5~##++imnSsBYfKA&PUt)e2V2qu(7Pful>}bPXz&p>qcjH-5jhs!b z`xqaQ_DkynUALcvDwxifR{sVfoYx%!$Ep$5+KH~@dLUBy!^gJ RnwS6p002ovPDHLkV1oK;)KdTe literal 0 HcmV?d00001 diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png new file mode 100644 index 0000000000000000000000000000000000000000..378fa3c19fc46d2795300bb90e7e7e48c68c4449 GIT binary patch literal 412 zcmV;N0b~A&P)5Fk0;=I;N+TD_cF|6*FjK|%lj{{R30ViWUa0003e zNkl~>TnP_T4vK10F^cpfR83BF9F)B%ym2gK+vxAbLH=WQc&Sb z;Ik2{6OoCa{6FT7>;a)LqAYEmM{`x5D0{sJxMr@rR#okg_a3U|er8sd)QLg8n|Bj2 zzFY(Jeg}ft!2vL{fm=|)4nq4)Q2l5k!g(KKxD8_00AzmTE$8=`>L;-U*qR@$Mz}uP z@c@2{2K5GT5MG`U&H!`>tj^RmpmU>DmdAPzT&m=64wY0000SWi7B?&A?wbQC| zcA}