pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix power bounce and unknown move code/data splits (#320)

Browse Source
This commit is contained in:
Ethan Roseman 2021-07-17 11:21:02 -04:00 committed by GitHub
parent bca5129f4c
commit a876384c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ver/us/asm/data/battle/move/power_bounce/743FE0.data.s → ver/us/asm/data/battle/move/power_bounce/743FF0.data.s
View File

@ -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

3
ver/us/asm/data/battle/move/unknown_move/779E20.data.s → ver/us/asm/data/battle/move/unknown_move/779E30.data.s
View File

@ -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

4
ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s
View File

@ -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

4
ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s
View File

@ -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

4
ver/us/splat.yaml
View File

@ -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