From a876384c97e0eed3b35debc83bce47ed4f1942f5 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 17 Jul 2021 11:21:02 -0400 Subject: [PATCH] fix power bounce and unknown move code/data splits (#320) --- .../battle/move/power_bounce/{743FE0.data.s => 743FF0.data.s} | 3 --- .../battle/move/unknown_move/{779E20.data.s => 779E30.data.s} | 3 --- .../battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s | 4 ++++ .../battle/move/unknown_move/779C90/func_802A10E4_779D74.s | 4 ++++ ver/us/splat.yaml | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) rename ver/us/asm/data/battle/move/power_bounce/{743FE0.data.s => 743FF0.data.s} (99%) rename ver/us/asm/data/battle/move/unknown_move/{779E20.data.s => 779E30.data.s} (99%) diff --git a/ver/us/asm/data/battle/move/power_bounce/743FE0.data.s b/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s similarity index 99% rename from ver/us/asm/data/battle/move/power_bounce/743FE0.data.s rename to ver/us/asm/data/battle/move/power_bounce/743FF0.data.s index a420a2608a..b8bcbee6f0 100644 --- a/ver/us/asm/data/battle/move/power_bounce/743FE0.data.s +++ b/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s @@ -2,9 +2,6 @@ .section .data -glabel D_802A11F0_743FE0 -.word 0x24020002, 0x00000000, 0x00000000, 0x00000000 - glabel D_802A1200_743FF0 .word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 diff --git a/ver/us/asm/data/battle/move/unknown_move/779E20.data.s b/ver/us/asm/data/battle/move/unknown_move/779E30.data.s similarity index 99% rename from ver/us/asm/data/battle/move/unknown_move/779E20.data.s rename to ver/us/asm/data/battle/move/unknown_move/779E30.data.s index 3305cc312d..e9499f75c9 100644 --- a/ver/us/asm/data/battle/move/unknown_move/779E20.data.s +++ b/ver/us/asm/data/battle/move/unknown_move/779E30.data.s @@ -2,9 +2,6 @@ .section .data -glabel D_802A1190_779E20 -.word 0x27BD0020, 0x00000000, 0x00000000, 0x00000000 - glabel D_802A11A0_779E30 .word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 diff --git a/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s index e6fe56d1d5..bdf0e8999f 100644 --- a/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s +++ b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s @@ -15,3 +15,7 @@ glabel func_802A11C0_743FB0 /* 743FD8 802A11E8 A4A202A0 */ sh $v0, 0x2a0($a1) .L802A11EC: /* 743FDC 802A11EC 03E00008 */ jr $ra +/* 743FE0 802A11F0 24020002 */ addiu $v0, $zero, 2 +nop +nop +nop diff --git a/ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s b/ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s index c483a74c44..f4d6710cb7 100644 --- a/ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s +++ b/ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s @@ -47,3 +47,7 @@ glabel func_802A10E4_779D74 /* 779E14 802A1184 8FB00010 */ lw $s0, 0x10($sp) /* 779E18 802A1188 24020002 */ addiu $v0, $zero, 2 /* 779E1C 802A118C 03E00008 */ jr $ra +/* 779E20 802A1190 27BD0020 */ addiu $sp, $sp, 0x20 +nop +nop +nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 8d3407ae99..71b6bcf84e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -3880,7 +3880,7 @@ segments: overlay: True subsegments: - [0x743DF0, c] - - [0x743FE0, data] + - [0x743FF0, data] - dir: battle/move/sleep_stomp type: code start: 0x746E10 @@ -4056,7 +4056,7 @@ segments: overlay: True subsegments: - [0x779C90, c] - - [0x779E20, data] + - [0x779E30, data] - dir: battle/move/shrink_smash type: code start: 0x77CB80