Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-08-28 22:01:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed naming for data/BSS symbols

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-08-15 23:13:37 -04:00
parent 3eb8c0e0b6
commit f9a76fcaa2
34 changed files with 3030 additions and 3000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_29_022DC240.inc
View File

@@ -96,7 +96,7 @@
.public sub_02048384
.public ov29_02336F4C
.public ov29_022FBF58
.public _023534E0
.public ov29_023534E0
.public ov29_0234BB2C
.public ov29_022FCD04
.public ov29_022F7308
@@ -288,7 +288,7 @@
.public ov29_02305814
.public ov29_0233785C
.public sub_02048400
.public _02353860
.public ov29_02353860
.public sub_01FF81CC
.public ov29_022EAF48
.public ov29_022FE2E4

192
asm/overlay_00.s
View File

@@ -83,7 +83,7 @@ _022BCB94:
mov r0, #4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BCB9C: .word _02318780 + 0x20
_022BCB9C: .word ov00_02318780 + 0x20
_022BCBA0: .word 0x0003FFE0
_022BCBA4: .word ov00_022BDE30
_022BCBA8: .word ov00_022BDF1C
@@ -126,7 +126,7 @@ _022BCBF0:
str r1, [r0, #0x18]
ldmia sp!, {r3, pc}
.align 2, 0
_022BCC2C: .word _02318780 + 0x20
_022BCC2C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCBAC
arm_func_start ov00_022BCC30
@@ -155,7 +155,7 @@ _022BCC64:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BCC88: .word _02318780 + 0x20
_022BCC88: .word ov00_02318780 + 0x20
_022BCC8C: .word 0x59465945
arm_func_end ov00_022BCC30
@@ -168,7 +168,7 @@ ov00_022BCC90: ; 0x022BCC90
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BCCA8: .word _02318780 + 0x20
_022BCCA8: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCC90
arm_func_start ov00_022BCCAC
@@ -180,7 +180,7 @@ ov00_022BCCAC: ; 0x022BCCAC
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BCCC4: .word _02318780 + 0x20
_022BCCC4: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCCAC
arm_func_start ov00_022BCCC8
@@ -196,7 +196,7 @@ ov00_022BCCC8: ; 0x022BCCC8
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_022BCCF0: .word _02318780 + 0x20
_022BCCF0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCCC8
arm_func_start ov00_022BCCF4
@@ -208,7 +208,7 @@ ov00_022BCCF4: ; 0x022BCCF4
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BCD0C: .word _02318780 + 0x20
_022BCD0C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCCF4
arm_func_start ov00_022BCD10
@@ -219,7 +219,7 @@ ov00_022BCD10: ; 0x022BCD10
ldr r1, [r1, #0xc]
bx ip
.align 2, 0
_022BCD24: .word _02318780 + 0x20
_022BCD24: .word ov00_02318780 + 0x20
_022BCD28: .word MemcpySimple
arm_func_end ov00_022BCD10
@@ -232,7 +232,7 @@ ov00_022BCD2C: ; 0x022BCD2C
mov r2, #0x40
bx ip
.align 2, 0
_022BCD44: .word _02318780 + 0x20
_022BCD44: .word ov00_02318780 + 0x20
_022BCD48: .word MemcpySimple
arm_func_end ov00_022BCD2C
@@ -261,7 +261,7 @@ _022BCD7C:
bl ov00_022DBA1C
ldmia sp!, {r4, pc}
.align 2, 0
_022BCDA0: .word _02318780 + 0x20
_022BCDA0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCD4C
arm_func_start ov00_022BCDA4
@@ -271,7 +271,7 @@ ov00_022BCDA4: ; 0x022BCDA4
ldr r0, [r0, #0xc]
bx ip
.align 2, 0
_022BCDB4: .word _02318780 + 0x20
_022BCDB4: .word ov00_02318780 + 0x20
_022BCDB8: .word ov00_022DB9EC
arm_func_end ov00_022BCDA4
@@ -371,7 +371,7 @@ _022BCF08:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022BCF10: .word _02318780 + 0x20
_022BCF10: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCDBC
arm_func_start ov00_022BCF14
@@ -398,7 +398,7 @@ ov00_022BCF14: ; 0x022BCF14
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_022BCF68: .word _02318780 + 0x20
_022BCF68: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCF14
arm_func_start ov00_022BCF6C
@@ -428,7 +428,7 @@ ov00_022BCF6C: ; 0x022BCF6C
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_022BCFCC: .word _02318780 + 0x20
_022BCFCC: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCF6C
arm_func_start ov00_022BCFD0
@@ -458,7 +458,7 @@ _022BD004:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022BD028: .word _02318780 + 0x20
_022BD028: .word ov00_02318780 + 0x20
arm_func_end ov00_022BCFD0
arm_func_start ov00_022BD02C
@@ -495,7 +495,7 @@ _022BD08C:
mvn r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022BD09C: .word _02318780 + 0x20
_022BD09C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD02C
arm_func_start ov00_022BD0A0
@@ -513,7 +513,7 @@ ov00_022BD0A0: ; 0x022BD0A0
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BD0D0: .word _02318780 + 0x20
_022BD0D0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD0A0
arm_func_start ov00_022BD0D4
@@ -531,7 +531,7 @@ ov00_022BD0D4: ; 0x022BD0D4
mla r0, r4, r0, r1
ldmia sp!, {r4, pc}
.align 2, 0
_022BD104: .word _02318780 + 0x20
_022BD104: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD0D4
arm_func_start ov00_022BD108
@@ -549,7 +549,7 @@ ov00_022BD108: ; 0x022BD108
bl ov00_022DB964
ldmia sp!, {r3, pc}
.align 2, 0
_022BD138: .word _02318780 + 0x20
_022BD138: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD108
arm_func_start ov00_022BD13C
@@ -567,7 +567,7 @@ ov00_022BD13C: ; 0x022BD13C
bl ov00_022DB98C
ldmia sp!, {r3, pc}
.align 2, 0
_022BD16C: .word _02318780 + 0x20
_022BD16C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD13C
arm_func_start ov00_022BD170
@@ -584,7 +584,7 @@ ov00_022BD170: ; 0x022BD170
bl ov00_022DB254
ldmia sp!, {r3, pc}
.align 2, 0
_022BD19C: .word _02318780 + 0x20
_022BD19C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD170
arm_func_start ov00_022BD1A0
@@ -662,7 +662,7 @@ ov00_022BD264: ; 0x022BD264
strb r0, [r1]
bx lr
.align 2, 0
_022BD270: .word _02318780 + 0x20
_022BD270: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD264
arm_func_start ov00_022BD274
@@ -671,7 +671,7 @@ ov00_022BD274: ; 0x022BD274
ldrb r0, [r0]
bx lr
.align 2, 0
_022BD280: .word _02318780 + 0x20
_022BD280: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD274
arm_func_start ov00_022BD284
@@ -684,7 +684,7 @@ ov00_022BD284: ; 0x022BD284
ldrlob r0, [r0, #0x1a0]
bx lr
.align 2, 0
_022BD2A0: .word _02318780 + 0x20
_022BD2A0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD284
arm_func_start ov00_022BD2A4
@@ -696,7 +696,7 @@ ov00_022BD2A4: ; 0x022BD2A4
strlob r1, [r0, #0x1a0]
bx lr
.align 2, 0
_022BD2BC: .word _02318780 + 0x20
_022BD2BC: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD2A4
arm_func_start ov00_022BD2C0
@@ -714,7 +714,7 @@ ov00_022BD2C0: ; 0x022BD2C0
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BD2F0: .word _02318780 + 0x20
_022BD2F0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD2C0
arm_func_start ov00_022BD2F4
@@ -737,7 +737,7 @@ _022BD308:
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BD334: .word _02318780 + 0x20
_022BD334: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD2F4
arm_func_start ov00_022BD338
@@ -768,7 +768,7 @@ _022BD380:
mov r0, r5
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022BD394: .word _02318780 + 0x20
_022BD394: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD338
arm_func_start ov00_022BD398
@@ -800,7 +800,7 @@ ov00_022BD3B4: ; 0x022BD3B4
bl ov00_022E3680
ldmia sp!, {r4, pc}
.align 2, 0
_022BD3F0: .word _02318780 + 0x20
_022BD3F0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD3B4
arm_func_start ov00_022BD3F4
@@ -825,7 +825,7 @@ _022BD428:
blt _022BD404
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BD438: .word _02318780 + 0x20
_022BD438: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD3F4
arm_func_start ov00_022BD43C
@@ -847,14 +847,14 @@ ov00_022BD43C: ; 0x022BD43C
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BD47C: .word _02318780 + 0x20
_022BD47C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD43C
arm_func_start ov00_022BD480
ov00_022BD480: ; 0x022BD480
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _022BD4CC ; =_0231D420
ldr r2, _022BD4CC ; =ov00_0231D420
mov r1, #0
strb r1, [r2, #2]
ldr r0, _022BD4D0 ; =ov00_022BE058
@@ -872,7 +872,7 @@ ov00_022BD480: ; 0x022BD480
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_022BD4CC: .word _0231D420
_022BD4CC: .word ov00_0231D420
_022BD4D0: .word ov00_022BE058
_022BD4D4: .word ov00_022BE044
_022BD4D8: .word ov00_022BE020
@@ -880,11 +880,11 @@ _022BD4D8: .word ov00_022BE020
arm_func_start ov00_022BD4DC
ov00_022BD4DC: ; 0x022BD4DC
ldr r0, _022BD4E8 ; =_0231D420
ldr r0, _022BD4E8 ; =ov00_0231D420
ldrb r0, [r0, #2]
bx lr
.align 2, 0
_022BD4E8: .word _0231D420
_022BD4E8: .word ov00_0231D420
arm_func_end ov00_022BD4DC
arm_func_start ov00_022BD4EC
@@ -924,7 +924,7 @@ _022BD550:
blt _022BD550
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022BD570: .word _02318780 + 0x20
_022BD570: .word ov00_02318780 + 0x20
_022BD574: .word 0x00003FFF
arm_func_end ov00_022BD4EC
@@ -941,7 +941,7 @@ _022BD588:
bne _022BD588
bx lr
.align 2, 0
_022BD59C: .word _02318780 + 0x20
_022BD59C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD578
arm_func_start ov00_022BD5A0
@@ -957,7 +957,7 @@ _022BD5B0:
bne _022BD5B0
bx lr
.align 2, 0
_022BD5C4: .word _02318780 + 0x20
_022BD5C4: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD5A0
arm_func_start ov00_022BD5C8
@@ -971,7 +971,7 @@ ov00_022BD5C8: ; 0x022BD5C8
and r0, r0, #0xff
bx lr
.align 2, 0
_022BD5E8: .word _02318780 + 0x20
_022BD5E8: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD5C8
arm_func_start ov00_022BD5EC
@@ -981,7 +981,7 @@ ov00_022BD5EC: ; 0x022BD5EC
add r0, r0, #0x1b0
bx lr
.align 2, 0
_022BD5FC: .word _02318780 + 0x20
_022BD5FC: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD5EC
arm_func_start ov00_022BD600
@@ -997,7 +997,7 @@ ov00_022BD600: ; 0x022BD600
and r0, r0, #0xff
bx lr
.align 2, 0
_022BD628: .word _02318780 + 0x20
_022BD628: .word ov00_02318780 + 0x20
_022BD62C: .word 0x00002710
arm_func_end ov00_022BD600
@@ -1009,7 +1009,7 @@ ov00_022BD630: ; 0x022BD630
ldrh r0, [r0, #0xe6]
bx lr
.align 2, 0
_022BD644: .word _02318780 + 0x20
_022BD644: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD630
arm_func_start ov00_022BD648
@@ -1020,7 +1020,7 @@ ov00_022BD648: ; 0x022BD648
strh r0, [r1, #0xe6]
bx lr
.align 2, 0
_022BD65C: .word _02318780 + 0x20
_022BD65C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD648
arm_func_start ov00_022BD660
@@ -1036,7 +1036,7 @@ ov00_022BD660: ; 0x022BD660
and r0, r0, #0xff
bx lr
.align 2, 0
_022BD688: .word _02318780 + 0x20
_022BD688: .word ov00_02318780 + 0x20
_022BD68C: .word 0x00002710
arm_func_end ov00_022BD660
@@ -1048,7 +1048,7 @@ ov00_022BD690: ; 0x022BD690
ldrh r0, [r0, #0xe8]
bx lr
.align 2, 0
_022BD6A4: .word _02318780 + 0x20
_022BD6A4: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD690
arm_func_start ov00_022BD6A8
@@ -1059,7 +1059,7 @@ ov00_022BD6A8: ; 0x022BD6A8
strh r0, [r1, #0xe8]
bx lr
.align 2, 0
_022BD6BC: .word _02318780 + 0x20
_022BD6BC: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD6A8
arm_func_start ov00_022BD6C0
@@ -1071,7 +1071,7 @@ ov00_022BD6C0: ; 0x022BD6C0
strh r1, [r0, #0xe8]
bx lr
.align 2, 0
_022BD6D8: .word _02318780 + 0x20
_022BD6D8: .word ov00_02318780 + 0x20
_022BD6DC: .word 0x00003FFF
arm_func_end ov00_022BD6C0
@@ -1082,7 +1082,7 @@ ov00_022BD6E0: ; 0x022BD6E0
ldrb r0, [r0, #0x1ea]
bx lr
.align 2, 0
_022BD6F0: .word _02318780 + 0x20
_022BD6F0: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD6E0
arm_func_start ov00_022BD6F4
@@ -1092,7 +1092,7 @@ ov00_022BD6F4: ; 0x022BD6F4
ldrb r0, [r0, #0x1eb]
bx lr
.align 2, 0
_022BD704: .word _02318780 + 0x20
_022BD704: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD6F4
arm_func_start ov00_022BD708
@@ -1102,7 +1102,7 @@ ov00_022BD708: ; 0x022BD708
ldrb r0, [r0, #0x1ec]
bx lr
.align 2, 0
_022BD718: .word _02318780 + 0x20
_022BD718: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD708
arm_func_start ov00_022BD71C
@@ -1112,7 +1112,7 @@ ov00_022BD71C: ; 0x022BD71C
ldrb r0, [r0, #0x1ed]
bx lr
.align 2, 0
_022BD72C: .word _02318780 + 0x20
_022BD72C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD71C
arm_func_start ov00_022BD730
@@ -1122,7 +1122,7 @@ ov00_022BD730: ; 0x022BD730
strb r0, [r1, #0x1ea]
bx lr
.align 2, 0
_022BD740: .word _02318780 + 0x20
_022BD740: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD730
arm_func_start ov00_022BD744
@@ -1132,7 +1132,7 @@ ov00_022BD744: ; 0x022BD744
strb r0, [r1, #0x1eb]
bx lr
.align 2, 0
_022BD754: .word _02318780 + 0x20
_022BD754: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD744
arm_func_start ov00_022BD758
@@ -1142,7 +1142,7 @@ ov00_022BD758: ; 0x022BD758
strb r0, [r1, #0x1ec]
bx lr
.align 2, 0
_022BD768: .word _02318780 + 0x20
_022BD768: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD758
arm_func_start ov00_022BD76C
@@ -1152,7 +1152,7 @@ ov00_022BD76C: ; 0x022BD76C
strb r0, [r1, #0x1ed]
bx lr
.align 2, 0
_022BD77C: .word _02318780 + 0x20
_022BD77C: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD76C
arm_func_start ov00_022BD780
@@ -1162,7 +1162,7 @@ ov00_022BD780: ; 0x022BD780
ldr r0, [r0, #0xc]
bx ip
.align 2, 0
_022BD790: .word _02318780 + 0x20
_022BD790: .word ov00_02318780 + 0x20
_022BD794: .word ov00_022DB914
arm_func_end ov00_022BD780
@@ -1269,7 +1269,7 @@ ov00_022BD870: ; 0x022BD870
str ip, [sp, #0x10]
bl ov00_022E1690
mov r1, #0
ldr ip, _022BD8F4 ; =_0231D420
ldr ip, _022BD8F4 ; =ov00_0231D420
ldr r2, _022BD8F8 ; =ov00_022BE008
mov r0, r4
mov r3, r1
@@ -1279,12 +1279,12 @@ ov00_022BD870: ; 0x022BD870
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
_022BD8E0: .word _02318780 + 0x20
_022BD8E0: .word ov00_02318780 + 0x20
_022BD8E4: .word 0x02317F54
_022BD8E8: .word 0x0231D490
_022BD8EC: .word 0x00002B1A
_022BD8F0: .word 0x02317F44
_022BD8F4: .word _0231D420
_022BD8F4: .word ov00_0231D420
_022BD8F8: .word ov00_022BE008
arm_func_end ov00_022BD870
@@ -1298,11 +1298,11 @@ _022BD904: .word ov00_022E1A84
arm_func_start ov00_022BD908
ov00_022BD908: ; 0x022BD908
ldr r0, _022BD914 ; =_0231D420
ldr r0, _022BD914 ; =ov00_0231D420
ldrb r0, [r0, #1]
bx lr
.align 2, 0
_022BD914: .word _0231D420
_022BD914: .word ov00_0231D420
arm_func_end ov00_022BD908
arm_func_start ov00_022BD918
@@ -1358,7 +1358,7 @@ ov00_022BD980: ; 0x022BD980
strb r1, [r0, #1]
ldmia sp!, {r3, pc}
.align 2, 0
_022BD998: .word _02318780 + 0x20
_022BD998: .word ov00_02318780 + 0x20
arm_func_end ov00_022BD980
arm_func_start ov00_022BD99C
@@ -1453,7 +1453,7 @@ ov00_022BDA74: ; 0x022BDA74
bl ov00_022EF4AC
ldmia sp!, {r3, pc}
.align 2, 0
_022BDA90: .word _02318780 + 0x20
_022BDA90: .word ov00_02318780 + 0x20
arm_func_end ov00_022BDA74
arm_func_start ov00_022BDA94
@@ -1463,7 +1463,7 @@ ov00_022BDA94: ; 0x022BDA94
ldr r1, _022BDAC0 ; =0x023187D0
ldr r2, _022BDAC4 ; =0x023187D8
bl ov00_022E1178
ldr r0, _022BDAC8 ; =_0231D420
ldr r0, _022BDAC8 ; =ov00_0231D420
mov r1, #0
str r1, [r0, #4]
str r1, [r0, #8]
@@ -1472,16 +1472,16 @@ ov00_022BDA94: ; 0x022BDA94
_022BDABC: .word ov00_022BE06C
_022BDAC0: .word 0x023187D0
_022BDAC4: .word 0x023187D8
_022BDAC8: .word _0231D420
_022BDAC8: .word ov00_0231D420
arm_func_end ov00_022BDA94
arm_func_start ov00_022BDACC
ov00_022BDACC: ; 0x022BDACC
ldr r0, _022BDAD8 ; =_0231D420
ldr r0, _022BDAD8 ; =ov00_0231D420
ldr r0, [r0, #8]
bx lr
.align 2, 0
_022BDAD8: .word _0231D420
_022BDAD8: .word ov00_0231D420
arm_func_end ov00_022BDACC
arm_func_start ov00_022BDADC
@@ -1507,14 +1507,14 @@ ov00_022BDB04: ; 0x022BDB04
ldmeqia sp!, {r3, pc}
bl ov00_022E1310
cmp r0, #0
ldrne r0, _022BDB34 ; =_0231D420
ldrne r0, _022BDB34 ; =ov00_0231D420
movne r1, #0
strne r1, [r0, #8]
movne r0, #1
moveq r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BDB34: .word _0231D420
_022BDB34: .word ov00_0231D420
arm_func_end ov00_022BDB04
arm_func_start ov00_022BDB38
@@ -1525,14 +1525,14 @@ ov00_022BDB38: ; 0x022BDB38
ldmeqia sp!, {r3, pc}
bl ov00_022E1334
cmp r0, #0
ldrne r0, _022BDB68 ; =_0231D420
ldrne r0, _022BDB68 ; =ov00_0231D420
movne r1, #0
strne r1, [r0, #8]
movne r0, #1
moveq r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BDB68: .word _0231D420
_022BDB68: .word ov00_0231D420
arm_func_end ov00_022BDB38
arm_func_start ov00_022BDB6C
@@ -1545,26 +1545,26 @@ ov00_022BDB6C: ; 0x022BDB6C
ldmeqia sp!, {r3, pc}
bl ov00_022E137C
cmp r0, #0
ldrne r0, _022BDBA4 ; =_0231D420
ldrne r0, _022BDBA4 ; =ov00_0231D420
movne r1, #0
strne r1, [r0, #8]
movne r0, #1
moveq r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BDBA4: .word _0231D420
_022BDBA4: .word ov00_0231D420
arm_func_end ov00_022BDB6C
arm_func_start ov00_022BDBA8
ov00_022BDBA8: ; 0x022BDBA8
stmdb sp!, {r3, lr}
ldr r0, _022BDBE0 ; =_0231D420
ldr r0, _022BDBE0 ; =ov00_0231D420
ldr r0, [r0, #8]
cmp r0, #1
beq _022BDBD8
bl ov00_022E13B4
cmp r0, #0
ldrne r1, _022BDBE0 ; =_0231D420
ldrne r1, _022BDBE0 ; =ov00_0231D420
movne r0, #1
strne r0, [r1, #8]
moveq r0, #0
@@ -1573,13 +1573,13 @@ _022BDBD8:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_022BDBE0: .word _0231D420
_022BDBE0: .word ov00_0231D420
arm_func_end ov00_022BDBA8
arm_func_start ov00_022BDBE4
ov00_022BDBE4: ; 0x022BDBE4
stmdb sp!, {r3, lr}
ldr r0, _022BDC54 ; =_0231D420
ldr r0, _022BDC54 ; =ov00_0231D420
ldr r1, [r0, #8]
cmp r1, #1
movne r0, #0
@@ -1597,7 +1597,7 @@ _022BDC1C:
bl ov00_022E1290
cmp r0, #0
beq _022BDC4C
ldr r0, _022BDC54 ; =_0231D420
ldr r0, _022BDC54 ; =ov00_0231D420
ldr r1, [r0, #4]
cmp r1, #0
moveq r1, #1
@@ -1610,7 +1610,7 @@ _022BDC4C:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BDC54: .word _0231D420
_022BDC54: .word ov00_0231D420
_022BDC58: .word ov00_022BE080
arm_func_end ov00_022BDBE4
@@ -1851,7 +1851,7 @@ _022BDEEC:
mov r0, r4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BDF18: .word _02318780 + 0x20
_022BDF18: .word ov00_02318780 + 0x20
arm_func_end ov00_022BDE30
arm_func_start ov00_022BDF1C
@@ -1917,72 +1917,72 @@ _022BDFFC:
bl SetIrqFlag
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BE004: .word _02318780 + 0x20
_022BE004: .word ov00_02318780 + 0x20
arm_func_end ov00_022BDF1C
arm_func_start ov00_022BE008
ov00_022BE008: ; 0x022BE008
cmp r0, #0
ldreq r0, _022BE01C ; =_0231D420
ldreq r0, _022BE01C ; =ov00_0231D420
moveq r1, #1
streqb r1, [r0, #1]
bx lr
.align 2, 0
_022BE01C: .word _0231D420
_022BE01C: .word ov00_0231D420
arm_func_end ov00_022BE008
arm_func_start ov00_022BE020
ov00_022BE020: ; 0x022BE020
cmp r0, #0
bxne lr
ldr r0, _022BE040 ; =_0231D420
ldr r0, _022BE040 ; =ov00_0231D420
mov r2, #1
strb r2, [r0, #2]
cmp r1, #0
strneb r2, [r0]
bx lr
.align 2, 0
_022BE040: .word _0231D420
_022BE040: .word ov00_0231D420
arm_func_end ov00_022BE020
arm_func_start ov00_022BE044
ov00_022BE044: ; 0x022BE044
ldr r0, _022BE054 ; =_0231D420
ldr r0, _022BE054 ; =ov00_0231D420
mov r1, #1
strb r1, [r0]
bx lr
.align 2, 0
_022BE054: .word _0231D420
_022BE054: .word ov00_0231D420
arm_func_end ov00_022BE044
arm_func_start ov00_022BE058
ov00_022BE058: ; 0x022BE058
ldr r0, _022BE068 ; =_0231D420
ldr r0, _022BE068 ; =ov00_0231D420
mov r1, #1
strb r1, [r0]
bx lr
.align 2, 0
_022BE068: .word _0231D420
_022BE068: .word ov00_0231D420
arm_func_end ov00_022BE058
arm_func_start ov00_022BE06C
ov00_022BE06C: ; 0x022BE06C
ldr r0, _022BE07C ; =_0231D420
ldr r0, _022BE07C ; =ov00_0231D420
mov r1, #1
str r1, [r0, #8]
bx lr
.align 2, 0
_022BE07C: .word _0231D420
_022BE07C: .word ov00_0231D420
arm_func_end ov00_022BE06C
arm_func_start ov00_022BE080
ov00_022BE080: ; 0x022BE080
ldr r0, _022BE090 ; =_0231D420
ldr r0, _022BE090 ; =ov00_0231D420
mov r1, #2
str r1, [r0, #4]
bx lr
.align 2, 0
_022BE090: .word _0231D420
_022BE090: .word ov00_0231D420
arm_func_end ov00_022BE080
arm_func_start ov00_022BE094
@@ -108539,7 +108539,8 @@ _02317F3C:
.byte 0x6a, 0xb2, 0x00, 0x00, 0x98, 0xd3, 0x31, 0x02, 0x90, 0xd3, 0x31, 0x02
.data
_02318780:
.global ov00_02318780
ov00_02318780:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -109769,5 +109770,6 @@ _02318780:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0231D420:
.global ov00_0231D420
ov00_0231D420:
.space 0xC100

396
asm/overlay_01.s
View File

File diff suppressed because it is too large Load Diff

16
asm/overlay_02.s
View File

@@ -242,14 +242,14 @@ ov02_023297C8: ; 0x023297C8
mov r1, #4
str r2, [r4, #0x20]
bl ov02_02329560
ldr r0, _0232983C ; =_023544C0
ldr r0, _0232983C ; =ov02_023544C0
ldr r0, [r0]
cmp r0, #0
bne _02329828
ldr r0, _02329840 ; =0x023544C4
mov r1, #4
bl ov02_02329560
ldr r0, _0232983C ; =_023544C0
ldr r0, _0232983C ; =ov02_023544C0
mov r1, #1
str r1, [r0]
_02329828:
@@ -259,7 +259,7 @@ _02329828:
bl ov02_023295A4
ldmia sp!, {r4, pc}
.align 2, 0
_0232983C: .word _023544C0
_0232983C: .word ov02_023544C0
_02329840: .word 0x023544C4
arm_func_end ov02_023297C8
@@ -8494,7 +8494,7 @@ ov02_0232F418: ; 0x0232F418
sub r0, r5, #2
pop {r4, r5, r6, r7, pc}
_0232F430:
ldr r7, _0232F520 ; =_02352F60
ldr r7, _0232F520 ; =ov02_02352F60
_0232F432:
ldr r2, [sp]
ldrb r0, [r4]
@@ -8619,7 +8619,7 @@ _0232F51C:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0232F520: .word _02352F60
_0232F520: .word ov02_02352F60
_0232F524: .word 0x0235853C
thumb_func_end ov02_0232F418
@@ -53946,7 +53946,8 @@ _0234FBC4: .word 0x0235ABE8
.byte 0x00, 0x01, 0xC0, 0x00, 0x80, 0x20, 0x00, 0x00
.data
_02352F60:
.global ov02_02352F60
ov02_02352F60:
.byte 0x09, 0x08, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x29, 0xFD, 0x32, 0x02, 0x41, 0xFD, 0x32, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -54291,5 +54292,6 @@ _02352F60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_023544C0:
.global ov02_023544C0
ov02_023544C0:
.space 0x6740

46
asm/overlay_03.s
View File

@@ -6,75 +6,75 @@
arm_func_start ov03_0233CA80
ov03_0233CA80: ; 0x0233CA80
ldr ip, _0233CA90 ; =MemZero
ldr r0, _0233CA94 ; =_02346BE0
ldr r0, _0233CA94 ; =ov03_02346BE0
mov r1, #0x10
bx ip
.align 2, 0
_0233CA90: .word MemZero
_0233CA94: .word _02346BE0
_0233CA94: .word ov03_02346BE0
arm_func_end ov03_0233CA80
arm_func_start ov03_0233CA98
ov03_0233CA98: ; 0x0233CA98
ldr r1, _0233CAA4 ; =_02346BE0
ldr r1, _0233CAA4 ; =ov03_02346BE0
str r0, [r1]
bx lr
.align 2, 0
_0233CAA4: .word _02346BE0
_0233CAA4: .word ov03_02346BE0
arm_func_end ov03_0233CA98
arm_func_start ov03_0233CAA8
ov03_0233CAA8: ; 0x0233CAA8
ldr r1, _0233CAB4 ; =_02346BE0
ldr r1, _0233CAB4 ; =ov03_02346BE0
str r0, [r1, #4]
bx lr
.align 2, 0
_0233CAB4: .word _02346BE0
_0233CAB4: .word ov03_02346BE0
arm_func_end ov03_0233CAA8
arm_func_start ov03_0233CAB8
ov03_0233CAB8: ; 0x0233CAB8
ldr r0, _0233CAC4 ; =_02346BE0
ldr r0, _0233CAC4 ; =ov03_02346BE0
ldr r0, [r0, #4]
bx lr
.align 2, 0
_0233CAC4: .word _02346BE0
_0233CAC4: .word ov03_02346BE0
arm_func_end ov03_0233CAB8
arm_func_start ov03_0233CAC8
ov03_0233CAC8: ; 0x0233CAC8
ldr r1, _0233CAD4 ; =_02346BE0
ldr r1, _0233CAD4 ; =ov03_02346BE0
str r0, [r1, #8]
bx lr
.align 2, 0
_0233CAD4: .word _02346BE0
_0233CAD4: .word ov03_02346BE0
arm_func_end ov03_0233CAC8
arm_func_start ov03_0233CAD8
ov03_0233CAD8: ; 0x0233CAD8
ldr r0, _0233CAE4 ; =_02346BE0
ldr r0, _0233CAE4 ; =ov03_02346BE0
ldr r0, [r0, #8]
bx lr
.align 2, 0
_0233CAE4: .word _02346BE0
_0233CAE4: .word ov03_02346BE0
arm_func_end ov03_0233CAD8
arm_func_start ov03_0233CAE8
ov03_0233CAE8: ; 0x0233CAE8
ldr r1, _0233CAF4 ; =_02346BE0
ldr r1, _0233CAF4 ; =ov03_02346BE0
str r0, [r1, #0xc]
bx lr
.align 2, 0
_0233CAF4: .word _02346BE0
_0233CAF4: .word ov03_02346BE0
arm_func_end ov03_0233CAE8
arm_func_start ov03_0233CAF8
ov03_0233CAF8: ; 0x0233CAF8
ldr r0, _0233CB04 ; =_02346BE0
ldr r0, _0233CB04 ; =ov03_02346BE0
ldr r0, [r0, #0xc]
bx lr
.align 2, 0
_0233CB04: .word _02346BE0
_0233CB04: .word ov03_02346BE0
arm_func_end ov03_0233CAF8
arm_func_start ov03_0233CB08
@@ -710,7 +710,7 @@ _0233D358:
mov r0, #0xf
bl ov01_023375C0
ldr r1, _0233D660 ; =0x02346958
ldr r3, _0233D664 ; =_02346B20
ldr r3, _0233D664 ; =ov03_02346B20
ldr r1, [r1, r0, lsl #3]
ldr r0, _0233D668 ; =0x02346954
str r1, [r3]
@@ -925,7 +925,7 @@ _0233D654: .word 0x00003849
_0233D658: .word 0x0000384C
_0233D65C: .word 0x0000384D
_0233D660: .word 0x02346958
_0233D664: .word _02346B20
_0233D664: .word ov03_02346B20
_0233D668: .word 0x02346954
_0233D66C: .word 0x0234673C
_0233D670: .word 0x00000501
@@ -1153,7 +1153,7 @@ _0233D960:
ov03_0233D964: ; 0x0233D964
bl ov01_023375C0
ldr r1, _0233DD84 ; =0x02346958
ldr r3, _0233DD88 ; =_02346B20
ldr r3, _0233DD88 ; =ov03_02346B20
ldr r1, [r1, r0, lsl #3]
ldr r0, _0233DD8C ; =0x02346954
str r1, [r3]
@@ -1447,7 +1447,7 @@ _0233DD78: .word 0x0000384A
_0233DD7C: .word 0x0000384B
_0233DD80: .word 0x0000384E
_0233DD84: .word 0x02346958
_0233DD88: .word _02346B20
_0233DD88: .word ov03_02346B20
_0233DD8C: .word 0x02346954
_0233DD90: .word 0x0234673C
_0233DD94: .word 0x00000301
@@ -11201,7 +11201,8 @@ _02346734: .word 0x02346BDC
.byte 0x64, 0x61, 0x74, 0x00,
.data
_02346B20:
.global ov03_02346B20
ov03_02346B20:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -11216,5 +11217,6 @@ _02346B20:
.byte 0x00, 0x00, 0x00, 0x00, 0x7A, 0x38, 0x7B, 0x38, 0x7C, 0x38, 0x00, 0x00
.bss
_02346BE0:
.global ov03_02346BE0
ov03_02346BE0:
.space 0x20

38
asm/overlay_04.s
View File

@@ -6,66 +6,66 @@
arm_func_start ov04_0233CA80
ov04_0233CA80: ; 0x0233CA80
ldr ip, _0233CA90 ; =MemZero
ldr r0, _0233CA94 ; =_0233F660
ldr r0, _0233CA94 ; =ov04_0233F660
mov r1, #0x10
bx ip
.align 2, 0
_0233CA90: .word MemZero
_0233CA94: .word _0233F660
_0233CA94: .word ov04_0233F660
arm_func_end ov04_0233CA80
arm_func_start ov04_0233CA98
ov04_0233CA98: ; 0x0233CA98
ldr r1, _0233CAA4 ; =_0233F660
ldr r1, _0233CAA4 ; =ov04_0233F660
str r0, [r1]
bx lr
.align 2, 0
_0233CAA4: .word _0233F660
_0233CAA4: .word ov04_0233F660
arm_func_end ov04_0233CA98
arm_func_start ov04_0233CAA8
ov04_0233CAA8: ; 0x0233CAA8
ldr r0, _0233CAB4 ; =_0233F660
ldr r0, _0233CAB4 ; =ov04_0233F660
ldr r0, [r0]
bx lr
.align 2, 0
_0233CAB4: .word _0233F660
_0233CAB4: .word ov04_0233F660
arm_func_end ov04_0233CAA8
arm_func_start ov04_0233CAB8
ov04_0233CAB8: ; 0x0233CAB8
ldr r1, _0233CAC4 ; =_0233F660
ldr r1, _0233CAC4 ; =ov04_0233F660
str r0, [r1, #4]
bx lr
.align 2, 0
_0233CAC4: .word _0233F660
_0233CAC4: .word ov04_0233F660
arm_func_end ov04_0233CAB8
arm_func_start ov04_0233CAC8
ov04_0233CAC8: ; 0x0233CAC8
ldr r0, _0233CAD4 ; =_0233F660
ldr r0, _0233CAD4 ; =ov04_0233F660
ldr r0, [r0, #4]
bx lr
.align 2, 0
_0233CAD4: .word _0233F660
_0233CAD4: .word ov04_0233F660
arm_func_end ov04_0233CAC8
arm_func_start ov04_0233CAD8
ov04_0233CAD8: ; 0x0233CAD8
ldr r1, _0233CAE4 ; =_0233F660
ldr r1, _0233CAE4 ; =ov04_0233F660
strb r0, [r1, #0xc]
bx lr
.align 2, 0
_0233CAE4: .word _0233F660
_0233CAE4: .word ov04_0233F660
arm_func_end ov04_0233CAD8
arm_func_start ov04_0233CAE8
ov04_0233CAE8: ; 0x0233CAE8
ldr r0, _0233CAF4 ; =_0233F660
ldr r0, _0233CAF4 ; =ov04_0233F660
ldrb r0, [r0, #0xc]
bx lr
.align 2, 0
_0233CAF4: .word _0233F660
_0233CAF4: .word ov04_0233F660
arm_func_end ov04_0233CAE8
arm_func_start ov04_0233CAF8
@@ -188,14 +188,14 @@ _0233CBE4:
mov r1, #0
str r1, [r0, #4]
bl sub_02046D20
ldr r0, _0233CC48 ; =_0233F640
ldr r0, _0233CC48 ; =ov04_0233F640
mov r1, #0
str r1, [r0]
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0233CC44: .word 0x0233F670
_0233CC48: .word _0233F640
_0233CC48: .word ov04_0233F640
arm_func_end ov04_0233CBB8
arm_func_start ov04_0233CC4C
@@ -3147,10 +3147,12 @@ _0233F564: .word 0x0233F644
.byte 0x45, 0x44, 0x41, 0x54, 0x2F, 0x69, 0x74, 0x65, 0x6D, 0x30, 0x30, 0x2E, 0x64, 0x61, 0x74, 0x00
.data
_0233F640:
.global ov04_0233F640
ov04_0233F640:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0233F660:
.global ov04_0233F660
ov04_0233F660:
.space 0x20

29
asm/overlay_05.s
View File

@@ -6,39 +6,39 @@
arm_func_start ov05_0233CA80
ov05_0233CA80: ; 0x0233CA80
ldr ip, _0233CA90 ; =MemZero
ldr r0, _0233CA94 ; =_0233FCC0
ldr r0, _0233CA94 ; =ov05_0233FCC0
mov r1, #0xc
bx ip
.align 2, 0
_0233CA90: .word MemZero
_0233CA94: .word _0233FCC0
_0233CA94: .word ov05_0233FCC0
arm_func_end ov05_0233CA80
arm_func_start ov05_0233CA98
ov05_0233CA98: ; 0x0233CA98
ldr r1, _0233CAA4 ; =_0233FCC0
ldr r1, _0233CAA4 ; =ov05_0233FCC0
str r0, [r1]
bx lr
.align 2, 0
_0233CAA4: .word _0233FCC0
_0233CAA4: .word ov05_0233FCC0
arm_func_end ov05_0233CA98
arm_func_start ov05_0233CAA8
ov05_0233CAA8: ; 0x0233CAA8
ldr r0, _0233CAB4 ; =_0233FCC0
ldr r0, _0233CAB4 ; =ov05_0233FCC0
ldr r0, [r0]
bx lr
.align 2, 0
_0233CAB4: .word _0233FCC0
_0233CAB4: .word ov05_0233FCC0
arm_func_end ov05_0233CAA8
arm_func_start ov05_0233CAB8
ov05_0233CAB8: ; 0x0233CAB8
ldr r1, _0233CAC4 ; =_0233FCC0
ldr r1, _0233CAC4 ; =ov05_0233FCC0
str r0, [r1, #4]
bx lr
.align 2, 0
_0233CAC4: .word _0233FCC0
_0233CAC4: .word ov05_0233FCC0
arm_func_end ov05_0233CAB8
arm_func_start ov05_0233CAC8
@@ -165,14 +165,14 @@ ov05_0233CB9C: ; 0x0233CB9C
mov r1, #0
str r1, [r0]
bl sub_02046D20
ldr r0, _0233CC0C ; =_0233FCA0
ldr r0, _0233CC0C ; =ov05_0233FCA0
mov r1, #0
str r1, [r0]
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0233CC08: .word 0x0233FCCC
_0233CC0C: .word _0233FCA0
_0233CC0C: .word ov05_0233FCA0
arm_func_end ov05_0233CB9C
arm_func_start ov05_0233CC10
@@ -3545,11 +3545,12 @@ _0233FB48: .word 0x0233FC6C
.byte 0x5D, 0x5B, 0x72, 0x61, 0x6E, 0x6B, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00
.data
_0233FCA0:
.byte 0x00, 0x00, 0x00, 0x00
.global ov05_0233FCA0
ov05_0233FCA0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0233FCC0:
.global ov05_0233FCC0
ov05_0233FCC0:
.space 0x20

56
asm/overlay_06.s
View File

@@ -6,48 +6,48 @@
arm_func_start ov06_0233CA80
ov06_0233CA80: ; 0x0233CA80
ldr ip, _0233CA90 ; =MemZero
ldr r0, _0233CA94 ; =_0233EEE0
ldr r0, _0233CA94 ; =ov06_0233EEE0
mov r1, #0xc
bx ip
.align 2, 0
_0233CA90: .word MemZero
_0233CA94: .word _0233EEE0
_0233CA94: .word ov06_0233EEE0
arm_func_end ov06_0233CA80
arm_func_start ov06_0233CA98
ov06_0233CA98: ; 0x0233CA98
ldr r1, _0233CAA4 ; =_0233EEE0
ldr r1, _0233CAA4 ; =ov06_0233EEE0
str r0, [r1]
bx lr
.align 2, 0
_0233CAA4: .word _0233EEE0
_0233CAA4: .word ov06_0233EEE0
arm_func_end ov06_0233CA98
arm_func_start ov06_0233CAA8
ov06_0233CAA8: ; 0x0233CAA8
ldr r0, _0233CAB4 ; =_0233EEE0
ldr r0, _0233CAB4 ; =ov06_0233EEE0
ldr r0, [r0]
bx lr
.align 2, 0
_0233CAB4: .word _0233EEE0
_0233CAB4: .word ov06_0233EEE0
arm_func_end ov06_0233CAA8
arm_func_start ov06_0233CAB8
ov06_0233CAB8: ; 0x0233CAB8
ldr r1, _0233CAC4 ; =_0233EEE0
ldr r1, _0233CAC4 ; =ov06_0233EEE0
str r0, [r1, #4]
bx lr
.align 2, 0
_0233CAC4: .word _0233EEE0
_0233CAC4: .word ov06_0233EEE0
arm_func_end ov06_0233CAB8
arm_func_start ov06_0233CAC8
ov06_0233CAC8: ; 0x0233CAC8
ldr r0, _0233CAD4 ; =_0233EEE0
ldr r0, _0233CAD4 ; =ov06_0233EEE0
ldr r0, [r0, #4]
bx lr
.align 2, 0
_0233CAD4: .word _0233EEE0
_0233CAD4: .word ov06_0233EEE0
arm_func_end ov06_0233CAC8
arm_func_start ov06_0233CAD8
@@ -56,40 +56,40 @@ ov06_0233CAD8: ; 0x0233CAD8
mov r0, #4
mov r1, #8
bl MemAlloc
ldr r2, _0233CB0C ; =_0233EEC0
ldr r2, _0233CB0C ; =ov06_0233EEC0
mov r1, #4
str r0, [r2]
bl MemZero
ldr r0, _0233CB0C ; =_0233EEC0
ldr r0, _0233CB0C ; =ov06_0233EEC0
mov r1, #0
ldr r0, [r0]
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CB0C: .word _0233EEC0
_0233CB0C: .word ov06_0233EEC0
arm_func_end ov06_0233CAD8
arm_func_start ov06_0233CB10
ov06_0233CB10: ; 0x0233CB10
stmdb sp!, {r3, lr}
ldr r0, _0233CB38 ; =_0233EEC0
ldr r0, _0233CB38 ; =ov06_0233EEC0
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0233CB38 ; =_0233EEC0
ldr r0, _0233CB38 ; =ov06_0233EEC0
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CB38: .word _0233EEC0
_0233CB38: .word ov06_0233EEC0
arm_func_end ov06_0233CB10
arm_func_start ov06_0233CB3C
ov06_0233CB3C: ; 0x0233CB3C
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
ldr r0, [r0]
ldr r0, [r0]
cmp r0, #5
@@ -111,7 +111,7 @@ _0233CB74:
ldr r3, _0233CD44 ; =0x000037A9
mov r1, r0
bl ov06_0233CD54
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -125,7 +125,7 @@ _0233CBA8:
mov r0, #6
bl ov01_02337624
cmp r4, #0x10
ldreq r0, _0233CD3C ; =_0233EEC0
ldreq r0, _0233CD3C ; =ov06_0233EEC0
moveq r1, #4
ldreq r0, [r0]
streq r1, [r0]
@@ -141,7 +141,7 @@ _0233CBA8:
ldr r3, _0233CD4C ; =0x000037AC
mov r1, r0
bl ov06_0233CD54
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #2
ldr r0, [r0]
str r1, [r0]
@@ -159,7 +159,7 @@ _0233CC1C:
ldr r1, _0233CD50 ; =0x000037AF
mov r0, #0x1c
bl ov06_0233CDC8
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #3
ldr r0, [r0]
str r1, [r0]
@@ -176,7 +176,7 @@ _0233CC60:
ldr r3, _0233CD44 ; =0x000037A9
mov r1, r0
bl ov06_0233CD54
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -191,7 +191,7 @@ _0233CCB4:
bl sub_02046D20
mov r0, #0x11
bl sub_020668B4
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #5
ldr r0, [r0]
str r1, [r0]
@@ -210,7 +210,7 @@ _0233CCD4:
ldr r3, _0233CD44 ; =0x000037A9
mov r1, r0
bl ov06_0233CD54
ldr r0, _0233CD3C ; =_0233EEC0
ldr r0, _0233CD3C ; =ov06_0233EEC0
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -227,7 +227,7 @@ _0233CD34:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0233CD3C: .word _0233EEC0
_0233CD3C: .word ov06_0233EEC0
_0233CD40: .word 0x0233ED1C
_0233CD44: .word 0x000037A9
_0233CD48: .word 0x0233ED34
@@ -2413,9 +2413,11 @@ _0233ED00: .word 0x0233EEF0
.byte 0x20, 0x49, 0x6C, 0x6C, 0x65, 0x67, 0x61, 0x6C, 0x20, 0x44, 0x61, 0x74, 0x61, 0x0A, 0x00, 0x00
.data
_0233EEC0:
.global ov06_0233EEC0
ov06_0233EEC0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0233EEE0:
.global ov06_0233EEE0
ov06_0233EEE0:
.space 0x20

79
asm/overlay_07.s
View File

@@ -9,7 +9,7 @@ ov07_0233CA80: ; 0x0233CA80
mov r0, #0x14
mov r1, #8
bl MemAlloc
ldr r1, _0233CAC4 ; =_02341B80
ldr r1, _0233CAC4 ; =ov07_02341B80
mov r2, #0
str r0, [r1]
str r2, [r0]
@@ -27,12 +27,12 @@ ov07_0233CAA8: ; 0x0233CAA8
strb r2, [r0, #0x10]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CAC4: .word _02341B80
_0233CAC4: .word ov07_02341B80
arm_func_end ov07_0233CAA8
arm_func_start ov07_0233CAC8
ov07_0233CAC8: ; 0x0233CAC8
ldr r1, _0233CAE4 ; =_02341B80
ldr r1, _0233CAE4 ; =ov07_02341B80
mov r2, #1
ldr r3, [r1]
str r0, [r3, #0xc]
@@ -44,7 +44,7 @@ ov07_0233CAD8: ; 0x0233CAD8
strb r2, [r0, #0x10]
bx lr
.align 2, 0
_0233CAE4: .word _02341B80
_0233CAE4: .word ov07_02341B80
arm_func_end ov07_0233CAD8
arm_func_start ov07_0233CAE8
@@ -56,7 +56,7 @@ ov07_0233CAE8: ; 0x0233CAE8
mov r7, #5
mov r6, #3
mov r8, #1
ldr r4, _0233CCEC ; =_02341B80
ldr r4, _0233CCEC ; =ov07_02341B80
b _0233CCDC
_0233CB0C:
ldr r1, [r4]
@@ -184,11 +184,11 @@ _0233CC88:
b _0233CCDC
_0233CCB8:
bl ov01_02338EB0
ldr r1, _0233CCEC ; =_02341B80
ldr r1, _0233CCEC ; =ov07_02341B80
ldr r1, [r1]
strb r0, [r1, #8]
bl ov01_02338B08
ldr r0, _0233CCEC ; =_02341B80
ldr r0, _0233CCEC ; =ov07_02341B80
ldr r0, [r0]
ldr r0, [r0, #4]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -198,32 +198,32 @@ _0233CCDC:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_0233CCEC: .word _02341B80
_0233CCEC: .word ov07_02341B80
arm_func_start ov07_0233CCF0
ov07_0233CCF0: ; 0x0233CCF0
ldr r0, _0233CD00 ; =_02341B80
ldr r0, _0233CD00 ; =ov07_02341B80
ldr r0, [r0]
ldrb r0, [r0, #8]
bx lr
.align 2, 0
_0233CD00: .word _02341B80
_0233CD00: .word ov07_02341B80
arm_func_end ov07_0233CCF0
arm_func_start ov07_0233CD04
ov07_0233CD04: ; 0x0233CD04
stmdb sp!, {r3, lr}
ldr r0, _0233CD2C ; =_02341B80
ldr r0, _0233CD2C ; =ov07_02341B80
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0233CD2C ; =_02341B80
ldr r0, _0233CD2C ; =ov07_02341B80
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CD2C: .word _02341B80
_0233CD2C: .word ov07_02341B80
arm_func_end ov07_0233CD04
arm_func_start ov07_0233CD30
@@ -232,24 +232,24 @@ ov07_0233CD30: ; 0x0233CD30
mov r0, #4
mov r1, #8
bl MemAlloc
ldr r2, _0233CD64 ; =_02341B60
ldr r2, _0233CD64 ; =ov07_02341B60
mov r1, #4
str r0, [r2]
bl MemZero
ldr r0, _0233CD64 ; =_02341B60
ldr r0, _0233CD64 ; =ov07_02341B60
mov r1, #0
ldr r0, [r0]
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CD64: .word _02341B60
_0233CD64: .word ov07_02341B60
arm_func_end ov07_0233CD30
arm_func_start ov07_0233CD68
ov07_0233CD68: ; 0x0233CD68
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
ldr r1, _0233CF50 ; =0x00001001
ldr r0, [r0]
ldr r2, [r0]
@@ -301,7 +301,7 @@ ov07_0233CDE4: ; 0x0233CDE4
ldr r3, _0233CF58 ; =0x000036F6
mov r1, r0
bl ov07_0233F638
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -315,26 +315,26 @@ _0233CE14:
mov r0, #5
bl ov01_02337938
cmp r4, #8
ldreq r0, _0233CF4C ; =_02341B60
ldreq r0, _0233CF4C ; =ov07_02341B60
moveq r1, #0x1000
ldreq r0, [r0]
streq r1, [r0]
beq _0233CF40
cmp r4, #9
ldreq r0, _0233CF4C ; =_02341B60
ldreq r0, _0233CF4C ; =ov07_02341B60
moveq r1, #0x2000
ldreq r0, [r0]
streq r1, [r0]
beq _0233CF40
cmp r4, #0x15
ldreq r0, _0233CF4C ; =_02341B60
ldreq r0, _0233CF4C ; =ov07_02341B60
ldreq r1, _0233CF5C ; =0x0000F001
ldreq r0, [r0]
streq r1, [r0]
b _0233CF40
_0233CE78:
bl ov07_0233E9C8
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
ldr r1, _0233CF50 ; =0x00001001
ldr r0, [r0]
str r1, [r0]
@@ -344,7 +344,7 @@ _0233CE8C:
cmp r0, #1
bne _0233CEB4
bl ov07_0233F60C
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
mov r1, #0
ldr r0, [r0]
str r1, [r0]
@@ -358,7 +358,7 @@ _0233CEB4:
_0233CEC8:
rsb r0, r1, #0x1000
bl ov07_0233DD58
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
ldr r1, _0233CF60 ; =0x00002001
ldr r0, [r0]
str r1, [r0]
@@ -367,7 +367,7 @@ _0233CEE0:
cmp r0, #1
bne _0233CF04
bl ov07_0233E514
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
mov r1, #0
ldr r0, [r0]
str r1, [r0]
@@ -376,7 +376,7 @@ _0233CF04:
cmp r0, #2
bne _0233CF24
bl ov07_0233E514
ldr r0, _0233CF4C ; =_02341B60
ldr r0, _0233CF4C ; =ov07_02341B60
ldr r1, _0233CF5C ; =0x0000F001
ldr r0, [r0]
str r1, [r0]
@@ -396,7 +396,7 @@ _0233CF44:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0233CF4C: .word _02341B60
_0233CF4C: .word ov07_02341B60
_0233CF50: .word 0x00001001
_0233CF54: .word 0x023419FC
_0233CF58: .word 0x000036F6
@@ -407,17 +407,17 @@ _0233CF60: .word 0x00002001
arm_func_start ov07_0233CF64
ov07_0233CF64: ; 0x0233CF64
stmdb sp!, {r3, lr}
ldr r0, _0233CF8C ; =_02341B60
ldr r0, _0233CF8C ; =ov07_02341B60
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0233CF8C ; =_02341B60
ldr r0, _0233CF8C ; =ov07_02341B60
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0233CF8C: .word _02341B60
_0233CF8C: .word ov07_02341B60
arm_func_end ov07_0233CF64
arm_func_start ov07_0233CF90
@@ -3312,7 +3312,7 @@ ov07_0233F758: ; 0x0233F758
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr ip, _0233FC9C ; =0x02341B74
ldr r3, _0233FCA0 ; =0x00003001
ldr r3, ov05_0233FCA0 ; =0x00003001
ldr r0, [ip]
ldr r0, [r0]
cmp r0, r3
@@ -3523,7 +3523,7 @@ _0233FA58:
bne _0233FC90
bl ov07_0233CD30
ldr r0, _0233FC9C ; =0x02341B74
ldr r1, _0233FCC0 ; =0x00002001
ldr r1, ov05_0233FCC0 ; =0x00002001
ldr r0, [r0]
str r1, [r0]
b _0233FC90
@@ -3550,7 +3550,7 @@ _0233FAB8:
bne _0233FC90
bl ov07_0233CF90
ldr r0, _0233FC9C ; =0x02341B74
ldr r1, _0233FCA0 ; =0x00003001
ldr r1, ov05_0233FCA0 ; =0x00003001
ldr r0, [r0]
str r1, [r0]
b _0233FC90
@@ -3681,7 +3681,7 @@ _0233FC94:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0233FC9C: .word 0x02341B74
_0233FCA0: .word 0x00003001
ov05_0233FCA0: .word 0x00003001
_0233FCA4: .word 0x00001002
_0233FCA8: .word 0x00005002
_0233FCAC: .word 0x02341A78
@@ -3689,7 +3689,7 @@ _0233FCB0: .word 0x02341A74
_0233FCB4: .word 0x000036E9
_0233FCB8: .word 0x00000233
_0233FCBC: .word 0x00001001
_0233FCC0: .word 0x00002001
ov05_0233FCC0: .word 0x00002001
_0233FCC4: .word 0x00004001
_0233FCC8: .word 0x00006001
_0233FCCC: .word 0x023419AC
@@ -5726,11 +5726,12 @@ _023418B8: .word 0x02341B78
.byte 0x00, 0x00, 0x00, 0x00
.data
_02341B60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov07_02341B60
ov07_02341B60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.bss
_02341B80:
.global ov07_02341B80
ov07_02341B80:
.space 0x20

7
asm/overlay_08.s
View File

@@ -583,7 +583,7 @@ ov08_0233D178: ; 0x0233D178
ldr r1, [r1, #4]
mov r2, r0
ldrh r3, [r1, #0x2a]
ldr r0, _0233D1F0 ; =_0233EC80
ldr r0, _0233D1F0 ; =ov08_0233EC80
add r1, r1, #0x14
bl ov00_022C6EFC
ldr r1, _0233D1EC ; =0x0233EC28
@@ -605,7 +605,7 @@ ov08_0233D178: ; 0x0233D178
ldmia sp!, {r3, pc}
.align 2, 0
_0233D1EC: .word 0x0233EC28
_0233D1F0: .word _0233EC80
_0233D1F0: .word ov08_0233EC80
_0233D1F4: .word ov08_0233D964
arm_func_end ov08_0233D178
@@ -2455,5 +2455,6 @@ ov08_0233EC20:
.byte 0x3C, 0xEB, 0x33, 0x02, 0x88, 0xEB, 0x33, 0x02, 0x6C, 0xEB, 0x33, 0x02, 0xF8, 0xEA, 0x33, 0x02
.bss
_0233EC80:
.global ov08_0233EC80
ov08_0233EC80:
.space 0xDCC0

182
asm/overlay_09.s
View File

@@ -11,7 +11,7 @@ ov09_0233CA80: ; 0x0233CA80
mov r0, #0x314
mov r1, #8
bl MemAlloc
ldr r2, _0233CBB8 ; =_0233F7E0
ldr r2, _0233CBB8 ; =ov09_0233F7E0
mov r1, #0
str r0, [r2]
str r1, [r0, #0x3c]
@@ -61,7 +61,7 @@ ov09_0233CB10: ; 0x0233CB10
ldr r6, _0233CBC4 ; =0x000004FD
mov r5, #0
mov r4, #1
ldr sb, _0233CBB8 ; =_0233F7E0
ldr sb, _0233CBB8 ; =ov09_0233F7E0
mvn r8, #0
b _0233CB90
_0233CB38:
@@ -98,7 +98,7 @@ _0233CB90:
ldr r0, [r7]
cmp r0, r8
bne _0233CB38
ldr r0, _0233CBB8 ; =_0233F7E0
ldr r0, _0233CBB8 ; =ov09_0233F7E0
ldr r1, [r0]
add r0, r1, #8
add r1, r1, #0x4c
@@ -106,7 +106,7 @@ _0233CB90:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0233CBB8: .word _0233F7E0
_0233CBB8: .word ov09_0233F7E0
_0233CBBC: .word 0x0233F61C
_0233CBC0: .word 0x0233F664
_0233CBC4: .word 0x000004FD
@@ -115,18 +115,18 @@ _0233CBC4: .word 0x000004FD
arm_func_start ov09_0233CBC8
ov09_0233CBC8: ; 0x0233CBC8
stmdb sp!, {r3, lr}
ldr r0, _0233CBF4 ; =_0233F7E0
ldr r0, _0233CBF4 ; =ov09_0233F7E0
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0233CBF4 ; =_0233F7E0
ldr r0, _0233CBF4 ; =ov09_0233F7E0
mov r1, #0
str r1, [r0]
bl sub_02003BC8
ldmia sp!, {r3, pc}
.align 2, 0
_0233CBF4: .word _0233F7E0
_0233CBF4: .word ov09_0233F7E0
arm_func_end ov09_0233CBC8
arm_func_start ov09_0233CBF8
@@ -134,7 +134,7 @@ ov09_0233CBF8: ; 0x0233CBF8
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
sub sp, sp, #0x1000
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r3, [r0]
ldr r0, [r3, #0x3c]
cmp r0, #0xd
@@ -169,7 +169,7 @@ _0233CC54:
bne _0233CC84
bl ov01_0232EDAC
_0233CC84:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #1
ldr r0, [r0]
str r1, [r0, #0x3c]
@@ -196,7 +196,7 @@ _0233CC98:
bne _0233CCE8
bl ov01_02330210
_0233CCE8:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #2
ldr r0, [r0]
str r1, [r0, #0x3c]
@@ -208,7 +208,7 @@ _0233CCFC:
bl ov00_022BE680
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #3
ldr r2, [r0]
mov r1, #0
@@ -224,16 +224,16 @@ _0233CD34:
bl ov09_0233ECFC
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC58
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #2]
_0233CD70:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #3]
@@ -242,16 +242,16 @@ _0233CD70:
bl IsDBoxActive
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #3]
bl FreeDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #3]
_0233CDB4:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r5, [r0]
ldr r0, [r5, #0x48]
cmp r0, #0
@@ -273,7 +273,7 @@ _0233CDB4:
add r3, r5, #8
str ip, [sp]
bl ov09_0233E030
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
ldr r2, [r1]
strb r0, [r2]
ldr r1, [r1]
@@ -283,7 +283,7 @@ _0233CDB4:
streq r0, [r1, #0x14]
ldr r0, _0233D93C ; =0x0233F59C
bl CreateDBox
ldr r3, _0233D928 ; =_0233F7E0
ldr r3, _0233D928 ; =ov09_0233F7E0
ldr r1, _0233D940 ; =0x00000404
ldr ip, [r3]
add r2, r1, #0xed
@@ -292,7 +292,7 @@ _0233CDB4:
mov r3, #0
ldrsb r0, [r0, #1]
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #0
ldr r2, [r0]
mov r1, #4
@@ -312,7 +312,7 @@ _0233CE78:
add r2, r1, #0xed
mov r3, #0
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x44]
@@ -325,24 +325,24 @@ _0233CEB8:
add r2, r1, #0xee
mov r3, #0
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #1
ldr r0, [r0]
strb r1, [r0, #0x44]
_0233CEE4:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0]
bl ov09_0233E384
cmp r0, #0
bne _0233CF6C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0]
bl ov09_0233E3A4
cmp r0, #0
blt _0233CF5C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r3, [r0]
ldr r2, [r3, #0x10]
ldr r1, [r3, #0x14]
@@ -353,7 +353,7 @@ _0233CEE4:
add r0, r0, #8
bl ov09_0233D9F8
_0233CF3C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #7
ldr r2, [r0]
mov r1, #0xa
@@ -362,19 +362,19 @@ _0233CF3C:
str r1, [r0, #0x48]
b _0233CF6C
_0233CF5C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #0xb
ldr r0, [r0]
str r1, [r0, #0x3c]
_0233CF6C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r1, [r0]
ldrb r0, [r1, #0x1d]
cmp r0, #0
beq _0233D918
ldrsb r0, [r1]
bl ov09_0233E308
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #5
ldr r2, [r0]
mov r1, #0
@@ -396,7 +396,7 @@ _0233CFA8:
mov r1, #0x13
str ip, [sp]
bl ov09_0233F210
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
mov r2, #6
ldr r3, [r1]
strb r0, [r3, #4]
@@ -408,7 +408,7 @@ _0233CFF8:
bl ov09_0233F3DC
cmp r0, #0
bne _0233D050
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #0
ldr r1, [r0]
mov r2, #4
@@ -418,7 +418,7 @@ _0233CFF8:
ldr r0, [r0]
ldrsb r0, [r0, #4]
bl ov09_0233F3C0
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #4]
@@ -427,7 +427,7 @@ _0233CFF8:
bl ov09_0233E2D4
b _0233D918
_0233D050:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r2, [r0]
ldrb r0, [r2, #0x44]
cmp r0, #0
@@ -440,7 +440,7 @@ _0233D050:
add r2, r1, #0xed
mov r3, #0
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x44]
@@ -453,7 +453,7 @@ _0233D098:
add r2, r1, #0xee
mov r3, #0
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #1
ldr r0, [r0]
strb r1, [r0, #0x44]
@@ -466,16 +466,16 @@ _0233D0C8:
bl ov09_0233E384
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0]
bl ov09_0233E34C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0]
_0233D104:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #1]
@@ -484,16 +484,16 @@ _0233D104:
bl IsDBoxActive
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #1]
bl FreeDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #1]
_0233D148:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r3, [r0]
ldr r0, [r3, #0x48]
cmp r0, #0
@@ -510,12 +510,12 @@ _0233D148:
add r3, r3, #8
str ip, [sp, #4]
bl ov09_0233E918
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
ldr r1, [r1]
strb r0, [r1, #2]
mov r0, #0
bl CreateDBox
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
ldr r2, [r1]
strb r0, [r2, #3]
ldr r3, [r1]
@@ -529,7 +529,7 @@ _0233D148:
bl GetStringFromFileVeneer
add r0, sp, #0xe00
bl InitPreprocessorArgs
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
add r3, sp, #0x88
ldr lr, [r0]
mov r2, #0
@@ -564,7 +564,7 @@ _0233D248:
bne _0233D238
_0233D254:
bl sub_020265A8
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
mov r3, #0
ldr ip, [r1]
mov r2, #8
@@ -579,7 +579,7 @@ _0233D280:
bl ov09_0233ECFC
cmp r0, #0
bne _0233D3E8
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233ED1C
@@ -596,51 +596,51 @@ _0233D2AC: ; jump table
b _0233D35C ; case 6
b _0233D3A4 ; case 7
_0233D2CC:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233D9F8
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC20
b _0233D918
_0233D2F0:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233DA4C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC20
b _0233D918
_0233D314:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233DA70
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC20
b _0233D918
_0233D338:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233DAD0
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC20
b _0233D918
_0233D35C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233DB54
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r2, [r0]
ldrb r1, [r2, #0x1d]
cmp r1, #0
@@ -656,17 +656,17 @@ _0233D398:
bl ov09_0233EC20
b _0233D918
_0233D3A4:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
add r0, r0, #8
bl ov09_0233DB6C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC20
b _0233D918
_0233D3C8:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #3
ldr r2, [r0]
mov r1, #0xa
@@ -675,14 +675,14 @@ _0233D3C8:
str r1, [r0, #0x48]
b _0233D918
_0233D3E8:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r2, [r0]
ldrb r1, [r2, #0x1d]
cmp r1, #0
beq _0233D424
ldrsb r0, [r2, #2]
bl ov09_0233EC98
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #9
ldr r2, [r0]
mov r1, #0
@@ -713,7 +713,7 @@ _0233D454:
ldrsb r0, [r0, #3]
add r2, r1, #0xf7
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r3, #0
ldr r2, [r0]
mov r1, #1
@@ -721,7 +721,7 @@ _0233D454:
ldr r0, [r0]
strb r1, [r0, #0x44]
_0233D494:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r3, [r0]
ldrb r1, [r3, #0x44]
cmp r1, #0
@@ -739,7 +739,7 @@ _0233D494:
bl GetStringFromFileVeneer
add r0, sp, #0x9b0
bl InitPreprocessorArgs
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
add r3, sp, #0x48
ldr lr, [r0]
mov r2, #0
@@ -774,7 +774,7 @@ _0233D54C:
bne _0233D53C
_0233D558:
bl sub_020265A8
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
ldr r1, [r1]
str r0, [r1, #0x38]
b _0233D918
@@ -792,7 +792,7 @@ _0233D56C:
mov r1, #0x13
str ip, [sp]
bl ov09_0233F210
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
mov r2, #0xa
ldr r3, [r1]
strb r0, [r3, #4]
@@ -804,7 +804,7 @@ _0233D5BC:
bl ov09_0233F3DC
cmp r0, #0
bne _0233D614
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r3, #0
ldr r1, [r0]
mov r2, #8
@@ -814,7 +814,7 @@ _0233D5BC:
ldr r0, [r0]
ldrsb r0, [r0, #4]
bl ov09_0233F3C0
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #4]
@@ -823,7 +823,7 @@ _0233D5BC:
bl ov09_0233EC20
b _0233D918
_0233D614:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r2, [r0]
ldrb r1, [r2, #0x44]
cmp r1, #0
@@ -847,7 +847,7 @@ _0233D64C:
ldrsb r0, [r0, #3]
add r2, r1, #0xf7
bl ShowMessageInDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r3, #0
ldr r2, [r0]
mov r1, #1
@@ -855,7 +855,7 @@ _0233D64C:
ldr r0, [r0]
strb r1, [r0, #0x44]
_0233D68C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r3, [r0]
ldrb r1, [r3, #0x44]
cmp r1, #0
@@ -874,7 +874,7 @@ _0233D68C:
add r0, sp, #0x400
add r0, r0, #0xc8
bl InitPreprocessorArgs
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
add r3, sp, #8
ldr lr, [r0]
mov r2, #0
@@ -911,7 +911,7 @@ _0233D750:
bne _0233D740
_0233D75C:
bl sub_020265A8
ldr r1, _0233D928 ; =_0233F7E0
ldr r1, _0233D928 ; =ov09_0233F7E0
ldr r1, [r1]
str r0, [r1, #0x38]
b _0233D918
@@ -926,7 +926,7 @@ _0233D770:
bl ov00_022BE5C8
bl ov01_0232EDAC
bl sub_02017B70
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #0xc
ldr r0, [r0]
str r1, [r0, #0x3c]
@@ -938,7 +938,7 @@ _0233D7AC:
bl ov00_022BE680
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0]
@@ -947,16 +947,16 @@ _0233D7AC:
bl ov09_0233E384
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0]
bl ov09_0233E34C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0]
_0233D808:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #1]
@@ -965,16 +965,16 @@ _0233D808:
bl IsDBoxActive
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #1]
bl FreeDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #1]
_0233D84C:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #2]
@@ -983,16 +983,16 @@ _0233D84C:
bl ov09_0233ECFC
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl ov09_0233EC58
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #2]
_0233D890:
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #3]
@@ -1001,11 +1001,11 @@ _0233D890:
bl IsDBoxActive
cmp r0, #0
bne _0233D918
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
ldr r0, [r0]
ldrsb r0, [r0, #3]
bl FreeDBox
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #3]
@@ -1013,7 +1013,7 @@ _0233D8D4:
bl ov00_022BE8D0
mov r0, #0x1e
bl ov00_022BE57C
ldr r0, _0233D928 ; =_0233F7E0
ldr r0, _0233D928 ; =ov09_0233F7E0
mov r1, #0xd
ldr r0, [r0]
str r1, [r0, #0x3c]
@@ -1035,7 +1035,7 @@ _0233D91C:
add sp, sp, #0x1000
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0233D928: .word _0233F7E0
_0233D928: .word ov09_0233F7E0
arm_func_end ov09_0233CBF8
_0233D92C: .word 0x0233F780
_0233D930: .word 0x000004EF
@@ -3145,6 +3145,6 @@ _0233F564:
.byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.data
_0233F7E0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov09_0233F7E0
ov09_0233F7E0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

224
asm/overlay_10.s
View File

@@ -835,14 +835,14 @@ _022BD568: .word 0x022C43B0
arm_func_start ov10_022BD56C
ov10_022BD56C: ; 0x022BD56C
stmdb sp!, {r3, lr}
ldr r0, _022BD5A8 ; =_022DC220
ldr r0, _022BD5A8 ; =ov10_022DC220
ldr r0, [r0]
cmp r0, #0
ldmneia sp!, {r3, pc}
mov r0, #0xa4
mov r1, #8
bl MemAlloc
ldr r1, _022BD5A8 ; =_022DC220
ldr r1, _022BD5A8 ; =ov10_022DC220
mov r2, #0
str r0, [r1]
str r2, [r0]
@@ -850,13 +850,13 @@ ov10_022BD56C: ; 0x022BD56C
str r2, [r0, #4]
ldmia sp!, {r3, pc}
.align 2, 0
_022BD5A8: .word _022DC220
_022BD5A8: .word ov10_022DC220
arm_func_end ov10_022BD56C
arm_func_start ov10_022BD5AC
ov10_022BD5AC: ; 0x022BD5AC
stmdb sp!, {r3, lr}
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
ldr r1, [r0]
ldr r0, [r1]
cmp r0, #4
@@ -872,7 +872,7 @@ _022BD5DC:
ldr r0, _022BD714 ; =0x020B0A48
mov r1, #0x68
ldr r0, [r0]
ldr r2, _022BD710 ; =_022DC220
ldr r2, _022BD710 ; =ov10_022DC220
add r0, r0, #0x9000
ldr r0, [r0, #0x84c]
mla r0, r3, r1, r0
@@ -883,12 +883,12 @@ _022BD5DC:
bl sub_020562B8
cmp r0, #0
beq _022BD668
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
ldr r0, [r0]
ldr r1, [r0, #0x4c]
add r0, r0, #8
bl sub_020534BC
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
mov r2, #0
ldr r1, [r0]
strb r2, [r1, #0xe]
@@ -899,25 +899,25 @@ _022BD5DC:
bl sub_02055CCC
mvn r1, #0
cmp r0, r1
ldreq r0, _022BD710 ; =_022DC220
ldreq r0, _022BD710 ; =ov10_022DC220
moveq r1, #1
ldreq r0, [r0]
streq r1, [r0]
beq _022BD690
_022BD668:
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
ldr r1, [r0]
ldr r0, [r1, #4]
add r0, r0, #1
str r0, [r1, #4]
_022BD67C:
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
ldr ip, [r0]
ldr r3, [ip, #4]
cmp r3, #4
blt _022BD5DC
_022BD690:
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
ldr r1, [r0]
ldr r0, [r1, #4]
cmp r0, #4
@@ -927,7 +927,7 @@ _022BD690:
_022BD6AC:
add r0, r1, #8
bl ov11_023061CC
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
mov r1, #2
ldr r0, [r0]
str r1, [r0]
@@ -938,7 +938,7 @@ _022BD6C8:
cmpne r0, #4
bne _022BD708
bl ov11_02306C64
ldr r0, _022BD710 ; =_022DC220
ldr r0, _022BD710 ; =ov10_022DC220
mov r1, #0
ldr r3, [r0]
ldr r2, [r3, #4]
@@ -954,35 +954,35 @@ _022BD708:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_022BD710: .word _022DC220
_022BD710: .word ov10_022DC220
_022BD714: .word 0x020B0A48
arm_func_end ov10_022BD5AC
arm_func_start ov10_022BD718
ov10_022BD718: ; 0x022BD718
stmdb sp!, {r3, lr}
ldr r0, _022BD740 ; =_022DC220
ldr r0, _022BD740 ; =ov10_022DC220
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _022BD740 ; =_022DC220
ldr r0, _022BD740 ; =ov10_022DC220
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_022BD740: .word _022DC220
_022BD740: .word ov10_022DC220
arm_func_end ov10_022BD718
arm_func_start ov10_022BD744
ov10_022BD744: ; 0x022BD744
ldr r0, _022BD758 ; =_022DC1C0
ldr r0, _022BD758 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x784]
bx lr
.align 2, 0
_022BD758: .word _022DC1C0
_022BD758: .word ov10_022DC1C0
arm_func_end ov10_022BD744
arm_func_start ov10_022BD75C
@@ -1049,7 +1049,7 @@ _022BD828: .word 0x020AFC4C
ov10_022BD82C: ; 0x022BD82C
stmdb sp!, {r4, lr}
sub sp, sp, #8
ldr r1, _022BDA78 ; =_022DC1C0
ldr r1, _022BDA78 ; =ov10_022DC1C0
mov r4, r0
ldr r0, [r1]
cmp r0, #0
@@ -1059,12 +1059,12 @@ _022BD84C:
ldr r0, _022BDA7C ; =0x000027A4
mov r1, #0xb
bl MemAlloc
ldr r2, _022BDA78 ; =_022DC1C0
ldr r2, _022BDA78 ; =ov10_022DC1C0
ldr r1, _022BDA7C ; =0x000027A4
str r0, [r2]
bl MemZero
bl sub_0206395C
ldr r1, _022BDA78 ; =_022DC1C0
ldr r1, _022BDA78 ; =ov10_022DC1C0
mov r2, #0
ldr r0, [r1]
add r0, r0, #0x2000
@@ -1077,7 +1077,7 @@ _022BD888:
cmp r2, #0x20
add r1, r1, #0x13c
blt _022BD888
ldr r2, _022BDA78 ; =_022DC1C0
ldr r2, _022BDA78 ; =ov10_022DC1C0
ldr r3, [sp, #0x10]
ldr r0, [r2]
ldr r1, [sp, #0x14]
@@ -1099,7 +1099,7 @@ _022BD888:
strb r3, [r1, #0x7a0]
bl ov10_022BFF30
bl ov10_022C04D8
ldr r0, _022BDA78 ; =_022DC1C0
ldr r0, _022BDA78 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x784]
@@ -1133,7 +1133,7 @@ _022BD888:
mov r2, #0
str r2, [sp]
str r2, [sp, #4]
ldr r1, _022BDA78 ; =_022DC1C0
ldr r1, _022BDA78 ; =ov10_022DC1C0
mov r3, #1
ldr r1, [r1]
add r1, r1, #0x2000
@@ -1145,7 +1145,7 @@ _022BD888:
mov r1, #1
ldrsh r2, [sp, #0x18]
bl ov10_022BD75C
ldr r1, _022BDA78 ; =_022DC1C0
ldr r1, _022BDA78 ; =ov10_022DC1C0
ldrsh r2, [sp, #0x18]
ldr r0, [r1]
add r0, r0, #0x2700
@@ -1162,7 +1162,7 @@ _022BD9D0:
mov r1, #3
mov r2, #0x124
bl sub_0201D484
ldr r1, _022BDA78 ; =_022DC1C0
ldr r1, _022BDA78 ; =ov10_022DC1C0
mov r2, #0
ldr r1, [r1]
mov r3, r2
@@ -1187,7 +1187,7 @@ _022BD9D0:
ldr r0, [r0]
mov r3, r2
bl sub_0201D484
ldr r2, _022BDA78 ; =_022DC1C0
ldr r2, _022BDA78 ; =ov10_022DC1C0
mov r3, #0
ldr r1, [r2]
add r1, r1, #0x2700
@@ -1199,7 +1199,7 @@ _022BDA70:
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
_022BDA78: .word _022DC1C0
_022BDA78: .word ov10_022DC1C0
_022BDA7C: .word 0x000027A4
_022BDA80: .word 0x020AFC68
arm_func_end ov10_022BD82C
@@ -1238,7 +1238,7 @@ ov10_022BDAB0: ; 0x022BDAB0
ov10_022BDADC: ; 0x022BDADC
stmdb sp!, {r3, lr}
sub sp, sp, #8
ldr r0, _022BDB50 ; =_022DC1C0
ldr r0, _022BDB50 ; =ov10_022DC1C0
ldr r3, [r0]
add r1, r3, #0x2000
ldr r0, [r1, #0x784]
@@ -1256,7 +1256,7 @@ ov10_022BDADC: ; 0x022BDADC
mov r1, r1, lsr #0x10
mov r3, #1
bl sub_0201D9C8
ldr r0, _022BDB50 ; =_022DC1C0
ldr r0, _022BDB50 ; =ov10_022DC1C0
mov r1, #1
ldr r0, [r0]
add r2, r0, #0x2700
@@ -1267,7 +1267,7 @@ _022BDB48:
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_022BDB50: .word _022DC1C0
_022BDB50: .word ov10_022DC1C0
arm_func_end ov10_022BDADC
arm_func_start ov10_022BDB54
@@ -1294,7 +1294,7 @@ _022BDB7C: .word sub_020639B4
arm_func_start ov10_022BDB80
ov10_022BDB80: ; 0x022BDB80
ldr r3, _022BDBA0 ; =_022DC1C0
ldr r3, _022BDBA0 ; =ov10_022DC1C0
ldr r2, [r3]
add r2, r2, #0x2000
str r0, [r2, #0x798]
@@ -1303,7 +1303,7 @@ ov10_022BDB80: ; 0x022BDB80
strh r1, [r0, #0x9c]
bx lr
.align 2, 0
_022BDBA0: .word _022DC1C0
_022BDBA0: .word ov10_022DC1C0
arm_func_end ov10_022BDB80
arm_func_start ov10_022BDBA4
@@ -1316,19 +1316,19 @@ _022BDBAC: .word sub_020639E8
arm_func_start ov10_022BDBB0
ov10_022BDBB0: ; 0x022BDBB0
ldr r1, _022BDBC4 ; =_022DC1C0
ldr r1, _022BDBC4 ; =ov10_022DC1C0
ldr r1, [r1]
add r1, r1, #0x2000
strb r0, [r1, #0x7a0]
bx lr
.align 2, 0
_022BDBC4: .word _022DC1C0
_022BDBC4: .word ov10_022DC1C0
arm_func_end ov10_022BDBB0
arm_func_start ov10_022BDBC8
ov10_022BDBC8: ; 0x022BDBC8
stmdb sp!, {r4, r5, r6, lr}
ldr r0, _022BDC08 ; =_022DC1C0
ldr r0, _022BDC08 ; =ov10_022DC1C0
mov r6, #0
ldr r5, [r0]
mvn r4, #0
@@ -1346,14 +1346,14 @@ _022BDBF4:
blt _022BDBDC
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BDC08: .word _022DC1C0
_022BDC08: .word ov10_022DC1C0
arm_func_end ov10_022BDBC8
arm_func_start ov10_022BDC0C
ov10_022BDC0C: ; 0x022BDC0C
stmdb sp!, {r3, lr}
bl ov10_022BDBC8
ldr r0, _022BDC60 ; =_022DC1C0
ldr r0, _022BDC60 ; =ov10_022DC1C0
ldr r1, _022BDC64 ; =0x020AFC68
ldr r2, [r0]
ldr r0, [r1]
@@ -1362,19 +1362,19 @@ ov10_022BDC0C: ; 0x022BDC0C
bl DeleteWanTableEntryVeneer
bl ov10_022C055C
bl ov10_022BFF78
ldr r0, _022BDC60 ; =_022DC1C0
ldr r0, _022BDC60 ; =ov10_022DC1C0
ldr r0, [r0]
cmp r0, #0
beq _022BDC58
bl MemFree
ldr r0, _022BDC60 ; =_022DC1C0
ldr r0, _022BDC60 ; =ov10_022DC1C0
mov r1, #0
str r1, [r0]
_022BDC58:
bl sub_02063DE4
ldmia sp!, {r3, pc}
.align 2, 0
_022BDC60: .word _022DC1C0
_022BDC60: .word ov10_022DC1C0
_022BDC64: .word 0x020AFC68
arm_func_end ov10_022BDC0C
@@ -1382,7 +1382,7 @@ _022BDC64: .word 0x020AFC68
ov10_022BDC68: ; 0x022BDC68
stmdb sp!, {r3, lr}
bl ov10_022BDBC8
ldr r0, _022BDCA0 ; =_022DC1C0
ldr r0, _022BDCA0 ; =ov10_022DC1C0
mov r2, #0
ldr r1, [r0]
mvn r0, #0
@@ -1396,7 +1396,7 @@ _022BDC80:
bl ov10_022C0588
ldmia sp!, {r3, pc}
.align 2, 0
_022BDCA0: .word _022DC1C0
_022BDCA0: .word ov10_022DC1C0
arm_func_end ov10_022BDC68
arm_func_start ov10_022BDCA4
@@ -1417,7 +1417,7 @@ ov10_022BDCBC: ; 0x022BDCBC
mvn r1, #0
cmp r0, r1
ldmeqia sp!, {r4, r5, r6, pc}
ldr r2, _022BDE44 ; =_022DC1C0
ldr r2, _022BDE44 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mla r4, r0, r1, r2
@@ -1428,7 +1428,7 @@ ov10_022BDCBC: ; 0x022BDCBC
mov r0, #0
bl ov10_022BDCA4
bl sub_02063E44
ldr r2, _022BDE44 ; =_022DC1C0
ldr r2, _022BDE44 ; =ov10_022DC1C0
mov r0, #0
ldr r1, [r2]
add r1, r1, #0x2000
@@ -1518,7 +1518,7 @@ _022BDE34:
bl ov10_022BDEC4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BDE44: .word _022DC1C0
_022BDE44: .word ov10_022DC1C0
_022BDE48: .word 0x022C79D8
_022BDE4C: .word 0x022C7A18
arm_func_end ov10_022BDCBC
@@ -1531,7 +1531,7 @@ ov10_022BDE50: ; 0x022BDE50
mvn r2, #0
cmp r0, r2
ldmeqia sp!, {r4, pc}
ldr r3, _022BDEB0 ; =_022DC1C0
ldr r3, _022BDEB0 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r3, [r3]
mla r1, r0, r1, r3
@@ -1551,7 +1551,7 @@ _022BDEA4:
bl ov10_022BDCBC
ldmia sp!, {r4, pc}
.align 2, 0
_022BDEB0: .word _022DC1C0
_022BDEB0: .word ov10_022DC1C0
arm_func_end ov10_022BDE50
arm_func_start GetEffectAnimationField0x19
@@ -1608,7 +1608,7 @@ ov10_022BDF34: ; 0x022BDF34
mov r0, r4
mov r1, #1
bl ov10_022BDEC4
ldr r2, _022BDFBC ; =_022DC1C0
ldr r2, _022BDFBC ; =ov10_022DC1C0
ldr r0, [r4]
ldr r3, [r2]
mov r1, #0
@@ -1636,7 +1636,7 @@ _022BDFB4:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_022BDFBC: .word _022DC1C0
_022BDFBC: .word ov10_022DC1C0
arm_func_end ov10_022BDF34
arm_func_start ov10_022BDFC0
@@ -1717,7 +1717,7 @@ _022BE0B0: ; jump table
caseD_6: ; 0x022BE0C8
b _022BE18C
_022BE0CC:
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x794]
@@ -1726,12 +1726,12 @@ _022BE0CC:
str r0, [r7, #0x48]
b _022BE1F0
_022BE0EC:
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x798]
bl sub_0201E184
ldr r1, _022BE448 ; =_022DC1C0
ldr r1, _022BE448 ; =ov10_022DC1C0
str r0, [r7, #0x54]
ldr r0, [r1]
mov r1, #0
@@ -1746,7 +1746,7 @@ _022BE124:
mvn r0, #0
str r0, [r7, #0x54]
ldr r1, [r4, #8]
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
str r1, [r7, #0x48]
ldr r0, [r0]
ldrb r1, [r4, #0x18]
@@ -1760,7 +1760,7 @@ _022BE158:
mvn r0, #0
str r0, [r7, #0x54]
ldr r1, [r4, #8]
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
str r1, [r7, #0x48]
ldr r0, [r0]
ldrb r1, [r4, #0x18]
@@ -1777,7 +1777,7 @@ _022BE18C:
streq r0, [r7, #0x48]
b _022BE1F0
_022BE1A4:
ldr r1, _022BE448 ; =_022DC1C0
ldr r1, _022BE448 ; =ov10_022DC1C0
ldr r0, [r1]
add r0, r0, #0x2000
ldr r0, [r0, #0x78c]
@@ -1790,7 +1790,7 @@ _022BE1A4:
str r0, [r7, #0x48]
b _022BE1F0
_022BE1D4:
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x78c]
@@ -1857,7 +1857,7 @@ _022BE280:
mov r3, r3, lsl #0x10
mov r3, r3, asr #0x10
bl sub_0201C2CC
ldr r0, _022BE448 ; =_022DC1C0
ldr r0, _022BE448 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2700
ldrsh r0, [r0, #0x90]
@@ -1957,7 +1957,7 @@ _022BE440:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BE448: .word _022DC1C0
_022BE448: .word ov10_022DC1C0
arm_func_start ov10_022BE44C
ov10_022BE44C: ; 0x022BE44C
@@ -1975,7 +1975,7 @@ ov10_022BE44C: ; 0x022BE44C
ldr r1, [r7]
cmp r1, #2
bne _022BE4A0
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x784]
@@ -1985,7 +1985,7 @@ ov10_022BE44C: ; 0x022BE44C
_022BE4A0:
cmp r1, #1
bne _022BE4C4
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x784]
@@ -1995,7 +1995,7 @@ _022BE4A0:
_022BE4C4:
cmp r1, #3
bne _022BE53C
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
mov r5, #0
ldr r6, [r0]
mov fp, #1
@@ -2028,7 +2028,7 @@ _022BE528:
_022BE53C:
cmp r1, #4
bne _022BE59C
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
mov r5, #0
ldr r4, [r0]
mov r7, #1
@@ -2053,7 +2053,7 @@ _022BE58C:
add r4, r4, #0x13c
blt _022BE558
_022BE59C:
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
mov r2, #0
ldr r5, [r0]
mvn r0, #0
@@ -2102,7 +2102,7 @@ _022BE618:
_022BE64C:
sub r1, r0, #1
cmp r1, #1
ldrls r0, _022BE72C ; =_022DC1C0
ldrls r0, _022BE72C ; =ov10_022DC1C0
ldrls r0, [r0]
addls r0, r0, #0x2700
ldrlssh r0, [r0, #0x88]
@@ -2121,7 +2121,7 @@ _022BE670:
bhi _022BE6B8
mov r1, #0
str r1, [sp]
ldr r2, _022BE72C ; =_022DC1C0
ldr r2, _022BE72C ; =ov10_022DC1C0
ldr r1, [r4]
ldr r3, [r2]
ldr r2, [r4, #4]
@@ -2130,7 +2130,7 @@ _022BE670:
bl ov10_022C0114
_022BE6B8:
ldr r1, [r4]
ldr r0, _022BE72C ; =_022DC1C0
ldr r0, _022BE72C ; =ov10_022DC1C0
str r1, [r5, #8]
str sl, [r5, #4]
ldr r0, [r0]
@@ -2162,7 +2162,7 @@ _022BE71C:
mvn r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022BE72C: .word _022DC1C0
_022BE72C: .word ov10_022DC1C0
arm_func_end ov10_022BE44C
arm_func_start ov10_022BE730
@@ -2177,7 +2177,7 @@ ov10_022BE730: ; 0x022BE730
mov r0, r0, asr #0x10
bl ov10_022BE9A0
mov r1, #0x13c
ldr r2, _022BE77C ; =_022DC1C0
ldr r2, _022BE77C ; =ov10_022DC1C0
mul r3, r0, r1
ldr r0, [r2]
ldr r1, [r0, r3]
@@ -2187,14 +2187,14 @@ ov10_022BE730: ; 0x022BE730
mov r0, r0, asr #0x10
ldmia sp!, {r4, pc}
.align 2, 0
_022BE77C: .word _022DC1C0
_022BE77C: .word ov10_022DC1C0
arm_func_end ov10_022BE730
arm_func_start ov10_022BE780
ov10_022BE780: ; 0x022BE780
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x5c
ldr r3, _022BE998 ; =_022DC1C0
ldr r3, _022BE998 ; =ov10_022DC1C0
mov sl, r0
ldr r0, [r3]
mov sb, r1
@@ -2207,7 +2207,7 @@ ov10_022BE780: ; 0x022BE780
mov r4, r0
ldr r0, [sb]
bl GetEffectAnimation
ldr r1, _022BE998 ; =_022DC1C0
ldr r1, _022BE998 ; =ov10_022DC1C0
mov r5, r0
ldr r0, [r1]
ldr r1, [sb]
@@ -2270,7 +2270,7 @@ _022BE86C:
_022BE8A0:
cmp r0, #3
bne _022BE980
ldr r0, _022BE998 ; =_022DC1C0
ldr r0, _022BE998 ; =ov10_022DC1C0
mov fp, #0
ldr r6, [r0]
mvn r0, #0
@@ -2338,7 +2338,7 @@ _022BE990:
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022BE998: .word _022DC1C0
_022BE998: .word ov10_022DC1C0
_022BE99C: .word 0x00000287
arm_func_end ov10_022BE780
@@ -2347,7 +2347,7 @@ ov10_022BE9A0: ; 0x022BE9A0
mvn r1, #0
cmp r0, r1
beq _022BE9DC
ldr r1, _022BE9E4 ; =_022DC1C0
ldr r1, _022BE9E4 ; =ov10_022DC1C0
mov r2, #0
ldr r3, [r1]
b _022BE9D4
@@ -2365,7 +2365,7 @@ _022BE9DC:
mvn r0, #0
bx lr
.align 2, 0
_022BE9E4: .word _022DC1C0
_022BE9E4: .word ov10_022DC1C0
arm_func_end ov10_022BE9A0
arm_func_start ov10_022BE9E8
@@ -2427,7 +2427,7 @@ _022BEA78:
cmp r0, r1
moveq r0, r1
beq _022BEB18
ldr r2, _022BEB28 ; =_022DC1C0
ldr r2, _022BEB28 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r3, [r2]
ldrh r2, [r6, #4]
@@ -2454,7 +2454,7 @@ _022BEB18:
.align 2, 0
_022BEB20: .word 0x022C78D0
_022BEB24: .word 0x022C7884
_022BEB28: .word _022DC1C0
_022BEB28: .word ov10_022DC1C0
arm_func_end ov10_022BE9E8
arm_func_start ov10_022BEB2C
@@ -2466,7 +2466,7 @@ ov10_022BEB2C: ; 0x022BEB2C
mvn r1, #0
cmp r0, r1
ldmeqia sp!, {r4, r5, r6, pc}
ldr r2, _022BEC04 ; =_022DC1C0
ldr r2, _022BEC04 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r3, [r2]
ldrh r2, [r6]
@@ -2514,7 +2514,7 @@ ov10_022BEB2C: ; 0x022BEB2C
str r5, [r4, #0x2c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BEC04: .word _022DC1C0
_022BEC04: .word ov10_022DC1C0
arm_func_end ov10_022BEB2C
arm_func_start ov10_022BEC08
@@ -2723,7 +2723,7 @@ _022BEEA0:
mvn r1, #0
cmp r0, r1
beq _022BEEFC
ldr r2, _022BEFD0 ; =_022DC1C0
ldr r2, _022BEFD0 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mov r3, #6
@@ -2789,7 +2789,7 @@ _022BEFBC:
_022BEFC4: .word 0x022C78B0
_022BEFC8: .word 0x022C7884
_022BEFCC: .word 0x0000FFFF
_022BEFD0: .word _022DC1C0
_022BEFD0: .word ov10_022DC1C0
_022BEFD4: .word 0x022C7954
arm_func_end ov10_022BED90
@@ -2800,7 +2800,7 @@ ov10_022BEFD8: ; 0x022BEFD8
mvn r1, #0
cmp r0, r1
beq _022BF000
ldr r2, _022BF008 ; =_022DC1C0
ldr r2, _022BF008 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mla r1, r0, r1, r2
@@ -2809,7 +2809,7 @@ _022BF000:
mov r0, r1
ldmia sp!, {r3, pc}
.align 2, 0
_022BF008: .word _022DC1C0
_022BF008: .word ov10_022DC1C0
arm_func_end ov10_022BEFD8
arm_func_start ov10_022BF00C
@@ -3059,7 +3059,7 @@ ov10_022BF314: ; 0x022BF314
moveq r0, #0
ldmeqia sp!, {r3, pc}
bl ov10_022BE9A0
ldr r2, _022BF358 ; =_022DC1C0
ldr r2, _022BF358 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mla r0, r1, r0, r2
@@ -3071,7 +3071,7 @@ ov10_022BF314: ; 0x022BF314
moveq r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BF358: .word _022DC1C0
_022BF358: .word ov10_022DC1C0
arm_func_end ov10_022BF314
arm_func_start ov10_022BF35C
@@ -3167,7 +3167,7 @@ ov10_022BF45C: ; 0x022BF45C
mvn r1, #0
cmp r0, r1
ldmeqia sp!, {r4, r5, r6, pc}
ldr r2, _022BF4E8 ; =_022DC1C0
ldr r2, _022BF4E8 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
cmp r6, #0
@@ -3196,7 +3196,7 @@ _022BF4D4:
bne _022BF4D4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022BF4E8: .word _022DC1C0
_022BF4E8: .word ov10_022DC1C0
_022BF4EC: .word 0x0000FFFF
arm_func_end ov10_022BF45C
@@ -3343,7 +3343,7 @@ _022BF6D4:
ldr r0, [r6, #0x5c]
cmp r0, #0
bne _022BF730
ldr r0, _022BF760 ; =_022DC1C0
ldr r0, _022BF760 ; =ov10_022DC1C0
ldr r0, [r0]
add r0, r0, #0x2000
ldr r0, [r0, #0x784]
@@ -3371,14 +3371,14 @@ _022BF750:
.align 2, 0
_022BF758: .word 0x022C7870
_022BF75C: .word 0x0000FFFF
_022BF760: .word _022DC1C0
_022BF760: .word ov10_022DC1C0
arm_func_end ov10_022BF4F0
arm_func_start ov10_022BF764
ov10_022BF764: ; 0x022BF764
stmdb sp!, {r3, r4, r5, r6, lr}
sub sp, sp, #4
ldr r1, _022BF7CC ; =_022DC1C0
ldr r1, _022BF7CC ; =ov10_022DC1C0
mov r4, r0
ldr r6, [r1]
cmp r6, #0
@@ -3405,7 +3405,7 @@ _022BF7C4:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_022BF7CC: .word _022DC1C0
_022BF7CC: .word ov10_022DC1C0
_022BF7D0: .word 0x022C7870
arm_func_end ov10_022BF764
@@ -3420,7 +3420,7 @@ _022BF7DC: .word ov10_022C039C
arm_func_start ov10_022BF7E0
ov10_022BF7E0: ; 0x022BF7E0
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r1, _022BF85C ; =_022DC1C0
ldr r1, _022BF85C ; =ov10_022DC1C0
mov r6, r0
ldr r5, [r1]
cmp r5, #0
@@ -3453,14 +3453,14 @@ _022BF844:
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BF85C: .word _022DC1C0
_022BF85C: .word ov10_022DC1C0
_022BF860: .word 0x022C7870
arm_func_end ov10_022BF7E0
arm_func_start ov10_022BF864
ov10_022BF864: ; 0x022BF864
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r1, _022BF8E0 ; =_022DC1C0
ldr r1, _022BF8E0 ; =ov10_022DC1C0
mov r6, r0
ldr r5, [r1]
cmp r5, #0
@@ -3493,20 +3493,20 @@ _022BF8C8:
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BF8E0: .word _022DC1C0
_022BF8E0: .word ov10_022DC1C0
_022BF8E4: .word 0x022C7870
arm_func_end ov10_022BF864
arm_func_start ov10_022BF8E8
ov10_022BF8E8: ; 0x022BF8E8
ldr r1, _022BF900 ; =_022DC1C0
ldr r1, _022BF900 ; =ov10_022DC1C0
ldr r1, [r1]
add r0, r1, r0
add r0, r0, #0x2000
ldrb r0, [r0, #0x79e]
bx lr
.align 2, 0
_022BF900: .word _022DC1C0
_022BF900: .word ov10_022DC1C0
arm_func_end ov10_022BF8E8
arm_func_start AnimationHasMoreFrames
@@ -3515,7 +3515,7 @@ AnimationHasMoreFrames: ; 0x022BF904
cmp r0, r1
moveq r0, #0
bxeq lr
ldr r1, _022BF960 ; =_022DC1C0
ldr r1, _022BF960 ; =ov10_022DC1C0
mov r2, #0
ldr r3, [r1]
b _022BF950
@@ -3538,7 +3538,7 @@ _022BF950:
mov r0, #0
bx lr
.align 2, 0
_022BF960: .word _022DC1C0
_022BF960: .word ov10_022DC1C0
arm_func_end AnimationHasMoreFrames
arm_func_start ov10_022BF964
@@ -3548,7 +3548,7 @@ ov10_022BF964: ; 0x022BF964
mvn r1, #0
cmp r0, r1
beq _022BF9C0
ldr r2, _022BF9C8 ; =_022DC1C0
ldr r2, _022BF9C8 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mla r1, r0, r1, r2
@@ -3570,13 +3570,13 @@ _022BF9C0:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_022BF9C8: .word _022DC1C0
_022BF9C8: .word ov10_022DC1C0
arm_func_end ov10_022BF964
arm_func_start ov10_022BF9CC
ov10_022BF9CC: ; 0x022BF9CC
stmdb sp!, {r3, lr}
ldr r2, _022BFA38 ; =_022DC1C0
ldr r2, _022BFA38 ; =ov10_022DC1C0
mov ip, #0
ldr lr, [r2]
mvn r2, #0
@@ -3607,7 +3607,7 @@ _022BFA14:
and r0, r0, #0xff
ldmia sp!, {r3, pc}
.align 2, 0
_022BFA38: .word _022DC1C0
_022BFA38: .word ov10_022DC1C0
arm_func_end ov10_022BF9CC
arm_func_start ov10_022BFA3C
@@ -3710,7 +3710,7 @@ ov10_022BFB6C: ; 0x022BFB6C
mvn r1, #0
cmp r0, r1
beq _022BFC4C
ldr r2, _022BFC54 ; =_022DC1C0
ldr r2, _022BFC54 ; =ov10_022DC1C0
mov r1, #0x13c
ldr r2, [r2]
mla ip, r0, r1, r2
@@ -3762,7 +3762,7 @@ _022BFC4C:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022BFC54: .word _022DC1C0
_022BFC54: .word ov10_022DC1C0
_022BFC58: .word 0x022C7890
arm_func_end ov10_022BFB6C
@@ -3962,14 +3962,14 @@ ov10_022BFE6C: ; 0x022BFE6C
cmp r0, r4
movge r0, #0
ldmgeia sp!, {r4, pc}
ldr r1, _022BFE9C ; =_022DC1C0
ldr r1, _022BFE9C ; =ov10_022DC1C0
mov r0, #1
ldr r1, [r1]
add r1, r1, #0x2000
strb r0, [r1, #0x7a0]
ldmia sp!, {r4, pc}
.align 2, 0
_022BFE9C: .word _022DC1C0
_022BFE9C: .word ov10_022DC1C0
arm_func_end ov10_022BFE6C
arm_func_start GetEffectAnimation
@@ -15200,7 +15200,8 @@ ov10_022C434C: ; 0x022C434C
.byte 0x69, 0x6E, 0x00, 0x00
.data
_022DC1C0:
.global ov10_022DC1C0
ov10_022DC1C0:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x19, 0x1A, 0x1B, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -15209,5 +15210,6 @@ _022DC1C0:
.byte 0x10, 0x00, 0x0C, 0x00, 0x19, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_022DC220:
.global ov10_022DC220
ov10_022DC220:
.space 0x20

174
asm/overlay_11.s
View File

@@ -7,7 +7,7 @@
ov11_022DC240: ; 0x022DC240
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #8
ldr r4, _022DC364 ; =_02324C60
ldr r4, _022DC364 ; =ov11_02324C60
mov r8, r0
ldr r0, [r4]
mov r7, r1
@@ -34,7 +34,7 @@ _022DC2A4:
mov r4, #1
_022DC2A8:
mov r1, #0
ldr lr, _022DC364 ; =_02324C60
ldr lr, _022DC364 ; =ov11_02324C60
mov r3, r1
mvn r0, #0
_022DC2B8:
@@ -51,7 +51,7 @@ _022DC2B8:
strh r0, [r2, #0x88]
cmp r1, #4
blt _022DC2B8
ldr ip, _022DC364 ; =_02324C60
ldr ip, _022DC364 ; =ov11_02324C60
ldr sb, [sp, #0x28]
ldr r0, [ip]
ldr lr, [sp, #0x2c]
@@ -68,12 +68,12 @@ _022DC2B8:
mov r3, r5
add r0, r0, #0x170
bl ov10_022C2300
ldr r0, _022DC364 ; =_02324C60
ldr r0, _022DC364 ; =ov11_02324C60
mov r1, r4
ldr r0, [r0]
add r0, r0, #0x170
bl ov10_022C0814
ldr r0, _022DC364 ; =_02324C60
ldr r0, _022DC364 ; =ov11_02324C60
mov r2, #0
ldr r1, [r0]
strb r2, [r1, #0x184]
@@ -83,32 +83,32 @@ _022DC35C:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_022DC364: .word _02324C60
_022DC364: .word ov11_02324C60
arm_func_end ov11_022DC240
arm_func_start ov11_022DC368
ov11_022DC368: ; 0x022DC368
stmdb sp!, {r3, lr}
ldr r0, _022DC39C ; =_02324C60
ldr r0, _022DC39C ; =ov11_02324C60
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl ov10_022C096C
ldr r0, _022DC39C ; =_02324C60
ldr r0, _022DC39C ; =ov11_02324C60
ldr r0, [r0]
bl MemFree
ldr r0, _022DC39C ; =_02324C60
ldr r0, _022DC39C ; =ov11_02324C60
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_022DC39C: .word _02324C60
_022DC39C: .word ov11_02324C60
arm_func_end ov11_022DC368
arm_func_start ov11_022DC3A0
ov11_022DC3A0: ; 0x022DC3A0
stmdb sp!, {r3, lr}
ldr r0, _022DC3F8 ; =_02324C60
ldr r0, _022DC3F8 ; =ov11_02324C60
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
@@ -116,13 +116,13 @@ ov11_022DC3A0: ; 0x022DC3A0
cmp r0, #0
ldmneia sp!, {r3, pc}
bl ov11_022DC504
ldr r0, _022DC3F8 ; =_02324C60
ldr r0, _022DC3F8 ; =ov11_02324C60
mov r1, #1
ldr r0, [r0]
mov r2, #0
bl ov10_022C09E8
bl ov10_022C0CE0
ldr r0, _022DC3F8 ; =_02324C60
ldr r0, _022DC3F8 ; =ov11_02324C60
mov r2, #1
ldr r1, [r0]
strb r2, [r1, #0x184]
@@ -130,32 +130,32 @@ ov11_022DC3A0: ; 0x022DC3A0
strb r2, [r0, #0x185]
ldmia sp!, {r3, pc}
.align 2, 0
_022DC3F8: .word _02324C60
_022DC3F8: .word ov11_02324C60
arm_func_end ov11_022DC3A0
arm_func_start ov11_022DC3FC
ov11_022DC3FC: ; 0x022DC3FC
stmdb sp!, {r3, lr}
ldr r0, _022DC430 ; =_02324C60
ldr r0, _022DC430 ; =ov11_02324C60
ldr r0, [r0]
cmp r0, #0
ldrneb r0, [r0, #0x185]
cmpne r0, #0
ldmeqia sp!, {r3, pc}
bl ov10_022C13B4
ldr r0, _022DC430 ; =_02324C60
ldr r0, _022DC430 ; =ov11_02324C60
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x185]
ldmia sp!, {r3, pc}
.align 2, 0
_022DC430: .word _02324C60
_022DC430: .word ov11_02324C60
arm_func_end ov11_022DC3FC
arm_func_start ov11_022DC434
ov11_022DC434: ; 0x022DC434
stmdb sp!, {r3, lr}
ldr r0, _022DC468 ; =_02324C60
ldr r0, _022DC468 ; =ov11_02324C60
ldr r1, [r0]
cmp r1, #0
ldrneb r0, [r1, #0x185]
@@ -168,13 +168,13 @@ ov11_022DC434: ; 0x022DC434
bl ov10_022C0CE0
ldmia sp!, {r3, pc}
.align 2, 0
_022DC468: .word _02324C60
_022DC468: .word ov11_02324C60
arm_func_end ov11_022DC434
arm_func_start ov11_022DC46C
ov11_022DC46C: ; 0x022DC46C
stmdb sp!, {r3, lr}
ldr r0, _022DC490 ; =_02324C60
ldr r0, _022DC490 ; =ov11_02324C60
ldr r0, [r0]
cmp r0, #0
ldrneb r0, [r0, #0x185]
@@ -183,13 +183,13 @@ ov11_022DC46C: ; 0x022DC46C
bl ov10_022C11D8
ldmia sp!, {r3, pc}
.align 2, 0
_022DC490: .word _02324C60
_022DC490: .word ov11_02324C60
arm_func_end ov11_022DC46C
arm_func_start ov11_022DC494
ov11_022DC494: ; 0x022DC494
stmdb sp!, {r3, lr}
ldr r0, _022DC4FC ; =_02324C60
ldr r0, _022DC4FC ; =ov11_02324C60
ldr r1, [r0]
cmp r1, #0
ldrneb r0, [r1, #0x185]
@@ -199,42 +199,42 @@ ov11_022DC494: ; 0x022DC494
cmp r0, #0
beq _022DC4D0
bl ov10_022C1398
ldr r0, _022DC4FC ; =_02324C60
ldr r0, _022DC4FC ; =ov11_02324C60
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x184]
_022DC4D0:
ldr r0, _022DC4FC ; =_02324C60
ldr r0, _022DC4FC ; =ov11_02324C60
ldr r1, _022DC500 ; =0x02316A3C
ldr r0, [r0]
ldr r0, [r0, #0x178]
bl sub_0200B3C0
ldr r0, _022DC4FC ; =_02324C60
ldr r0, _022DC4FC ; =ov11_02324C60
ldr r1, _022DC500 ; =0x02316A3C
ldr r0, [r0]
ldr r0, [r0, #0x17c]
bl sub_0200B3C0
ldmia sp!, {r3, pc}
.align 2, 0
_022DC4FC: .word _02324C60
_022DC4FC: .word ov11_02324C60
_022DC500: .word 0x02316A3C
arm_func_end ov11_022DC494
arm_func_start ov11_022DC504
ov11_022DC504: ; 0x022DC504
stmdb sp!, {r3, lr}
ldr r0, _022DC530 ; =_02324C60
ldr r0, _022DC530 ; =ov11_02324C60
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl ov11_022DC534
ldr r0, _022DC530 ; =_02324C60
ldr r0, _022DC530 ; =ov11_02324C60
mov r1, #1
ldr r0, [r0]
strb r1, [r0, #0x19a]
ldmia sp!, {r3, pc}
.align 2, 0
_022DC530: .word _02324C60
_022DC530: .word ov11_02324C60
arm_func_end ov11_022DC504
arm_func_start ov11_022DC534
@@ -305,7 +305,7 @@ _022DC558:
add r0, sl, r5
mov r1, r7
stmia sp, {r3, sb}
ldr r3, _022DC6C0 ; =_02324C60
ldr r3, _022DC6C0 ; =ov11_02324C60
str sb, [sp, #8]
ldr r3, [r3]
add r2, sp, #0x1c
@@ -343,7 +343,7 @@ _022DC69C:
.align 2, 0
_022DC6B8: .word 0x020A1870
_022DC6BC: .word 0x000003E7
_022DC6C0: .word _02324C60
_022DC6C0: .word ov11_02324C60
arm_func_end ov11_022DC534
arm_func_start ov11_022DC6C4
@@ -353,7 +353,7 @@ ov11_022DC6C4: ; 0x022DC6C4
mov r1, #6
bl MemAlloc
ldr r2, _022DC710 ; =0x02324C64
ldr r1, _022DC714 ; =_02324E80
ldr r1, _022DC714 ; =ov11_02324E80
mov r3, #1
str r0, [r2, #4]
strb r3, [r1]
@@ -369,7 +369,7 @@ ov11_022DC6C4: ; 0x022DC6C4
ldmia sp!, {r3, pc}
.align 2, 0
_022DC710: .word 0x02324C64
_022DC714: .word _02324E80
_022DC714: .word ov11_02324E80
arm_func_end ov11_022DC6C4
arm_func_start ov11_022DC718
@@ -383,7 +383,7 @@ ov11_022DC718: ; 0x022DC718
ldr r0, _022DC790 ; =0x02324ECC
bl InitPreprocessorArgs
mov r3, #0
ldr r0, _022DC794 ; =_02324E80
ldr r0, _022DC794 ; =ov11_02324E80
mvn r1, #0
str r1, [r0, #0xc]
str r1, [r0, #0x10]
@@ -407,7 +407,7 @@ _022DC770:
_022DC788: .word 0x02324E94
_022DC78C: .word 0x02324EA4
_022DC790: .word 0x02324ECC
_022DC794: .word _02324E80
_022DC794: .word ov11_02324E80
_022DC798: .word 0x02324EB4
_022DC79C: .word 0x02324F1C
arm_func_end ov11_022DC718
@@ -446,22 +446,22 @@ _022DC804: .word 0x02324C64
arm_func_start ov11_022DC808
ov11_022DC808: ; 0x022DC808
ldr r0, _022DC818 ; =_02324E80
ldr r0, _022DC818 ; =ov11_02324E80
mov r1, #1
strb r1, [r0]
bx lr
.align 2, 0
_022DC818: .word _02324E80
_022DC818: .word ov11_02324E80
arm_func_end ov11_022DC808
arm_func_start ov11_022DC81C
ov11_022DC81C: ; 0x022DC81C
ldr r0, _022DC82C ; =_02324E80
ldr r0, _022DC82C ; =ov11_02324E80
mov r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_022DC82C: .word _02324E80
_022DC82C: .word ov11_02324E80
arm_func_end ov11_022DC81C
arm_func_start ov11_022DC830
@@ -1008,12 +1008,12 @@ ov11_022DCEEC: ; 0x022DCEEC
strh r1, [r0, #0x3e]
mov r1, #3
strh r1, [r0, #0xe]
ldr r1, _022DCF08 ; =_02324E80
ldr r1, _022DCF08 ; =ov11_02324E80
mov r0, #1
strb r0, [r1, #1]
bx lr
.align 2, 0
_022DCF08: .word _02324E80
_022DCF08: .word ov11_02324E80
arm_func_end ov11_022DCEEC
arm_func_start ov11_022DCF0C
@@ -1185,7 +1185,7 @@ ov11_022DD130: ; 0x022DD130
stmdb sp!, {r3, lr}
ldr ip, _022DD158 ; =0x02324EB4
mov lr, #1
ldr r1, _022DD15C ; =_02324E80
ldr r1, _022DD15C ; =ov11_02324E80
ldr r2, _022DD160 ; =0x02324F1C
mov r3, #0
strb lr, [ip, r0]
@@ -1194,7 +1194,7 @@ ov11_022DD130: ; 0x022DD130
ldmia sp!, {r3, pc}
.align 2, 0
_022DD158: .word 0x02324EB4
_022DD15C: .word _02324E80
_022DD15C: .word ov11_02324E80
_022DD160: .word 0x02324F1C
arm_func_end ov11_022DD130
@@ -1209,7 +1209,7 @@ ov11_022DD164: ; 0x022DD164
mov r5, #1
mov sb, r8
mov r4, r8
ldr r7, _022DD2BC ; =_02324E80
ldr r7, _022DD2BC ; =ov11_02324E80
b _022DD2A4
_022DD190:
ldrsh r0, [r6, #0xe]
@@ -1303,7 +1303,7 @@ _022DD2B4:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_022DD2BC: .word _02324E80
_022DD2BC: .word ov11_02324E80
arm_func_end ov11_022DD164
arm_func_start ov11_022DD2C0
@@ -1461,14 +1461,14 @@ _022DD468:
str r0, [r4, #0x1c]
b _022DDD00
_022DD4F4:
ldr r0, _022DDD18 ; =_02324E80
ldr r0, _022DDD18 ; =ov11_02324E80
ldrsh r0, [r0, #6]
bl ov11_022F12C0
mov r0, #2
strh r0, [r4, #0xe]
b _022DDD00
_022DD50C:
ldr r0, _022DDD18 ; =_02324E80
ldr r0, _022DDD18 ; =ov11_02324E80
ldrsh r0, [r0, #6]
bl ov11_022F173C
mov r0, #2
@@ -1597,7 +1597,7 @@ _022DD6BC:
b _022DDD00
_022DD6D0:
ldr r0, _022DDD34 ; =0x00000113
ldr r1, _022DDD18 ; =_02324E80
ldr r1, _022DDD18 ; =ov11_02324E80
strh r0, [r1, #6]
bl ov11_022F12C0
mov r0, #3
@@ -1620,7 +1620,7 @@ _022DD700:
mov r8, r0
ldrh r0, [r6, #8]
bl ov11_022E48AC
ldr r1, _022DDD18 ; =_02324E80
ldr r1, _022DDD18 ; =ov11_02324E80
mov r6, r0
strh r7, [r1, #6]
ldrsh r0, [r1, #6]
@@ -1652,7 +1652,7 @@ _022DD758:
b _022DDD00
_022DD7A0:
ldr r0, _022DDD34 ; =0x00000113
ldr r1, _022DDD18 ; =_02324E80
ldr r1, _022DDD18 ; =ov11_02324E80
strh r0, [r1, #6]
bl ov11_022F12C0
mov r0, #4
@@ -1665,7 +1665,7 @@ _022DD7A0:
b _022DDD00
_022DD7D0:
ldr r0, _022DDD38 ; =0x00000132
ldr r1, _022DDD18 ; =_02324E80
ldr r1, _022DDD18 ; =ov11_02324E80
strh r0, [r1, #6]
bl ov11_022F12C0
mov r0, #5
@@ -1678,7 +1678,7 @@ _022DD7D0:
b _022DDD00
_022DD800:
ldr r0, _022DDD34 ; =0x00000113
ldr r1, _022DDD18 ; =_02324E80
ldr r1, _022DDD18 ; =ov11_02324E80
strh r0, [r1, #6]
bl ov11_022F12C0
mov r0, #6
@@ -1772,7 +1772,7 @@ _022DD938:
bl DebugPrint
ldr r0, _022DDD44 ; =0x02324EA4
bl sub_02034E28
ldr r0, _022DDD18 ; =_02324E80
ldr r0, _022DDD18 ; =ov11_02324E80
ldr r2, _022DDD48 ; =0x02324ECC
ldr r0, [r0, #0xc]
cmp r0, #0
@@ -2046,7 +2046,7 @@ _022DDD08: .word 0x0000012F
_022DDD0C: .word 0x02319260
_022DDD10: .word 0x02319284
_022DDD14: .word 0x023192B4
_022DDD18: .word _02324E80
_022DDD18: .word ov11_02324E80
_022DDD1C: .word 0x023192E8
_022DDD20: .word 0x02319304
_022DDD24: .word 0x02319320
@@ -2586,7 +2586,7 @@ ov11_022DE4BC: ; 0x022DE4BC
_022DE500:
ldrh r0, [r6]
bl ov11_022E48AC
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
strh r0, [r1, #8]
ldrsh r2, [r1, #8]
mov r0, #2
@@ -2594,7 +2594,7 @@ _022DE500:
bl GetDebugFlag2
cmp r0, #0
beq _022DE554
ldr r3, _022DED18 ; =_02324E80
ldr r3, _022DED18 ; =ov11_02324E80
mov r0, #0xc
ldrsh r2, [r3, #8]
ldr r4, _022DED1C ; =0x020A5490
@@ -2606,12 +2606,12 @@ _022DE500:
ldrsh r3, [r3, #6]
bl DebugPrint
_022DE554:
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
mov r0, #0
ldrsh r2, [r1, #8]
mov r1, #0x1f
bl SaveScriptVariableValue
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
mov r1, #0xc
ldrsh r3, [r0, #8]
ldr r2, _022DED24 ; =0x020A548A
@@ -2620,7 +2620,7 @@ _022DE554:
ldrsh r2, [r2, r1]
mov r1, #0x20
bl SaveScriptVariableValue
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r0, [r0, #6]
bl ov11_022F46B4
mov r0, #0
@@ -2643,7 +2643,7 @@ _022DE5BC:
_022DE5D8:
ldrh r0, [r6]
bl ov11_022E48AC
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
strh r0, [r1, #2]
ldrsh r2, [r1, #2]
mov r0, #2
@@ -2651,7 +2651,7 @@ _022DE5D8:
bl GetDebugFlag2
cmp r0, #0
beq _022DE62C
ldr r3, _022DED18 ; =_02324E80
ldr r3, _022DED18 ; =ov11_02324E80
mov r0, #0xc
ldrsh r2, [r3, #2]
ldr r4, _022DED1C ; =0x020A5490
@@ -2663,11 +2663,11 @@ _022DE5D8:
ldrsh r3, [r3, #4]
bl DebugPrint
_022DE62C:
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
mov r0, #0
ldrsh r1, [r1, #4]
bl ov11_022E7F28
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r0, [r0, #6]
bl ov11_022F4734
mov r0, #4
@@ -2677,13 +2677,13 @@ _022DE650:
bl ov11_022E48AC
mov r4, r0
bl ov11_022F1710
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
mov r0, #2
strh r4, [r1, #6]
bl GetDebugFlag2
cmp r0, #0
beq _022DE6A4
ldr r3, _022DED18 ; =_02324E80
ldr r3, _022DED18 ; =ov11_02324E80
mov r0, #0xc
ldrsh r2, [r3, #8]
ldr r4, _022DED1C ; =0x020A5490
@@ -2949,10 +2949,10 @@ ov11_022DE9B8: ; 0x022DE9B8
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
_022DE9E8:
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
strh r0, [r1, #0xa]
bl ov11_022E5148
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r0, [r0, #0xa]
bl ov11_022F71E4
mov r0, #6
@@ -2971,7 +2971,7 @@ ov11_022DEA08: ; 0x022DEA08
mov r0, r0, lsl #0x18
cmp r1, r7, asr #16
mov r7, r0, asr #0x18
ldreq r0, _022DED18 ; =_02324E80
ldreq r0, _022DED18 ; =ov11_02324E80
ldreqsh r6, [r0, #8]
cmp r7, #0
ldrltsb r7, [r4, #0x12]
@@ -2985,7 +2985,7 @@ ov11_022DEA08: ; 0x022DEA08
mov r0, r6
and r2, r2, #0xff
bl ov11_022F722C
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r1, [r0, #0xa]
cmp r1, r6
beq _022DEAA0
@@ -3027,7 +3027,7 @@ ov11_022DEAC4: ; 0x022DEAC4
mvn r1, #0
cmp r1, sb, asr #16
mov r6, r0, asr #0x18
ldreq r0, _022DED18 ; =_02324E80
ldreq r0, _022DED18 ; =ov11_02324E80
mov r1, r8
ldreqsh r7, [r0, #8]
cmp r6, #0
@@ -3046,7 +3046,7 @@ ov11_022DEAC4: ; 0x022DEAC4
mov r2, r6
and r3, r3, #0xff
bl ov11_022F72A0
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r1, [r0, #0xa]
cmp r1, r7
beq _022DEB80
@@ -3088,7 +3088,7 @@ ov11_022DEBA4: ; 0x022DEBA4
mvn r1, #0
cmp r1, sb, asr #16
mov r6, r0, asr #0x18
ldreq r0, _022DED18 ; =_02324E80
ldreq r0, _022DED18 ; =ov11_02324E80
mov r1, r8
ldreqsh r7, [r0, #8]
cmp r6, #0
@@ -3107,7 +3107,7 @@ ov11_022DEBA4: ; 0x022DEBA4
mov r2, r6
and r3, r3, #0xff
bl ov11_022F7354
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r1, [r0, #0xa]
cmp r1, r7
strneh r7, [r0, #0xa]
@@ -3142,7 +3142,7 @@ ov11_022DEC7C: ; 0x022DEC7C
mvn r2, #0
mov r1, r0
cmp r2, r5, asr #16
ldreq r0, _022DED18 ; =_02324E80
ldreq r0, _022DED18 ; =ov11_02324E80
ldreqsh r6, [r0, #8]
add r0, sp, #0x130
bl ov11_022E4600
@@ -3176,7 +3176,7 @@ _022DED08: .word 0x02318610
_022DED0C: .word 0x00000172
_022DED10: .word 0x023193EC
_022DED14: .word 0x02319410
_022DED18: .word _02324E80
_022DED18: .word ov11_02324E80
_022DED1C: .word 0x020A5490
_022DED20: .word 0x02319438
_022DED24: .word 0x020A548A
@@ -4066,11 +4066,11 @@ ov11_022DF8B8: ; 0x022DF8B8
ov11_022DF8F4: ; 0x022DF8F4
ldrh r0, [r6]
bl ov11_022E48AC
ldr r1, _022DED18 ; =_02324E80
ldr r1, _022DED18 ; =ov11_02324E80
str r0, [r1, #0xc]
ldrh r0, [r6, #2]
bl ov11_022E48AC
ldr r2, _022DED18 ; =_02324E80
ldr r2, _022DED18 ; =ov11_02324E80
mov r1, r0
str r1, [r2, #0x10]
ldr r0, [r2, #0xc]
@@ -4103,7 +4103,7 @@ _022DF960:
ldr r0, _022DFE24 ; =0x02324E94
bl sub_02034E28
_022DF968:
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldr r0, [r0, #0xc]
cmp r0, #0
movge r1, #0x20
@@ -4176,7 +4176,7 @@ ov11_022DFA50: ; 0x022DFA50
ldrh r1, [r6]
add r0, r4, #0x14
bl ov11_022E4248
ldr r3, _022DED18 ; =_02324E80
ldr r3, _022DED18 ; =ov11_02324E80
ldr r1, _022DFE18 ; =0x02324ECC
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
@@ -4193,7 +4193,7 @@ ov11_022DFA78: ; 0x022DFA78
ldrh r1, [r6, #2]
add r0, r4, #0x14
bl ov11_022E4248
ldr r2, _022DED18 ; =_02324E80
ldr r2, _022DED18 ; =ov11_02324E80
ldr r1, _022DFE18 ; =0x02324ECC
ldr r3, [r2, #0xc]
mov r2, r5
@@ -4211,7 +4211,7 @@ ov11_022DFAAC: ; 0x022DFAAC
mov r0, #2
mov r6, #0
bl DebugPrint
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldr r0, [r0, #0xc]
cmp r0, #0
movge r8, #0x20
@@ -4322,7 +4322,7 @@ _022DFC44:
str r0, [r4, #0x1c]
b _022E2474
_022DFC64:
ldr r0, _022DED18 ; =_02324E80
ldr r0, _022DED18 ; =ov11_02324E80
ldrsh r0, [r0, #6]
bl ov11_022F46B4
mov r0, #0
@@ -9386,7 +9386,7 @@ _022E4348:
arm_func_start ov11_022E4350
ov11_022E4350: ; 0x022E4350
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr r0, _022E43DC ; =_02324E80
ldr r0, _022E43DC ; =ov11_02324E80
ldrb r1, [r0, #1]
cmp r1, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
@@ -9423,7 +9423,7 @@ _022E43CC:
blt _022E437C
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E43DC: .word _02324E80
_022E43DC: .word ov11_02324E80
_022E43E0: .word 0x023195EC
_022E43E4: .word 0x02324EB4
arm_func_end ov11_022E4350
@@ -72900,7 +72900,8 @@ _02316788: .word 0x02324E78
.byte 0x33, 0x5D, 0x00, 0x00
.data
_02324C60:
.global ov11_02324C60
ov11_02324C60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -72937,5 +72938,6 @@ _02324C60:
.byte 0x68, 0x61, 0x31, 0x02, 0x68, 0x61, 0x31, 0x02, 0xE0, 0x63, 0x31, 0x02
.bss
_02324E80:
.global ov11_02324E80
ov11_02324E80:
.space 0x652C0

381
asm/overlay_13.s
View File

File diff suppressed because it is too large Load Diff

579
asm/overlay_14.s
View File

File diff suppressed because it is too large Load Diff

199
asm/overlay_15.s
View File

@@ -9,20 +9,20 @@ ov15_0238A140: ; 0x0238A140
mov r0, #0xec
mov r1, #8
bl MemAlloc
ldr r1, _0238A228 ; =_0238B180
ldr r1, _0238A228 ; =ov15_0238B180
str r0, [r1]
add r0, r0, #0x88
bl InitPreprocessorArgs
mov r0, #0
bl CreateDBox
ldr r2, _0238A228 ; =_0238B180
ldr r2, _0238A228 ; =ov15_0238B180
mov r1, #3
ldr r3, [r2]
mov r2, #1
strb r0, [r3, #0x80]
mov r0, #0
bl CreatePortraitBox
ldr r2, _0238A228 ; =_0238B180
ldr r2, _0238A228 ; =ov15_0238B180
mvn r3, #1
ldr r1, [r2]
mov ip, #0
@@ -44,17 +44,17 @@ ov15_0238A140: ; 0x0238A140
ldr r0, [r2]
add r0, r0, #0xdc
bl InitPortraitBoxWithMonsterId
ldr r0, _0238A228 ; =_0238B180
ldr r0, _0238A228 ; =ov15_0238B180
mov r1, #0
ldr r0, [r0]
add r0, r0, #0xdc
bl SetPortraitUnknownAttr
ldr r0, _0238A228 ; =_0238B180
ldr r0, _0238A228 ; =ov15_0238B180
mov r1, #0
ldr r0, [r0]
add r0, r0, #0xdc
bl SetPortraitExpressionId
ldr r0, _0238A228 ; =_0238B180
ldr r0, _0238A228 ; =ov15_0238B180
ldr r1, [r0]
ldrsb r0, [r1, #0x81]
add r1, r1, #0xdc
@@ -64,7 +64,7 @@ ov15_0238A140: ; 0x0238A140
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238A228: .word _0238B180
_0238A228: .word ov15_0238B180
_0238A22C: .word 0x00000183
_0238A230: .word 0x0000270F
arm_func_end ov15_0238A140
@@ -72,7 +72,7 @@ _0238A230: .word 0x0000270F
arm_func_start ov15_0238A234
ov15_0238A234: ; 0x0238A234
stmdb sp!, {r4, lr}
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r1, [r0]
ldr r0, [r1, #4]
cmp r0, #0xc
@@ -97,7 +97,7 @@ _0238A284:
bl IsDBoxActive
cmp r0, #0
bne _0238A4D4
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
ldr r0, [r0, #8]
bl ov15_0238A4E8
@@ -105,7 +105,7 @@ _0238A284:
_0238A2A8:
ldrsb r0, [r1, #0x83]
bl GetNormalMenuResult
ldr r1, _0238A4DC ; =_0238B180
ldr r1, _0238A4DC ; =ov15_0238B180
mov r4, r0
ldr r0, [r1]
ldrsb r0, [r0, #0x80]
@@ -122,7 +122,7 @@ _0238A2D8: ; jump table
b _0238A308 ; case 3
b _0238A324 ; case 4
_0238A2EC:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #7
ldr r1, [r0]
mov r0, #0xd
@@ -130,7 +130,7 @@ _0238A2EC:
bl ov15_0238A4E8
b _0238A4D4
_0238A308:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #0xa
ldr r1, [r0]
mov r0, #0xd
@@ -138,7 +138,7 @@ _0238A308:
bl ov15_0238A4E8
b _0238A4D4
_0238A324:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #3
ldr r1, [r0]
mov r0, #0xd
@@ -146,7 +146,7 @@ _0238A324:
bl ov15_0238A4E8
b _0238A4D4
_0238A340:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #4
ldr r1, [r0]
mov r0, #0xd
@@ -165,7 +165,7 @@ _0238A370: ; jump table
b _0238A3E4 ; case 2
b _0238A3A0 ; case 3
_0238A380:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #1
ldr r1, [r0]
strb r2, [r1, #0xd8]
@@ -174,14 +174,14 @@ _0238A380:
bl sub_0203083C
b _0238A4D4
_0238A3A0:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r2, [r0]
ldr r1, [r2, #0x54]
str r1, [r2, #0xc]
ldr r0, [r0]
ldr r0, [r0, #0xc]
bl sub_02010758
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
ldr r0, [r0, #0xc]
rsb r0, r0, #0
@@ -192,7 +192,7 @@ _0238A3A0:
bl ov15_0238A4E8
b _0238A4D4
_0238A3E4:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl ShowDBox
@@ -211,7 +211,7 @@ _0238A414: ; jump table
b _0238A488 ; case 2
b _0238A444 ; case 3
_0238A424:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
mov r2, #0
ldr r1, [r0]
strb r2, [r1, #0xd8]
@@ -220,7 +220,7 @@ _0238A424:
bl sub_0203083C
b _0238A4D4
_0238A444:
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r2, [r0]
ldr r1, [r2, #0x54]
str r1, [r2, #0xc]
@@ -228,7 +228,7 @@ _0238A444:
ldr r0, [r0, #0xc]
rsb r0, r0, #0
bl sub_02010758
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
arm_func_end ov15_0238A234
arm_func_start ov15_0238A468
@@ -244,7 +244,7 @@ ov15_0238A468: ; 0x0238A468
_0238A488:
ldr r0, _0238A4E4 ; =0x0238B0CC
bl DebugPrint0__0200C1FC
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl ShowDBox
@@ -259,7 +259,7 @@ _0238A4B4:
bl IsDBoxActive
cmp r0, #0
bne _0238A4D4
ldr r0, _0238A4DC ; =_0238B180
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
ldr r0, [r0, #8]
bl ov15_0238A4E8
@@ -267,7 +267,7 @@ _0238A4D4:
mov r0, #0
ldmia sp!, {r4, pc}
.align 2, 0
_0238A4DC: .word _0238B180
_0238A4DC: .word ov15_0238B180
_0238A4E0: .word 0x00001308
_0238A4E4: .word 0x0238B0CC
arm_func_end ov15_0238A468
@@ -276,7 +276,7 @@ _0238A4E4: .word 0x0238B0CC
ov15_0238A4E8: ; 0x0238A4E8
stmdb sp!, {r3, lr}
sub sp, sp, #8
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r2, [r1]
str r0, [r2, #4]
ldr r3, [r1]
@@ -320,29 +320,29 @@ _0238A56C:
and r1, r1, #0x1f
strb r1, [r3, #0x68]
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_020308A0
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F8FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #0x82]
ldr r0, [r0]
strb r2, [r0, #0x68]
_0238A5CC:
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov r1, #2
ldr r0, [r0]
str r1, [r0, #8]
bl sub_0201070C
cmp r0, #0
bne _0238A608
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD14 ; =0x00003008
ldr r3, [r0]
ldr r2, _0238AD1C ; =0x00000376
@@ -352,7 +352,7 @@ _0238A5CC:
b _0238AD08
_0238A608:
bl sub_0201070C
ldr r3, _0238AD10 ; =_0238B180
ldr r3, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD14 ; =0x00003008
ldr ip, [r3]
ldr r2, _0238AD20 ; =0x00000377
@@ -366,7 +366,7 @@ _0238A634:
ldr r0, _0238AD24 ; =0x0238B08C
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r2, [r1]
strb r0, [r2, #0x82]
ldr r0, [r1]
@@ -381,30 +381,30 @@ _0238A634:
mov r2, #0
ldr r3, _0238AD38 ; =0x0238B054
bl CreateNormalMenu
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238AD08
_0238A68C:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
bl FreeNormalMenu
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #0x83]
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F8FC
mvn r3, #1
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #1
ldr r2, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -422,22 +422,22 @@ _0238A708:
mov r1, #6
str r1, [r3, #8]
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
bl FreeNormalMenu
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #0x83]
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F8FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x82]
@@ -445,7 +445,7 @@ _0238A708:
cmp r0, #0
ldr r1, _0238AD40 ; =0x00003018
bne _0238A790
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r2, _0238AD44 ; =0x00000379
ldr r3, [r0]
ldrsb r0, [r3, #0x80]
@@ -453,7 +453,7 @@ _0238A708:
bl ShowMessageInDBox
b _0238AD08
_0238A790:
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r2, _0238AD48 ; =0x0000037A
ldr r3, [r0]
ldrsb r0, [r3, #0x80]
@@ -463,22 +463,22 @@ _0238A790:
_0238A7AC:
ldr r0, _0238AD4C ; =0x0238B0F4
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov r2, #1
ldr r1, [r0]
str r2, [r1, #8]
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_0203088C
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_020288DC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD14 ; =0x00003008
ldr ip, [r0]
ldr r2, _0238AD50 ; =0x0000037B
@@ -493,19 +493,19 @@ _0238A7AC:
_0238A820:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
bl FreeNormalMenu
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F8FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #0x82]
@@ -514,14 +514,14 @@ _0238A820:
bl GetGold
cmp r0, #0
bne _0238A8AC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD14 ; =0x00003008
ldr r3, [r0]
mov r2, #0x37c
ldrsb r0, [r3, #0x80]
add r3, r3, #0x88
bl ShowMessageInDBox
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov r1, #1
ldr r0, [r0]
str r1, [r0, #8]
@@ -531,7 +531,7 @@ _0238A8AC:
ldr r1, _0238AD54 ; =0x0098967F
cmp r0, r1
blt _0238A8E8
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #1
ldr r2, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -543,7 +543,7 @@ _0238A8AC:
bl ShowMessageInDBox
b _0238AD08
_0238A8E8:
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #8
ldr r1, [r0]
ldr r2, _0238AD58 ; =0x0000037E
@@ -558,23 +558,23 @@ _0238A914:
ldrsb r0, [r3, #0x80]
bl ShowDBox
bl sub_0201070C
ldr r2, _0238AD10 ; =_0238B180
ldr r2, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD54 ; =0x0098967F
ldr r2, [r2]
sub r0, r1, r0
str r0, [r2, #0x60]
bl GetGold
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
ldr r1, [r1, #0x60]
cmp r1, r0
ble _0238A95C
bl GetGold
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
str r0, [r1, #0x60]
_0238A95C:
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r3, #1
ldr r2, [r1]
mov lr, #5
@@ -595,7 +595,7 @@ _0238A95C:
ldr r0, _0238AD24 ; =0x0238B08C
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r2, #0
ldr r3, [r1]
ldr r1, _0238AD60 ; =0x00001017
@@ -605,13 +605,13 @@ _0238A95C:
ldr r3, _0238AD68 ; =ov15_0238AE6C
str r2, [sp, #4]
bl sub_020305B4
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r2, [r1]
strb r0, [r2, #0x68]
ldr r0, [r1]
add r0, r0, #0x54
bl sub_020395CC
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r0, #1
ldr r1, [r1]
strb r0, [r1, #0xd8]
@@ -620,19 +620,19 @@ _0238A95C:
_0238AA08:
ldrsb r0, [r3, #0x80]
bl ShowDBox
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_0203088C
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_020288DC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #1
ldr lr, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -653,19 +653,19 @@ _0238AA08:
_0238AA88:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
bl FreeNormalMenu
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F8FC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mvn r2, #1
ldr r1, [r0]
strb r2, [r1, #0x82]
@@ -678,7 +678,7 @@ _0238AA88:
ldr r1, _0238AD6C ; =0x0001869F
cmp r0, r1
blt _0238AB20
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov r3, #1
ldr r2, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -693,7 +693,7 @@ _0238AB20:
bl sub_0201070C
cmp r0, #0
bne _0238AB58
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #1
ldr r2, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -705,12 +705,12 @@ _0238AB20:
bl ShowMessageInDBox
b _0238AD08
_0238AB58:
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov r1, #0xb
ldr r0, [r0]
str r1, [r0, #8]
bl sub_0201070C
ldr r3, _0238AD10 ; =_0238B180
ldr r3, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD14 ; =0x00003008
ldr ip, [r3]
ldr r2, _0238AD70 ; =0x00000382
@@ -722,23 +722,23 @@ _0238AB58:
b _0238AD08
_0238AB94:
bl GetGold
ldr r2, _0238AD10 ; =_0238B180
ldr r2, _0238AD10 ; =ov15_0238B180
ldr r1, _0238AD6C ; =0x0001869F
ldr r2, [r2]
sub r0, r1, r0
str r0, [r2, #0x60]
bl sub_0201070C
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
ldr r1, [r1, #0x60]
cmp r1, r0
ble _0238ABD4
bl sub_0201070C
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
str r0, [r1, #0x60]
_0238ABD4:
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r3, #1
ldr r2, [r1]
mov lr, #5
@@ -759,7 +759,7 @@ _0238ABD4:
ldr r0, _0238AD24 ; =0x0238B08C
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r2, #0
ldr r3, [r1]
ldr r1, _0238AD60 ; =0x00001017
@@ -769,13 +769,13 @@ _0238ABD4:
ldr r3, _0238AD68 ; =ov15_0238AE6C
str r2, [sp, #4]
bl sub_020305B4
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r2, [r1]
strb r0, [r2, #0x68]
ldr r0, [r1]
add r0, r0, #0x54
bl sub_020395CC
ldr r1, _0238AD10 ; =_0238B180
ldr r1, _0238AD10 ; =ov15_0238B180
mov r0, #0
ldr r1, [r1]
strb r0, [r1, #0xd8]
@@ -784,19 +784,19 @@ _0238ABD4:
_0238AC80:
ldrsb r0, [r3, #0x80]
bl ShowDBox
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_0202F954
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_0203088C
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
bl sub_020288DC
ldr r0, _0238AD10 ; =_0238B180
ldr r0, _0238AD10 ; =ov15_0238B180
mov ip, #1
ldr lr, [r0]
ldr r1, _0238AD14 ; =0x00003008
@@ -821,7 +821,7 @@ _0238AD08:
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
_0238AD10: .word _0238B180
_0238AD10: .word ov15_0238B180
_0238AD14: .word 0x00003008
_0238AD18: .word 0x0238B0D4
_0238AD1C: .word 0x00000376
@@ -854,7 +854,7 @@ ov15_0238AD78: ; 0x0238AD78
stmdb sp!, {r3, lr}
cmp r0, #0
movne r0, #0x384
ldr r1, _0238ADBC ; =_0238B180
ldr r1, _0238ADBC ; =ov15_0238B180
ldreq r0, _0238ADC0 ; =0x00000385
ldr r1, [r1]
mov r0, r0, lsl #0x10
@@ -863,13 +863,13 @@ ov15_0238AD78: ; 0x0238AD78
mov r1, #2
mov r2, #0
bl sub_02026268
ldr r0, _0238ADBC ; =_0238B180
ldr r0, _0238ADBC ; =ov15_0238B180
ldr r0, [r0]
add r0, r0, #0x54
bl sub_02039B0C
ldmia sp!, {r3, pc}
.align 2, 0
_0238ADBC: .word _0238B180
_0238ADBC: .word ov15_0238B180
_0238ADC0: .word 0x00000385
arm_func_end ov15_0238AD78
@@ -926,13 +926,13 @@ _0238AE68: .word 0x0000C402
arm_func_start ov15_0238AE6C
ov15_0238AE6C: ; 0x0238AE6C
ldr r0, _0238AE80 ; =_0238B180
ldr r0, _0238AE80 ; =ov15_0238B180
ldr ip, _0238AE84 ; =ov15_0238AD78
ldr r0, [r0]
ldrb r0, [r0, #0xd8]
bx ip
.align 2, 0
_0238AE80: .word _0238B180
_0238AE80: .word ov15_0238B180
_0238AE84: .word ov15_0238AD78
arm_func_end ov15_0238AE6C
@@ -947,7 +947,7 @@ ov15_0238AE88: ; 0x0238AE88
arm_func_start ov15_0238AE98
ov15_0238AE98: ; 0x0238AE98
stmdb sp!, {r3, lr}
ldr r0, _0238AF40 ; =_0238B180
ldr r0, _0238AF40 ; =ov15_0238B180
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
@@ -958,7 +958,7 @@ ov15_0238AE98: ; 0x0238AE98
ldr r0, _0238AF44 ; =0x0238B11C
bl DebugPrint0__0200C1FC
_0238AEC4:
ldr r1, _0238AF40 ; =_0238B180
ldr r1, _0238AF40 ; =ov15_0238B180
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #0x82]
@@ -967,7 +967,7 @@ _0238AEC4:
ldr r0, _0238AF48 ; =0x0238B12C
bl DebugPrint0__0200C1FC
_0238AEE4:
ldr r1, _0238AF40 ; =_0238B180
ldr r1, _0238AF40 ; =ov15_0238B180
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #0x83]
@@ -976,7 +976,7 @@ _0238AEE4:
ldr r0, _0238AF4C ; =0x0238B13C
bl DebugPrint0__0200C1FC
_0238AF04:
ldr r1, _0238AF40 ; =_0238B180
ldr r1, _0238AF40 ; =ov15_0238B180
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #0x84]
@@ -985,15 +985,15 @@ _0238AF04:
ldr r0, _0238AF50 ; =0x0238B150
bl DebugPrint0__0200C1FC
_0238AF24:
ldr r0, _0238AF40 ; =_0238B180
ldr r0, _0238AF40 ; =ov15_0238B180
ldr r0, [r0]
bl MemFree
ldr r0, _0238AF40 ; =_0238B180
ldr r0, _0238AF40 ; =ov15_0238B180
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238AF40: .word _0238B180
_0238AF40: .word ov15_0238B180
_0238AF44: .word 0x0238B11C
_0238AF48: .word 0x0238B12C
_0238AF4C: .word 0x0238B13C
@@ -1036,5 +1036,6 @@ _0238AF50: .word 0x0238B150
.byte 0x74, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
.data
_0238B180:
.global ov15_0238B180
ov15_0238B180:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

404
asm/overlay_16.s
View File

File diff suppressed because it is too large Load Diff

357
asm/overlay_17.s
View File

File diff suppressed because it is too large Load Diff

606
asm/overlay_18.s
View File

File diff suppressed because it is too large Load Diff

20
asm/overlay_19.s
View File

@@ -525,7 +525,7 @@ _0238A7D8:
str r0, [sp, #4]
mov r1, #0
str r1, [sp, #8]
ldr r2, _0238B450 ; =_0238E360
ldr r2, _0238B450 ; =ov19_0238E360
ldr r0, [r4, #0x64]
ldrsh r2, [r2]
add r3, r4, #0x23
@@ -545,7 +545,7 @@ _0238A838:
ldrsb r0, [r8, #0x20]
bl ov10_022BCDA8
ldrh r2, [sp, #0x18]
ldr r1, _0238B450 ; =_0238E360
ldr r1, _0238B450 ; =ov19_0238E360
strh r0, [r1]
tst r2, #4
bne _0238A878
@@ -577,7 +577,7 @@ _0238A8B0:
bl ov10_022BCDBC
cmp r0, #0
blt _0238A910
ldr r1, _0238B450 ; =_0238E360
ldr r1, _0238B450 ; =ov19_0238E360
str r0, [r8, #0x58]
ldrsh r2, [r1, #2]
mov r1, #0
@@ -623,7 +623,7 @@ _0238A970:
bl ov19_0238D418
mov r4, r0
bl sub_02046BA0
ldr r1, _0238B450 ; =_0238E360
ldr r1, _0238B450 ; =ov19_0238E360
sub r2, r4, #9
strh r0, [r1, #2]
cmp r2, #1
@@ -753,7 +753,7 @@ _0238AB54:
mvn r1, #0
cmp r0, r1
beq _0238ABA4
ldr r1, _0238B450 ; =_0238E360
ldr r1, _0238B450 ; =ov19_0238E360
str r0, [r8, #0xd4]
ldrsh r2, [r1, #4]
mov r1, #0
@@ -781,7 +781,7 @@ _0238ABC0:
bl ov19_0238D418
mov r4, r0
bl sub_02046BA0
ldr r1, _0238B450 ; =_0238E360
ldr r1, _0238B450 ; =ov19_0238E360
sub r2, r4, #9
strh r0, [r1, #4]
cmp r2, #1
@@ -1378,7 +1378,7 @@ _0238B440: .word 0x0000301C
_0238B444: .word 0x0000458D
_0238B448: .word 0x0000458E
_0238B44C: .word ov19_0238D4A4
_0238B450: .word _0238E360
_0238B450: .word ov19_0238E360
_0238B454: .word 0x0238E1D8
_0238B458: .word 0x0238E270
_0238B45C: .word 0x00003F02
@@ -4062,6 +4062,6 @@ _0238D688: .word 0x00000163
.byte 0x73, 0x65, 0x74, 0x0A, 0x00, 0x00, 0x00, 0x00
.data
_0238E360:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov19_0238E360
ov19_0238E360:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

57
asm/overlay_20.s
View File

@@ -24,7 +24,7 @@ _0238A15C: .word ov20_0238B294
arm_func_start ov20_0238A160
ov20_0238A160: ; 0x0238A160
stmdb sp!, {r3, lr}
ldr r0, _0238A1AC ; =_0238D120
ldr r0, _0238A1AC ; =ov20_0238D120
ldr r1, [r0]
cmp r1, #0
beq _0238A1A4
@@ -35,24 +35,24 @@ ov20_0238A160: ; 0x0238A160
bl sub_020125CC
_0238A188:
bl sub_02046D20
ldr r0, _0238A1AC ; =_0238D120
ldr r0, _0238A1AC ; =ov20_0238D120
ldr r0, [r0]
bl MemFree
ldr r0, _0238A1AC ; =_0238D120
ldr r0, _0238A1AC ; =ov20_0238D120
mov r1, #0
str r1, [r0]
_0238A1A4:
bl sub_020017EC
ldmia sp!, {r3, pc}
.align 2, 0
_0238A1AC: .word _0238D120
_0238A1AC: .word ov20_0238D120
arm_func_end ov20_0238A160
arm_func_start ov20_0238A1B0
ov20_0238A1B0: ; 0x0238A1B0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0xb0
ldr r0, _0238B144 ; =_0238D120
ldr r0, _0238B144 ; =ov20_0238D120
ldr r8, [r0]
ldr r0, [r8]
cmp r0, #8
@@ -85,7 +85,7 @@ _0238A210:
cmp r0, #0
beq _0238B288
_0238A228:
ldr sl, _0238B144 ; =_0238D120
ldr sl, _0238B144 ; =ov20_0238D120
ldr sb, [sl]
ldr r0, [sb, #4]
cmp r0, #9
@@ -1179,7 +1179,7 @@ _0238B130:
str r0, [r8]
b _0238B288
.align 2, 0
_0238B144: .word _0238D120
_0238B144: .word ov20_0238D120
_0238B148: .word 0x000045EE
_0238B14C: .word 0x0238CFEC
_0238B150: .word 0x000045ED
@@ -1284,7 +1284,7 @@ _0238B28C:
arm_func_start ov20_0238B294
ov20_0238B294: ; 0x0238B294
stmdb sp!, {r4, lr}
ldr r1, _0238B33C ; =_0238D120
ldr r1, _0238B33C ; =ov20_0238D120
mov r4, r0
ldr r0, [r1]
cmp r0, #0
@@ -1292,12 +1292,12 @@ ov20_0238B294: ; 0x0238B294
mov r0, #0xb4
mov r1, #8
bl MemAlloc
ldr r2, _0238B33C ; =_0238D120
ldr r2, _0238B33C ; =ov20_0238D120
mov r1, #0xb4
str r0, [r2]
bl MemZero
_0238B2C8:
ldr r0, _0238B33C ; =_0238D120
ldr r0, _0238B33C ; =ov20_0238D120
mov r1, #0
ldr r2, [r0]
mvn r0, #1
@@ -1327,13 +1327,13 @@ _0238B2C8:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0238B33C: .word _0238D120
_0238B33C: .word ov20_0238D120
arm_func_end ov20_0238B294
arm_func_start ov20_0238B340
ov20_0238B340: ; 0x0238B340
stmdb sp!, {r4, lr}
ldr r1, _0238B394 ; =_0238D120
ldr r1, _0238B394 ; =ov20_0238D120
mov r4, r0
ldr r0, [r1]
ldrb r1, [r0, #0xa4]
@@ -1341,13 +1341,13 @@ ov20_0238B340: ; 0x0238B340
bne _0238B360
bl ov20_0238B4A8
_0238B360:
ldr r1, _0238B394 ; =_0238D120
ldr r1, _0238B394 ; =ov20_0238D120
mov r0, r4
ldr r1, [r1]
mov r2, #0x188
str r2, [r1, #0x7c]
bl StringFromMessageId
ldr r2, _0238B394 ; =_0238D120
ldr r2, _0238B394 ; =ov20_0238D120
mov r1, r0
ldr r2, [r2]
ldr r0, _0238B398 ; =0x0000301C
@@ -1355,7 +1355,7 @@ _0238B360:
bl sub_02046C30
ldmia sp!, {r4, pc}
.align 2, 0
_0238B394: .word _0238D120
_0238B394: .word ov20_0238D120
_0238B398: .word 0x0000301C
arm_func_end ov20_0238B340
@@ -1370,7 +1370,7 @@ ov20_0238B39C: ; 0x0238B39C
bne _0238B3BC
bl ov20_0238B4A8
_0238B3BC:
ldr r1, _0238B40C ; =_0238D120
ldr r1, _0238B40C ; =ov20_0238D120
add r0, sp, #0xc
ldr r2, [r1]
mov r3, #0x188
@@ -1379,7 +1379,7 @@ _0238B3BC:
bl MemZero
mov r0, #0
str r0, [sp, #0xc]
ldr r1, _0238B40C ; =_0238D120
ldr r1, _0238B40C ; =ov20_0238D120
stmia sp, {r4, r5}
ldr r1, [r1]
add r3, sp, #0xc
@@ -1391,7 +1391,7 @@ _0238B3BC:
add sp, sp, #0xa4
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0238B40C: .word _0238D120
_0238B40C: .word ov20_0238D120
arm_func_end ov20_0238B39C
arm_func_start ov20_0238B410
@@ -2527,7 +2527,7 @@ _0238C360:
cmp r5, #0
mov r3, #0
beq _0238C3A4
ldr r2, _0238C4DC ; =_0238D140
ldr r2, _0238C4DC ; =ov20_0238D140
b _0238C394
_0238C380:
ldr r0, [r4]
@@ -2541,7 +2541,7 @@ _0238C394:
blt _0238C380
b _0238C3C0
_0238C3A4:
ldr r1, _0238C4DC ; =_0238D140
ldr r1, _0238C4DC ; =ov20_0238D140
ldr r0, _0238C4E0 ; =0x0000041A
mov r2, r3
_0238C3B0:
@@ -2622,7 +2622,7 @@ _0238C3C0:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0238C4D8: .word 0x0238D12C
_0238C4DC: .word _0238D140
_0238C4DC: .word ov20_0238D140
_0238C4E0: .word 0x0000041A
_0238C4E4: .word 0x0000032F
arm_func_end ov20_0238C2E0
@@ -3021,7 +3021,7 @@ ov20_0238CA3C: ; 0x0238CA3C
ldmeqia sp!, {r3, pc}
ldr r2, [ip, #0x1b8]
mov r3, #0
ldr r1, _0238CAD8 ; =_0238D140
ldr r1, _0238CAD8 ; =ov20_0238D140
b _0238CA74
_0238CA60:
ldr r0, [r2]
@@ -3034,7 +3034,7 @@ _0238CA74:
cmp r3, r0
blt _0238CA60
mov r2, #0
ldr r1, _0238CAD8 ; =_0238D140
ldr r1, _0238CAD8 ; =ov20_0238D140
ldr r0, _0238CADC ; =0x0000041A
b _0238CA98
_0238CA90:
@@ -3058,7 +3058,7 @@ _0238CA98:
ldmia sp!, {r3, pc}
.align 2, 0
_0238CAD4: .word 0x0238D12C
_0238CAD8: .word _0238D140
_0238CAD8: .word ov20_0238D140
_0238CADC: .word 0x0000041A
arm_func_end ov20_0238CA3C
@@ -3464,10 +3464,11 @@ _0238CF78: .word 0x00004628
.byte 0x02, 0x00, 0x00, 0x00
.data
_0238D120:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov20_0238D120
ov20_0238D120:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0238D140:
.global ov20_0238D140
ov20_0238D140:
.space 0x420

262
asm/overlay_21.s
View File

@@ -7,7 +7,7 @@
ov21_0238A140: ; 0x0238A140
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
sub sp, sp, #0x180
ldr r4, _0238B08C ; =_0238CF40
ldr r4, _0238B08C ; =ov21_0238CF40
ldr r1, [r4]
str r0, [r1]
ldr r0, [r4]
@@ -105,26 +105,26 @@ _0238A274:
mov r1, #3
mov r2, #1
bl CreatePortraitBox
ldr r2, _0238B08C ; =_0238CF40
ldr r2, _0238B08C ; =ov21_0238CF40
ldr r1, _0238B09C ; =0x000001EF
ldr r3, [r2]
strb r0, [r3, #0x81]
ldr r0, [r2]
add r0, r0, #0xc8
bl InitPortraitBoxWithMonsterId
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
mov r1, #0
ldr r0, [r0]
add r0, r0, #0xc8
bl SetPortraitUnknownAttr
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
add r0, r1, #0xc8
ldr r1, [r1, #0x28]
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
ldrsb r0, [r1, #0x81]
add r1, r1, #0xc8
@@ -146,7 +146,7 @@ _0238A32C:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -217,7 +217,7 @@ _0238A44C:
arm_func_start ov21_0238A468
ov21_0238A468: ; 0x0238A468
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -594,7 +594,7 @@ _0238A9E8:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -618,7 +618,7 @@ _0238AA1C:
bl PreprocessString
add r0, sp, #0x18
bl InitPreprocessorArgs
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0x18
ldr r3, [r0]
ldr r0, _0238B130 ; =0x0238CB98
@@ -636,7 +636,7 @@ _0238AA1C:
ldr r3, _0238B138 ; =0x0000033E
mov r2, #0
bl sub_0202E3CC
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x85]
b _0238B7B8
@@ -699,7 +699,7 @@ _0238AB90:
cmp r0, #3
ldr r1, _0238B094 ; =0x00003008
bne _0238ABC0
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
mov r2, #0x3bc
ldr r3, [r0]
ldrsb r0, [r3, #0x80]
@@ -707,7 +707,7 @@ _0238AB90:
bl ShowMessageInDBox
b _0238B7B8
_0238ABC0:
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r2, _0238B144 ; =0x000003BB
ldr r3, [r0]
ldrsb r0, [r3, #0x80]
@@ -734,7 +734,7 @@ _0238ABDC:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -852,7 +852,7 @@ _0238ADB0:
ldrsb r0, [r0, #0x81]
bl HidePortraitBox
_0238ADE4:
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
ldrb r0, [r1, #0xc]
cmp r0, #0
@@ -887,7 +887,7 @@ _0238AE44:
add r3, r3, #0x30
bl ShowMessageInDBox
_0238AE54:
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
str r2, [r1, #0x28]
@@ -897,7 +897,7 @@ _0238AE54:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
ldrsb r0, [r1, #0x81]
add r1, r1, #0xc8
@@ -947,7 +947,7 @@ _0238AEF4:
ldrsb r0, [r3, #0x80]
add r3, r3, #0x30
bl ShowMessageInDBox
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x81]
bl HidePortraitBox
@@ -974,7 +974,7 @@ _0238AF88:
cmp r5, r0
blt _0238AF78
mov r5, #0
ldr r4, _0238B08C ; =_0238CF40
ldr r4, _0238B08C ; =ov21_0238CF40
b _0238AFB8
_0238AFA4:
add r0, r1, r5, lsl #1
@@ -990,7 +990,7 @@ _0238AFB8:
blt _0238AFA4
bl RemoveEmptyItemsInBag
bl sub_0201007C
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
ldrsh r0, [r0, #0xe]
bl sub_02013150
@@ -1006,7 +1006,7 @@ _0238AFE8:
mov sl, r4
mov sb, #1
add r7, sp, #0xc
ldr r6, _0238B08C ; =_0238CF40
ldr r6, _0238B08C ; =ov21_0238CF40
b _0238B05C
_0238B018:
ldr r0, [r6]
@@ -1034,15 +1034,15 @@ _0238B064:
bl IsBagFull
cmp r0, #0
beq _0238B170
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl AddItemToStorage
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
mov r1, #1
b _0238B188
.align 2, 0
_0238B08C: .word _0238CF40
_0238B08C: .word ov21_0238CF40
_0238B090: .word 0x0238CBB8
_0238B094: .word 0x00003008
_0238B098: .word 0x000003B2
@@ -1100,17 +1100,17 @@ _0238B164: .word 0x0238CED0
_0238B168: .word 0x00001311
_0238B16C: .word 0x0238CEF8
_0238B170:
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl SpecialProcAddItemToBag
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
mov r1, #0
_0238B188:
ldr r0, [r0]
mov r2, #0x12
strb r1, [r0, #0xc]
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
str r2, [r1, #4]
ldr r2, [r0]
@@ -1125,12 +1125,12 @@ _0238B188:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, [r0]
ldrsb r0, [r1, #0x81]
add r1, r1, #0xc8
bl ShowPortraitBox
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r1, _0238B0CC ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B7C0 ; =0x000003BE
@@ -1171,7 +1171,7 @@ _0238B260:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -1284,7 +1284,7 @@ _0238B408:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -1304,7 +1304,7 @@ _0238B434:
bl PreprocessString
add r0, sp, #0xe0
bl InitPreprocessorArgs
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0xe0
ldr r4, [r0]
ldr r0, _0238B130 ; =0x0238CB98
@@ -1323,7 +1323,7 @@ _0238B434:
mov r2, #0
str r4, [sp, #8]
bl sub_0202E3CC
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x85]
b _0238B7B8
@@ -1391,7 +1391,7 @@ _0238B5A4:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -1481,7 +1481,7 @@ _0238B6F8:
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238B7B8
@@ -1501,7 +1501,7 @@ _0238B724:
bl PreprocessString
add r0, sp, #0x130
bl InitPreprocessorArgs
ldr r0, _0238B08C ; =_0238CF40
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0x130
ldr r4, [r0]
ldr r0, _0238B130 ; =0x0238CB98
@@ -1520,7 +1520,7 @@ _0238B724:
mov r2, #0
str r4, [sp, #8]
bl sub_0202E3CC
ldr r1, _0238B08C ; =_0238CF40
ldr r1, _0238B08C ; =ov21_0238CF40
ldr r1, [r1]
strb r0, [r1, #0x85]
_0238B7B8:
@@ -1576,7 +1576,7 @@ ov21_0238B848: ; 0x0238B848
ldr r0, _0238B8F0 ; =0x0000093C
mov r1, #6
bl MemAlloc
ldr r1, _0238B8F4 ; =_0238CF40
ldr r1, _0238B8F4 ; =ov21_0238CF40
mov r3, #0
str r0, [r1]
str r3, [r0, #0x1c]
@@ -1596,7 +1596,7 @@ ov21_0238B848: ; 0x0238B848
ldr r0, [r1]
add r0, r0, #0x30
bl InitPreprocessorArgs
ldr r0, _0238B8F4 ; =_0238CF40
ldr r0, _0238B8F4 ; =ov21_0238CF40
ldr r3, _0238B8F8 ; =0x000001EF
ldr r2, [r0]
mov r1, #0
@@ -1606,7 +1606,7 @@ ov21_0238B848: ; 0x0238B848
ldr r0, [r0]
str r1, [r0, #8]
bl ov11_0230C910
ldr r0, _0238B8F4 ; =_0238CF40
ldr r0, _0238B8F4 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
mov r0, #0x41
@@ -1616,31 +1616,31 @@ ov21_0238B848: ; 0x0238B848
ldmia sp!, {r3, pc}
.align 2, 0
_0238B8F0: .word 0x0000093C
_0238B8F4: .word _0238CF40
_0238B8F4: .word ov21_0238CF40
_0238B8F8: .word 0x000001EF
arm_func_end ov21_0238B848
arm_func_start ov21_0238B8FC
ov21_0238B8FC: ; 0x0238B8FC
stmdb sp!, {r3, lr}
ldr r0, _0238B924 ; =_0238CF40
ldr r0, _0238B924 ; =ov21_0238CF40
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238B924 ; =_0238CF40
ldr r0, _0238B924 ; =ov21_0238CF40
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238B924: .word _0238CF40
_0238B924: .word ov21_0238CF40
arm_func_end ov21_0238B8FC
arm_func_start ov21_0238B928
ov21_0238B928: ; 0x0238B928
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r3, [r0]
ldr r1, [r3, #0x2c]
cmp r1, #8
@@ -1742,7 +1742,7 @@ _0238BA9C:
bne _0238C7E4
mov r0, #0x1b
bl ov21_0238A140
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl ShowDBox
@@ -1763,7 +1763,7 @@ _0238BAE4:
beq _0238BB28
b _0238BB44
_0238BAFC:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
mov r3, #0x1f
@@ -1775,7 +1775,7 @@ _0238BAFC:
str r1, [r0, #4]
b _0238C7E4
_0238BB28:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl ov11_0230B8C0
@@ -1795,12 +1795,12 @@ _0238BB44:
ldr r0, _0238C8D4 ; =0x00003F02
mov r1, #0x100
bl sub_02017C74
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl ov11_0230B8C0
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0xf
ldr r2, [r0]
mov r1, #0x43
@@ -1820,7 +1820,7 @@ _0238BBA8:
bl GetGold
cmp r0, #0
bne _0238BC00
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
mov r3, #0x1f
@@ -1835,7 +1835,7 @@ _0238BC00:
bl GetGold
cmp r0, #0x96
bge _0238BC38
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
mov r3, #0x1f
@@ -1850,7 +1850,7 @@ _0238BC38:
bl ov11_0230B914
cmp r0, #0
bne _0238BC78
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov ip, #0
ldr r1, [r0]
mov r3, #0x1f
@@ -1873,7 +1873,7 @@ _0238BC78:
add r1, r2, r1
cmp r1, r0
bge _0238BCC8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
mov r3, #0x1f
@@ -1886,7 +1886,7 @@ _0238BC78:
b _0238C7E4
_0238BCC8:
bl ov11_0230B958
ldr r1, _0238C8D0 ; =_0238CF40
ldr r1, _0238C8D0 ; =ov21_0238CF40
mov ip, #0
ldr r2, [r1]
mov r3, #0x1f
@@ -1901,7 +1901,7 @@ _0238BCC8:
b _0238C7E4
_0238BD00:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0xf
ldr r2, [r0]
mov r1, #0x43
@@ -1912,7 +1912,7 @@ _0238BD00:
_0238BD24:
bl ov21_0238C920
bl ov11_0230BCF8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0xd
ldr r0, [r0]
str r1, [r0]
@@ -1922,11 +1922,11 @@ _0238BD40:
bl sub_0202E6E4
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x85]
bl sub_0202E6C8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r2, #1
ldr r1, [r0]
mov r0, #0xd
@@ -1952,7 +1952,7 @@ _0238BDA0:
b _0238C7E4
_0238BDB8:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x1a
ldr r1, [r0]
mov r2, #0xb
@@ -1963,7 +1963,7 @@ _0238BDB8:
ldrsb r0, [r1, #0x81]
add r1, r1, #0xc8
bl ShowPortraitBox
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r1, _0238C8DC ; =0x00003018
ldr r3, [r0]
ldr r2, _0238C8E0 ; =0x000003B9
@@ -1979,18 +1979,18 @@ _0238BE10:
bl IsDBoxActive
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl ShowDBox
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0x44
ldr r1, [r0]
str r2, [r1]
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl sub_0202F2C4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x81]
bl HidePortraitBox
@@ -1999,7 +1999,7 @@ _0238BE60:
ldrsb r0, [r3, #0x83]
bl GetNormalMenuResult
cmp r0, #1
ldrne r1, _0238C8D0 ; =_0238CF40
ldrne r1, _0238C8D0 ; =ov21_0238CF40
ldrne r1, [r1]
strne r0, [r1, #0x1c]
cmp r0, #8
@@ -2055,7 +2055,7 @@ _0238BF20:
bl ov00_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r1, [r0]
ldr r0, [r1, #8]
add r0, r0, #1
@@ -2068,11 +2068,11 @@ _0238BF50:
bl ov00_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldr r0, [r0, #4]
bl ov21_0238A140
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0
ldr r0, [r0]
str r1, [r0, #8]
@@ -2093,11 +2093,11 @@ _0238BF80:
mov r0, #0
bl sub_02017CCC
bl sub_0203AAB0
ldr r1, _0238C8D0 ; =_0238CF40
ldr r1, _0238C8D0 ; =ov21_0238CF40
ldr r1, [r1]
str r0, [r1, #0x914]
bl sub_0203A5F0
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #0x28
@@ -2110,14 +2110,14 @@ _0238BFEC:
mvn r1, #0
cmp r0, r1
beq _0238C014
ldr r1, _0238C8D0 ; =_0238CF40
ldr r1, _0238C8D0 ; =ov21_0238CF40
ldr r1, [r1]
str r0, [r1, #0x914]
mov r0, #0x26
bl ov21_0238A140
b _0238C7E4
_0238C014:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #1
@@ -2146,7 +2146,7 @@ _0238C048: ; jump table
b _0238C0E4 ; case 11
_0238C078:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #0x30
@@ -2156,7 +2156,7 @@ _0238C078:
b _0238C7E4
_0238C09C:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #0x28
@@ -2166,7 +2166,7 @@ _0238C09C:
b _0238C7E4
_0238C0C0:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #0x2a
@@ -2176,7 +2176,7 @@ _0238C0C0:
b _0238C7E4
_0238C0E4:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x27
ldr r2, [r0]
mov r1, #0x2e
@@ -2186,7 +2186,7 @@ _0238C0E4:
b _0238C7E4
_0238C108:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0x25
ldr r0, [r0]
str r1, [r0]
@@ -2196,7 +2196,7 @@ _0238C124:
bl sub_0203F398
cmp r0, #1
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x29
ldr r2, [r0]
mov r1, #0x25
@@ -2208,7 +2208,7 @@ _0238C150:
bl sub_020407EC
cmp r0, #1
bne _0238C17C
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x2b
ldr r2, [r0]
mov r1, #0x25
@@ -2221,7 +2221,7 @@ _0238C17C:
cmpne r0, #7
bne _0238C7E4
bl sub_0203FD38
ldr r2, _0238C8D0 ; =_0238CF40
ldr r2, _0238C8D0 ; =ov21_0238CF40
mov r1, r0
ldr r0, [r2]
mov r2, #0x20
@@ -2229,7 +2229,7 @@ _0238C17C:
add r0, r0, #0x900
bl MemcpySimple
bl sub_02041094
ldr r2, _0238C8D0 ; =_0238CF40
ldr r2, _0238C8D0 ; =ov21_0238CF40
mov ip, #0x2b
ldr r1, [r2]
mov r3, #0x2c
@@ -2244,7 +2244,7 @@ _0238C1D8:
bl sub_02041A18
cmp r0, #1
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x2d
ldr r2, [r0]
mov r1, #0x2a
@@ -2256,7 +2256,7 @@ _0238C204:
bl sub_02041B7C
cmp r0, #1
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x2f
ldr r2, [r0]
mov r1, #0x25
@@ -2272,7 +2272,7 @@ _0238C230:
beq _0238C268
b _0238C284
_0238C248:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x32
ldr r2, [r0]
mov r1, #0x35
@@ -2281,7 +2281,7 @@ _0238C248:
str r1, [r0, #4]
b _0238C7E4
_0238C268:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl ov11_0230B8C0
@@ -2301,12 +2301,12 @@ _0238C284:
ldr r0, _0238C8D4 ; =0x00003F02
mov r1, #0x100
bl sub_02017C74
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl ov11_0230B8C0
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x34
ldr r2, [r0]
mov r1, #0x32
@@ -2322,7 +2322,7 @@ _0238C2E8:
cmp r0, #6
bne _0238C7E4
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x32
ldr r2, [r0]
mov r1, #0x34
@@ -2332,7 +2332,7 @@ _0238C2E8:
b _0238C7E4
_0238C324:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0x31
ldr r0, [r0]
str r1, [r0]
@@ -2343,11 +2343,11 @@ _0238C340:
bl sub_0202E6E4
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x85]
bl sub_0202E6C8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r2, #1
ldr r1, [r0]
mov r0, #0x31
@@ -2414,7 +2414,7 @@ _0238C42C:
beq _0238C464
b _0238C4EC
_0238C444:
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x3c
ldr r2, [r0]
mov r1, #0x40
@@ -2424,14 +2424,14 @@ _0238C444:
b _0238C7E4
_0238C464:
bl ov11_0230B874
ldr r1, _0238C8D0 ; =_0238CF40
ldr r1, _0238C8D0 ; =ov21_0238CF40
ldr r1, [r1]
ldrh r1, [r1, #0xd8]
cmp r0, r1
bge _0238C4A0
mov r0, #0
bl sub_02017CCC
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0x18
bl ov11_0230B8C0
@@ -2442,7 +2442,7 @@ _0238C4A0:
bne _0238C7E4
mov r0, #0
bl sub_02017CCC
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r2, [r0]
add r3, r2, #0x42
add r0, r2, #0xda
@@ -2450,7 +2450,7 @@ _0238C4A0:
add r2, r2, #0x140
add r3, r3, #0x100
bl ov11_0230C118
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x3c
ldr r2, [r0]
mov r1, #0x10
@@ -2471,12 +2471,12 @@ _0238C4EC:
ldr r0, _0238C8D4 ; =0x00003F02
mov r1, #0x100
bl sub_02017C74
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0x18
bl ov11_0230B8C0
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x3f
ldr r2, [r0]
mov r1, #0x3d
@@ -2492,7 +2492,7 @@ _0238C550:
cmp r0, #6
bne _0238C7E4
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r3, #0x3d
ldr r2, [r0]
mov r1, #0x3f
@@ -2502,7 +2502,7 @@ _0238C550:
b _0238C7E4
_0238C58C:
bl ov21_0238C920
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0x3a
ldr r0, [r0]
str r1, [r0]
@@ -2513,11 +2513,11 @@ _0238C5A8:
bl sub_0202E6E4
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x85]
bl sub_0202E6C8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r2, #1
ldr r1, [r0]
mov r0, #0x3b
@@ -2570,7 +2570,7 @@ _0238C674:
b _0238C7E4
_0238C67C:
bl sub_0203F990
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x85]
@@ -2579,22 +2579,22 @@ _0238C694:
ldr r0, [r1, #0x914]
bl sub_0203FD80
bl sub_020407C0
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x82]
bl sub_020308A0
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x82]
b _0238C7E4
_0238C6C4:
bl sub_02041A00
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x85]
bl sub_0202E6C8
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x85]
@@ -2612,7 +2612,7 @@ _0238C700:
_0238C708:
ldr r0, [r1, #4]
bl ov21_0238A140
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #0
ldr r0, [r0]
str r1, [r0, #8]
@@ -2621,7 +2621,7 @@ _0238C724:
bl ov00_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r2, [r0]
ldr r1, [r2, #8]
add r1, r1, #1
@@ -2636,7 +2636,7 @@ _0238C724:
mov r1, #0
bl ov11_022E8124
bl ov00_0230D92C
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
str r2, [r1, #4]
@@ -2647,7 +2647,7 @@ _0238C788:
bl ov00_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldr r0, [r0, #4]
bl ov21_0238A140
@@ -2661,11 +2661,11 @@ _0238C7B4:
bl IsDBoxActive
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl ShowDBox
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldr r0, [r0, #4]
bl ov21_0238A140
@@ -2674,18 +2674,18 @@ _0238C7E4:
_0238C7E8:
cmp r0, #3
bne _0238C914
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #2
ldr r1, [r0]
str r2, [r1, #0x2c]
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl sub_0202F2C4
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x81]
bl HidePortraitBox
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl sub_0202836C
@@ -2696,7 +2696,7 @@ _0238C830:
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
bl FreeDBox
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x81]
bl FreePortraitBox
@@ -2707,7 +2707,7 @@ _0238C858:
beq _0238C914
mov r0, #1
bl ov11_022E6E8C
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x2c]
@@ -2718,7 +2718,7 @@ _0238C880:
beq _0238C914
mov r0, #2
bl ov11_022E6E8C
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x2c]
@@ -2729,13 +2729,13 @@ _0238C8A8:
beq _0238C914
mov r0, #3
bl ov11_022E6E8C
ldr r0, _0238C8D0 ; =_0238CF40
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x2c]
b _0238C914
.align 2, 0
_0238C8D0: .word _0238CF40
_0238C8D0: .word ov21_0238CF40
_0238C8D4: .word 0x00003F02
_0238C8D8: .word 0x00001308
_0238C8DC: .word 0x00003018
@@ -2744,7 +2744,7 @@ _0238C8E4: .word 0x0238CF1C
_0238C8E8:
bl ov11_022E6EC8
cmp r0, #0
ldrne r0, _0238C8D0 ; =_0238CF40
ldrne r0, _0238C8D0 ; =ov21_0238CF40
movne r1, #1
ldrne r0, [r0]
strne r1, [r0, #0x2c]
@@ -2764,40 +2764,40 @@ _0238C918:
arm_func_start ov21_0238C920
ov21_0238C920: ; 0x0238C920
stmdb sp!, {r3, lr}
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #0x84]
cmp r0, r1
beq _0238C960
bl sub_0202836C
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x84]
bl sub_0202F8FC
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x84]
_0238C960:
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
cmp r0, r1
ldmeqia sp!, {r3, pc}
bl sub_0202836C
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
bl FreeNormalMenu
ldr r0, _0238C9A0 ; =_0238CF40
ldr r0, _0238C9A0 ; =ov21_0238CF40
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x83]
ldmia sp!, {r3, pc}
.align 2, 0
_0238C9A0: .word _0238CF40
_0238C9A0: .word ov21_0238CF40
arm_func_end ov21_0238C920
arm_func_start ov21_0238C9A4
@@ -2922,6 +2922,6 @@ _0238CA24: .word 0x00000225
.byte 0x56, 0x5D, 0x5B, 0x67, 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00
.data
_0238CF40:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov21_0238CF40
ov21_0238CF40:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

90
asm/overlay_22.s
View File

@@ -15,7 +15,7 @@ ov22_0238A140: ; 0x0238A140
ov22_0238A150: ; 0x0238A150
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r0, _0238A210 ; =_0238EC60
ldr r0, _0238A210 ; =ov22_0238EC60
ldr r2, _0238A214 ; =0x0000032D
ldr r1, [r0, #4]
mov r3, #0x10
@@ -27,7 +27,7 @@ ov22_0238A150: ; 0x0238A150
mov r0, #0x12
str r2, [r1, #4]
bl Arm9LoadUnkFieldNa0x2029EC8
ldr r2, _0238A210 ; =_0238EC60
ldr r2, _0238A210 ; =ov22_0238EC60
ldr r1, _0238A218 ; =ov22_0238A67C
ldr ip, [r2, #4]
mov r3, #8
@@ -42,27 +42,27 @@ ov22_0238A150: ; 0x0238A150
ldr r2, [r2, #4]
ldr r3, _0238A224 ; =0x0238A640
bl sub_0202C3A8
ldr r2, _0238A210 ; =_0238EC60
ldr r2, _0238A210 ; =ov22_0238EC60
mov r1, #0x76
ldr r3, [r2, #4]
strb r0, [r3, #0x98]
ldr r0, [r2, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202C5F4
ldr r0, _0238A210 ; =_0238EC60
ldr r0, _0238A210 ; =ov22_0238EC60
ldr r1, _0238A228 ; =0x0238A774
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202C7D0
mov r0, #0
bl sub_0204440C
ldr r0, _0238A210 ; =_0238EC60
ldr r0, _0238A210 ; =ov22_0238EC60
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_0238A210: .word _0238EC60
_0238A210: .word ov22_0238EC60
_0238A214: .word 0x0000032D
_0238A218: .word ov22_0238A67C
_0238A21C: .word 0x0238E81C
@@ -79,7 +79,7 @@ ov22_0238A22C: ; 0x0238A22C
arm_func_start ov22_0238A230
ov22_0238A230: ; 0x0238A230
stmdb sp!, {r3, lr}
ldr r0, _0238A2A8 ; =_0238EC60
ldr r0, _0238A2A8 ; =ov22_0238EC60
ldr r0, [r0, #4]
cmp r0, #0
moveq r0, #0
@@ -88,19 +88,19 @@ ov22_0238A230: ; 0x0238A230
bl sub_0202C728
cmp r0, #0
bne _0238A284
ldr r0, _0238A2A8 ; =_0238EC60
ldr r0, _0238A2A8 ; =ov22_0238EC60
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202C75C
mvn r1, #0
cmp r0, r1
ldrne r1, _0238A2A8 ; =_0238EC60
ldrne r1, _0238A2A8 ; =ov22_0238EC60
moveq r0, #2
strneh r0, [r1]
movne r0, #3
ldmia sp!, {r3, pc}
_0238A284:
ldr r0, _0238A2A8 ; =_0238EC60
ldr r0, _0238A2A8 ; =ov22_0238EC60
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202C748
@@ -110,17 +110,17 @@ _0238A284:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_0238A2A8: .word _0238EC60
_0238A2A8: .word ov22_0238EC60
arm_func_end ov22_0238A230
arm_func_start ov22_0238A2AC
ov22_0238A2AC: ; 0x0238A2AC
ldr r0, _0238A2BC ; =_0238EC60
ldr r0, _0238A2BC ; =ov22_0238EC60
ldrsh r0, [r0]
and r0, r0, #0xff
bx lr
.align 2, 0
_0238A2BC: .word _0238EC60
_0238A2BC: .word ov22_0238EC60
arm_func_end ov22_0238A2AC
arm_func_start ov22_0238A2C0
@@ -129,32 +129,32 @@ ov22_0238A2C0: ; 0x0238A2C0
mov r0, #0x398
mov r1, #8
bl MemAlloc
ldr r1, _0238A2F0 ; =_0238EC60
ldr r1, _0238A2F0 ; =ov22_0238EC60
str r0, [r1, #4]
bl ov22_0238A320
ldr r0, _0238A2F0 ; =_0238EC60
ldr r0, _0238A2F0 ; =ov22_0238EC60
mvn r1, #1
ldr r0, [r0, #4]
strb r1, [r0, #0x98]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A2F0: .word _0238EC60
_0238A2F0: .word ov22_0238EC60
arm_func_end ov22_0238A2C0
arm_func_start ov22_0238A2F4
ov22_0238A2F4: ; 0x0238A2F4
stmdb sp!, {r3, lr}
ldr r0, _0238A31C ; =_0238EC60
ldr r0, _0238A31C ; =ov22_0238EC60
ldr r0, [r0, #4]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238A31C ; =_0238EC60
ldr r0, _0238A31C ; =ov22_0238EC60
mov r1, #0
str r1, [r0, #4]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A31C: .word _0238EC60
_0238A31C: .word ov22_0238EC60
arm_func_end ov22_0238A2F4
arm_func_start ov22_0238A320
@@ -162,7 +162,7 @@ ov22_0238A320: ; 0x0238A320
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x64
mov r3, #0
ldr r0, _0238A4C0 ; =_0238EC60
ldr r0, _0238A4C0 ; =ov22_0238EC60
mov r2, r3
_0238A334:
ldr r1, [r0, #4]
@@ -173,7 +173,7 @@ _0238A334:
blt _0238A334
bl sub_02010830
mov sl, #0
ldr r4, _0238A4C0 ; =_0238EC60
ldr r4, _0238A4C0 ; =ov22_0238EC60
mov r8, #3
ldr r1, [r4, #4]
mov r7, #1
@@ -264,7 +264,7 @@ _0238A488:
blt _0238A378
mov r2, #0
add r1, r1, sl, lsl #3
ldr r0, _0238A4C0 ; =_0238EC60
ldr r0, _0238A4C0 ; =ov22_0238EC60
str r2, [r1, #0xa0]
ldr r0, [r0, #4]
sub r1, r2, #1
@@ -273,14 +273,14 @@ _0238A488:
add sp, sp, #0x64
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_0238A4C0: .word _0238EC60
_0238A4C0: .word ov22_0238EC60
_0238A4C4: .word 0x0238E82C
_0238A4C8: .word 0x0238E834
arm_func_end ov22_0238A468
arm_func_start ov22_0238A4CC
ov22_0238A4CC: ; 0x0238A4CC
ldr r1, _0238A504 ; =_0238EC60
ldr r1, _0238A504 ; =ov22_0238EC60
mov r0, #0
ldr r3, [r1, #4]
mov r2, r0
@@ -297,12 +297,12 @@ _0238A4F8:
blt _0238A4E4
bx lr
.align 2, 0
_0238A504: .word _0238EC60
_0238A504: .word ov22_0238EC60
arm_func_end ov22_0238A4CC
arm_func_start ov22_0238A508
ov22_0238A508: ; 0x0238A508
ldr r1, _0238A540 ; =_0238EC60
ldr r1, _0238A540 ; =ov22_0238EC60
mov r0, #0
ldr r2, [r1, #4]
ldr r3, [r2, #0x9c]
@@ -319,12 +319,12 @@ _0238A530:
mvn r0, #0
bx lr
.align 2, 0
_0238A540: .word _0238EC60
_0238A540: .word ov22_0238EC60
arm_func_end ov22_0238A508
arm_func_start ov22_0238A544
ov22_0238A544: ; 0x0238A544
ldr r1, _0238A584 ; =_0238EC60
ldr r1, _0238A584 ; =ov22_0238EC60
mov r0, #0
ldr r3, [r1, #4]
mov r2, r0
@@ -343,7 +343,7 @@ _0238A578:
blt _0238A55C
bx lr
.align 2, 0
_0238A584: .word _0238EC60
_0238A584: .word ov22_0238EC60
arm_func_end ov22_0238A544
arm_func_start ov22_0238A588
@@ -355,7 +355,7 @@ ov22_0238A588: ; 0x0238A588
bl SpecialProcAddItemToBag
and r0, r4, #0xff
bl sub_0201086C
ldr r0, _0238A5C8 ; =_0238EC60
ldr r0, _0238A5C8 ; =ov22_0238EC60
ldr r0, [r0, #4]
add r0, r0, r4, lsl #2
ldr r0, [r0, #0x370]
@@ -365,7 +365,7 @@ ov22_0238A588: ; 0x0238A588
bl ov22_0238A320
ldmia sp!, {r4, pc}
.align 2, 0
_0238A5C8: .word _0238EC60
_0238A5C8: .word ov22_0238EC60
arm_func_end ov22_0238A588
arm_func_start ov22_0238A5CC
@@ -373,7 +373,7 @@ ov22_0238A5CC: ; 0x0238A5CC
stmdb sp!, {r4, r5, r6, lr}
mov r4, #0
mov r5, r4
ldr r6, _0238A63C ; =_0238EC60
ldr r6, _0238A63C ; =ov22_0238EC60
b _0238A618
_0238A5E0:
add r0, r1, r5
@@ -402,12 +402,12 @@ _0238A618:
bl ov22_0238A320
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0238A63C: .word _0238EC60
_0238A63C: .word ov22_0238EC60
arm_func_end ov22_0238A5CC
arm_func_start ov22_0238A640
ov22_0238A640: ; 0x0238A640
ldr r0, _0238A678 ; =_0238EC60
ldr r0, _0238A678 ; =ov22_0238EC60
ldr r0, [r0, #4]
add r0, r0, r1
ldrb r0, [r0, #0x390]
@@ -415,14 +415,14 @@ ov22_0238A640: ; 0x0238A640
movne r0, #1
moveq r0, #0
str r0, [r2]
ldr r2, _0238A678 ; =_0238EC60
ldr r2, _0238A678 ; =ov22_0238EC60
mov r0, #0x50
ldr r2, [r2, #4]
add r2, r2, #0xe8
mla r0, r1, r0, r2
bx lr
.align 2, 0
_0238A678: .word _0238EC60
_0238A678: .word ov22_0238EC60
arm_func_end ov22_0238A640
arm_func_start ov22_0238A67C
@@ -431,11 +431,11 @@ ov22_0238A67C: ; 0x0238A67C
tst r0, #0x400
mov r4, #0
beq _0238A730
ldr r0, _0238A770 ; =_0238EC60
ldr r0, _0238A770 ; =ov22_0238EC60
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202C748
ldr r1, _0238A770 ; =_0238EC60
ldr r1, _0238A770 ; =ov22_0238EC60
mov r5, r0
ldr r0, [r1, #4]
add r2, r0, #0x390
@@ -460,7 +460,7 @@ _0238A6D0:
cmp r6, #0
bne _0238A728
_0238A6F8:
ldr r0, _0238A770 ; =_0238EC60
ldr r0, _0238A770 ; =ov22_0238EC60
ldr r0, [r0, #4]
add r2, r0, r5
ldrb r0, [r2, #0x368]
@@ -479,14 +479,14 @@ _0238A730:
bl ov22_0238A4CC
cmp r0, #0
ble _0238A754
ldr r0, _0238A770 ; =_0238EC60
ldr r0, _0238A770 ; =ov22_0238EC60
mov r1, #1
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
bl sub_0202D16C
b _0238A768
_0238A754:
ldr r0, _0238A770 ; =_0238EC60
ldr r0, _0238A770 ; =ov22_0238EC60
mov r1, #0
ldr r0, [r0, #4]
ldrsb r0, [r0, #0x98]
@@ -495,7 +495,7 @@ _0238A768:
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0238A770: .word _0238EC60
_0238A770: .word ov22_0238EC60
arm_func_end ov22_0238A67C
arm_func_start ov22_0238A774
@@ -5117,6 +5117,6 @@ _0238E818: .word 0x0238EC70
.byte 0x43, 0x68, 0x61, 0x6E, 0x67, 0x65, 0x4A, 0x6F, 0x62, 0x0A, 0x00, 0x00
.data
_0238EC60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov22_0238EC60
ov22_0238EC60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

506
asm/overlay_23.s
View File

File diff suppressed because it is too large Load Diff

406
asm/overlay_24.s
View File

File diff suppressed because it is too large Load Diff

214
asm/overlay_25.s
View File

@@ -6,7 +6,7 @@
arm_func_start ov25_0238A140
ov25_0238A140: ; 0x0238A140
stmdb sp!, {r3, lr}
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r2, [r0]
ldr r1, [r2]
cmp r1, #0x1f
@@ -53,7 +53,7 @@ _0238A1DC:
bne _0238A674
mov r0, #0x1a
bl ov25_0238A694
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
@@ -67,7 +67,7 @@ _0238A210:
beq _0238A248
b _0238A260
_0238A228:
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r3, #0x1f
ldr r2, [r0]
mov r1, #1
@@ -76,7 +76,7 @@ _0238A228:
str r1, [r0, #4]
b _0238A674
_0238A248:
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0xc
bl ov11_0230B8C0
@@ -95,12 +95,12 @@ _0238A260:
ldr r0, _0238A680 ; =0x00003F02
mov r1, #0x100
bl sub_02017C74
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0xc
bl ov11_0230B8C0
bl ov25_0238B380
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r3, #0xf
ldr r2, [r0]
mov r1, #0x1f
@@ -118,19 +118,19 @@ _0238A2C4:
beq _0238A310
cmp r0, #7
bne _0238A674
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0x10
ldr r0, [r0]
str r1, [r0, #4]
bl ov25_0238B380
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0x1f
ldr r0, [r0]
str r1, [r0]
b _0238A674
_0238A310:
bl ov25_0238B380
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r3, #0xf
ldr r2, [r0]
mov r1, #0x1f
@@ -140,7 +140,7 @@ _0238A310:
b _0238A674
_0238A334:
bl ov25_0238B380
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0xd
ldr r0, [r0]
str r1, [r0]
@@ -152,12 +152,12 @@ _0238A350:
bl sub_0202E6E4
cmp r0, #0
bne _0238A674
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x3b]
bl sub_0202E6C8
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mvn r2, #1
ldr r1, [r0]
mov r0, #0xd
@@ -203,12 +203,12 @@ _0238A404:
bl IsDBoxActive
cmp r0, #0
bne _0238A674
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl ShowDBox
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r2, #0x20
ldr r1, [r0]
str r2, [r1]
@@ -216,7 +216,7 @@ _0238A404:
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl sub_0202F2C4
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x39]
@@ -231,7 +231,7 @@ ov25_0238A468: ; 0x0238A468
ldrsb r0, [r0, #0x3a]
bl GetNormalMenuResult
cmp r0, #1
ldrne r1, _0238A67C ; =_0238B5E0
ldrne r1, _0238A67C ; =ov25_0238B5E0
ldrne r1, [r1]
strne r0, [r1, #0x14]
cmp r0, #1
@@ -285,7 +285,7 @@ _0238A528:
add r0, r1, #0x100
ldrsb r0, [r0, #0x3c]
bl sub_0202836C
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x3c]
@@ -295,7 +295,7 @@ _0238A528:
_0238A550:
ldr r0, [r1, #4]
bl ov25_0238A694
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0
ldr r0, [r0]
str r1, [r0, #8]
@@ -319,7 +319,7 @@ _0238A59C:
_0238A5A4:
ldr r0, [r1, #4]
bl ov25_0238A694
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0
ldr r0, [r0]
str r1, [r0, #8]
@@ -334,7 +334,7 @@ _0238A5C0:
ldr r2, _0238A68C ; =0x000003E2
add r3, r3, #0x28
bl ShowMessageInDBox
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0x1b
ldr r0, [r0]
str r1, [r0]
@@ -352,7 +352,7 @@ _0238A5F8:
rsb r2, r2, #0x3e4
add r3, r3, #0x28
bl ShowMessageInDBox
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
mov r1, #0x1b
ldr r0, [r0]
str r1, [r0]
@@ -363,12 +363,12 @@ _0238A63C:
bl IsDBoxActive
cmp r0, #0
bne _0238A674
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl ShowDBox
ldr r0, _0238A67C ; =_0238B5E0
ldr r0, _0238A67C ; =ov25_0238B5E0
ldr r0, [r0]
ldr r0, [r0, #4]
bl ov25_0238A694
@@ -376,7 +376,7 @@ _0238A674:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_0238A67C: .word _0238B5E0
_0238A67C: .word ov25_0238B5E0
_0238A680: .word 0x00003F02
_0238A684: .word 0x00001308
_0238A688: .word 0x00003008
@@ -388,7 +388,7 @@ _0238A690: .word 0x00003018
ov25_0238A694: ; 0x0238A694
stmdb sp!, {r3, lr}
sub sp, sp, #0x68
ldr ip, _0238B0D0 ; =_0238B5E0
ldr ip, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [ip]
str r0, [r1]
ldr r1, [ip]
@@ -432,7 +432,7 @@ _0238A734:
mov r0, #0
str r2, [r1, #0x4c]
bl CreateDBox
ldr r3, _0238B0D0 ; =_0238B5E0
ldr r3, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0D4 ; =0x00003008
ldr ip, [r3]
ldr r2, _0238B0D8 ; =0x000003D7
@@ -446,26 +446,26 @@ _0238A734:
mov r1, #3
mov r2, #1
bl CreatePortraitBox
ldr r2, _0238B0D0 ; =_0238B5E0
ldr r2, _0238B0D0 ; =ov25_0238B5E0
mov r1, #0xb2
ldr r3, [r2]
strb r0, [r3, #0x139]
ldr r0, [r2]
add r0, r0, #0x140
bl InitPortraitBoxWithMonsterId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r1, #0
ldr r0, [r0]
add r0, r0, #0x140
bl SetPortraitUnknownAttr
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x140
ldr r1, [r1, #0x20]
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
@@ -476,7 +476,7 @@ _0238A7E4:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r2, _0238B0D0 ; =_0238B5E0
ldr r2, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0E4 ; =0x00300013
ldr r2, [r2]
ldr r3, _0238B0E8 ; =0x0238B4CC
@@ -486,13 +486,13 @@ _0238A7E4:
mov r2, #0
str ip, [sp]
bl CreateNormalMenu
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r1]
strb r0, [r1, #0x13a]
b _0238B0C8
_0238A828:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r2, #0
ldr r1, [r0]
str r2, [r1, #0x20]
@@ -502,13 +502,13 @@ _0238A828:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0D4 ; =0x00003008
ldr r3, [r0]
ldr r2, _0238B0F0 ; =0x000003DD
@@ -519,7 +519,7 @@ _0238A828:
b _0238B0C8
_0238A890:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #1
ldr r1, [r0]
mov r2, #0
@@ -532,13 +532,13 @@ _0238A890:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
mov r2, #0x3e4
@@ -549,7 +549,7 @@ _0238A890:
b _0238B0C8
_0238A904:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r2, #4
ldr r1, [r0]
str r2, [r1, #4]
@@ -559,13 +559,13 @@ _0238A904:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B0F8 ; =0x000003E5
@@ -576,7 +576,7 @@ _0238A904:
b _0238B0C8
_0238A96C:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #1
ldr r1, [r0]
mov r2, #0
@@ -589,13 +589,13 @@ _0238A96C:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
mov r2, #0x3d8
@@ -606,7 +606,7 @@ _0238A96C:
b _0238B0C8
_0238A9E0:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #1
ldr r1, [r0]
mov r2, #0
@@ -619,13 +619,13 @@ _0238A9E0:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B0FC ; =0x000003D9
@@ -636,7 +636,7 @@ _0238A9E0:
b _0238B0C8
_0238AA54:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #1
ldr r1, [r0]
mov r2, #0
@@ -649,13 +649,13 @@ _0238AA54:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B0FC ; =0x000003D9
@@ -666,7 +666,7 @@ _0238AA54:
b _0238B0C8
_0238AAC8:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #1
ldr r1, [r0]
mov r2, #0
@@ -679,13 +679,13 @@ _0238AAC8:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
mov r2, #0x3e0
@@ -696,7 +696,7 @@ _0238AAC8:
b _0238B0C8
_0238AB3C:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r2, #0x96
ldr r1, [r0]
mov r3, #1
@@ -712,13 +712,13 @@ _0238AB3C:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
mov r2, #0x3e0
@@ -729,7 +729,7 @@ _0238AB3C:
b _0238B0C8
_0238ABBC:
bl ov25_0238B380
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r2, #0xc
ldr r1, [r0]
mov r3, #0x19
@@ -745,7 +745,7 @@ _0238ABBC:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
@@ -767,13 +767,13 @@ _0238AC1C:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0D4 ; =0x00003008
ldr r3, [r0]
ldr r2, _0238B0F0 ; =0x000003DD
@@ -797,13 +797,13 @@ _0238AC90:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B100 ; =0x000003DF
@@ -816,12 +816,12 @@ _0238AD04:
add r0, r1, #0x100
ldrsb r0, [r0, #0x38]
bl ShowDBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl sub_0202F2C4
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x39]
@@ -834,12 +834,12 @@ _0238AD48:
add r0, r1, #0x100
ldrsb r0, [r0, #0x38]
bl ShowDBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl sub_0202F2C4
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x39]
@@ -858,7 +858,7 @@ _0238AD8C:
mov r2, #0
str ip, [sp]
bl CreateNormalMenu
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r1]
strb r0, [r1, #0x13a]
b _0238B0C8
@@ -885,7 +885,7 @@ ov25_0238ADFC: ; 0x0238ADFC
bl PreprocessString
add r0, sp, #0x18
bl InitPreprocessorArgs
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
add r1, sp, #0x18
ldr ip, [r0]
ldr r0, _0238B114 ; =0x0238B594
@@ -904,7 +904,7 @@ ov25_0238ADFC: ; 0x0238ADFC
mov r2, #0
str ip, [sp, #8]
bl sub_0202E3CC
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r1]
strb r0, [r1, #0x13b]
b _0238B0C8
@@ -917,7 +917,7 @@ _0238AE64:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r3, #0x1b
ldr r1, [r0]
mov r2, #0x1d
@@ -929,7 +929,7 @@ _0238AE64:
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0D4 ; =0x00003008
ldr ip, [r0]
mov r2, #0x3dc
@@ -948,7 +948,7 @@ _0238AEF0:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r3, _0238B120 ; =0x0238B4B4
ldr r1, [r1]
mov ip, #2
@@ -958,7 +958,7 @@ _0238AEF0:
mov r2, #0
str ip, [sp]
bl CreateNormalMenu
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r1]
strb r0, [r1, #0x13a]
b _0238B0C8
@@ -980,7 +980,7 @@ _0238AF4C:
_0238AF64:
mvn r0, #0x95
bl AddMoneyCarried
ldr r1, _0238B0D0 ; =_0238B5E0
ldr r1, _0238B0D0 ; =ov25_0238B5E0
add r0, sp, #0x12
ldr ip, [r1]
add r1, sp, #0xc
@@ -993,7 +993,7 @@ _0238AF64:
bl sub_0200D0A0
add r0, sp, #0x12
bl RemoveItemByIdAndStackNoHole
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r1, #0
ldr r0, [r0]
ldrh r0, [r0, #0xe]
@@ -1027,7 +1027,7 @@ _0238B00C:
strb r1, [sp, #0xc]
bl AddItemToBagNoHeld
bl ov11_022DC504
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
mov r2, #0x13
ldr r1, [r0]
mov r3, #6
@@ -1039,7 +1039,7 @@ _0238B00C:
ldr r2, _0238B12C ; =0x0238B498
add r0, r0, #0xb8
bl sub_0200D670
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r2, [r0]
add r1, r2, #0xb8
str r1, [r2, #0x60]
@@ -1055,13 +1055,13 @@ _0238B00C:
mov r1, r1, lsl #0x18
mov r1, r1, asr #0x18
bl SetPortraitExpressionId
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, [r0]
add r0, r1, #0x100
ldrsb r0, [r0, #0x39]
add r1, r1, #0x140
bl ShowPortraitBox
ldr r0, _0238B0D0 ; =_0238B5E0
ldr r0, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0F4 ; =0x00003018
ldr r3, [r0]
ldr r2, _0238B130 ; =0x000003E1
@@ -1073,7 +1073,7 @@ _0238B0C8:
add sp, sp, #0x68
ldmia sp!, {r3, pc}
.align 2, 0
_0238B0D0: .word _0238B5E0
_0238B0D0: .word ov25_0238B5E0
_0238B0D4: .word 0x00003008
_0238B0D8: .word 0x000003D7
_0238B0DC: .word 0x0238B4A4
@@ -1106,7 +1106,7 @@ ov25_0238B134: ; 0x0238B134
mov r0, #0x150
mov r1, #6
bl MemAlloc
ldr r1, _0238B1C8 ; =_0238B5E0
ldr r1, _0238B1C8 ; =ov25_0238B5E0
mov r3, #0
str r0, [r1]
str r3, [r0, #0x14]
@@ -1122,7 +1122,7 @@ ov25_0238B134: ; 0x0238B134
ldr r0, [r1]
add r0, r0, #0x28
bl InitPreprocessorArgs
ldr r0, _0238B1C8 ; =_0238B5E0
ldr r0, _0238B1C8 ; =ov25_0238B5E0
mov r3, #0xb2
ldr r2, [r0]
mov r1, #0
@@ -1132,7 +1132,7 @@ ov25_0238B134: ; 0x0238B134
ldr r0, [r0]
str r1, [r0, #8]
bl ov11_0230C910
ldr r1, _0238B1C8 ; =_0238B5E0
ldr r1, _0238B1C8 ; =ov25_0238B5E0
mov r0, #0
ldr r1, [r1]
str r0, [r1, #0x20]
@@ -1140,29 +1140,29 @@ ov25_0238B134: ; 0x0238B134
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238B1C8: .word _0238B5E0
_0238B1C8: .word ov25_0238B5E0
arm_func_end ov25_0238B134
arm_func_start ov25_0238B1CC
ov25_0238B1CC: ; 0x0238B1CC
stmdb sp!, {r3, lr}
ldr r0, _0238B1F4 ; =_0238B5E0
ldr r0, _0238B1F4 ; =ov25_0238B5E0
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238B1F4 ; =_0238B5E0
ldr r0, _0238B1F4 ; =ov25_0238B5E0
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238B1F4: .word _0238B5E0
_0238B1F4: .word ov25_0238B5E0
arm_func_end ov25_0238B1CC
arm_func_start ov25_0238B1F8
ov25_0238B1F8: ; 0x0238B1F8
stmdb sp!, {r3, lr}
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
ldr r2, [r0]
ldr r1, [r2, #0x24]
cmp r1, #8
@@ -1187,7 +1187,7 @@ _0238B248:
bl ov25_0238A140
cmp r0, #3
bne _0238B374
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
mov r2, #2
ldr r1, [r0]
str r2, [r1, #0x24]
@@ -1195,12 +1195,12 @@ _0238B248:
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl sub_0202F2C4
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x39]
bl HidePortraitBox
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
@@ -1212,7 +1212,7 @@ _0238B2A0:
beq _0238B374
mov r0, #1
bl ov11_022E6E8C
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x24]
@@ -1223,7 +1223,7 @@ _0238B2C8:
beq _0238B374
mov r0, #2
bl ov11_022E6E8C
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x24]
@@ -1234,7 +1234,7 @@ _0238B2F0:
beq _0238B374
mov r0, #3
bl ov11_022E6E8C
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
mov r1, #4
ldr r0, [r0]
str r1, [r0, #0x24]
@@ -1246,7 +1246,7 @@ _0238B318:
add r0, r0, #0x100
ldrsb r0, [r0, #0x38]
bl FreeDBox
ldr r0, _0238B37C ; =_0238B5E0
ldr r0, _0238B37C ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x39]
@@ -1255,7 +1255,7 @@ _0238B318:
_0238B348:
bl ov11_022E6EC8
cmp r0, #0
ldrne r0, _0238B37C ; =_0238B5E0
ldrne r0, _0238B37C ; =ov25_0238B5E0
movne r1, #1
ldrne r0, [r0]
strne r1, [r0, #0x24]
@@ -1269,13 +1269,13 @@ _0238B374:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238B37C: .word _0238B5E0
_0238B37C: .word ov25_0238B5E0
arm_func_end ov25_0238B1F8
arm_func_start ov25_0238B380
ov25_0238B380: ; 0x0238B380
stmdb sp!, {r3, lr}
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
mvn r1, #1
ldr r0, [r0]
add r0, r0, #0x100
@@ -1283,17 +1283,17 @@ ov25_0238B380: ; 0x0238B380
cmp r0, r1
beq _0238B3C8
bl sub_0202836C
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x3a]
bl FreeNormalMenu
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x13a]
_0238B3C8:
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
mvn r1, #1
ldr r0, [r0]
add r0, r0, #0x100
@@ -1301,18 +1301,18 @@ _0238B3C8:
cmp r0, r1
ldmeqia sp!, {r3, pc}
bl sub_0202836C
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
ldr r0, [r0]
add r0, r0, #0x100
ldrsb r0, [r0, #0x3d]
bl sub_0202F8FC
ldr r0, _0238B410 ; =_0238B5E0
ldr r0, _0238B410 ; =ov25_0238B5E0
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x13d]
ldmia sp!, {r3, pc}
.align 2, 0
_0238B410: .word _0238B5E0
_0238B410: .word ov25_0238B5E0
arm_func_end ov25_0238B380
arm_func_start ov25_0238B414
@@ -1375,6 +1375,6 @@ _0238B494: .word 0x00000225
.byte 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00
.data
_0238B5E0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B5E0
ov25_0238B5E0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

104
asm/overlay_26.s
View File

@@ -35,7 +35,7 @@ _0238A1A8:
mov r0, #0x9c
mov r1, #8
bl MemAlloc
ldr r1, _0238A530 ; =_0238AF60
ldr r1, _0238A530 ; =ov26_0238AF60
mov r4, #0
str r0, [r1]
str r4, [r0]
@@ -52,15 +52,15 @@ _0238A1A8:
mov r0, r4
mov r1, #0x69
bl SaveScriptVariableValue
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r0, [r0]
ldr r0, [r0, #0x90]
bl sub_0205F9D4
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r0, [r0]
add r0, r0, #8
bl InitPreprocessorArgs
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
mov r2, r4
ldr r3, [r0]
ldr r1, [r3, #0x90]
@@ -79,12 +79,12 @@ _0238A1A8:
ldr r0, [r0]
add r0, r0, #0x60
bl sub_0206351C
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r1, [r0]
ldr r0, [r1, #0x90]
add r1, r1, #0x60
bl sub_02062E5C
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
mov r3, #2
ldr r1, [r0]
mov r2, r4
@@ -107,7 +107,7 @@ _0238A2B8:
ldrsh r0, [sp, #6]
bl IncrementExclusiveMonsterCounts
_0238A2CC:
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r1, [r0]
ldr r2, [r1, #0x90]
ldrb r2, [r2, #1]
@@ -181,7 +181,7 @@ _0238A3A0:
ldr r0, [r0, #0x98]
and r0, r0, #0xff
bl SetChallengeLetterCleared
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r2, [r0]
ldr r1, [r2, #0x98]
cmp r1, #0
@@ -194,7 +194,7 @@ _0238A3A0:
ldr r0, [r0]
add r0, r0, #0x60
bl sub_0206351C
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r2, [r0]
ldr r1, [r2, #0x90]
ldrsh r1, [r1, #0xe]
@@ -213,7 +213,7 @@ _0238A3A0:
bhi _0238A458
add r0, r1, #4
bl GetOutlawLeaderLevel
ldr r1, _0238A530 ; =_0238AF60
ldr r1, _0238A530 ; =ov26_0238AF60
ldr r1, [r1]
str r0, [r1, #0x64]
b _0238A460
@@ -221,7 +221,7 @@ _0238A458:
mov r0, #1
str r0, [r2, #0x64]
_0238A460:
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
mov r1, #0
arm_func_end ov26_0238A140
@@ -233,7 +233,7 @@ ov26_0238A468: ; 0x0238A468
bl IsMonsterOnTeam
cmp r0, #0
beq _0238A4A0
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
mov r3, #0
ldr r2, [r0]
mov r1, #0x3e8
@@ -242,7 +242,7 @@ ov26_0238A468: ; 0x0238A468
str r1, [r0, #0x68]
b _0238A50C
_0238A4A0:
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
mov r1, #6
ldr r3, [r0]
ldr r2, [r3, #0x90]
@@ -255,7 +255,7 @@ _0238A4C4:
add r0, r1, #0x60
ldr r4, [r1, #0x88]
bl sub_0206351C
ldr r0, _0238A530 ; =_0238AF60
ldr r0, _0238A530 ; =ov26_0238AF60
ldr r2, _0238A560 ; =0x000001E3
ldr r1, [r0]
mov r3, #0
@@ -272,7 +272,7 @@ _0238A504:
ldr r0, _0238A564 ; =0x0238AE26
str r0, [r1, #0x94]
_0238A50C:
ldr r1, _0238A530 ; =_0238AF60
ldr r1, _0238A530 ; =ov26_0238AF60
mvn r3, #1
ldr r2, [r1]
mov r0, #1
@@ -283,7 +283,7 @@ _0238A528:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0238A530: .word _0238AF60
_0238A530: .word ov26_0238AF60
_0238A534: .word 0x0238AE92
_0238A538: .word 0x0238AE86
_0238A53C: .word 0x0238AE7A
@@ -302,27 +302,27 @@ _0238A564: .word 0x0238AE26
arm_func_start ov26_0238A568
ov26_0238A568: ; 0x0238A568
stmdb sp!, {r3, lr}
ldr r0, _0238A59C ; =_0238AF60
ldr r0, _0238A59C ; =ov26_0238AF60
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl ov26_0238A90C
ldr r0, _0238A59C ; =_0238AF60
ldr r0, _0238A59C ; =ov26_0238AF60
ldr r0, [r0]
bl MemFree
ldr r0, _0238A59C ; =_0238AF60
ldr r0, _0238A59C ; =ov26_0238AF60
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A59C: .word _0238AF60
_0238A59C: .word ov26_0238AF60
arm_func_end ov26_0238A568
arm_func_start ov26_0238A5A0
ov26_0238A5A0: ; 0x0238A5A0
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x10
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r1, [r0]
ldr r0, [r1]
cmp r0, #7
@@ -346,12 +346,12 @@ _0238A5E0:
cmp r0, #0
bne _0238A8EC
_0238A5FC:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r1, #0
ldr r0, [r0]
str r1, [r0]
_0238A60C:
ldr r1, _0238A8F8 ; =_0238AF60
ldr r1, _0238A8F8 ; =ov26_0238AF60
ldr r2, [r1]
ldr r7, [r2, #0x94]
add r0, r7, #6
@@ -380,7 +380,7 @@ _0238A660: ; jump table
b _0238A6FC ; case 4
b _0238A720 ; case 5
_0238A678:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r2, _0238A900 ; =0x0001003C
ldr r1, [r0]
mov r0, #0x3c
@@ -389,7 +389,7 @@ _0238A678:
mov r5, r0
b _0238A74C
_0238A698:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r2, _0238A904 ; =0x0001003D
ldr r1, [r0]
mov r0, #0x3d
@@ -398,7 +398,7 @@ _0238A698:
mov r5, r0
b _0238A74C
_0238A6B8:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r2, _0238A908 ; =0x0001003F
ldr r1, [r0]
mov r0, #0x3f
@@ -407,7 +407,7 @@ _0238A6B8:
mov r5, r0
b _0238A74C
_0238A6D8:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r2, [r0]
ldr r1, [r2, #0x90]
ldrsh r1, [r1, #0xe]
@@ -417,7 +417,7 @@ _0238A6D8:
ldrsh r5, [r0, #0xe]
b _0238A74C
_0238A6FC:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldr r2, [r0]
ldr r1, [r2, #0x90]
ldrsh r1, [r1, #0x10]
@@ -427,14 +427,14 @@ _0238A6FC:
ldrsh r5, [r0, #0x10]
b _0238A74C
_0238A720:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r1, #0x60000
ldr r0, [r0]
mov r6, #0
str r1, [r0, #0x54]
b _0238A74C
_0238A738:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r1, #0x70000
ldr r0, [r0]
mov r6, #0
@@ -447,7 +447,7 @@ _0238A74C:
add r0, sp, #0
mov r1, r5
bl InitPortraitBoxWithMonsterId
ldr r1, _0238A8F8 ; =_0238AF60
ldr r1, _0238A8F8 ; =ov26_0238AF60
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #5]
@@ -457,17 +457,17 @@ _0238A74C:
mov r1, #3
mov r2, #1
bl CreatePortraitBox
ldr r1, _0238A8F8 ; =_0238AF60
ldr r1, _0238A8F8 ; =ov26_0238AF60
ldr r1, [r1]
strb r0, [r1, #5]
_0238A79C:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
add r1, sp, #0
ldr r0, [r0]
ldrsb r0, [r0, #5]
bl ShowPortraitBox
_0238A7B0:
ldr r1, _0238A8F8 ; =_0238AF60
ldr r1, _0238A8F8 ; =ov26_0238AF60
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #4]
@@ -475,11 +475,11 @@ _0238A7B0:
bne _0238A7DC
mov r0, #0
bl CreateDBox
ldr r1, _0238A8F8 ; =_0238AF60
ldr r1, _0238A8F8 ; =ov26_0238AF60
ldr r1, [r1]
strb r0, [r1, #4]
_0238A7DC:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
ldrh r1, [r7, #2]
ldr r3, [r0]
mov r2, r4
@@ -489,11 +489,11 @@ _0238A7DC:
mov r0, #1
_0238A7FC:
cmp r0, #0
ldrne r0, _0238A8F8 ; =_0238AF60
ldrne r0, _0238A8F8 ; =ov26_0238AF60
movne r1, #1
ldrne r0, [r0]
strne r1, [r0]
ldreq r0, _0238A8F8 ; =_0238AF60
ldreq r0, _0238A8F8 ; =ov26_0238AF60
moveq r1, #2
ldreq r0, [r0]
streq r1, [r0]
@@ -508,7 +508,7 @@ _0238A824:
bne _0238A8EC
_0238A840:
bl ov26_0238A90C
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r3, #0xa
ldr r2, [r0]
mov r1, #3
@@ -525,27 +525,27 @@ _0238A864:
mov r0, #4
str r0, [r1]
_0238A880:
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r2, #0
ldr r0, [r0]
ldr r1, [r0, #0x5c]
add r0, r0, #0x60
bl sub_0203D438
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r1, #5
ldr r0, [r0]
str r1, [r0]
_0238A8A8:
bl sub_0203D538
cmp r0, #1
ldreq r0, _0238A8F8 ; =_0238AF60
ldreq r0, _0238A8F8 ; =ov26_0238AF60
moveq r1, #6
ldreq r0, [r0]
streq r1, [r0]
b _0238A8EC
_0238A8C4:
bl sub_0203EFD4
ldr r0, _0238A8F8 ; =_0238AF60
ldr r0, _0238A8F8 ; =ov26_0238AF60
mov r1, #7
ldr r0, [r0]
str r1, [r0]
@@ -561,7 +561,7 @@ _0238A8F0:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0238A8F8: .word _0238AF60
_0238A8F8: .word ov26_0238AF60
_0238A8FC: .word 0x0000026D
_0238A900: .word 0x0001003C
_0238A904: .word 0x0001003D
@@ -571,32 +571,32 @@ _0238A908: .word 0x0001003F
arm_func_start ov26_0238A90C
ov26_0238A90C: ; 0x0238A90C
stmdb sp!, {r3, lr}
ldr r0, _0238A96C ; =_0238AF60
ldr r0, _0238A96C ; =ov26_0238AF60
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #4]
cmp r0, r1
beq _0238A93C
bl FreeDBox
ldr r0, _0238A96C ; =_0238AF60
ldr r0, _0238A96C ; =ov26_0238AF60
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #4]
_0238A93C:
ldr r0, _0238A96C ; =_0238AF60
ldr r0, _0238A96C ; =ov26_0238AF60
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #5]
cmp r0, r1
ldmeqia sp!, {r3, pc}
bl FreePortraitBox
ldr r0, _0238A96C ; =_0238AF60
ldr r0, _0238A96C ; =ov26_0238AF60
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #5]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A96C: .word _0238AF60
_0238A96C: .word ov26_0238AF60
arm_func_end ov26_0238A90C
arm_func_start ov26_0238A970
@@ -1010,6 +1010,6 @@ _0238AE1C: .word 0x0238AF70
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00
.data
_0238AF60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov26_0238AF60
ov26_0238AF60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

100
asm/overlay_27.s
View File

@@ -10,20 +10,20 @@ ov27_0238A140: ; 0x0238A140
ldr r0, _0238A37C ; =0x02324DB8
ldr r1, [r0]
cmp r1, #0
ldrne r0, _0238A380 ; =_0238CE80
ldrne r0, _0238A380 ; =ov27_0238CE80
strne r1, [r0]
bne _0238A370
ldr r0, _0238A384 ; =0x000008D4
mov r1, #8
bl MemAlloc
ldr r3, _0238A380 ; =_0238CE80
ldr r3, _0238A380 ; =ov27_0238CE80
ldr r2, _0238A37C ; =0x02324DB8
add r1, r0, #0x3c
str r0, [r3]
str r0, [r2]
add r0, r1, #0x800
bl sub_02034A38
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
mov r3, #0
ldr r4, [r1]
sub r2, r3, #2
@@ -38,18 +38,18 @@ ov27_0238A140: ; 0x0238A140
strb r2, [r0, #9]
bl ov27_0238A8EC
bl GetGold
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r1, [r1]
str r0, [r1, #0xc]
bl sub_0201070C
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r2, [r1]
str r0, [r2, #0x10]
ldr r0, [r1]
ldr r0, [r0, #0xc]
bl sub_02010758
bl sub_0201070C
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r2, [r1]
str r0, [r2, #0x14]
ldr r3, [r1]
@@ -62,15 +62,15 @@ ov27_0238A140: ; 0x0238A140
rsb r0, r0, #0
bl AddMoneyCarried
bl GetNbItemsInBag
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r1, [r1]
str r0, [r1, #0x1c]
bl sub_0200FD48
ldr r1, _0238A380 ; =_0238CE80
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r1, [r1]
str r0, [r1, #0x20]
bl sub_0200FD78
ldr r7, _0238A380 ; =_0238CE80
ldr r7, _0238A380 ; =ov27_0238CE80
mov r6, #0
ldr r1, [r7]
str r0, [r1, #0x24]
@@ -105,7 +105,7 @@ _0238A2B8:
cmp r6, #0x3e8
blt _0238A274
_0238A2C0:
ldr r0, _0238A380 ; =_0238CE80
ldr r0, _0238A380 ; =ov27_0238CE80
ldr r3, [r0]
ldr r4, [r3, #0x1c]
ldr r0, [r3, #0x28]
@@ -148,7 +148,7 @@ _0238A348:
_0238A350:
bl RemoveEmptyItemsInBag
_0238A354:
ldr r0, _0238A380 ; =_0238CE80
ldr r0, _0238A380 ; =ov27_0238CE80
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x2c]
@@ -162,27 +162,27 @@ _0238A370:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0238A37C: .word 0x02324DB8
_0238A380: .word _0238CE80
_0238A380: .word ov27_0238CE80
_0238A384: .word 0x000008D4
arm_func_end ov27_0238A140
arm_func_start ov27_0238A388
ov27_0238A388: ; 0x0238A388
ldr r0, _0238A3A0 ; =_0238CE80
ldr r0, _0238A3A0 ; =ov27_0238CE80
ldr r1, [r0]
cmp r1, #0
movne r1, #0
strne r1, [r0]
bx lr
.align 2, 0
_0238A3A0: .word _0238CE80
_0238A3A0: .word ov27_0238CE80
arm_func_end ov27_0238A388
arm_func_start ov27_0238A3A4
ov27_0238A3A4: ; 0x0238A3A4
stmdb sp!, {r4, r5, r6, r7, lr}
sub sp, sp, #0x18c
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
ldr ip, [r0]
ldr r1, [ip]
cmp r1, #7
@@ -231,7 +231,7 @@ _0238A448:
mov r1, #0x400
strh r3, [ip, #0x34]
mov r2, #0
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
str r2, [sp]
ldr r0, [r0]
add r2, r1, #0xb8
@@ -241,7 +241,7 @@ _0238A448:
ov27_0238A468: ; 0x0238A468
add r0, r0, #0x38
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r3, #4
ldr r2, [r0]
mov r1, #1
@@ -263,12 +263,12 @@ _0238A490:
add r0, r0, #0x38
add r2, r1, #0xb9
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #4
ldr r0, [r0]
str r1, [r0]
_0238A4D4:
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #2
ldr r0, [r0]
str r1, [r0, #4]
@@ -287,7 +287,7 @@ _0238A4E8:
add r2, r1, #0xba
add r3, r1, #8
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r3, #4
ldr r2, [r0]
mov r1, #6
@@ -310,7 +310,7 @@ _0238A53C:
add r0, r0, #0x38
add r2, r1, #0xbc
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r3, #4
ldr r2, [r0]
mov r1, #3
@@ -333,7 +333,7 @@ _0238A594:
add r0, r0, #0x38
add r2, r1, #0xbb
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r2, #4
ldr r1, [r0]
str r2, [r1]
@@ -351,7 +351,7 @@ _0238A5E8:
add r0, r0, #0x38
add r3, r1, #8
bl PreprocessStringFromMessageId
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r3, #4
ldr r2, [r0]
mov r1, #5
@@ -369,24 +369,24 @@ _0238A63C:
cmp r0, r1
beq _0238A660
bl FreeDBox
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #8]
_0238A660:
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #9]
cmp r0, r1
beq _0238A68C
bl FreePortraitBox
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #9]
_0238A68C:
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #3
ldr r0, [r0]
str r1, [r0]
@@ -407,7 +407,7 @@ _0238A6B8:
stmia r6, {r0, r1}
mov r0, ip
bl MemFree
ldr r2, _0238A8DC ; =_0238CE80
ldr r2, _0238A8DC ; =ov27_0238CE80
mov r1, #0
ldr r0, _0238A8E8 ; =0x02324DB8
str r1, [r2]
@@ -438,7 +438,7 @@ _0238A728:
cmp r0, #0
beq _0238A8D0
_0238A740:
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #0
ldr r3, [r0]
ldr r2, [r3, #0x30]
@@ -463,14 +463,14 @@ _0238A78C:
add r0, sp, #0x54
mov r4, #0
bl InitPreprocessorArgs
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
ldr r0, [r0]
add r0, r0, #0x38
bl sub_0202A66C
cmp r0, #0
bne _0238A7D4
bl ov27_0238A960
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
add r3, sp, #0x54
ldr r2, [r0]
ldrsb r0, [r2, #8]
@@ -480,11 +480,11 @@ _0238A78C:
mov r4, #1
_0238A7D4:
cmp r4, #0
ldrne r0, _0238A8DC ; =_0238CE80
ldrne r0, _0238A8DC ; =ov27_0238CE80
movne r1, #5
ldrne r0, [r0]
strne r1, [r0]
ldreq r0, _0238A8DC ; =_0238CE80
ldreq r0, _0238A8DC ; =ov27_0238CE80
moveq r1, #6
ldreq r0, [r0]
streq r1, [r0]
@@ -492,7 +492,7 @@ _0238A7D4:
_0238A7FC:
bl ov27_0238A928
cmp r0, #0
ldreq r0, _0238A8DC ; =_0238CE80
ldreq r0, _0238A8DC ; =ov27_0238CE80
moveq r1, #6
ldreq r0, [r0]
streq r1, [r0]
@@ -508,7 +508,7 @@ _0238A830:
add r0, sp, #4
mov r4, #0
bl InitPreprocessorArgs
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
ldr r0, [r0]
add r0, r0, #0x38
add r0, r0, #0x400
@@ -516,7 +516,7 @@ _0238A830:
cmp r0, #0
bne _0238A880
bl ov27_0238A960
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
add r3, sp, #4
ldr r1, [r0]
add r2, r1, #0x38
@@ -527,13 +527,13 @@ _0238A830:
mov r4, #1
_0238A880:
cmp r4, #0
ldrne r0, _0238A8DC ; =_0238CE80
ldrne r0, _0238A8DC ; =ov27_0238CE80
movne r1, #7
ldrne r0, [r0]
strne r1, [r0]
bne _0238A8D0
bl ov27_0238A8EC
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -543,7 +543,7 @@ _0238A8B0:
cmp r0, #0
beq _0238A8D0
bl ov27_0238A8EC
ldr r0, _0238A8DC ; =_0238CE80
ldr r0, _0238A8DC ; =ov27_0238CE80
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -553,14 +553,14 @@ _0238A8D4:
add sp, sp, #0x18c
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_0238A8DC: .word _0238CE80
_0238A8DC: .word ov27_0238CE80
_0238A8E0: .word 0x00000408
_0238A8E4: .word 0x00000618
_0238A8E8: .word 0x02324DB8
arm_func_start ov27_0238A8EC
ov27_0238A8EC: ; 0x0238A8EC
ldr r0, _0238A924 ; =_0238CE80
ldr r0, _0238A924 ; =ov27_0238CE80
mov r3, #8
ldr r1, [r0]
mov r2, #0
@@ -575,13 +575,13 @@ ov27_0238A8EC: ; 0x0238A8EC
str r2, [r0, #0x30]
bx lr
.align 2, 0
_0238A924: .word _0238CE80
_0238A924: .word ov27_0238CE80
arm_func_end ov27_0238A8EC
arm_func_start ov27_0238A928
ov27_0238A928: ; 0x0238A928
stmdb sp!, {r3, lr}
ldr r0, _0238A95C ; =_0238CE80
ldr r0, _0238A95C ; =ov27_0238CE80
mvn r1, #1
ldr r0, [r0]
ldrsb r0, [r0, #8]
@@ -595,13 +595,13 @@ _0238A954:
mov r0, #0
ldmia sp!, {r3, pc}
.align 2, 0
_0238A95C: .word _0238CE80
_0238A95C: .word ov27_0238CE80
arm_func_end ov27_0238A928
arm_func_start ov27_0238A960
ov27_0238A960: ; 0x0238A960
stmdb sp!, {r3, lr}
ldr r1, _0238A994 ; =_0238CE80
ldr r1, _0238A994 ; =ov27_0238CE80
mvn r0, #1
ldr r1, [r1]
ldrsb r1, [r1, #8]
@@ -609,12 +609,12 @@ ov27_0238A960: ; 0x0238A960
ldmneia sp!, {r3, pc}
mov r0, #0
bl CreateDBox
ldr r1, _0238A994 ; =_0238CE80
ldr r1, _0238A994 ; =ov27_0238CE80
ldr r1, [r1]
strb r0, [r1, #8]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A994: .word _0238CE80
_0238A994: .word ov27_0238CE80
arm_func_end ov27_0238A960
arm_func_start ov27_0238A998
@@ -2888,6 +2888,6 @@ _0238C944: .word 0x0238CE84
.byte 0x41, 0x4E, 0x4B, 0x53, 0x3A, 0x0A, 0x00, 0x00
.data
_0238CE80:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov27_0238CE80
ov27_0238CE80:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

92
asm/overlay_28.s
View File

@@ -11,7 +11,7 @@ ov28_0238A140: ; 0x0238A140
str r1, [r0, #0xc]
str r2, [r0, #4]
sub r2, r2, #1
ldr r1, _0238A17C ; =_0238ADA0
ldr r1, _0238A17C ; =ov28_0238ADA0
str r2, [r0, #8]
ldr r2, [r1]
mov r1, #0xc
@@ -21,7 +21,7 @@ ov28_0238A140: ; 0x0238A140
strh r1, [r0, #0x18]
bx lr
.align 2, 0
_0238A17C: .word _0238ADA0
_0238A17C: .word ov28_0238ADA0
_0238A180: .word 0x0238AD28
arm_func_end ov28_0238A140
@@ -41,8 +41,8 @@ _0238A1A0: ; jump table
b _0238A398 ; case 3
b _0238A41C ; case 4
_0238A1B4:
ldr r0, _0238A454 ; =_0238ADA0
ldr r1, _0238A458 ; =_0238AD80
ldr r0, _0238A454 ; =ov28_0238ADA0
ldr r1, _0238A458 ; =ov28_0238AD80
ldr r2, [r0]
mov r0, #0xc
mul r3, r2, r0
@@ -115,7 +115,7 @@ _0238A2A4:
ldr r0, [r5, #0xc]
and r0, r0, #0xff
bl sub_02028F88
ldr r2, _0238A454 ; =_0238ADA0
ldr r2, _0238A454 ; =ov28_0238ADA0
ldr r0, _0238A460 ; =0x0238AD0C
ldr r1, [r2]
ldr r3, [r5, #4]
@@ -178,7 +178,7 @@ _0238A398:
ldr r0, [r5, #0xc]
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238A454 ; =_0238ADA0
ldr r0, _0238A454 ; =ov28_0238ADA0
ldr r1, _0238A460 ; =0x0238AD0C
ldr r0, [r0]
ldr r2, [r5, #4]
@@ -220,8 +220,8 @@ _0238A44C:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0238A454: .word _0238ADA0
_0238A458: .word _0238AD80
_0238A454: .word ov28_0238ADA0
_0238A458: .word ov28_0238AD80
_0238A45C: .word 0x0238AD24
_0238A460: .word 0x0238AD0C
_0238A464: .word 0x0238AD2C
@@ -234,12 +234,12 @@ ov28_0238A468: ; 0x0238A468
ldr r0, _0238A488 ; =0x0238ACFC
bl sub_020348E4
cmp r0, #0
ldrne r0, _0238A48C ; =_0238ADA0
ldrne r0, _0238A48C ; =ov28_0238ADA0
strne r4, [r0]
ldmia sp!, {r4, pc}
.align 2, 0
_0238A488: .word 0x0238ACFC
_0238A48C: .word _0238ADA0
_0238A48C: .word ov28_0238ADA0
arm_func_end ov28_0238A468
arm_func_start ov28_0238A490
@@ -248,7 +248,7 @@ ov28_0238A490: ; 0x0238A490
ldr r0, _0238A578 ; =0x00003618
mov r1, #8
bl MemAlloc
ldr r1, _0238A57C ; =_0238AD80
ldr r1, _0238A57C ; =ov28_0238AD80
cmp r0, #0
str r0, [r1]
moveq r0, #0
@@ -256,13 +256,13 @@ ov28_0238A490: ; 0x0238A490
add r0, r0, #0x20
mov r1, #0
bl ov28_0238A140
ldr r0, _0238A57C ; =_0238AD80
ldr r0, _0238A57C ; =ov28_0238AD80
mov r1, #1
ldr r0, [r0]
add r0, r0, #0x3c
add r0, r0, #0x400
bl ov28_0238A140
ldr r0, _0238A57C ; =_0238AD80
ldr r0, _0238A57C ; =ov28_0238AD80
mov r3, #0
mvn r2, #1
_0238A4E4:
@@ -272,7 +272,7 @@ _0238A4E4:
strb r2, [r1, #9]
cmp r3, #0x14
blt _0238A4E4
ldr r1, _0238A580 ; =_0238ADA0
ldr r1, _0238A580 ; =ov28_0238ADA0
mov r0, #0xc
ldr r2, [r1]
ldr r1, _0238A584 ; =0x0238AD24
@@ -281,7 +281,7 @@ _0238A4E4:
ldr r0, _0238A588 ; =0x0238AD2C
mov r4, r6
ldr r5, [r0, r3]
ldr r7, _0238A57C ; =_0238AD80
ldr r7, _0238A57C ; =ov28_0238AD80
b _0238A54C
_0238A528:
ldr r0, [r7]
@@ -296,7 +296,7 @@ _0238A528:
_0238A54C:
cmp r4, r5
ble _0238A528
ldr r0, _0238A57C ; =_0238AD80
ldr r0, _0238A57C ; =ov28_0238AD80
mov r3, #5
ldr r1, [r0]
mov r2, #0
@@ -307,8 +307,8 @@ _0238A54C:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0238A578: .word 0x00003618
_0238A57C: .word _0238AD80
_0238A580: .word _0238ADA0
_0238A57C: .word ov28_0238AD80
_0238A580: .word ov28_0238ADA0
_0238A584: .word 0x0238AD24
_0238A588: .word 0x0238AD2C
arm_func_end ov28_0238A490
@@ -321,24 +321,24 @@ ov28_0238A58C: ; 0x0238A58C
bl sub_02025C14
bl sub_02027170
bl sub_02027228
ldr r0, _0238A5C8 ; =_0238AD80
ldr r0, _0238A5C8 ; =ov28_0238AD80
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238A5C8 ; =_0238AD80
ldr r0, _0238A5C8 ; =ov28_0238AD80
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A5C8: .word _0238AD80
_0238A5C8: .word ov28_0238AD80
arm_func_end ov28_0238A58C
arm_func_start ov28_0238A5CC
ov28_0238A5CC: ; 0x0238A5CC
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x18
ldr r6, _0238AB50 ; =_0238AD80
ldr r6, _0238AB50 ; =ov28_0238AD80
ldr r1, [r6]
ldr r0, [r1]
cmp r0, #6
@@ -356,7 +356,7 @@ _0238A608:
bl ov11_022E6EC8
cmp r0, #0
beq _0238AB44
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
mov r1, r6
ldr r0, [r0]
cmp r0, #0
@@ -378,7 +378,7 @@ _0238A648:
mov r2, #0x60
bl ov28_0238ABD4
_0238A664:
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
mov r1, #4
ldr r0, [r0]
str r1, [r0]
@@ -432,15 +432,15 @@ _0238A718:
add r4, r4, #1
cmp r4, #0x14
blt _0238A6D0
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r2, [r0]
cmp r2, #0
bne _0238A854
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
ldr r0, [r0]
add r0, r0, #0x20
bl ov28_0238A184
ldr r1, _0238AB50 ; =_0238AD80
ldr r1, _0238AB50 ; =ov28_0238AD80
mov r5, r0
ldr r1, [r1]
ldr r0, [r1, #0x24]
@@ -470,7 +470,7 @@ _0238A790:
ldr r0, [r4, #0x40c]
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x404]
@@ -512,7 +512,7 @@ _0238A814:
str r0, [r4, #0x410]
b _0238AA48
_0238A854:
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
ldr r4, [r0]
ldr r0, [r4, #0x24]
mov r0, r0, asr #0x10
@@ -543,7 +543,7 @@ _0238A8A4:
ldr r0, [r4, #0x2c]
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x24]
@@ -567,7 +567,7 @@ _0238A8A4:
add r0, r0, #1
str r0, [r4, #0x30]
_0238A924:
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
ldr r4, [r0]
ldr r0, [r4, #0x24]
mov r0, r0, asr #0x10
@@ -612,7 +612,7 @@ _0238A9A8:
ldr r0, [r4, #0x448]
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x440]
@@ -637,7 +637,7 @@ _0238A9A8:
str r0, [r4, #0x44c]
b _0238AA48
_0238AA2C:
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x440]
@@ -645,7 +645,7 @@ _0238AA2C:
add r0, r2, r0
str r0, [r4, #0x440]
_0238AA48:
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
ldr r2, [r0]
ldrb r0, [r2, #8]
cmp r0, #0
@@ -659,7 +659,7 @@ _0238AA48:
bl ov11_022E6E8C
_0238AA78:
cmp r5, #0
ldreq r0, _0238AB50 ; =_0238AD80
ldreq r0, _0238AB50 ; =ov28_0238AD80
moveq r1, #6
ldreq r0, [r0]
streq r1, [r0]
@@ -682,7 +682,7 @@ _0238AAC0:
bl ov28_0238AB5C
mov r0, #0
bl ov11_022E6E8C
ldr r0, _0238AB54 ; =_0238ADA0
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r0, [r0]
cmp r0, #5
addls pc, pc, r0, lsl #2
@@ -716,7 +716,7 @@ _0238AB2C:
mvn r0, #0
_0238AB30:
bl sub_02025B90
ldr r0, _0238AB50 ; =_0238AD80
ldr r0, _0238AB50 ; =ov28_0238AD80
mov r1, #0
ldr r0, [r0]
str r1, [r0]
@@ -726,8 +726,8 @@ _0238AB48:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0238AB50: .word _0238AD80
_0238AB54: .word _0238ADA0
_0238AB50: .word ov28_0238AD80
_0238AB54: .word ov28_0238ADA0
_0238AB58: .word 0x0238AD0C
arm_func_end ov28_0238A5CC
@@ -787,7 +787,7 @@ ov28_0238ABD4: ; 0x0238ABD4
str r7, [sp]
str r7, [sp, #0xc]
adds r8, r8, r2, ror #29
ldr r0, _0238ACF8 ; =_0238AD80
ldr r0, _0238ACF8 ; =ov28_0238AD80
movne r7, #1
strb r1, [sp, #4]
add r1, r7, #2
@@ -824,7 +824,7 @@ _0238AC9C:
add r0, sp, #0
mov r1, #3
bl sub_020276C0
ldr r1, _0238ACF8 ; =_0238AD80
ldr r1, _0238ACF8 ; =ov28_0238AD80
ldr r2, [r1]
add r2, r2, r7
strb r0, [r2, #9]
@@ -832,7 +832,7 @@ _0238AC9C:
add r0, r0, r7
ldrsb r0, [r0, #9]
bl sub_0202810C
ldr r0, _0238ACF8 ; =_0238AD80
ldr r0, _0238ACF8 ; =ov28_0238AD80
mov r6, r5, lsr #0x1f
ldr r0, [r0]
rsb r1, r6, r5, lsl #29
@@ -845,7 +845,7 @@ _0238AC9C:
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0238ACF8: .word _0238AD80
_0238ACF8: .word ov28_0238AD80
arm_func_end ov28_0238ABD4
; 0x0238ACFC
@@ -858,10 +858,12 @@ _0238ACF8: .word _0238AD80
.byte 0xE0, 0x46, 0x00, 0x00, 0xE1, 0x46, 0x00, 0x00, 0xE2, 0x46, 0x00, 0x00, 0x3C, 0x47, 0x00, 0x00
.data
_0238AD80:
.global ov28_0238AD80
ov28_0238AD80:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.bss
_0238ADA0:
.global ov28_0238ADA0
ov28_0238ADA0:
.space 0x20

6
asm/overlay_29_022DC240.s
View File

@@ -214,7 +214,7 @@ _022DC518:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022DC52C: .word 0x00019628
_022DC530: .word _02353860 + 0x20
_022DC530: .word ov29_02353860 + 0x20
_022DC534: .word 0x020AFC70
_022DC538: .word 0x00007FFF
_022DC53C: .word 0x00018304
@@ -290,7 +290,7 @@ ov29_022DC61C: ; 0x022DC61C
bl ov29_022DC544
ldr r0, _022DC650 ; =0x023538B4
bl ov29_022DC240
ldr r1, _022DC658 ; =_023534E0
ldr r1, _022DC658 ; =ov29_023534E0
ldr r0, _022DC650 ; =0x023538B4
ldr r1, [r1]
bl ov29_022DC314
@@ -298,7 +298,7 @@ ov29_022DC61C: ; 0x022DC61C
.align 2, 0
_022DC650: .word 0x023538B4
_022DC654: .word 0x0001963C
_022DC658: .word _023534E0
_022DC658: .word ov29_023534E0
arm_func_end ov29_022DC61C
arm_func_start ov29_022DC65C

8
asm/overlay_29_022EAB50.s
View File

@@ -120523,8 +120523,8 @@ _0234FCF8: .word 0x02353848
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.data
.global _023534E0
_023534E0:
.global ov29_023534E0
ov29_023534E0:
.byte 0x6C, 0xFD, 0x34, 0x02, 0x28, 0xFD, 0x34, 0x02, 0x58, 0xFD, 0x34, 0x02
.byte 0x38, 0xFD, 0x34, 0x02, 0xB8, 0xFD, 0x34, 0x02, 0xC8, 0xFD, 0x34, 0x02, 0xC0, 0xFD, 0x34, 0x02
.byte 0x88, 0xFD, 0x34, 0x02, 0xB0, 0xFD, 0x34, 0x02, 0x98, 0xFD, 0x34, 0x02, 0xA0, 0xFD, 0x34, 0x02
@@ -120583,6 +120583,6 @@ _023534E0:
.byte 0x00, 0x00, 0x00, 0x00
.bss
.global _02353860
_02353860:
.global ov29_02353860
ov29_02353860:
.space 0x2EFC0

31
asm/overlay_30.s
View File

@@ -12,7 +12,7 @@ ov30_02382820: ; 0x02382820
mov r1, #5
mov r4, r2
bl MemAlloc
ldr r1, _02382870 ; =_023860A0
ldr r1, _02382870 ; =ov30_023860A0
mov r2, #0
str r0, [r1]
str r6, [r0, #4]
@@ -26,13 +26,13 @@ ov30_02382820: ; 0x02382820
str r2, [r0]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02382870: .word _023860A0
_02382870: .word ov30_023860A0
arm_func_end ov30_02382820
arm_func_start ov30_02382874
ov30_02382874: ; 0x02382874
stmdb sp!, {r3, lr}
ldr r0, _02382974 ; =_023860A0
ldr r0, _02382974 ; =ov30_023860A0
ldr r1, [r0]
ldr r0, [r1]
cmp r0, #3
@@ -48,7 +48,7 @@ _023828A0:
bl ReadQuickSaveInfo
cmp r0, #0
bne _023828D4
ldr r2, _02382974 ; =_023860A0
ldr r2, _02382974 ; =ov30_023860A0
ldr r1, _02382978 ; =0x21061522
ldr r3, [r2]
ldr r2, [r3, #8]
@@ -60,7 +60,7 @@ _023828A0:
_023828D4:
cmp r0, #0
bne _023828FC
ldr r0, _02382974 ; =_023860A0
ldr r0, _02382974 ; =ov30_023860A0
mov r3, #1
ldr r2, [r0]
mov r1, #3
@@ -75,7 +75,7 @@ _023828FC:
ldr r0, _0238297C ; =0x0000040C
ldr r1, _02382980 ; =0x00000247
bl sub_02034EB4
ldr r0, _02382974 ; =_023860A0
ldr r0, _02382974 ; =ov30_023860A0
mov r1, #2
ldr r0, [r0]
str r1, [r0]
@@ -84,7 +84,7 @@ _02382928:
ldr r0, _02382984 ; =0x0000061C
ldr r1, _02382988 ; =0x0000024D
bl sub_02034EB4
ldr r0, _02382974 ; =_023860A0
ldr r0, _02382974 ; =ov30_023860A0
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -92,7 +92,7 @@ _02382928:
_02382948:
bl sub_02034DA8
cmp r0, #0
ldreq r0, _02382974 ; =_023860A0
ldreq r0, _02382974 ; =ov30_023860A0
moveq r1, #3
ldreq r0, [r0]
streq r1, [r0]
@@ -104,7 +104,7 @@ _0238296C:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02382974: .word _023860A0
_02382974: .word ov30_023860A0
_02382978: .word 0x21061522
_0238297C: .word 0x0000040C
_02382980: .word 0x00000247
@@ -114,28 +114,28 @@ _02382988: .word 0x0000024D
arm_func_start ov30_0238298C
ov30_0238298C: ; 0x0238298C
ldr r0, _0238299C ; =_023860A0
ldr r0, _0238299C ; =ov30_023860A0
ldr r0, [r0]
ldrb r0, [r0, #0xc]
bx lr
.align 2, 0
_0238299C: .word _023860A0
_0238299C: .word ov30_023860A0
arm_func_end ov30_0238298C
arm_func_start ov30_023829A0
ov30_023829A0: ; 0x023829A0
stmdb sp!, {r3, lr}
ldr r0, _023829C8 ; =_023860A0
ldr r0, _023829C8 ; =ov30_023860A0
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _023829C8 ; =_023860A0
ldr r0, _023829C8 ; =ov30_023860A0
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_023829C8: .word _023860A0
_023829C8: .word ov30_023860A0
arm_func_end ov30_023829A0
arm_func_start ov30_023829CC
@@ -4012,5 +4012,6 @@ _0238607C: .word ov30_02385CA4
.byte 0x82, 0xA2, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00
.data
_023860A0:
.global ov30_023860A0
ov30_023860A0:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

122
asm/overlay_31.s
View File

@@ -13,7 +13,7 @@ ov31_02382820: ; 0x02382820
mov r0, #0x10
mov r1, #8
bl MemAlloc
ldr r1, _02382860 ; =_0238A260
ldr r1, _02382860 ; =ov31_0238A260
mov r2, #0
str r0, [r1]
str r2, [r0, #4]
@@ -22,7 +22,7 @@ ov31_02382820: ; 0x02382820
ldmia sp!, {r3, pc}
.align 2, 0
_0238285C: .word 0x02389DB4
_02382860: .word _0238A260
_02382860: .word ov31_0238A260
arm_func_end ov31_02382820
arm_func_start ov31_02382864
@@ -252,7 +252,7 @@ _02382B50: .word 0x02389E14
ov31_02382B54: ; 0x02382B54
stmdb sp!, {lr}
sub sp, sp, #0x9c
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r2, [r0]
ldr r1, [r2, #4]
cmp r1, #3
@@ -282,7 +282,7 @@ _02382B98:
bl ShouldMonsterRunAwayVariation
cmp r0, #0
beq _02382BEC
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
mov r2, #3
ldr r1, [r0]
strb r2, [r1, #8]
@@ -293,7 +293,7 @@ _02382B98:
ldr r0, [r0]
strb r2, [r0, #0xc]
_02382BEC:
ldr r1, _02382D8C ; =_0238A260
ldr r1, _02382D8C ; =ov31_0238A260
mov r0, #5
ldr r1, [r1]
add r1, r1, #8
@@ -305,19 +305,19 @@ _02382BEC:
ldr r3, _02382D98 ; =0x02389DD4
add r2, sp, #4
bl sub_0202A5CC
ldr r2, _02382D8C ; =_0238A260
ldr r2, _02382D8C ; =ov31_0238A260
ldr r1, _02382D9C ; =ov31_02382864
ldr r2, [r2]
strb r0, [r2]
ldr r0, _02382DA0 ; =0x02389DC4
bl sub_0202F8C4
ldr r2, _02382D8C ; =_0238A260
ldr r2, _02382D8C ; =ov31_0238A260
ldr r1, _02382DA4 ; =ov31_02382AC0
ldr r2, [r2]
strb r0, [r2, #2]
ldr r0, _02382DA8 ; =0x02389DA4
bl sub_0202F8C4
ldr r1, _02382D8C ; =_0238A260
ldr r1, _02382D8C ; =ov31_0238A260
ldr r2, [r1]
strb r0, [r2, #1]
ldr r1, [r1]
@@ -330,7 +330,7 @@ _02382C6C:
bl sub_0202AB40
cmp r0, #0
beq _02382D20
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0]
bl sub_0202AB80
@@ -348,39 +348,39 @@ _02382C6C:
bl ShouldMonsterRunAwayVariation
cmp r0, #0
bne _02382D80
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
mov r1, #0
ldr r0, [r0]
ldrsb r0, [r0]
bl sub_0202AB94
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0]
bl sub_0202B030
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0, #1]
bl sub_0202F954
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl sub_0202F954
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r1, [r0]
ldr r0, [r1, #4]
add r0, r0, #1
str r0, [r1, #4]
b _02382D80
_02382D20:
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0, #1]
bl sub_0202F954
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl sub_0202F954
ldr r0, _02382D8C ; =_0238A260
ldr r0, _02382D8C ; =ov31_0238A260
ldr r1, [r0]
ldr r0, [r1, #4]
add r0, r0, #1
@@ -389,7 +389,7 @@ _02382D20:
_02382D58:
ldrsb r0, [r2]
bl sub_0202ABB0
ldr r1, _02382D8C ; =_0238A260
ldr r1, _02382D8C ; =ov31_0238A260
str r0, [r1, #4]
ldr r2, [r1]
mov r0, #4
@@ -403,7 +403,7 @@ _02382D84:
add sp, sp, #0x9c
ldmia sp!, {pc}
.align 2, 0
_02382D8C: .word _0238A260
_02382D8C: .word ov31_0238A260
_02382D90: .word 0x02389D94
_02382D94: .word 0x00000233
_02382D98: .word 0x02389DD4
@@ -416,38 +416,38 @@ _02382DA8: .word 0x02389DA4
arm_func_start ov31_02382DAC
ov31_02382DAC: ; 0x02382DAC
stmdb sp!, {r3, lr}
ldr r0, _02382E04 ; =_0238A260
ldr r0, _02382E04 ; =ov31_0238A260
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
ldrsb r0, [r0, #1]
bl sub_0202F8FC
ldr r0, _02382E04 ; =_0238A260
ldr r0, _02382E04 ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0, #2]
bl sub_0202F8FC
ldr r0, _02382E04 ; =_0238A260
ldr r0, _02382E04 ; =ov31_0238A260
ldr r0, [r0]
ldrsb r0, [r0]
bl sub_0202AABC
ldr r0, _02382E04 ; =_0238A260
ldr r0, _02382E04 ; =ov31_0238A260
ldr r0, [r0]
bl MemFree
ldr r0, _02382E04 ; =_0238A260
ldr r0, _02382E04 ; =ov31_0238A260
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_02382E04: .word _0238A260
_02382E04: .word ov31_0238A260
arm_func_end ov31_02382DAC
arm_func_start ov31_02382E08
ov31_02382E08: ; 0x02382E08
ldr r0, _02382E14 ; =_0238A260
ldr r0, _02382E14 ; =ov31_0238A260
ldr r0, [r0, #4]
bx lr
.align 2, 0
_02382E14: .word _0238A260
_02382E14: .word ov31_0238A260
arm_func_end ov31_02382E08
arm_func_start ov31_02382E18
@@ -467,7 +467,7 @@ ov31_02382E18: ; 0x02382E18
mov r5, #0
mov r6, #1
mov r7, #0x62
ldr r4, _02382ED0 ; =_0238A2A0
ldr r4, _02382ED0 ; =ov31_0238A2A0
b _02382E64
_02382E5C:
mov r0, r7
@@ -504,7 +504,7 @@ _02382EC4:
bl ov29_022E0C2C
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02382ED0: .word _0238A2A0
_02382ED0: .word ov31_0238A2A0
arm_func_end ov31_02382E18
arm_func_start ov31_02382ED4
@@ -518,7 +518,7 @@ ov31_02382ED4: ; 0x02382ED4
mov r0, #0x18
mov r1, #8
bl MemAlloc
ldr r1, _02382F64 ; =_0238A2A0
ldr r1, _02382F64 ; =ov31_0238A2A0
mov r2, #0
str r0, [r1, #4]
str r2, [r0, #4]
@@ -541,19 +541,19 @@ ov31_02382ED4: ; 0x02382ED4
cmp r0, #0
movne r4, #3
_02382F50:
ldr r0, _02382F64 ; =_0238A2A0
ldr r0, _02382F64 ; =ov31_0238A2A0
ldr r0, [r0, #4]
str r4, [r0, #0x14]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02382F60: .word 0x02389E30
_02382F64: .word _0238A2A0
_02382F64: .word ov31_0238A2A0
arm_func_end ov31_02382ED4
arm_func_start ov31_02382F68
ov31_02382F68: ; 0x02382F68
stmdb sp!, {r4, lr}
ldr r1, _02382FB4 ; =_0238A2A0
ldr r1, _02382FB4 ; =ov31_0238A2A0
ldr r2, _02382FB8 ; =0x02389E22
ldr r1, [r1, #4]
mov r4, r0
@@ -562,7 +562,7 @@ ov31_02382F68: ; 0x02382F68
ldrh r0, [r2, r0]
bl StringFromMessageId
mov r3, r0
ldr ip, _02382FB4 ; =_0238A2A0
ldr ip, _02382FB4 ; =ov31_0238A2A0
mov r0, r4
mov r1, #0x10
mov r2, #0x12
@@ -572,7 +572,7 @@ ov31_02382F68: ; 0x02382F68
bl sub_02027AF0
ldmia sp!, {r4, pc}
.align 2, 0
_02382FB4: .word _0238A2A0
_02382FB4: .word ov31_0238A2A0
_02382FB8: .word 0x02389E22
arm_func_end ov31_02382F68
@@ -580,7 +580,7 @@ _02382FB8: .word 0x02389E22
ov31_02382FBC: ; 0x02382FBC
stmdb sp!, {r4, lr}
sub sp, sp, #0x138
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
ldr r1, [r0, #4]
ldr r0, [r1, #0xc]
cmp r0, #5
@@ -601,7 +601,7 @@ _02382FF4:
ldr r1, _02383224 ; =0x00400013
mov r2, #0
bl sub_0202A5CC
ldr r1, _02383218 ; =_0238A2A0
ldr r1, _02383218 ; =ov31_0238A2A0
ldr r3, _02383228 ; =0x02389E22
ldr r4, [r1, #4]
mov r2, #0x10
@@ -620,14 +620,14 @@ _02382FF4:
add r2, sp, #0xa0
str r4, [sp, #4]
bl sub_020305B4
ldr r2, _02383218 ; =_0238A2A0
ldr r2, _02383218 ; =ov31_0238A2A0
mov r1, r4
ldr r3, [r2, #4]
strb r0, [r3]
ldr r0, [r2, #4]
ldrsb r0, [r0]
bl sub_020307A4
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
mov r1, #1
ldr r0, [r0, #4]
str r1, [r0, #0xc]
@@ -637,15 +637,15 @@ _0238308C:
bl sub_0202AB40
cmp r0, #0
bne _0238320C
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
ldr r0, [r0, #4]
ldrsb r0, [r0, #1]
bl sub_0202ABB0
ldr r1, _02383218 ; =_0238A2A0
ldr r1, _02383218 ; =ov31_0238A2A0
ldr r1, [r1, #4]
str r0, [r1, #4]
bl FUN_0238328C
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
ldr r1, [r0, #4]
ldr r0, [r1, #4]
add r0, r0, #1
@@ -683,7 +683,7 @@ _023830F4:
b _02383210
_02383144:
bl FUN_0238328C
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
mov r3, #2
ldr r2, [r0, #4]
mov r1, #3
@@ -715,7 +715,7 @@ _02383170:
add r2, sp, #8
str ip, [sp, #4]
bl sub_020305B4
ldr r1, _02383218 ; =_0238A2A0
ldr r1, _02383218 ; =ov31_0238A2A0
mov r2, #4
ldr r3, [r1, #4]
strb r0, [r3, #2]
@@ -727,11 +727,11 @@ _023831DC:
bl sub_020308C4
cmp r0, #0
bne _0238320C
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
ldr r0, [r0, #4]
ldrsb r0, [r0, #2]
bl sub_020308A0
ldr r0, _02383218 ; =_0238A2A0
ldr r0, _02383218 ; =ov31_0238A2A0
mov r1, #0
ldr r0, [r0, #4]
str r1, [r0, #0xc]
@@ -741,7 +741,7 @@ _02383210:
add sp, sp, #0x138
ldmia sp!, {r4, pc}
.align 2, 0
_02383218: .word _0238A2A0
_02383218: .word ov31_0238A2A0
_0238321C: .word 0x02389E70
_02383220: .word 0x02389E60
_02383224: .word 0x00400013
@@ -758,7 +758,7 @@ _02383244: .word ov31_02383248
arm_func_start ov31_02383248
ov31_02383248: ; 0x02383248
stmdb sp!, {r4, lr}
ldr r1, _02383284 ; =_0238A2A0
ldr r1, _02383284 ; =ov31_0238A2A0
ldr r2, _02383288 ; =0x02389E20
ldr r1, [r1, #4]
mov r4, r0
@@ -773,58 +773,58 @@ ov31_02383248: ; 0x02383248
bl sub_02026214
ldmia sp!, {r4, pc}
.align 2, 0
_02383284: .word _0238A2A0
_02383284: .word ov31_0238A2A0
_02383288: .word 0x02389E20
arm_func_end ov31_02383248
arm_func_start FUN_0238328C
FUN_0238328C: ; 0x0238328C
stmdb sp!, {r3, lr}
ldr r0, _023832EC ; =_0238A2A0
ldr r0, _023832EC ; =ov31_0238A2A0
mvn r1, #1
ldr r0, [r0, #4]
ldrsb r0, [r0]
cmp r0, r1
beq _023832BC
bl sub_020308A0
ldr r0, _023832EC ; =_0238A2A0
ldr r0, _023832EC ; =ov31_0238A2A0
mvn r1, #1
ldr r0, [r0, #4]
strb r1, [r0]
_023832BC:
ldr r0, _023832EC ; =_0238A2A0
ldr r0, _023832EC ; =ov31_0238A2A0
mvn r1, #1
ldr r0, [r0, #4]
ldrsb r0, [r0, #1]
cmp r0, r1
ldmeqia sp!, {r3, pc}
bl sub_0202AABC
ldr r0, _023832EC ; =_0238A2A0
ldr r0, _023832EC ; =ov31_0238A2A0
mvn r1, #1
ldr r0, [r0, #4]
strb r1, [r0, #1]
ldmia sp!, {r3, pc}
.align 2, 0
_023832EC: .word _0238A2A0
_023832EC: .word ov31_0238A2A0
arm_func_end FUN_0238328C
arm_func_start ov31_023832F0
ov31_023832F0: ; 0x023832F0
stmdb sp!, {r3, lr}
ldr r0, _02383324 ; =_0238A2A0
ldr r0, _02383324 ; =ov31_0238A2A0
ldr r0, [r0, #4]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl FUN_0238328C
ldr r0, _02383324 ; =_0238A2A0
ldr r0, _02383324 ; =ov31_0238A2A0
ldr r0, [r0, #4]
bl MemFree
ldr r0, _02383324 ; =_0238A2A0
ldr r0, _02383324 ; =ov31_0238A2A0
mov r1, #0
str r1, [r0, #4]
ldmia sp!, {r3, pc}
.align 2, 0
_02383324: .word _0238A2A0
_02383324: .word ov31_0238A2A0
arm_func_end ov31_023832F0
arm_func_start ov31_02383328
@@ -8541,12 +8541,14 @@ ov31_02389D80: ; 0x02389D80
.byte 0x61, 0x63, 0x74, 0x69, 0x63, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00
.data
_0238A260:
.global ov31_0238A260
ov31_0238A260:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_0238A2A0:
.global ov31_0238A2A0
ov31_0238A2A0:
.space 0x20

43
asm/overlay_34.s
View File

@@ -8,7 +8,7 @@ ExplorersOfSkyMain: ; 0x022DC240
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0xa0
ldr r3, _022DC598 ; =ov34_022DC738
ldr r1, _022DC59C ; =_022DD0A0
ldr r1, _022DC59C ; =ov34_022DD0A0
mov r2, #0
str r3, [sp, #0x8c]
str r2, [sp, #0x90]
@@ -19,7 +19,7 @@ ExplorersOfSkyMain: ; 0x022DC240
bl sub_02028E2C
bl sub_02017A68
bl sub_02017B70
ldr r0, _022DC59C ; =_022DD0A0
ldr r0, _022DC59C ; =ov34_022DD0A0
ldr r0, [r0, #8]
cmp r0, #3
beq _022DC28C
@@ -27,12 +27,12 @@ ExplorersOfSkyMain: ; 0x022DC240
_022DC28C:
bl sub_0201DC90
bl ov34_022DC748
ldr r1, _022DC5A0 ; =_022DD080
ldr r1, _022DC5A0 ; =ov34_022DD080
mov r2, #1
ldr r0, _022DC5A4 ; =ov34_022DC5B0
strb r2, [r1]
bl sub_0200383C
ldr r0, _022DC59C ; =_022DD0A0
ldr r0, _022DC59C ; =ov34_022DD0A0
ldr r1, [r0, #8]
cmp r1, #0xd
addls pc, pc, r1, lsl #2
@@ -135,8 +135,8 @@ _022DC3F8:
_022DC404:
mov r8, #1
mov fp, #2
ldr r5, _022DC59C ; =_022DD0A0
ldr r4, _022DC5A0 ; =_022DD080
ldr r5, _022DC59C ; =ov34_022DD0A0
ldr r4, _022DC5A0 ; =ov34_022DD080
mov r7, r8
mov r6, r8
mov sb, fp
@@ -231,21 +231,21 @@ _022DC560:
mov r0, #0
bl sub_0200383C
bl sub_0201DCD0
ldr r0, _022DC59C ; =_022DD0A0
ldr r0, _022DC59C ; =ov34_022DD0A0
ldr r0, [r0, #8]
cmp r0, #3
beq _022DC584
bl sub_02051B44
_022DC584:
bl sub_02034710
ldr r0, _022DC59C ; =_022DD0A0
ldr r0, _022DC59C ; =ov34_022DD0A0
ldr r0, [r0]
add sp, sp, #0xa0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022DC598: .word ov34_022DC738
_022DC59C: .word _022DD0A0
_022DC5A0: .word _022DD080
_022DC59C: .word ov34_022DD0A0
_022DC5A0: .word ov34_022DD080
_022DC5A4: .word ov34_022DC5B0
_022DC5A8: .word 0x022DCFF4
_022DC5AC: .word 0x022DD004
@@ -265,7 +265,7 @@ _022DC5D0:
bl ov34_022DCA70
bl sub_0201DD48
bl sub_0201F464
ldr r0, _022DC710 ; =_022DD080
ldr r0, _022DC710 ; =ov34_022DD080
ldrb r0, [r0]
cmp r0, #0
bne _022DC5F0
@@ -275,11 +275,11 @@ _022DC5F0:
bl sub_0201BE28
bl sub_02017A80
bl sub_02003A40
ldr r1, _022DC710 ; =_022DD080
ldr r1, _022DC710 ; =ov34_022DD080
mov r4, r0
ldrb r0, [r1]
cmp r0, #0
ldrne r0, _022DC714 ; =_022DD0A0
ldrne r0, _022DC714 ; =ov34_022DD0A0
ldrne r0, [r0, #8]
cmpne r0, #1
beq _022DC6C4
@@ -335,26 +335,26 @@ _022DC6C4:
bl sub_020778D0
bl sub_0201DE10
bl sub_02028E88
ldr r0, _022DC714 ; =_022DD0A0
ldr r0, _022DC714 ; =ov34_022DD0A0
ldr r0, [r0, #8]
cmp r0, #3
beq _022DC6F8
bl sub_02051C24
_022DC6F8:
bl sub_0201BF4C
ldr r1, _022DC710 ; =_022DD080
ldr r1, _022DC710 ; =ov34_022DD080
mov r2, #0
mov r0, r4
strb r2, [r1]
ldmia sp!, {r4, pc}
.align 2, 0
_022DC710: .word _022DD080
_022DC714: .word _022DD0A0
_022DC710: .word ov34_022DD080
_022DC714: .word ov34_022DD0A0
arm_func_end ov34_022DC5B0
arm_func_start ov34_022DC718
ov34_022DC718: ; 0x022DC718
ldr r1, _022DC734 ; =_022DD0A0
ldr r1, _022DC734 ; =ov34_022DD0A0
ldr r2, [r1]
cmp r2, #0
streq r0, [r1]
@@ -362,7 +362,7 @@ ov34_022DC718: ; 0x022DC718
movne r0, #0
bx lr
.align 2, 0
_022DC734: .word _022DD0A0
_022DC734: .word ov34_022DD0A0
arm_func_end ov34_022DC718
arm_func_start ov34_022DC738
@@ -1090,10 +1090,11 @@ _022DCFF0: .word 0x022DD08C
.byte 0x20, 0x3D, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.data
_022DD080:
.global ov34_022DD080
ov34_022DD080:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.bss
_022DD0A0:
ov34_022DD0A0:
.space 0xC0