Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed incorrect ov02 calls

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-07-09 20:35:35 -04:00
parent ad62158e7f
commit 197ba2abf1
18 changed files with 1383 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asm/include/overlay_01.inc
View File

@ -305,3 +305,16 @@
.public sub_0202C38C
.public ov00_022BD780
.public sub_0202BD48
.public ov00_022BD4EC
.public CardBackupError
.public ov00_022BDC6C
.public ov00_022BCD2C
.public sub_02046A20
.public sub_0205B80C
.public sub_020590DC
.public sub_02046C30
.public sub_02046D44
.public sub_0205B77C
.public ov00_022BCCAC
.public ov00_022BD3F4
.public ov00_022BDE24

4
asm/include/overlay_03.inc
View File

@ -153,7 +153,7 @@
.public sub_02055E14
.public GetTeamNameCheck
.public ov01_0232D8FC
.public ov02_02338EC4
.public ov01_02338EC4
.public sub_02003B94
.public sub_02066990
.public UnloadFile
@ -226,7 +226,7 @@
.public sub_0206351C
.public sub_020630A4
.public ov00_022BD780
.public ov02_0232D590
.public ov01_0232D590
.public ov01_0232D1F4
.public GetPressedButtons
.public ov01_0233462C

2
asm/include/overlay_05.inc
View File

@ -49,7 +49,7 @@
.public ov01_0232DEE0
.public sub_0208FE3C
.public sub_02029F88
.public ov02_02338EC4
.public ov01_02338EC4
.public sub_02027AF0
.public PreprocessString
.public ov01_02338C28

4
asm/include/overlay_06.inc
View File

@ -55,7 +55,7 @@
.public GetKeyboardStatus
.public MemcpySimple
.public DungeonRequestsDoneWrapper
.public ov02_02338E48
.public ov01_02338E48
.public sub_02003BFC
.public DebugPrint0__0200C1FC
.public sub_0204DD80
@ -70,7 +70,7 @@
.public sub_02067664
.public sub_0204E210
.public sub_02069904
.public ov02_02338EC4
.public ov01_02338EC4
.public sub_02003B94
.public ov01_0233769C
.public sub_0205FD88

2
asm/include/overlay_07.inc
View File

@ -139,7 +139,7 @@
.public ov01_02338B08
.public ov00_022BD578
.public sub_0202C728
.public ov02_02338EC4
.public ov01_02338EC4
.public sub_02039304
.public ov01_0232B540
.public ov00_022BD730

2
asm/include/overlay_30.inc
View File

@ -14,7 +14,7 @@
.public Memset
.public ov29_02344B30
.public ov29_022E1608
.public ov02_02345538
.public ov29_02345538
.public ov29_022E1A40
.public sub_02048DC4
.public ov29_022E2018

6
asm/include/overlay_31.inc
View File

@ -1,6 +1,6 @@
#include <nitro/fs/overlay.h>
#pragma once
.public ov02_0234FB6C
.public ov29_0234FB6C
.public GetRecruitRate2
.public ov11_022EA428
.public sub_02030A2C
@ -105,7 +105,7 @@
.public ov29_022EB44C
.public sub_0202F474
.public ov29_023021F0
.public ov02_02347100
.public ov29_02347100
.public ov29_022EBBE8
.public sub_02041484
.public PrintIqSkillsMenu
@ -229,7 +229,7 @@
.public sub_020416FC
.public sub_020410A4
.public AiMovement
.public ov02_0234FB60
.public ov29_0234FB60
.public ov29_022F9C40
.public sub_02017C74
.public sub_0204019C

30
asm/main.s
View File

@ -82255,8 +82255,14 @@ sub_02046D2C: ; 0x02046D2C
.align 2, 0
_02046D40: .word 0x020AFEE0
arm_func_end sub_02046D2C
_02046D44:
.byte 0x00, 0xC0, 0x9F, 0xE5, 0x1C, 0xFF, 0x2F, 0xE1, 0xB8, 0x74, 0x04, 0x02
arm_func_start sub_02046D44
sub_02046D44: ; 0x02046D44
ldr ip, _02046D4C ; =sub_020474B8
bx ip
.align 2, 0
_02046D4C: .word sub_020474B8
arm_func_end sub_02046D44
arm_func_start sub_02046D50
sub_02046D50: ; 0x02046D50
@ -82849,10 +82855,22 @@ sub_020474A0: ; 0x020474A0
.align 2, 0
_020474B4: .word 0x020AFEE4
arm_func_end sub_020474A0
_020474B8:
.byte 0x18, 0x20, 0x9F, 0xE5, 0x00, 0x30, 0xA0, 0xE1
.byte 0x00, 0x00, 0x92, 0xE5, 0x10, 0xC0, 0x9F, 0xE5, 0x01, 0x20, 0xA0, 0xE1, 0xD0, 0x00, 0xD0, 0xE1
.byte 0x03, 0x10, 0xA0, 0xE1, 0x1C, 0xFF, 0x2F, 0xE1, 0xE4, 0xFE, 0x0A, 0x02, 0x4C, 0xF4, 0x02, 0x02
arm_func_start sub_020474B8
sub_020474B8: ; 0x020474B8
ldr r2, _020474D8 ; =0x020AFEE4
mov r3, r0
ldr r0, [r2]
ldr ip, _020474DC ; =sub_0202F44C
mov r2, r1
ldrsb r0, [r0]
mov r1, r3
bx ip
.align 2, 0
_020474D8: .word 0x020AFEE4
_020474DC: .word sub_0202F44C
arm_func_end sub_020474B8
_020474E0:
.byte 0x08, 0x40, 0x2D, 0xE9, 0x88, 0x00, 0x9F, 0xE5, 0x00, 0x20, 0x90, 0xE5, 0x00, 0x00, 0x52, 0xE3
.byte 0x1D, 0x00, 0x00, 0x0A, 0x10, 0x10, 0x92, 0xE5, 0x02, 0x00, 0x51, 0xE3, 0x07, 0x00, 0x00, 0xCA
.byte 0x00, 0x00, 0x51, 0xE3, 0x18, 0x00, 0x00, 0xBA, 0x06, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x51, 0xE3

74
asm/overlay_00.s
View File

@ -223,10 +223,19 @@ ov00_022BCD10: ; 0x022BCD10
_022BCD24: .word 0x023187A0
_022BCD28: .word MemcpySimple
arm_func_end ov00_022BCD10
_022BCD2C:
.byte 0x10, 0x20, 0x9F, 0xE5
.byte 0x10, 0xC0, 0x9F, 0xE5, 0x00, 0x10, 0xA0, 0xE1, 0x0C, 0x00, 0x92, 0xE5, 0x40, 0x20, 0xA0, 0xE3
.byte 0x1C, 0xFF, 0x2F, 0xE1, 0xA0, 0x87, 0x31, 0x02, 0xD4, 0x32, 0x00, 0x02
arm_func_start ov00_022BCD2C
ov00_022BCD2C: ; 0x022BCD2C
ldr r2, _022BCD44 ; =0x023187A0
ldr ip, _022BCD48 ; =MemcpySimple
mov r1, r0
ldr r0, [r2, #0xc]
mov r2, #0x40
bx ip
.align 2, 0
_022BCD44: .word 0x023187A0
_022BCD48: .word MemcpySimple
arm_func_end ov00_022BCD2C
arm_func_start ov00_022BCD4C
ov00_022BCD4C: ; 0x022BCD4C
@ -1532,13 +1541,35 @@ ov00_022BDC5C: ; 0x022BDC5C
.align 2, 0
_022BDC68: .word ov00_022E05C8
arm_func_end ov00_022BDC5C
_022BDC6C:
.byte 0x08, 0x40, 0x2D, 0xE9
.byte 0xDD, 0x8B, 0x00, 0xEB, 0x03, 0x00, 0x50, 0xE3, 0x00, 0xF1, 0x8F, 0x90, 0x0B, 0x00, 0x00, 0xEA
.byte 0x02, 0x00, 0x00, 0xEA, 0x03, 0x00, 0x00, 0xEA, 0x04, 0x00, 0x00, 0xEA, 0x05, 0x00, 0x00, 0xEA
.byte 0x00, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8
.byte 0x02, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x03, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8
.byte 0x00, 0x00, 0xE0, 0xE3, 0x08, 0x80, 0xBD, 0xE8
arm_func_start ov00_022BDC6C
ov00_022BDC6C: ; 0x022BDC6C
stmdb sp!, {r3, lr}
bl ov00_022E0BEC
cmp r0, #3
addls pc, pc, r0, lsl #2
b _022BDCB0
_022BDC80: ; jump table
b _022BDC90 ; case 0
b _022BDC98 ; case 1
b _022BDCA0 ; case 2
b _022BDCA8 ; case 3
_022BDC90:
mov r0, #0
ldmdb sp!, {r3, pc}
_022BDC98:
mov r0, #1
ldmdb sp!, {r3, pc}
_022BDCA0:
mov r0, #2
ldmdb sp!, {r3, pc}
_022BDCA8:
mov r0, #3
ldmdb sp!, {r3, pc}
_022BDCB0:
mvn r0, #0
ldmdb sp!, {r3, pc}
arm_func_end ov00_022BDC6C
arm_func_start ov00_022BDCB8
ov00_022BDCB8: ; 0x022BDCB8
@ -1664,8 +1695,14 @@ _022BDE1C:
add sp, sp, #4
ldmdb sp!, {r3, r4, pc}
arm_func_end ov00_022BDCB8
_022BDE24:
.byte 0x00, 0xC0, 0x9F, 0xE5, 0x1C, 0xFF, 0x2F, 0xE1, 0x58, 0x03, 0x2E, 0x02
arm_func_start ov00_022BDE24
ov00_022BDE24: ; 0x022BDE24
ldr ip, _022BDE2C ; =ov00_022E0358
bx ip
.align 2, 0
_022BDE2C: .word ov00_022E0358
arm_func_end ov00_022BDE24
arm_func_start ov00_022BDE30
ov00_022BDE30: ; 0x022BDE30
@ -42586,9 +42623,14 @@ _022E0BE0:
.align 2, 0
_022E0BE8: .word 0x02326D7C
arm_func_end ov00_022E0BC0
_022E0BEC:
.byte 0x00, 0xC0, 0x9F, 0xE5
.byte 0x1C, 0xFF, 0x2F, 0xE1, 0x94, 0x74, 0x2D, 0x02
arm_func_start ov00_022E0BEC
ov00_022E0BEC: ; 0x022E0BEC
ldr ip, _022E0BF4 ; =ov00_022D7494
bx ip
.align 2, 0
_022E0BF4: .word ov00_022D7494
arm_func_end ov00_022E0BEC
arm_func_start ov00_022E0BF8
ov00_022E0BF8: ; 0x022E0BF8

1458
asm/overlay_01.s
View File

File diff suppressed because it is too large Load Diff

30
asm/overlay_02.s
View File

@ -5648,7 +5648,7 @@ _0232DE2E:
mvn r1, r1
cmp r0, r1
beq _0232DE5A
bl ov01_0232FE98
bl ov02_0232FE98
_0232DE5A:
add r0, r4, #0
pop {r4, pc}
@ -5753,7 +5753,7 @@ _0232DF10:
str r0, [sp, #0xc]
_0232DF26:
ldr r0, [sp, #8]
bl ov01_0232E8D8
bl ov02_0232E8D8
ldr r0, _0232E1E0 ; =0x0235853C
ldr r1, [r0, #0x2c]
mov r0, #1
@ -6092,7 +6092,7 @@ _0232E200:
mvn r1, r1
cmp r0, r1
beq _0232E20E
bl ov01_0232FE98
bl ov02_0232FE98
_0232E20E:
mov r1, #0
ldr r0, _0232E540 ; =0x02352F64
@ -6408,7 +6408,7 @@ _0232E47A:
add r3, r2, #0
ldr r0, [r0]
add r0, r0, #1
bl ov01_0232FE1C
bl ov02_0232FE1C
cmp r0, #0
bgt _0232E4F4
ldr r0, [sp, #0x50]
@ -6507,7 +6507,7 @@ _0232E578:
ldr r0, [r0]
cmp r0, r5
beq _0232E584
bl ov01_0232FE98
bl ov02_0232FE98
_0232E584:
mov r1, #0
ldr r0, _0232E87C ; =0x02352F64
@ -6798,7 +6798,7 @@ _0232E7D2:
mvn r1, r1
cmp r0, r1
beq _0232E7E2
bl ov01_0232FE98
bl ov02_0232FE98
_0232E7E2:
mov r1, #0
ldr r0, _0232E87C ; =0x02352F64
@ -6933,8 +6933,8 @@ _0232E8D2:
_0232E8D4: .word 0x0235853C
thumb_func_end ov02_0232E8AC
thumb_func_start ov01_0232E8D8
ov01_0232E8D8: ; 0x0232E8D8
thumb_func_start ov02_0232E8D8
ov02_0232E8D8: ; 0x0232E8D8
push {r4, lr}
add r4, r0, #0
ldr r0, _0232E91C ; =0x0235929C
@ -6972,7 +6972,7 @@ _0232E920: .word 0x0235853C
_0232E924: .word 0x02358560
_0232E928: .word 0x0235855C
_0232E92C: .word 0xC0A80B01
thumb_func_end ov01_0232E8D8
thumb_func_end ov02_0232E8D8
thumb_func_start ov02_0232E930
ov02_0232E930: ; 0x0232E930
@ -9733,8 +9733,8 @@ ov02_0232FE08: ; 0x0232FE08
.align 2, 0
thumb_func_end ov02_0232FE08
thumb_func_start ov01_0232FE1C
ov01_0232FE1C: ; 0x0232FE1C
thumb_func_start ov02_0232FE1C
ov02_0232FE1C: ; 0x0232FE1C
push {r4, r5, r6, lr}
sub sp, #8
ldr r2, [r1]
@ -9773,7 +9773,7 @@ ov01_0232FE1C: ; 0x0232FE1C
pop {r4, r5, r6, pc}
nop
_0232FE6C: .word 0x01FF6210
thumb_func_end ov01_0232FE1C
thumb_func_end ov02_0232FE1C
thumb_func_start ov02_0232FE70
ov02_0232FE70: ; 0x0232FE70
@ -9809,13 +9809,13 @@ ov02_0232FE8C: ; 0x0232FE8C
_0232FE94: .word ov00_022CF1D8
thumb_func_end ov02_0232FE8C
thumb_func_start ov01_0232FE98
ov01_0232FE98: ; 0x0232FE98
thumb_func_start ov02_0232FE98
ov02_0232FE98: ; 0x0232FE98
ldr r3, _0232FE9C ; =ov00_022CF3C8
bx r3
.align 2, 0
_0232FE9C: .word ov00_022CF3C8
thumb_func_end ov01_0232FE98
thumb_func_end ov02_0232FE98
thumb_func_start ov02_0232FEA0
ov02_0232FEA0: ; 0x0232FEA0

38
asm/overlay_03.s
View File

@ -5729,7 +5729,7 @@ _02341A20:
str r1, [r0]
b _02344184
_02341A38:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _02341B40
cmp r0, #4
@ -5825,7 +5825,7 @@ _02341B78:
_02341B80:
bl sub_02066494
mov r4, r0
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _02341BB0
bl sub_02046D20
@ -5897,7 +5897,7 @@ _02341C44:
str r1, [r0]
b _02344184
_02341C88:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _023421A8
bl ov03_0233CAB8
@ -6266,7 +6266,7 @@ _023421EC:
mov r0, #2
b _02344188
_023421F4:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02342574
bl ov03_0233CAB8
@ -6279,7 +6279,7 @@ _02342218:
mov r0, #0
bl ov01_02338E1C
mov r4, r0
bl ov02_0232D590
bl ov01_0232D590
cmp r0, #0x64
bne _023423E4
ldr r1, _02341D00 ; =0x02346BC8
@ -6511,7 +6511,7 @@ _02342574:
mov r0, #2
b _02344188
_0234258C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02342780
bl ov03_0233CAB8
@ -6668,7 +6668,7 @@ _023427C4:
b _02344188
_023427CC:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl sub_02066494
mov r4, r0
@ -6732,7 +6732,7 @@ _0234289C:
str r1, [r0]
b _02344184
_023428C0:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #0
beq _02344184
bl ov01_02338B08
@ -6754,7 +6754,7 @@ _02342904:
mov r0, #2
b _02344188
_0234290C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _02342EE8
bl ov01_02338B08
@ -7265,7 +7265,7 @@ _02343064:
mov r0, #1
b _02344188
_02343074:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02343184
mov r0, #0
@ -7343,7 +7343,7 @@ _02343184:
mov r0, #2
b _02344188
_0234319C:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl sub_02066494
cmp r4, #5
@ -7378,7 +7378,7 @@ _023431EC:
ldr r0, [r0]
str r1, [r0]
_0234321C:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl sub_02066A44
cmp r4, #5
@ -7500,7 +7500,7 @@ _023433C4:
str r1, [r0]
b _02344184
_023433E4:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02343528
mov r0, #0
@ -7591,7 +7591,7 @@ _02343528:
mov r0, #2
b _02344188
_02343540:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _023435B8
mov r0, #0
@ -7676,7 +7676,7 @@ _02343668:
mov r0, #2
b _02344188
_02343678:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl sub_02066434
mov r4, r0
@ -7721,7 +7721,7 @@ _023436FC:
str r1, [r0]
b _02344184
_02343720:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl sub_02066494
cmp r4, #5
@ -7745,7 +7745,7 @@ _02343750:
str r1, [r0]
b _02344184
_02343778:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl sub_02066494
cmp r4, #5
@ -7858,7 +7858,7 @@ _02343918:
cmp r8, #0
beq _023437F4
_02343920:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02343AAC
mov r0, #0
@ -7969,7 +7969,7 @@ _02343AAC:
mov r0, #2
b _02344188
_02343AC4:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl sub_02066494
mov r4, r0

34
asm/overlay_05.s
View File

@ -1863,7 +1863,7 @@ _0233E364:
str r1, [r0]
b _0233F854
_0233E37C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _0233E3F4
cmp r0, #4
@ -1912,7 +1912,7 @@ _0233E40C:
_0233E424:
bl ov05_0233CB84
mov r4, r0
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _0233E454
bl sub_020473A4
@ -1964,7 +1964,7 @@ _0233E4A8:
str r1, [r0]
b _0233F854
_0233E4EC:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233E628
bl ov05_0233CAA8
@ -2058,7 +2058,7 @@ _0233E628:
str r1, [r0]
b _0233F854
_0233E64C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233E694
mov r0, #0
@ -2087,7 +2087,7 @@ _0233E694:
str r1, [r0]
b _0233F854
_0233E6B8:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233E780
mov r0, #0
@ -2149,7 +2149,7 @@ _0233E780:
str r1, [r0]
b _0233F854
_0233E7A4:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl ov05_0233CB84
cmp r4, #5
@ -2220,7 +2220,7 @@ _0233E888:
ldr r1, [r1]
add r1, r1, #0x1000
str r0, [r1, #0x7d8]
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _0233E8D4
bl ov05_0233F980
@ -2285,7 +2285,7 @@ _0233E948:
str r1, [r0]
b _0233F854
_0233E9A4:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov05_0233CB34
mov r4, r0
@ -2341,7 +2341,7 @@ _0233EA40:
str r1, [r0]
b _0233F854
_0233EA78:
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl ov05_0233CB84
cmp r4, #5
@ -2423,7 +2423,7 @@ _0233EBA8: .word 0x00003024
_0233EBAC: .word 0x00003025
_0233EBB0: .word 0x00003026
_0233EBB4:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233ED00
mov r0, #0
@ -2523,7 +2523,7 @@ _0233ED00:
b _0233F854
_0233ED24:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl ov05_0233CB84
mov r5, r0
@ -2584,7 +2584,7 @@ _0233EDEC:
str r1, [r0]
b _0233F854
_0233EE0C:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov05_0233CB34
mov r4, r0
@ -2630,7 +2630,7 @@ _0233EE94:
str r1, [r0]
b _0233F854
_0233EEB8:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233EF9C
mov r0, #0
@ -2700,7 +2700,7 @@ _0233EF9C:
str r1, [r0]
b _0233F854
_0233EFC0:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233F118
mov r0, #0
@ -2804,7 +2804,7 @@ _0233F118:
b _0233F854
_0233F13C:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r4, r0
bl ov05_0233CB84
mov r5, r0
@ -2865,7 +2865,7 @@ _0233F204:
str r1, [r0]
b _0233F854
_0233F224:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #0
beq _0233F854
bl ov01_02338B08
@ -2875,7 +2875,7 @@ _0233F224:
str r1, [r0]
b _0233F854
_0233F248:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _0233F3EC
bl ov01_02338B08

14
asm/overlay_06.s
View File

@ -1539,7 +1539,7 @@ _0233DED4:
str r1, [r0]
b _0233E8D4
_0233DEEC:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _0233DF2C
cmp r0, #4
@ -1566,7 +1566,7 @@ _0233DF2C:
_0233DF44:
bl ov06_0233CDE4
mov r4, r0
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _0233DF74
bl sub_02046D20
@ -1580,14 +1580,14 @@ _0233DF74:
cmp r4, #0x12
bne _0233E8D4
mov r0, #0
bl ov02_02338E48
bl ov01_02338E48
ldr r0, _0233E8E0 ; =0x0233EEC8
ldr r1, _0233E8FC ; =0x00001003
ldr r0, [r0]
str r1, [r0]
b _0233E8D4
_0233DF98:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233E148
bl ov01_02338E54
@ -1716,7 +1716,7 @@ _0233E148:
str r1, [r0]
b _0233E8D4
_0233E16C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _0233E1A0
bl ov01_02338B08
@ -1739,7 +1739,7 @@ _0233E1A0:
str r1, [r0]
b _0233E8D4
_0233E1C0:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #0
beq _0233E8D4
bl ov01_02338B08
@ -2073,7 +2073,7 @@ _0233E688:
_0233E69C:
mov r4, #0
_0233E6A0:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _0233E6D8
bl sub_02067664

42
asm/overlay_07.s
View File

@ -84,7 +84,7 @@ ov07_0233CB3C:
str r8, [r0]
b _0233CCDC
_0233CB4C:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _0233CB6C
cmp r0, #4
@ -128,7 +128,7 @@ _0233CBD0:
mov r0, #3
str r0, [r1]
_0233CBE8:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _0233CC3C
mov r0, #0
@ -157,7 +157,7 @@ _0233CC3C:
streq r0, [r1]
b _0233CCDC
_0233CC54:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _0233CC88
ldr r1, [r4]
@ -2170,7 +2170,7 @@ _0233E7A4:
str r0, [r4]
b _0233E99C
_0233E7B4:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _0233E7D4
cmp r0, #4
@ -2222,7 +2222,7 @@ _0233E868:
mov r0, #2
b _0233E9A0
_0233E874:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov07_0233F6C8
cmp r5, #5
@ -2242,7 +2242,7 @@ _0233E89C:
str r0, [r4]
b _0233E99C
_0233E8BC:
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov07_0233F6C8
cmp r5, #5
@ -2262,7 +2262,7 @@ _0233E8E4:
str r0, [r4]
b _0233E99C
_0233E904:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _0233E930
bl ov01_02338B08
@ -2299,7 +2299,7 @@ _0233E970:
mov r0, #2
b _0233E9A0
_0233E984:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #0
beq _0233E99C
bl ov01_02338B08
@ -4256,7 +4256,7 @@ _0234052C:
b _023414B4
_0234053C:
bl sub_02003BFC
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #1
beq _023405B4
cmp r0, #4
@ -4295,7 +4295,7 @@ _023405B4:
str r0, [r4]
b _023414B4
_023405D0:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #0
beq _023414B4
bl ov01_02338B08
@ -4317,7 +4317,7 @@ _023405F8:
streq r0, [r4]
b _023414B4
_02340620:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _023406A0
mov r0, #0
@ -4370,7 +4370,7 @@ _023406A0:
b _023414B4
_023406E4:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r6, r0
bl ov07_0233F678
mov r5, r0
@ -4420,7 +4420,7 @@ _02340768:
b _023414B4
_023407A0:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r6, r0
bl ov07_0233F678
mov r5, r0
@ -4479,7 +4479,7 @@ _02340848:
b _023414B4
_02340880:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov07_0233F6C8
cmp r5, #5
@ -4513,7 +4513,7 @@ _023408E0:
str r0, [r4]
_023408FC:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov01_02336014
cmp r5, #5
@ -4561,7 +4561,7 @@ _02340978:
b _023414B4
_023409B0:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r6, r0
bl ov07_0233F678
mov r5, r0
@ -4613,7 +4613,7 @@ _02340A58:
b _023414B4
_02340A74:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov07_0233F6C8
cmp r5, #5
@ -4650,7 +4650,7 @@ _02340ABC:
str r0, [r4]
b _023414B4
_02340B04:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #4
bne _02340B40
mov r0, #0
@ -4685,7 +4685,7 @@ _02340B40:
b _023414B4
_02340B84:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
mov r5, r0
bl ov07_0233F6C8
cmp r5, #5
@ -4711,7 +4711,7 @@ _02340BCC:
b _023414B4
_02340BE4:
bl ov01_02339988
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #5
bne _02340C28
bl ov07_023417A8
@ -4736,7 +4736,7 @@ _02340C28:
str r0, [r4]
b _023414B4
_02340C44:
bl ov02_02338EC4
bl ov01_02338EC4
cmp r0, #6
bne _02340C84
bl ov01_02338B08

8
asm/overlay_29.s
View File

@ -92294,8 +92294,8 @@ _0232A59C:
_0232A5A8: .word 0x02352AEC
arm_func_end ov29_0232A524
arm_func_start ov02_0232A5AC
ov02_0232A5AC: ; 0x0232A5AC
arm_func_start ov29_0232A5AC
ov29_0232A5AC: ; 0x0232A5AC
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #4
@ -92335,7 +92335,7 @@ _0232A628:
bx lr
.align 2, 0
_0232A63C: .word 0x022C44C4
arm_func_end ov02_0232A5AC
arm_func_end ov29_0232A5AC
arm_func_start ov29_0232A640
ov29_0232A640: ; 0x0232A640
@ -99550,7 +99550,7 @@ ov29_02330624: ; 0x02330624
mov r1, r4
mov r2, r8
str r7, [sp]
bl ov02_0232A5AC
bl ov29_0232A5AC
mov sl, r0
b _023326CC
arm_func_end ov29_02330624

2
asm/overlay_30.s
View File

@ -2433,7 +2433,7 @@ _02384AC8:
mov r0, r4
mov r1, r5
mov r2, r8
bl ov02_02345538
bl ov29_02345538
_02384B08:
add r6, r6, #1
cmp r6, #0x40

6
asm/overlay_31.s
View File

@ -5440,7 +5440,7 @@ _02387830:
beq _0238786C
mov r0, r5
ldr r8, [r5, #0xb4]
bl ov02_02347100
bl ov29_02347100
strb r0, [r8, #0x161]
_0238786C:
add r0, sp, #0x218
@ -7667,7 +7667,7 @@ _02389AD0:
add r0, r0, #0x12000
ldr r8, [r0, #0xb28]
mov r0, r8
bl ov02_0234FB60
bl ov29_0234FB60
cmp r0, #0
beq _02389B08
ldr r1, [r8, #0xb4]
@ -7793,7 +7793,7 @@ _02389C78:
add r0, r0, #0x12000
ldr r7, [r0, #0xb28]
mov r0, r7
bl ov02_0234FB60
bl ov29_0234FB60
cmp r0, #0
beq _02389CA4
mov r0, r7