Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-07-28 06:18:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed incorrect function boundaries

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-09-05 23:05:31 -04:00
parent c3f85b9fa1
commit 698fbcad14
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/overlay_10.s
View File

@ -1711,11 +1711,7 @@ _022BE0B0: ; jump table
b _022BE0CC ; case 3
b _022BE0EC ; case 4
b _022BE124 ; case 5
arm_func_end ov10_022BDFC0
arm_func_start caseD_6
caseD_6: ; 0x022BE0C8
b _022BE18C
b _022BE18C ; case 6
_022BE0CC:
ldr r0, _022BE448 ; =ov10_022DC1C0
ldr r0, [r0]
@ -1768,7 +1764,6 @@ _022BE158:
add r0, r0, #0x2000
strb r1, [r0, #0x79e]
b _022BE1F0
arm_func_end caseD_6
_022BE18C:
cmp r6, #0
mvneq r0, #0
@ -1958,6 +1953,7 @@ _022BE440:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BE448: .word ov10_022DC1C0
arm_func_end ov10_022BDFC0
arm_func_start ov10_022BE44C
ov10_022BE44C: ; 0x022BE44C

8
asm/overlay_23.s
View File

@ -862,10 +862,6 @@ _0238ADCC:
ldr r1, _0238B0DC ; =ov23_0238D8A0
ldr r1, [r1]
strb r0, [r1, #0x99]
arm_func_end ov23_0238A140
arm_func_start caseD_2c
caseD_2c: ; 0x0238ADFC
b _0238B230
_0238AE00:
ldr r0, _0238B1AC ; =0x0238D7BC
@ -1148,10 +1144,10 @@ _0238B1F4:
ldrsb r0, [r3, #0x95]
add r3, r3, #0x9c
bl ov23_0238D0E0
arm_func_end caseD_2c
_0238B230:
add sp, sp, #0x30c
ldmia sp!, {r3, r4, pc}
arm_func_end ov23_0238A140
arm_func_start ov23_0238B238
ov23_0238B238: ; 0x0238B238
@ -3539,7 +3535,7 @@ _0238D2E4: .word ov23_0238D8A0
.byte 0x5F, 0x43, 0x4F, 0x4E, 0x46, 0x49, 0x52, 0x4D, 0x20, 0x4E, 0x45, 0x57, 0x0A, 0x00, 0x00, 0x00
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x4B, 0x45, 0x45, 0x50, 0x45, 0x52, 0x5F, 0x4D, 0x4F, 0x44, 0x45
.byte 0x5F, 0x47, 0x45, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x3A, 0x0A, 0x00, 0x00, 0x00
.data
.global ov23_0238D8A0
ov23_0238D8A0:

6
asm/overlay_29_02305C28.s
View File

@ -419,10 +419,6 @@ ov29_023061CC: ; 0x023061CC
ldrb r0, [r4, #0xbf]
cmp r0, #5
addls pc, pc, r0, lsl #2
arm_func_end ov29_023061CC
arm_func_start caseD_6
caseD_6: ; 0x023061E4
b _02306238
_023061E8: ; jump table
b _02306238 ; case 0
@ -448,7 +444,6 @@ _02306228:
mov r0, r6
mov r1, r5
bl LogMessageByIdWithPopupCheckUserTarget
arm_func_end caseD_6
_02306238:
mov r1, #0
mov r0, r5
@ -459,6 +454,7 @@ _02306238:
_0230624C: .word 0x00000C9E
_02306250: .word 0x00000C9C
_02306254: .word 0x00000C9D
arm_func_end ov29_023061CC
arm_func_start EndFrozenClassStatus
EndFrozenClassStatus: ; 0x02306258

10
asm/overlay_31.s
View File

@ -5613,14 +5613,14 @@ ov31_02387660: ; 0x02387660
ldr r1, _02387680 ; =0x02353538
ldrb r0, [r0, #4]
ldr r1, [r1]
ldr ip, _02387684 ; =ov31_0238948
ldr ip, _02387684 ; =ov31_0238948C
add r0, r1, r0, lsl #2
add r0, r0, #0x12000
ldr r0, [r0, #0xb28]
bx ip
.align 2, 0
_02387680: .word 0x02353538
_02387684: .word ov31_0238948
_02387684: .word ov31_0238948C
arm_func_end ov31_02387660
arm_func_start ov31_02387688
@ -7798,8 +7798,8 @@ ov31_02389460: ; 0x02389460
_02389488: .word 0x0238A28C
arm_func_end ov31_02389460
arm_func_start ov31_0238948
ov31_0238948: ; 0x0238948C
arm_func_start ov31_0238948C
ov31_0238948C: ; 0x0238948C
stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x134
mov r4, r0
@ -8114,7 +8114,7 @@ _0238990C: .word 0x80000213
_02389910: .word 0x00003F07
_02389914: .word 0x00003F04
_02389918: .word 0x00003F03
arm_func_end ov31_0238948
arm_func_end ov31_0238948C
arm_func_start ov31_0238991C
ov31_0238991C: ; 0x0238991C