diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc index b11fb400..e65bb8c9 100644 --- a/asm/include/overlay_29_022DC240.inc +++ b/asm/include/overlay_29_022DC240.inc @@ -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 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index 94e37f21..77af50eb 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -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 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index f64a3505..9d5e6195 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -5,27 +5,27 @@ arm_func_start ov01_02329520 ov01_02329520: ; 0x02329520 - ldr r0, _0232952C ; =_0233C0C0 + ldr r0, _0232952C ; =ov01_0233C0C0 ldr r0, [r0, #8] bx lr .align 2, 0 -_0232952C: .word _0233C0C0 +_0232952C: .word ov01_0233C0C0 arm_func_end ov01_02329520 arm_func_start ov01_02329530 ov01_02329530: ; 0x02329530 - ldr r0, _02329540 ; =_0233C0C0 + ldr r0, _02329540 ; =ov01_0233C0C0 mov r1, #0 str r1, [r0, #8] bx lr .align 2, 0 -_02329540: .word _0233C0C0 +_02329540: .word ov01_0233C0C0 arm_func_end ov01_02329530 arm_func_start ov01_02329544 ov01_02329544: ; 0x02329544 stmdb sp!, {r3, lr} - ldr r0, _02329568 ; =_0233C240 + ldr r0, _02329568 ; =ov01_0233C240 mov r1, #3 str r1, [r0, #0x7c] mov r1, #0 @@ -34,26 +34,26 @@ ov01_02329544: ; 0x02329544 bl ov01_02329A38 ldmia sp!, {r3, pc} .align 2, 0 -_02329568: .word _0233C240 +_02329568: .word ov01_0233C240 arm_func_end ov01_02329544 arm_func_start ov01_0232956C ov01_0232956C: ; 0x0232956C - ldr r0, _02329578 ; =_0233C0C0 + ldr r0, _02329578 ; =ov01_0233C0C0 ldr r0, [r0, #4] bx lr .align 2, 0 -_02329578: .word _0233C0C0 +_02329578: .word ov01_0233C0C0 arm_func_end ov01_0232956C arm_func_start ov01_0232957C ov01_0232957C: ; 0x0232957C - ldr r0, _0232958C ; =_0233C0C0 + ldr r0, _0232958C ; =ov01_0233C0C0 mov r1, #0 str r1, [r0, #4] bx lr .align 2, 0 -_0232958C: .word _0233C0C0 +_0232958C: .word ov01_0233C0C0 arm_func_end ov01_0232957C arm_func_start ov01_02329590 @@ -83,7 +83,7 @@ ov01_023295C4: ; 0x023295C4 bl ov01_0232AB88 ldmia sp!, {r3, pc} _023295DC: - ldr r1, _02329618 ; =_0233C240 + ldr r1, _02329618 ; =ov01_0233C240 ldrh r3, [r0, #0xa] ldrh r2, [r1] cmp r2, r3 @@ -100,7 +100,7 @@ _02329610: bl ov01_0232AB88 ldmia sp!, {r3, pc} .align 2, 0 -_02329618: .word _0233C240 +_02329618: .word ov01_0233C240 arm_func_end ov01_023295C4 arm_func_start ov01_0232961C @@ -128,10 +128,10 @@ _02329640: arm_func_start ov01_0232965C ov01_0232965C: ; 0x0232965C stmdb sp!, {r4, lr} - ldr r4, _02329828 ; =_0233C0C0 + ldr r4, _02329828 ; =ov01_0233C0C0 mov lr, #0 str lr, [r4, #8] - ldr ip, _0232982C ; =_0233C240 + ldr ip, _0232982C ; =ov01_0233C240 str lr, [r4, #4] str lr, [ip, #0x7c] strh lr, [ip, #8] @@ -147,12 +147,12 @@ ov01_0232965C: ; 0x0232965C mov r1, #8 str lr, [ip, #0x18] bl MemAlloc - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 mov r1, #8 str r0, [r2, #0x10] mov r0, #0x60 bl MemAlloc - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 add r1, r0, #0x1f str r0, [r2, #0x24] bic r3, r1, #0x1f @@ -160,7 +160,7 @@ ov01_0232965C: ; 0x0232965C mov r1, #8 str r3, [r2, #0x20] bl MemAlloc - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 add r1, r0, #0x1f str r0, [r2, #0x70] bic r3, r1, #0x1f @@ -168,7 +168,7 @@ ov01_0232965C: ; 0x0232965C mov r1, #8 str r3, [r2, #0x28] bl MemAlloc - ldr r1, _0232982C ; =_0233C240 + ldr r1, _0232982C ; =ov01_0233C240 add r2, r0, #0x1f str r0, [r1, #0x38] bic r0, r2, #0x1f @@ -179,7 +179,7 @@ ov01_0232965C: ; 0x0232965C mov r0, #0x840 mov r1, #8 bl MemAlloc - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 add r1, r0, #0x1f str r0, [r2, #0x54] bic r3, r1, #0x1f @@ -187,18 +187,18 @@ ov01_0232965C: ; 0x0232965C mov r1, #8 str r3, [r2, #0x50] bl MemAlloc - ldr r1, _0232982C ; =_0233C240 + ldr r1, _0232982C ; =ov01_0233C240 add r2, r0, #0x1f str r0, [r1, #0x5c] bic r0, r2, #0x1f str r0, [r1, #0x58] _02329760: - ldr r0, _0232982C ; =_0233C240 + ldr r0, _0232982C ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x60] ldrh r1, [r4, #0x34] ldrh r0, [r4, #0x36] - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 add r1, r1, #0x23 add r0, r0, #0x21 bic r3, r1, #0x1f @@ -209,7 +209,7 @@ _02329760: mov r1, #8 str r3, [r2, #0x34] bl MemAlloc - ldr r1, _0232982C ; =_0233C240 + ldr r1, _0232982C ; =ov01_0233C240 add r2, r0, #0x1f str r0, [r1, #0x40] bic r0, r2, #0x1f @@ -227,12 +227,12 @@ _02329760: cmp r3, r0, lsl #1 mov r0, r0, lsl #1 movle r3, r0 - ldr r2, _0232982C ; =_0233C240 + ldr r2, _0232982C ; =ov01_0233C240 add r0, r3, #0x20 mov r1, #8 str r3, [r2, #0x44] bl MemAlloc - ldr r1, _0232982C ; =_0233C240 + ldr r1, _0232982C ; =ov01_0233C240 add r2, r0, #0x1f str r0, [r1, #0x1c] bic r0, r2, #0x1f @@ -244,8 +244,8 @@ _02329760: bl ov00_022BE964 ldmia sp!, {r4, pc} .align 2, 0 -_02329828: .word _0233C0C0 -_0232982C: .word _0233C240 +_02329828: .word ov01_0233C0C0 +_0232982C: .word ov01_0233C240 arm_func_end ov01_0232965C arm_func_start ov01_02329830 @@ -255,7 +255,7 @@ ov01_02329830: ; 0x02329830 mov r2, r1 mov r0, #0xd bl ov00_022BF308 - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x7c] cmp r0, #0 cmpne r0, #2 @@ -263,54 +263,54 @@ ov01_02329830: ; 0x02329830 bl ov00_022BEB74 cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x1c] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x40] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r1, [r0, #0x30] cmp r1, #0 beq _023298A0 ldr r0, [r0, #0x5c] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x54] bl MemFree _023298A0: - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x38] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x70] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x24] bl MemFree - ldr r0, _023298E0 ; =_0233C240 + ldr r0, _023298E0 ; =ov01_0233C240 ldr r0, [r0, #0x10] bl MemFree - ldr r0, _023298E4 ; =_0233C0C0 + ldr r0, _023298E4 ; =ov01_0233C0C0 mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_023298E0: .word _0233C240 -_023298E4: .word _0233C0C0 +_023298E0: .word ov01_0233C240 +_023298E4: .word ov01_0233C0C0 arm_func_end ov01_02329830 arm_func_start ov01_023298E8 ov01_023298E8: ; 0x023298E8 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02329994 ; =_0233C0C0 + ldr r2, _02329994 ; =ov01_0233C0C0 mov r3, #0 mov r5, r0 mov r4, r1 str r3, [r2, #0x10] bl ov00_022BF96C - ldr r2, _02329998 ; =_0233C240 - ldr r1, _02329994 ; =_0233C0C0 + ldr r2, _02329998 ; =ov01_0233C240 + ldr r1, _02329994 ; =ov01_0233C0C0 strh r0, [r2, #2] str r5, [r1, #0x14] strh r4, [r1] @@ -351,17 +351,17 @@ _0232997C: bl ov01_0232AB88 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02329994: .word _0233C0C0 -_02329998: .word _0233C240 +_02329994: .word ov01_0233C0C0 +_02329998: .word ov01_0233C240 arm_func_end ov01_023298E8 arm_func_start ov01_0232999C ov01_0232999C: ; 0x0232999C stmdb sp!, {r3, lr} - ldr r1, _02329A30 ; =_0233C0C0 + ldr r1, _02329A30 ; =ov01_0233C0C0 mov r2, #0 str r0, [r1, #0xc] - ldr r0, _02329A34 ; =_0233C240 + ldr r0, _02329A34 ; =ov01_0233C240 str r2, [r1, #0x10] ldr r1, [r0, #0x7c] cmp r1, #5 @@ -400,14 +400,14 @@ _02329A18: bl ov01_0232AB88 ldmia sp!, {r3, pc} .align 2, 0 -_02329A30: .word _0233C0C0 -_02329A34: .word _0233C240 +_02329A30: .word ov01_0233C0C0 +_02329A34: .word ov01_0233C240 arm_func_end ov01_0232999C arm_func_start ov01_02329A38 ov01_02329A38: ; 0x02329A38 stmdb sp!, {r3, lr} - ldr r0, _02329AA4 ; =_0233C240 + ldr r0, _02329AA4 ; =ov01_0233C240 ldr r1, [r0, #0x7c] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -438,13 +438,13 @@ _02329A8C: bl ov01_0232AB88 ldmia sp!, {r3, pc} .align 2, 0 -_02329AA4: .word _0233C240 +_02329AA4: .word ov01_0233C240 arm_func_end ov01_02329A38 arm_func_start ov01_02329AA8 ov01_02329AA8: ; 0x02329AA8 stmdb sp!, {r3, lr} - ldr r0, _02329B14 ; =_0233C240 + ldr r0, _02329B14 ; =ov01_0233C240 ldr r1, [r0, #0x7c] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -475,31 +475,31 @@ _02329AFC: bl ov01_0232AB88 ldmia sp!, {r3, pc} .align 2, 0 -_02329B14: .word _0233C240 +_02329B14: .word ov01_0233C240 arm_func_end ov01_02329AA8 arm_func_start ov01_02329B18 ov01_02329B18: ; 0x02329B18 - ldr r0, _02329B24 ; =_0233C240 + ldr r0, _02329B24 ; =ov01_0233C240 ldr r0, [r0, #0x7c] bx lr .align 2, 0 -_02329B24: .word _0233C240 +_02329B24: .word ov01_0233C240 arm_func_end ov01_02329B18 arm_func_start ov01_02329B28 ov01_02329B28: ; 0x02329B28 - ldr r0, _02329B34 ; =_0233C240 + ldr r0, _02329B34 ; =ov01_0233C240 ldrh r0, [r0, #8] bx lr .align 2, 0 -_02329B34: .word _0233C240 +_02329B34: .word ov01_0233C240 arm_func_end ov01_02329B28 arm_func_start ov01_02329B38 ov01_02329B38: ; 0x02329B38 stmdb sp!, {r3, lr} - ldr r2, _02329B6C ; =_0233C240 + ldr r2, _02329B6C ; =ov01_0233C240 ldr r3, [r2, #0x20] ldrh r3, [r3, #0x34] cmp r1, r3 @@ -512,13 +512,13 @@ ov01_02329B38: ; 0x02329B38 bl ov01_0232AD60 ldmia sp!, {r3, pc} .align 2, 0 -_02329B6C: .word _0233C240 +_02329B6C: .word ov01_0233C240 arm_func_end ov01_02329B38 arm_func_start ov01_02329B70 ov01_02329B70: ; 0x02329B70 stmdb sp!, {r3, lr} - ldr r2, _02329BA4 ; =_0233C240 + ldr r2, _02329BA4 ; =ov01_0233C240 ldr r3, [r2, #0x4c] ldrh r3, [r3, #0x36] cmp r1, r3 @@ -531,42 +531,42 @@ ov01_02329B70: ; 0x02329B70 bl ov01_0232AD60 ldmia sp!, {r3, pc} .align 2, 0 -_02329BA4: .word _0233C240 +_02329BA4: .word ov01_0233C240 arm_func_end ov01_02329B70 arm_func_start ov01_02329BA8 ov01_02329BA8: ; 0x02329BA8 - ldr r1, _02329BB4 ; =_0233C240 + ldr r1, _02329BB4 ; =ov01_0233C240 str r0, [r1, #0x2c] bx lr .align 2, 0 -_02329BB4: .word _0233C240 +_02329BB4: .word ov01_0233C240 arm_func_end ov01_02329BA8 arm_func_start ov01_02329BB8 ov01_02329BB8: ; 0x02329BB8 - ldr r1, _02329BC4 ; =_0233C240 + ldr r1, _02329BC4 ; =ov01_0233C240 str r0, [r1, #0x18] bx lr .align 2, 0 -_02329BC4: .word _0233C240 +_02329BC4: .word ov01_0233C240 arm_func_end ov01_02329BB8 arm_func_start ov01_02329BC8 ov01_02329BC8: ; 0x02329BC8 stmdb sp!, {r3, lr} - ldr r1, _02329C2C ; =_0233C240 + ldr r1, _02329C2C ; =ov01_0233C240 mov r2, #0x40 ldr r0, [r1, #0x4c] ldr r1, [r1, #0x20] bl sub_0207C330 - ldr r0, _02329C2C ; =_0233C240 + ldr r0, _02329C2C ; =ov01_0233C240 ldrh r1, [r0, #6] ldr r0, [r0, #0x20] strh r1, [r0, #0x32] bl ov00_022BF6F0 - ldr r2, _02329C2C ; =_0233C240 - ldr r1, _02329C30 ; =_0233C0C0 + ldr r2, _02329C2C ; =ov01_0233C240 + ldr r1, _02329C30 ; =ov01_0233C0C0 ldr r3, [r2, #0x20] strh r0, [r3, #0x18] ldrh r3, [r2, #2] @@ -580,14 +580,14 @@ ov01_02329BC8: ; 0x02329BC8 strh r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_02329C2C: .word _0233C240 -_02329C30: .word _0233C0C0 +_02329C2C: .word ov01_0233C240 +_02329C30: .word ov01_0233C0C0 arm_func_end ov01_02329BC8 arm_func_start ov01_02329C34 ov01_02329C34: ; 0x02329C34 stmdb sp!, {r3, lr} - ldr r0, _02329CA4 ; =_0233C240 + ldr r0, _02329CA4 ; =ov01_0233C240 ldr r2, [r0, #0x6c] ldr r1, [r0, #0x28] str r2, [r1] @@ -596,7 +596,7 @@ ov01_02329C34: ; 0x02329C34 ldrh r1, [r1, #0x32] strh r1, [r0, #4] bl ov00_022BF780 - ldr r1, _02329CA4 ; =_0233C240 + ldr r1, _02329CA4 ; =ov01_0233C240 mov r2, #0xff ldr r3, [r1, #0x28] strh r0, [r3, #6] @@ -615,7 +615,7 @@ ov01_02329C34: ; 0x02329C34 bl ov01_02329CA8 ldmia sp!, {r3, pc} .align 2, 0 -_02329CA4: .word _0233C240 +_02329CA4: .word ov01_0233C240 arm_func_end ov01_02329C34 arm_func_start ov01_02329CA8 @@ -625,7 +625,7 @@ ov01_02329CA8: ; 0x02329CA8 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} - ldr r1, _02329D28 ; =_0233C240 + ldr r1, _02329D28 ; =ov01_0233C240 mov ip, #0 ldr lr, [r1, #0x28] mov r3, #1 @@ -638,7 +638,7 @@ _02329CD0: add r1, r2, r1, ror #28 tst r0, r3, lsl r1 beq _02329D14 - ldr r0, _02329D28 ; =_0233C240 + ldr r0, _02329D28 ; =ov01_0233C240 ldr r2, [r0, #0x28] ldrh r0, [r2, #4] add r0, r0, ip @@ -657,7 +657,7 @@ _02329D20: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02329D28: .word _0233C240 +_02329D28: .word ov01_0233C240 arm_func_end ov01_02329CA8 arm_func_start ov01_02329D2C @@ -669,7 +669,7 @@ ov01_02329D2C: ; 0x02329D2C mov r4, r0 cmp r1, #0 bne _02329D90 - ldr r0, _02329DA8 ; =_0233C240 + ldr r0, _02329DA8 ; =ov01_0233C240 ldr r1, [r0, #0x78] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -692,7 +692,7 @@ _02329D88: bl ov01_0232AAEC b _02329D9C _02329D90: - ldr r0, _02329DA8 ; =_0233C240 + ldr r0, _02329DA8 ; =ov01_0233C240 mov r1, #2 str r1, [r0, #0x7c] _02329D9C: @@ -700,7 +700,7 @@ _02329D9C: bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_02329DA8: .word _0233C240 +_02329DA8: .word ov01_0233C240 arm_func_end ov01_02329D2C arm_func_start ov01_02329DAC @@ -712,7 +712,7 @@ ov01_02329DAC: ; 0x02329DAC mov r4, r0 cmp r1, #0 bne _02329E44 - ldr r1, _02329E5C ; =_0233C240 + ldr r1, _02329E5C ; =ov01_0233C240 ldr r0, [r1, #0x78] cmp r0, #5 addls pc, pc, r0, lsl #2 @@ -735,7 +735,7 @@ _02329E00: b _02329E50 _02329E10: mov r2, #0 - ldr r0, _02329E60 ; =_0233C0C0 + ldr r0, _02329E60 ; =ov01_0233C0C0 str r2, [r1, #0x7c] ldrh r1, [r0] ldr r0, [r0, #0x14] @@ -743,13 +743,13 @@ _02329E10: b _02329E50 _02329E2C: mov r2, #0 - ldr r0, _02329E60 ; =_0233C0C0 + ldr r0, _02329E60 ; =ov01_0233C0C0 str r2, [r1, #0x7c] ldr r0, [r0, #0xc] bl ov01_0232999C b _02329E50 _02329E44: - ldr r0, _02329E5C ; =_0233C240 + ldr r0, _02329E5C ; =ov01_0233C240 mov r1, #2 str r1, [r0, #0x7c] _02329E50: @@ -757,8 +757,8 @@ _02329E50: bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_02329E5C: .word _0233C240 -_02329E60: .word _0233C0C0 +_02329E5C: .word ov01_0233C240 +_02329E60: .word ov01_0233C0C0 arm_func_end ov01_02329DAC arm_func_start ov01_02329E64 @@ -770,7 +770,7 @@ ov01_02329E64: ; 0x02329E64 mov r4, r0 cmp r1, #0 bne _02329FA8 - ldr r0, _02329FC0 ; =_0233C240 + ldr r0, _02329FC0 ; =ov01_0233C240 ldr r0, [r0, #0x78] cmp r0, #5 addls pc, pc, r0, lsl #2 @@ -789,7 +789,7 @@ _02329EB4: bl ov01_0232AB58 cmp r0, #0 beq _02329FB4 - ldr r1, _02329FC0 ; =_0233C240 + ldr r1, _02329FC0 ; =ov01_0233C240 ldr r0, [r1, #0x68] cmp r0, #1 mov r0, #0 @@ -815,7 +815,7 @@ _02329F08: bl ov01_0232AC00 cmp r0, #0 bne _02329FB4 - ldr r0, _02329FC0 ; =_0233C240 + ldr r0, _02329FC0 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -824,20 +824,20 @@ _02329F34: bl ov01_0232AB58 cmp r0, #1 bne _02329FB4 - ldr r0, _02329FC4 ; =_0233C0C0 + ldr r0, _02329FC4 ; =ov01_0233C0C0 ldr r0, [r0, #0x10] cmp r0, #0 bne _02329F88 bl ov01_02329C34 cmp r0, #0 - ldreq r0, _02329FC0 ; =_0233C240 + ldreq r0, _02329FC0 ; =ov01_0233C240 moveq r1, #2 streq r1, [r0, #0x7c] beq _02329FB4 bl ov01_0232AC2C cmp r0, #0 bne _02329FB4 - ldr r0, _02329FC0 ; =_0233C240 + ldr r0, _02329FC0 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -846,13 +846,13 @@ _02329F88: bl ov01_0232AC78 cmp r0, #0 bne _02329FB4 - ldr r0, _02329FC0 ; =_0233C240 + ldr r0, _02329FC0 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 b _02329FB4 _02329FA8: - ldr r0, _02329FC0 ; =_0233C240 + ldr r0, _02329FC0 ; =ov01_0233C240 mov r1, #2 str r1, [r0, #0x7c] _02329FB4: @@ -860,8 +860,8 @@ _02329FB4: bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_02329FC0: .word _0233C240 -_02329FC4: .word _0233C0C0 +_02329FC0: .word ov01_0233C240 +_02329FC4: .word ov01_0233C0C0 arm_func_end ov01_02329E64 arm_func_start ov01_02329FC8 @@ -873,7 +873,7 @@ ov01_02329FC8: ; 0x02329FC8 mov r4, r0 cmp r1, #0 bne _0232A02C - ldr r0, _0232A044 ; =_0233C240 + ldr r0, _0232A044 ; =ov01_0233C240 ldr r1, [r0, #0x78] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -896,7 +896,7 @@ _0232A024: bl ov01_0232AAEC b _0232A038 _0232A02C: - ldr r0, _0232A044 ; =_0233C240 + ldr r0, _0232A044 ; =ov01_0233C240 mov r1, #2 str r1, [r0, #0x7c] _0232A038: @@ -904,7 +904,7 @@ _0232A038: bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_0232A044: .word _0233C240 +_0232A044: .word ov01_0233C240 arm_func_end ov01_02329FC8 arm_func_start ov01_0232A048 @@ -914,14 +914,14 @@ ov01_0232A048: ; 0x0232A048 bl EnableIrqFlag ldrh r1, [r4, #2] cmp r1, #8 - ldreq r1, _0232A074 ; =_0233C240 + ldreq r1, _0232A074 ; =ov01_0233C240 moveq r2, #2 streq r2, [r1, #0x78] streq r2, [r1, #0x7c] bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_0232A074: .word _0233C240 +_0232A074: .word ov01_0233C240 arm_func_end ov01_0232A048 arm_func_start ov01_0232A078 @@ -933,7 +933,7 @@ ov01_0232A078: ; 0x0232A078 mov r4, r0 cmp r1, #0 bne _0232A174 - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 mov r1, #0 strh r1, [r0, #8] ldr r1, [r0, #0x18] @@ -942,7 +942,7 @@ ov01_0232A078: ; 0x0232A078 mov r0, r5 blx r1 _0232A0B4: - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 ldr r0, [r0, #0x78] cmp r0, #5 addls pc, pc, r0, lsl #2 @@ -962,26 +962,26 @@ _0232A0E8: bl ov01_0232AC00 cmp r0, #0 bne _0232A180 - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 b _0232A180 _0232A10C: - ldr r0, _0232A190 ; =_0233C0C0 + ldr r0, _0232A190 ; =ov01_0233C0C0 ldr r0, [r0, #0x10] cmp r0, #0 bne _0232A154 bl ov01_02329C34 cmp r0, #0 - ldreq r0, _0232A18C ; =_0233C240 + ldreq r0, _0232A18C ; =ov01_0233C240 moveq r1, #2 streq r1, [r0, #0x7c] beq _0232A180 bl ov01_0232AC2C cmp r0, #0 bne _0232A180 - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -990,13 +990,13 @@ _0232A154: bl ov01_0232AC78 cmp r0, #0 bne _0232A180 - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 b _0232A180 _0232A174: - ldr r0, _0232A18C ; =_0233C240 + ldr r0, _0232A18C ; =ov01_0233C240 mov r1, #2 str r1, [r0, #0x7c] _0232A180: @@ -1004,8 +1004,8 @@ _0232A180: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A18C: .word _0233C240 -_0232A190: .word _0233C0C0 +_0232A18C: .word ov01_0233C240 +_0232A190: .word ov01_0233C0C0 arm_func_end ov01_0232A078 arm_func_start ov01_0232A194 @@ -1017,7 +1017,7 @@ ov01_0232A194: ; 0x0232A194 mov r4, r0 cmp r1, #0 bne _0232A218 - ldr r0, _0232A240 ; =_0233C240 + ldr r0, _0232A240 ; =ov01_0233C240 ldr r1, [r0, #0x78] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -1037,7 +1037,7 @@ _0232A1E4: bl ov00_022BFD9C cmp r0, #2 beq _0232A234 - ldr r0, _0232A240 ; =_0233C240 + ldr r0, _0232A240 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1048,11 +1048,11 @@ _0232A208: bl ov01_0232AB88 b _0232A234 _0232A218: - ldr r0, _0232A240 ; =_0233C240 + ldr r0, _0232A240 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] ldrh r1, [r5, #2] - ldr r0, _0232A248 ; =_0233C0C0 + ldr r0, _0232A248 ; =ov01_0233C0C0 str r1, [r0, #4] bl ov01_0232AB88 _0232A234: @@ -1060,9 +1060,9 @@ _0232A234: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A240: .word _0233C240 +_0232A240: .word ov01_0233C240 _0232A244: .word ov01_0232A24C -_0232A248: .word _0233C0C0 +_0232A248: .word ov01_0233C0C0 arm_func_end ov01_0232A194 arm_func_start ov01_0232A24C @@ -1094,7 +1094,7 @@ _0232A2A4: cmp r0, #0x1a b _0232A36C _0232A2AC: - ldr r0, _0232A378 ; =_0233C240 + ldr r0, _0232A378 ; =ov01_0233C240 mov r1, #0 strh r1, [r0, #8] ldr r1, [r0, #0x78] @@ -1115,7 +1115,7 @@ _0232A2E8: bl ov01_0232ACD8 cmp r0, #0 bne _0232A36C - ldr r0, _0232A378 ; =_0233C240 + ldr r0, _0232A378 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1126,7 +1126,7 @@ _0232A308: bl ov01_0232AB88 b _0232A36C _0232A318: - ldr r0, _0232A378 ; =_0233C240 + ldr r0, _0232A378 ; =ov01_0233C240 ldr r1, [r0, #0x18] cmp r1, #0 beq _0232A36C @@ -1134,19 +1134,19 @@ _0232A318: blx r1 b _0232A36C _0232A334: - ldr r0, _0232A378 ; =_0233C240 + ldr r0, _0232A378 ; =ov01_0233C240 ldr r1, [r0, #0x18] cmp r1, #0 beq _0232A34C mov r0, r5 blx r1 _0232A34C: - ldr r0, _0232A37C ; =_0233C0C0 + ldr r0, _0232A37C ; =ov01_0233C0C0 mov r1, #1 str r1, [r0, #8] b _0232A36C _0232A35C: - ldr r0, _0232A378 ; =_0233C240 + ldr r0, _0232A378 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1155,8 +1155,8 @@ _0232A36C: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A378: .word _0233C240 -_0232A37C: .word _0233C0C0 +_0232A378: .word ov01_0233C240 +_0232A37C: .word ov01_0233C0C0 arm_func_end ov01_0232A24C arm_func_start ov01_0232A380 @@ -1168,7 +1168,7 @@ ov01_0232A380: ; 0x0232A380 mov r4, r0 cmp r1, #0 bne _0232A508 - ldr r1, _0232A524 ; =_0233C240 + ldr r1, _0232A524 ; =ov01_0233C240 ldr r0, [r1, #0x78] cmp r0, #5 addls pc, pc, r0, lsl #2 @@ -1187,13 +1187,13 @@ _0232A3D0: bl ov01_0232AC58 cmp r0, #0 bne _0232A518 - ldr r0, _0232A524 ; =_0233C240 + ldr r0, _0232A524 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 b _0232A518 _0232A3F0: - ldr r0, _0232A528 ; =_0233C0C0 + ldr r0, _0232A528 ; =ov01_0233C0C0 ldr r0, [r0, #0x10] cmp r0, #0 bne _0232A518 @@ -1205,14 +1205,14 @@ _0232A3F0: ldr r0, [r1, #0x6c] mov r1, #0xc0 bl sub_0207A2A4 - ldr r1, _0232A524 ; =_0233C240 + ldr r1, _0232A524 ; =ov01_0233C240 ldr r0, [r1, #0x60] cmp r0, #0 ldr r0, [r1, #0x6c] beq _0232A458 bl sub_020851AC cmp r0, #0 - ldrne r0, _0232A524 ; =_0233C240 + ldrne r0, _0232A524 ; =ov01_0233C240 ldrne r1, [r0, #0x64] cmpne r1, #0 beq _0232A4C4 @@ -1232,7 +1232,7 @@ _0232A458: bne _0232A4C4 ldrb r1, [r0, #0x4b] tst r1, #1 - ldrne r1, _0232A528 ; =_0233C0C0 + ldrne r1, _0232A528 ; =ov01_0233C0C0 ldrne r1, [r1, #0xc] cmpne r1, #0 beq _0232A4C4 @@ -1242,7 +1242,7 @@ _0232A458: bl ov01_0232AC58 cmp r0, #0 bne _0232A518 - ldr r0, _0232A524 ; =_0233C240 + ldr r0, _0232A524 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1254,7 +1254,7 @@ _0232A4C4: bl ov01_0232AC2C cmp r0, #0 bne _0232A518 - ldr r0, _0232A524 ; =_0233C240 + ldr r0, _0232A524 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1267,7 +1267,7 @@ _0232A4F0: bl ov01_0232AB88 b _0232A518 _0232A508: - ldr r0, _0232A524 ; =_0233C240 + ldr r0, _0232A524 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1276,8 +1276,8 @@ _0232A518: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A524: .word _0233C240 -_0232A528: .word _0233C0C0 +_0232A524: .word ov01_0233C240 +_0232A528: .word ov01_0233C0C0 arm_func_end ov01_0232A380 arm_func_start ov01_0232A52C @@ -1289,7 +1289,7 @@ ov01_0232A52C: ; 0x0232A52C mov r4, r0 cmp r1, #0 bne _0232A5C0 - ldr r0, _0232A5DC ; =_0233C240 + ldr r0, _0232A5DC ; =ov01_0233C240 ldr r0, [r0, #0x78] cmp r0, #5 addls pc, pc, r0, lsl #2 @@ -1309,7 +1309,7 @@ _0232A57C: bl ov01_0232AC00 cmp r0, #0 bne _0232A5D0 - ldr r0, _0232A5DC ; =_0233C240 + ldr r0, _0232A5DC ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1318,13 +1318,13 @@ _0232A5A0: bl ov01_0232AC78 cmp r0, #0 bne _0232A5D0 - ldr r0, _0232A5DC ; =_0233C240 + ldr r0, _0232A5DC ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 b _0232A5D0 _0232A5C0: - ldr r0, _0232A5DC ; =_0233C240 + ldr r0, _0232A5DC ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1333,7 +1333,7 @@ _0232A5D0: bl SetIrqFlag ldmia sp!, {r4, pc} .align 2, 0 -_0232A5DC: .word _0233C240 +_0232A5DC: .word ov01_0233C240 arm_func_end ov01_0232A52C arm_func_start ov01_0232A5E0 @@ -1345,7 +1345,7 @@ ov01_0232A5E0: ; 0x0232A5E0 mov r4, r0 cmp r1, #0 bne _0232A6E8 - ldr r0, _0232A748 ; =_0233C240 + ldr r0, _0232A748 ; =ov01_0233C240 ldr r1, [r0, #0x78] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -1388,7 +1388,7 @@ _0232A670: bl ov01_0232ACD8 cmp r0, #0 bne _0232A73C - ldr r0, _0232A748 ; =_0233C240 + ldr r0, _0232A748 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1401,12 +1401,12 @@ _0232A6A4: beq _0232A6BC bl ov01_0232AB88 _0232A6BC: - ldr r0, _0232A74C ; =_0233C0C0 + ldr r0, _0232A74C ; =ov01_0233C0C0 mov r1, #1 str r1, [r0, #8] b _0232A73C _0232A6CC: - ldr r0, _0232A748 ; =_0233C240 + ldr r0, _0232A748 ; =ov01_0233C240 mov r1, #3 str r1, [r0, #0x7c] mov r1, #0 @@ -1416,24 +1416,24 @@ _0232A6CC: _0232A6E8: cmp r1, #0xb bne _0232A708 - ldr r0, _0232A748 ; =_0233C240 + ldr r0, _0232A748 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] ldrh r1, [r5, #2] - ldr r0, _0232A74C ; =_0233C0C0 + ldr r0, _0232A74C ; =ov01_0233C0C0 str r1, [r0, #4] _0232A708: ldrh r0, [r5, #2] cmp r0, #0xc - ldreq r0, _0232A748 ; =_0233C240 + ldreq r0, _0232A748 ; =ov01_0233C240 moveq r1, #5 streq r1, [r0, #0x78] beq _0232A738 - ldr r0, _0232A748 ; =_0233C240 + ldr r0, _0232A748 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] ldrh r1, [r5, #2] - ldr r0, _0232A74C ; =_0233C0C0 + ldr r0, _0232A74C ; =ov01_0233C0C0 str r1, [r0, #4] _0232A738: bl ov01_0232AB88 @@ -1442,8 +1442,8 @@ _0232A73C: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A748: .word _0233C240 -_0232A74C: .word _0233C0C0 +_0232A748: .word ov01_0233C240 +_0232A74C: .word ov01_0233C0C0 arm_func_end ov01_0232A5E0 arm_func_start ov01_0232A750 @@ -1464,7 +1464,7 @@ ov01_0232A750: ; 0x0232A750 cmpne r0, #0xc b _0232A8A4 _0232A78C: - ldr r0, _0232A8B4 ; =_0233C240 + ldr r0, _0232A8B4 ; =ov01_0233C240 ldr r1, [r0, #0x78] cmp r1, #5 addls pc, pc, r1, lsl #2 @@ -1495,20 +1495,20 @@ _0232A7C0: movhi ip, r5 mov r2, r0, lsr #0x10 str ip, [sp] - ldr r0, _0232A8B4 ; =_0233C240 + ldr r0, _0232A8B4 ; =ov01_0233C240 ldrh r3, [r3, #0x36] ldr r0, [r0, #0x50] mov r1, #0xc bl ov00_022C0810 cmp r0, #0 movne r1, #0 - ldreq r0, _0232A8B4 ; =_0233C240 + ldreq r0, _0232A8B4 ; =ov01_0233C240 moveq r1, #1 streq r1, [r0, #0x14] cmp r1, #0 movne r5, #1 bne _0232A848 - ldr r0, _0232A8B4 ; =_0233C240 + ldr r0, _0232A8B4 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1518,7 +1518,7 @@ _0232A844: _0232A848: cmp r5, #0 beq _0232A8A4 - ldr r0, _0232A8B4 ; =_0233C240 + ldr r0, _0232A8B4 ; =ov01_0233C240 mov r1, #1 str r1, [r0, #0x74] ldr r1, [r0, #0x78] @@ -1534,7 +1534,7 @@ _0232A87C: cmpne r1, #0xd cmpne r1, #0xf beq _0232A8A4 - ldr r0, _0232A8B4 ; =_0233C240 + ldr r0, _0232A8B4 ; =ov01_0233C240 mov r1, #3 str r1, [r0, #0x7c] mov r1, #0 @@ -1546,7 +1546,7 @@ _0232A8A4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232A8B4: .word _0233C240 +_0232A8B4: .word ov01_0233C240 arm_func_end ov01_0232A750 arm_func_start ov01_0232A8B8 @@ -1572,7 +1572,7 @@ ov01_0232A8DC: ; 0x0232A8DC mov r4, r0 cmp r1, #0 bne _0232A914 - ldr r0, _0232A930 ; =_0233C240 + ldr r0, _0232A930 ; =ov01_0233C240 ldr r1, [r0, #0x18] cmp r1, #0 beq _0232A924 @@ -1580,7 +1580,7 @@ ov01_0232A8DC: ; 0x0232A8DC blx r1 b _0232A924 _0232A914: - ldr r0, _0232A930 ; =_0233C240 + ldr r0, _0232A930 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x78] bl ov01_0232AB88 @@ -1589,7 +1589,7 @@ _0232A924: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A930: .word _0233C240 +_0232A930: .word ov01_0233C240 arm_func_end ov01_0232A8DC arm_func_start ov01_0232A934 @@ -1597,7 +1597,7 @@ ov01_0232A934: ; 0x0232A934 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl EnableIrqFlag - ldr r1, _0232A970 ; =_0233C240 + ldr r1, _0232A970 ; =ov01_0233C240 mov r2, #1 str r2, [r1, #0x74] ldr r1, [r1, #0x18] @@ -1611,7 +1611,7 @@ _0232A964: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A970: .word _0233C240 +_0232A970: .word ov01_0233C240 arm_func_end ov01_0232A934 arm_func_start ov01_0232A974 @@ -1639,7 +1639,7 @@ _0232A9C0: cmp r0, #0x1a b _0232AA7C _0232A9C8: - ldr r0, _0232AA88 ; =_0233C240 + ldr r0, _0232AA88 ; =ov01_0233C240 ldr r1, [r0, #0x7c] cmp r1, #4 beq _0232A9E4 @@ -1665,7 +1665,7 @@ _0232AA04: blx r3 b _0232AA7C _0232AA24: - ldr r0, _0232AA88 ; =_0233C240 + ldr r0, _0232AA88 ; =ov01_0233C240 ldr r1, [r0, #0x7c] cmp r1, #4 beq _0232AA40 @@ -1694,7 +1694,7 @@ _0232AA7C: bl SetIrqFlag ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AA88: .word _0233C240 +_0232AA88: .word ov01_0233C240 arm_func_end ov01_0232A974 arm_func_start ov01_0232AA8C @@ -1703,7 +1703,7 @@ ov01_0232AA8C: ; 0x0232AA8C ldr r0, _0232AAB4 ; =ov01_02329D2C bl ov00_022BF9E0 cmp r0, #2 - ldrne r0, _0232AAB8 ; =_0233C240 + ldrne r0, _0232AAB8 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 @@ -1711,7 +1711,7 @@ ov01_0232AA8C: ; 0x0232AA8C ldmia sp!, {r3, pc} .align 2, 0 _0232AAB4: .word ov01_02329D2C -_0232AAB8: .word _0233C240 +_0232AAB8: .word ov01_0233C240 arm_func_end ov01_0232AA8C arm_func_start ov01_0232AABC @@ -1720,7 +1720,7 @@ ov01_0232AABC: ; 0x0232AABC ldr r0, _0232AAE4 ; =ov01_02329DAC bl ov00_022BFA54 cmp r0, #2 - ldrne r0, _0232AAE8 ; =_0233C240 + ldrne r0, _0232AAE8 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 @@ -1728,26 +1728,26 @@ ov01_0232AABC: ; 0x0232AABC ldmia sp!, {r3, pc} .align 2, 0 _0232AAE4: .word ov01_02329DAC -_0232AAE8: .word _0233C240 +_0232AAE8: .word ov01_0233C240 arm_func_end ov01_0232AABC arm_func_start ov01_0232AAEC ov01_0232AAEC: ; 0x0232AAEC stmdb sp!, {r3, lr} - ldr r1, _0232AB20 ; =_0233C240 + ldr r1, _0232AB20 ; =ov01_0233C240 mov r2, #1 ldr r0, _0232AB24 ; =ov01_02329E64 str r2, [r1, #0x68] bl ov00_022BFA94 cmp r0, #2 - ldrne r0, _0232AB20 ; =_0233C240 + ldrne r0, _0232AB20 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 moveq r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232AB20: .word _0233C240 +_0232AB20: .word ov01_0233C240 _0232AB24: .word ov01_02329E64 arm_func_end ov01_0232AAEC @@ -1757,7 +1757,7 @@ ov01_0232AB28: ; 0x0232AB28 ldr r0, _0232AB50 ; =ov01_02329FC8 bl ov00_022BFAD4 cmp r0, #2 - ldrne r0, _0232AB54 ; =_0233C240 + ldrne r0, _0232AB54 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 @@ -1765,7 +1765,7 @@ ov01_0232AB28: ; 0x0232AB28 ldmia sp!, {r3, pc} .align 2, 0 _0232AB50: .word ov01_02329FC8 -_0232AB54: .word _0233C240 +_0232AB54: .word ov01_0233C240 arm_func_end ov01_0232AB28 arm_func_start ov01_0232AB58 @@ -1774,7 +1774,7 @@ ov01_0232AB58: ; 0x0232AB58 ldr r0, _0232AB80 ; =ov01_0232A048 bl ov00_022BF2C4 cmp r0, #0 - ldrne r0, _0232AB84 ; =_0233C240 + ldrne r0, _0232AB84 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 @@ -1782,13 +1782,13 @@ ov01_0232AB58: ; 0x0232AB58 ldmia sp!, {r3, pc} .align 2, 0 _0232AB80: .word ov01_0232A048 -_0232AB84: .word _0233C240 +_0232AB84: .word ov01_0233C240 arm_func_end ov01_0232AB58 arm_func_start ov01_0232AB88 ov01_0232AB88: ; 0x0232AB88 stmdb sp!, {r3, lr} - ldr r0, _0232ABF8 ; =_0233C240 + ldr r0, _0232ABF8 ; =ov01_0233C240 ldr r1, [r0, #0x14] cmp r1, #0 beq _0232ABBC @@ -1797,11 +1797,11 @@ ov01_0232AB88: ; 0x0232AB88 cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0232ABF8 ; =_0233C240 + ldr r0, _0232ABF8 ; =ov01_0233C240 mov r1, #0 str r1, [r0, #0x14] _0232ABBC: - ldr r0, _0232ABF8 ; =_0233C240 + ldr r0, _0232ABF8 ; =ov01_0233C240 ldr r1, [r0, #0x7c] cmp r1, #3 cmpne r1, #2 @@ -1810,21 +1810,21 @@ _0232ABBC: ldr r0, _0232ABFC ; =ov01_0232A078 bl ov00_022BFB9C cmp r0, #2 - ldrne r0, _0232ABF8 ; =_0233C240 + ldrne r0, _0232ABF8 ; =ov01_0233C240 movne r1, #2 strne r1, [r0, #0x7c] movne r0, #0 moveq r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232ABF8: .word _0233C240 +_0232ABF8: .word ov01_0233C240 _0232ABFC: .word ov01_0232A078 arm_func_end ov01_0232AB88 arm_func_start ov01_0232AC00 ov01_0232AC00: ; 0x0232AC00 stmdb sp!, {r3, lr} - ldr r1, _0232AC24 ; =_0233C240 + ldr r1, _0232AC24 ; =ov01_0233C240 ldr r0, _0232AC28 ; =ov01_0232A194 ldr r1, [r1, #0x20] bl ov00_022BFC14 @@ -1833,14 +1833,14 @@ ov01_0232AC00: ; 0x0232AC00 movne r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0232AC24: .word _0233C240 +_0232AC24: .word ov01_0233C240 _0232AC28: .word ov01_0232A194 arm_func_end ov01_0232AC00 arm_func_start ov01_0232AC2C ov01_0232AC2C: ; 0x0232AC2C stmdb sp!, {r3, lr} - ldr r1, _0232AC50 ; =_0233C240 + ldr r1, _0232AC50 ; =ov01_0233C240 ldr r0, _0232AC54 ; =ov01_0232A380 ldr r1, [r1, #0x28] bl ov00_022BFDEC @@ -1849,7 +1849,7 @@ ov01_0232AC2C: ; 0x0232AC2C movne r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0232AC50: .word _0233C240 +_0232AC50: .word ov01_0233C240 _0232AC54: .word ov01_0232A380 arm_func_end ov01_0232AC2C @@ -1869,13 +1869,13 @@ _0232AC74: .word ov01_0232A52C arm_func_start ov01_0232AC78 ov01_0232AC78: ; 0x0232AC78 stmdb sp!, {r3, lr} - ldr r0, _0232ACCC ; =_0233C0C0 + ldr r0, _0232ACCC ; =ov01_0233C0C0 mov r2, #0 ldr r1, [r0, #0x10] mov r3, #1 cmp r1, #0 bne _0232ACAC - ldr r0, _0232ACD0 ; =_0233C240 + ldr r0, _0232ACD0 ; =ov01_0233C240 str r2, [sp] ldr r1, [r0, #0x6c] ldr r0, _0232ACD4 ; =ov01_0232A5E0 @@ -1892,8 +1892,8 @@ _0232ACBC: moveq r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232ACCC: .word _0233C0C0 -_0232ACD0: .word _0233C240 +_0232ACCC: .word ov01_0233C0C0 +_0232ACD0: .word ov01_0233C240 _0232ACD4: .word ov01_0232A5E0 arm_func_end ov01_0232AC78 @@ -1901,7 +1901,7 @@ _0232ACD4: .word ov01_0232A5E0 ov01_0232ACD8: ; 0x0232ACD8 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r0, _0232AD54 ; =_0233C240 + ldr r0, _0232AD54 ; =ov01_0233C240 ldr r0, [r0, #0x30] cmp r0, #0 bne _0232AD0C @@ -1913,7 +1913,7 @@ ov01_0232ACD8: ; 0x0232ACD8 movne r0, #0 bne _0232AD4C _0232AD0C: - ldr r3, _0232AD54 ; =_0233C240 + ldr r3, _0232AD54 ; =ov01_0233C240 mov r2, #1 ldr r1, [r3, #0x34] ldr r0, _0232AD5C ; =ov01_0232A750 @@ -1933,7 +1933,7 @@ _0232AD4C: add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232AD54: .word _0233C240 +_0232AD54: .word ov01_0233C240 _0232AD58: .word ov01_0232A974 _0232AD5C: .word ov01_0232A750 arm_func_end ov01_0232ACD8 @@ -1954,7 +1954,7 @@ ov01_0232AD60: ; 0x0232AD60 str ip, [sp, #8] bl ov00_022C0498 cmp r0, #2 - ldrne r0, _0232ADBC ; =_0233C240 + ldrne r0, _0232ADBC ; =ov01_0233C240 movne r1, #1 strne r1, [r0, #0x74] movne r0, #0 @@ -1964,7 +1964,7 @@ ov01_0232AD60: ; 0x0232AD60 .align 2, 0 _0232ADB4: .word 0x0000FFFF _0232ADB8: .word ov01_0232A934 -_0232ADBC: .word _0233C240 +_0232ADBC: .word ov01_0233C240 arm_func_end ov01_0232AD60 arm_func_start ov01_0232ADC0 @@ -21386,7 +21386,8 @@ _0233AE74: .word 0x0233C0A4 .byte 0xEC, 0xAD, 0x33, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0xAE, 0x33, 0x02 .data -_0233C0C0: + .global ov01_0233C0C0 +ov01_0233C0C0: .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, 0x68, 0x05, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -21414,5 +21415,6 @@ _0233C0C0: .byte 0x00, 0x00, 0x00, 0x00 .bss -_0233C240: + .global ov01_0233C240 +ov01_0233C240: .space 0x840 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 0b2868b8..1ec20e3d 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -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 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 29433a0e..d481d58a 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -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 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index c7b3a22a..0fdb81e6 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -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 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 337da38e..5ffe350a 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -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 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index a7f22ff7..ef6bd2bc 100644 --- a/asm/overlay_06.s +++ b/asm/overlay_06.s @@ -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 diff --git a/asm/overlay_07.s b/asm/overlay_07.s index 732ec4e4..7d840b1a 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -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 diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 673c4911..796d3109 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -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 diff --git a/asm/overlay_09.s b/asm/overlay_09.s index 5b210f5c..e9eeff0d 100644 --- a/asm/overlay_09.s +++ b/asm/overlay_09.s @@ -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 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index ae842eaf..131200a3 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -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 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index bc7097a8..7a17d0e4 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -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 diff --git a/asm/overlay_13.s b/asm/overlay_13.s index 7cf7a14e..7b2e33e5 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -10,7 +10,7 @@ EntryOverlay13: ; 0x0238A140 ldr r0, _0238A184 ; =0x00000428 mov r1, #8 bl MemAlloc - ldr r1, _0238A188 ; =_0238CEA0 + ldr r1, _0238A188 ; =ov13_0238CEA0 mov r3, #0 str r0, [r1] strb r3, [r0] @@ -24,33 +24,33 @@ EntryOverlay13: ; 0x0238A140 ldmia sp!, {r3, pc} .align 2, 0 _0238A184: .word 0x00000428 -_0238A188: .word _0238CEA0 +_0238A188: .word ov13_0238CEA0 _0238A18C: .word 0x0238C024 arm_func_end EntryOverlay13 arm_func_start ExitOverlay13 ExitOverlay13: ; 0x0238A190 stmdb sp!, {r3, lr} - ldr r0, _0238A1C4 ; =_0238CEA0 + ldr r0, _0238A1C4 ; =ov13_0238CEA0 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl sub_0201F2E4 - ldr r0, _0238A1C4 ; =_0238CEA0 + ldr r0, _0238A1C4 ; =ov13_0238CEA0 ldr r0, [r0] bl MemFree - ldr r0, _0238A1C4 ; =_0238CEA0 + ldr r0, _0238A1C4 ; =ov13_0238CEA0 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0238A1C4: .word _0238CEA0 +_0238A1C4: .word ov13_0238CEA0 arm_func_end ExitOverlay13 arm_func_start Overlay13SwitchFunctionNa238A1C8 Overlay13SwitchFunctionNa238A1C8: ; 0x0238A1C8 stmdb sp!, {r3, lr} - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 ldr r0, [r0] ldrb r0, [r0] cmp r0, #0x13 @@ -79,7 +79,7 @@ _0238A1E4: ; jump table b _0238A558 ; case 19 _0238A234: bl ov00_022E6E68 - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r1, #0xd ldr r0, [r0] strb r1, [r0] @@ -90,7 +90,7 @@ _0238A24C: beq _0238A568 mov r0, #1 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -104,7 +104,7 @@ _0238A280: beq _0238A568 mov r0, #0x19 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -118,7 +118,7 @@ _0238A2B4: beq _0238A568 mov r0, #0x1d bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -132,7 +132,7 @@ _0238A2E8: beq _0238A568 mov r0, #0x1c bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -146,7 +146,7 @@ _0238A31C: beq _0238A568 mov r0, #0x1f bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -160,7 +160,7 @@ _0238A350: beq _0238A568 mov r0, #0x20 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -174,7 +174,7 @@ _0238A384: beq _0238A568 mov r0, #0x18 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -188,7 +188,7 @@ _0238A3B8: beq _0238A3E8 mov r0, #0x15 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -201,7 +201,7 @@ _0238A3E8: beq _0238A418 mov r0, #0x16 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -212,13 +212,13 @@ _0238A418: bl ov11_022E6EC8 cmp r0, #0 beq _0238A568 - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 ldr r0, [r0] add r0, r0, #0x400 ldrh r0, [r0, #0x26] add r0, r0, #5 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -236,7 +236,7 @@ _0238A45C: ov13_0238A468: ; 0x0238A468 mov r0, #2 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -250,7 +250,7 @@ _0238A490: beq _0238A568 mov r0, #0x1e bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -264,7 +264,7 @@ _0238A4C4: beq _0238A4F4 mov r0, #3 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -277,7 +277,7 @@ _0238A4F4: beq _0238A524 mov r0, #4 bl ov11_022E6E8C - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #0xd @@ -288,7 +288,7 @@ _0238A524: bl ov11_022E6EC8 cmp r0, #0 beq _0238A568 - ldr r0, _0238A570 ; =_0238CEA0 + ldr r0, _0238A570 ; =ov13_0238CEA0 mov r1, #0xd ldr r3, [r0] ldrb r2, [r3, #1] @@ -308,7 +308,7 @@ _0238A568: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238A570: .word _0238CEA0 +_0238A570: .word ov13_0238CEA0 arm_func_end ov13_0238A468 arm_func_start Overlay13SwitchFunctionNa238A574 @@ -317,11 +317,11 @@ Overlay13SwitchFunctionNa238A574: ; 0x0238A574 sub sp, sp, #0x178 add r0, sp, #0xb0 bl GetReleasedStylus - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] add r0, r0, #0x3b4 bl InitPortraitBox - ldr r2, _0238B4F8 ; =_0238CEA0 + ldr r2, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r2] ldr r1, [r0, #0x20] cmp r1, #0x41 @@ -402,20 +402,20 @@ _0238A6B4: add r0, sp, #0x14 bl sub_0204A198 ldrb r1, [sp, #0x19] - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] and r1, r1, #0xf b _0238A6F4 _0238A6E0: add r0, sp, #0xd4 bl sub_02004F74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldrb r1, [sp, #0xd5] ldr r0, [r0] _0238A6F4: add r0, r0, #0x400 strh r1, [r0, #0x26] - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r3, #0xe ldr r1, [r0] mov r2, #0 @@ -434,7 +434,7 @@ _0238A6F4: _0238A73C: ldr r0, _0238B4FC ; =0x0238C064 bl CreateDBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r3, #2 ldr r4, [r1] mov r2, #0xa @@ -446,7 +446,7 @@ _0238A73C: str r2, [sp, #0x20] ldmia r1, {r1, r2} bl sub_02028770 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #8 ldr r0, [r0] add r2, r1, #0x6c0 @@ -462,17 +462,17 @@ _0238A79C: ldr r0, [r2] ldrsb r0, [r0, #2] bl sub_0202836C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl FreeDBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r0, _0238B500 ; =0x0238C034 ldr r1, [r1] mvn r2, #1 strb r2, [r1, #2] bl CreateDBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r3, #0 ldr r2, [r1] mov sb, r3 @@ -490,7 +490,7 @@ _0238A800: add r3, r3, #1 cmp r3, #0x10 blt _0238A800 - ldr sl, _0238B4F8 ; =_0238CEA0 + ldr sl, _0238B4F8 ; =ov13_0238CEA0 mov r5, #1 mov r4, #4 mov r8, #0x10 @@ -512,7 +512,7 @@ _0238A830: strb r2, [r0, #0x55] cmp sb, #8 blt _0238A830 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r3, #0x41 ldr r1, [r0] mov r2, #0x40 @@ -526,7 +526,7 @@ _0238A830: ldr r0, _0238B504 ; =0x0238C054 ldr r1, _0238B508 ; =ov13_0238BE6C bl sub_0202F8C4 - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r1] strb r0, [r1, #6] b _0238BD74 @@ -539,7 +539,7 @@ _0238A8B8: str r2, [sp, #0x20] ldmia r1, {r1, r2} bl sub_02028770 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r3, _0238B50C ; =0x0238CF24 ldr r7, [r0] mov r2, #0 @@ -563,7 +563,7 @@ _0238A8B8: add r0, r0, #0x6c bl GetStringFromFileVeneer mov r0, r5, asr #8 - ldr r4, _0238B4F8 ; =_0238CEA0 + ldr r4, _0238B4F8 ; =ov13_0238CEA0 and r1, r0, #0xff ldr r2, [r4] mov r7, #0 @@ -594,7 +594,7 @@ _0238A968: _0238A9A4: cmp r7, r8 bne _0238A968 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238B514 ; =0x0238CECC mov r2, r8, lsl #3 mov r3, #0 @@ -602,14 +602,14 @@ _0238A9A4: strh r3, [r1, r2] ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r2, [r0] mov r3, #0 ldrsb r0, [r2, #2] ldrh r2, [r2, #0x60] bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -620,7 +620,7 @@ _0238AA00: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -636,7 +636,7 @@ _0238AA28: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r1] strb r0, [r2, #3] ldr r1, [r1] @@ -649,11 +649,11 @@ _0238AA6C: bl IsNormalMenuActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl GetNormalMenuResult - ldr r3, _0238B4F8 ; =_0238CEA0 + ldr r3, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r3] ldr r1, [r2, #0x24] cmp r1, #9 @@ -683,7 +683,7 @@ _0238AAEC: bne _0238AAC0 _0238AAF4: mov r4, #0 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r3, r4 mov r2, r4 _0238AB04: @@ -698,7 +698,7 @@ _0238AB04: movlt r4, r1 cmp r3, #0x10 blt _0238AB04 - ldr r6, _0238B4F8 ; =_0238CEA0 + ldr r6, _0238B4F8 ; =ov13_0238CEA0 mov r5, #0 mov r7, #0x14 _0238AB3C: @@ -754,7 +754,7 @@ _0238ABD4: strb r0, [r4, #0x34] blt _0238ABD4 _0238ABF8: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #6] @@ -762,7 +762,7 @@ _0238ABF8: beq _0238AC14 bl ov13_0238BE6C _0238AC14: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -771,11 +771,11 @@ _0238AC14: _0238AC2C: ldrsb r0, [r0, #2] bl sub_02027B1C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeNormalMenu - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r1, #1 ldr r2, [r0] strb r1, [r2, #3] @@ -798,7 +798,7 @@ _0238AC2C: cmp r0, r1 beq _0238BD74 bl sub_0202F8FC - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #6] @@ -811,7 +811,7 @@ _0238ACC0: ldrsb r0, [r0, #2] bl ShowDBox bl GetPersonality - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 add r0, r0, r0, lsl #1 ldr r3, [r1] mov r2, r0, lsl #1 @@ -829,7 +829,7 @@ _0238AD00: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r1] strb r0, [r2, #5] ldr r4, [r1] @@ -842,26 +842,26 @@ _0238AD00: mov r2, r2, lsl #1 ldrsh r1, [r1, r2] bl InitPortraitBoxWithMonsterId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitExpressionId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitUnknownAttr - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] add r1, r1, #0x3b4 bl ShowPortraitBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r4, [r0] bl GetPersonality add r0, r0, r0, lsl #1 @@ -881,7 +881,7 @@ _0238AD00: _0238ADD4: ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #5] bl HidePortraitBox @@ -897,7 +897,7 @@ ov13_0238ADFC: ; 0x0238ADFC bl sub_0202F2C4 mov r0, #0xb4 bl sub_02017B7C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -906,11 +906,11 @@ ov13_0238ADFC: ; 0x0238ADFC _0238AE20: ldrsb r0, [r0, #2] bl sub_0202836C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl FreeDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r3, #1 ldr r2, [r0] mov r1, #0xf @@ -931,12 +931,12 @@ _0238AE78: mov r1, #4 strb r1, [r0] _0238AE80: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202F2C4 _0238AE90: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -945,15 +945,15 @@ _0238AE90: _0238AEA8: ldrsb r0, [r0, #2] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #5] bl HidePortraitBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #5] bl FreePortraitBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r2, #1 ldr r1, [r0] strb r2, [r1, #5] @@ -965,11 +965,11 @@ _0238AEA8: _0238AEF4: ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r3, [r0] ldr r2, [r3, #0x30] sub r1, r2, #1 @@ -987,14 +987,14 @@ _0238AF38: _0238AF44: ldr r0, _0238B534 ; =0x00002208 bl sub_02017CB4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r2, #3 ldr r1, [r0] strb r2, [r1] ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1003,7 +1003,7 @@ _0238AF44: _0238AF80: ldrsb r0, [r0, #4] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1020,14 +1020,14 @@ _0238AFA0: _0238AFBC: ldr r0, _0238B534 ; =0x00002208 bl sub_02017CB4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r2, #2 ldr r1, [r0] strb r2, [r1] ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1036,11 +1036,11 @@ _0238AFBC: _0238AFF8: ldrsb r0, [r0, #4] bl FreeDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B538 ; =0x000005CC ldr r0, [r0] mov r1, #8 @@ -1057,20 +1057,20 @@ _0238B038: bl SetBothScreensWindowsColor ldr r0, _0238B540 ; =0x0238C044 bl CreateDBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r1] strb r0, [r2, #4] ldr r0, [r1] ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B544 ; =0x000006AD ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r2, #0x11 ldr r1, [r0] strb r2, [r1] @@ -1090,14 +1090,14 @@ _0238B0A8: _0238B0C4: ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B548 ; =0x000006AE ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1106,14 +1106,14 @@ _0238B0C4: _0238B100: ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B54C ; =0x000006AF ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1122,14 +1122,14 @@ _0238B100: _0238B13C: ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #8 ldr r0, [r0] mov r2, #0x6b0 ldrsb r0, [r0, #4] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1138,14 +1138,14 @@ _0238B13C: _0238B178: ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B550 ; =0x000006B1 ldr r0, [r0] mov r1, #0x18 ldrsb r0, [r0, #4] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1154,7 +1154,7 @@ _0238B178: _0238B1B4: ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #8 ldr r4, [r0] mov r3, #0 @@ -1166,7 +1166,7 @@ _0238B1B4: mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1178,7 +1178,7 @@ _0238B204: mov r1, #0x218 mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1189,18 +1189,18 @@ _0238B230: ldrsh r1, [r0, #0x24] add r0, sp, #0x70 bl GetNameRaw - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 add r1, sp, #0x70 ldr r0, [r0] add r0, r0, #0x3e4 bl SpecialStrcpy - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 add r1, sp, #0x70 ldr r0, [r0] add r0, r0, #4 add r0, r0, #0x400 bl SpecialStrcpy - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r0, #3 ldr r3, [r1] mov r2, #0 @@ -1208,7 +1208,7 @@ _0238B230: add r3, r3, #4 add r3, r3, #0x400 bl ShowKeyboard - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1219,19 +1219,19 @@ _0238B2A4: cmp r0, #3 bne _0238BD74 bl GetKeyboardStringResult - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r4, r0 ldr r0, [r1] mov r1, r4 add r0, r0, #0x3c4 mov r2, #0x10 bl StrncpySimpleNoPadSafe - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, r4 ldr r0, [r0] add r0, r0, #0x3e4 bl StrcpySimple - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1241,7 +1241,7 @@ _0238B2FC: bl sub_02037468 cmp r0, #0 beq _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r0] ldr r1, [r2, #0x20] add r1, r1, #1 @@ -1253,13 +1253,13 @@ _0238B2FC: _0238B32C: bl sub_0203931C cmp r0, #0 - ldreq r0, _0238B4F8 ; =_0238CEA0 + ldreq r0, _0238B4F8 ; =ov13_0238CEA0 moveq r1, #0x34 ldreq r0, [r0] streq r1, [r0, #0x20] beq _0238BD74 cmp r0, #1 - ldreq r0, _0238B4F8 ; =_0238CEA0 + ldreq r0, _0238B4F8 ; =ov13_0238CEA0 moveq r1, #0x35 ldreq r0, [r0] streq r1, [r0, #0x20] @@ -1270,7 +1270,7 @@ _0238B360: beq _0238BD74 add r0, sp, #0x34 bl sub_02048764 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r4, [r0] bl GetPersonality ldrb r3, [r4, #0x5f] @@ -1289,7 +1289,7 @@ _0238B360: bl StrcpySimple add r0, sp, #0x34 bl sub_02048794 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #0x36 ldr r0, [r0] str r1, [r0, #0x20] @@ -1298,7 +1298,7 @@ _0238B3D4: bl sub_02039218 cmp r0, #0 beq _0238BD74 - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r3, #0x31 ldr r2, [r1] mov r0, #3 @@ -1315,7 +1315,7 @@ _0238B410: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1326,15 +1326,15 @@ _0238B438: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r3, #0xc ldr r2, [r0] mov r1, #1 @@ -1347,11 +1347,11 @@ _0238B488: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1362,18 +1362,18 @@ _0238B4C0: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 str r0, [r1, #0x20] b _0238BD74 .align 2, 0 -_0238B4F8: .word _0238CEA0 +_0238B4F8: .word ov13_0238CEA0 _0238B4FC: .word 0x0238C064 _0238B500: .word 0x0238C034 _0238B504: .word 0x0238C054 @@ -1407,11 +1407,11 @@ _0238B558: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1421,7 +1421,7 @@ _0238B5A4: add r1, sp, #8 mov r0, #0 bl GetPressedButtons - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r2, #0x3c ldr r0, [r0] add r1, sp, #0xc @@ -1431,7 +1431,7 @@ _0238B5A4: ldrh r0, [sp, #0xb0] tst r0, #1 beq _0238BD74 - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r3, #5 ldr r2, [r1] ldr r0, _0238B534 ; =0x00002208 @@ -1451,7 +1451,7 @@ _0238B608: ldrh r0, [sp, #0xb0] tst r0, #1 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1465,7 +1465,7 @@ _0238B63C: bne _0238BD74 ldrsb r0, [r0, #4] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1474,14 +1474,14 @@ _0238B63C: _0238B670: ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238BD7C ; =0x000006C2 ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #2] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1490,14 +1490,14 @@ _0238B670: _0238B6AC: ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238BD80 ; =0x000006C3 ldr r0, [r0] mov r1, #4 ldrsb r0, [r0, #2] mov r3, #0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1506,7 +1506,7 @@ _0238B6AC: _0238B6E8: add r0, sp, #0x128 bl InitPreprocessorArgs - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r0, #4] add r0, r1, r0, lsl #1 @@ -1515,14 +1515,14 @@ _0238B6E8: str r0, [sp, #0x128] ldrsb r0, [r1, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r3, sp, #0x128 ldrsb r0, [r0, #2] add r2, r1, #0x6c0 bl ShowMessageInDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #0x3b ldr r0, [r0] str r1, [r0, #0x20] @@ -1530,7 +1530,7 @@ _0238B6E8: _0238B744: ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238BD84 ; =0x000006C5 ldr r0, [r0] mov r1, #8 @@ -1552,7 +1552,7 @@ _0238B774: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r1] strb r0, [r2, #3] ldr r1, [r1] @@ -1569,26 +1569,26 @@ _0238B7C0: beq _0238B848 b _0238BD74 _0238B7DC: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeNormalMenu - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r2, #1 ldr r1, [r0] strb r2, [r1, #3] ldr r0, [r0] ldrsb r0, [r0, #5] bl FreePortraitBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r3, #1 ldr r2, [r0] mov r1, #0x30 @@ -1597,11 +1597,11 @@ _0238B7DC: str r1, [r0, #0x20] b _0238BD74 _0238B848: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeNormalMenu - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r3, #1 ldr r2, [r0] mov r1, #0x2a @@ -1613,7 +1613,7 @@ _0238B878: mov r0, #0x1f str r0, [r2, #8] bl GetPersonality - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r2, _0238B530 ; =0x0238C0B8 ldr r1, [r1] ldrb r1, [r1, #0x5f] @@ -1628,7 +1628,7 @@ _0238B878: bl FemaleToMaleForm mov r4, r0 _0238B8BC: - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 mov r0, r4 ldr r2, [r1] mov r1, #0 @@ -1646,7 +1646,7 @@ _0238B8BC: bl RandInt ldr fp, _0238BD94 ; =0x0238C08C ldr r5, _0238BD90 ; =0x0238C0F8 - ldr r4, _0238B4F8 ; =_0238CEA0 + ldr r4, _0238B4F8 ; =ov13_0238CEA0 mov r6, r0 mov r7, #0 _0238B910: @@ -1678,7 +1678,7 @@ _0238B970: add r7, r7, #1 cmp r7, #0x15 blt _0238B910 - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r0, _0238BD98 ; =0x0238CEBC ldr r2, [r1] ldr r1, _0238BD9C ; =0x00001011 @@ -1689,7 +1689,7 @@ _0238B970: mov r2, #0 str r4, [sp, #4] bl CreateAdvancedMenu - ldr r2, _0238B4F8 ; =_0238CEA0 + ldr r2, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r2] strb r0, [r1, #3] ldr r4, [r2] @@ -1707,11 +1707,11 @@ _0238B970: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r1] strb r0, [r1, #5] _0238B9FC: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r0] ldr r1, [r0, #4] add r0, r2, #0x3b4 @@ -1719,22 +1719,22 @@ _0238B9FC: add r1, r1, #0x300 ldrsh r1, [r1, #0x74] bl InitPortraitBoxWithMonsterId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitExpressionId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitUnknownAttr - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitAttrStruct - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] add r1, r1, #0x3b4 @@ -1746,13 +1746,13 @@ _0238BA70: bl GetAdvancedMenuCurrentOption cmp r4, r0 beq _0238BB10 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #0 str r1, [r0, #8] ldr r0, [r0] ldrsb r0, [r0, #3] bl GetAdvancedMenuCurrentOption - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 str r0, [r1, #4] ldr r2, [r1] add r0, r2, r0, lsl #1 @@ -1760,29 +1760,29 @@ _0238BA70: ldrsh r1, [r0, #0x74] add r0, r2, #0x3b4 bl InitPortraitBoxWithMonsterId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitExpressionId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitUnknownAttr - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitAttrStruct - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] add r1, r1, #0x3b4 bl ShowPortraitBox b _0238BB98 _0238BB10: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0, #8] cmp r1, #0x20 addne r1, r1, #1 @@ -1796,34 +1796,34 @@ _0238BB10: ldrsh r1, [r0, #0x74] add r0, r2, #0x3b4 bl InitPortraitBoxWithMonsterId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitExpressionId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitUnknownAttr - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitAttrStruct - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] add r1, r1, #0x3b4 bl ShowPortraitBox _0238BB98: - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl IsAdvancedMenuActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r4, [r0] ldrsb r0, [r4, #3] bl GetAdvancedMenuResult @@ -1831,20 +1831,20 @@ _0238BB98: add r0, r0, #0x300 ldrsh r2, [r0, #0x74] add r0, r4, #0x400 - ldr r1, _0238B4F8 ; =_0238CEA0 + ldr r1, _0238B4F8 ; =ov13_0238CEA0 strh r2, [r0, #0x24] ldr r0, [r1] ldrsb r0, [r0, #2] bl ShowDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_02027B1C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_0202F2C4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r2, [r0] ldr r1, [r0, #4] add r0, r2, #0x3b4 @@ -1852,32 +1852,32 @@ _0238BB98: add r1, r1, #0x300 ldrsh r1, [r1, #0x74] bl InitPortraitBoxWithMonsterId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitExpressionId - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitUnknownAttr - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 bl SetPortraitAttrStruct - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] add r1, r1, #0x3b4 bl ShowPortraitBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeAdvancedMenu mvn r2, #1 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] strb r2, [r1, #3] ldr r1, [r0] @@ -1888,7 +1888,7 @@ _0238BB98: _0238BCA8: ldrsb r0, [r0, #2] bl sub_0202836C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1899,11 +1899,11 @@ _0238BCC8: bl IsDBoxActive cmp r0, #0 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_02027B1C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x30] str r0, [r1, #0x20] @@ -1911,7 +1911,7 @@ _0238BCC8: _0238BCFC: mov r0, #1 bl ov11_023039D4 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] add r0, r0, #1 @@ -1922,18 +1922,18 @@ _0238BD1C: mvn r1, #0 cmp r0, r1 bne _0238BD74 - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r2, #0x39 ldr r1, [r0] str r2, [r1, #0x20] ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_0202836C - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] bl FreeDBox - ldr r0, _0238B4F8 ; =_0238CEA0 + ldr r0, _0238B4F8 ; =ov13_0238CEA0 mvn r3, #1 ldr r2, [r0] mov r1, #2 @@ -1960,7 +1960,7 @@ _0238BDA4: .word 0x0238C014 arm_func_start GetPersonality GetPersonality: ; 0x0238BDA8 stmdb sp!, {r3, lr} - ldr r0, _0238BDEC ; =_0238CEA0 + ldr r0, _0238BDEC ; =ov13_0238CEA0 mov ip, #0 ldr lr, [r0] mov r0, ip @@ -1978,14 +1978,14 @@ _0238BDC0: blt _0238BDC0 ldmia sp!, {r3, pc} .align 2, 0 -_0238BDEC: .word _0238CEA0 +_0238BDEC: .word ov13_0238CEA0 arm_func_end GetPersonality arm_func_start GetOptionStringFromID GetOptionStringFromID: ; 0x0238BDF0 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x54 - ldr r2, _0238BE40 ; =_0238CEA0 + ldr r2, _0238BE40 ; =ov13_0238CEA0 add ip, sp, #4 ldr r3, [r2] ldr r2, _0238BE44 ; =0x0238CE70 @@ -2004,14 +2004,14 @@ GetOptionStringFromID: ; 0x0238BDF0 add sp, sp, #0x54 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0238BE40: .word _0238CEA0 +_0238BE40: .word ov13_0238CEA0 _0238BE44: .word 0x0238CE70 _0238BE48: .word 0x0000C402 arm_func_end GetOptionStringFromID arm_func_start WaitForNextStep WaitForNextStep: ; 0x0238BE4C - ldr r1, _0238BE68 ; =_0238CEA0 + ldr r1, _0238BE68 ; =ov13_0238CEA0 mov r3, #0x3a ldr r2, [r1] str r3, [r2, #0x20] @@ -2019,7 +2019,7 @@ WaitForNextStep: ; 0x0238BE4C str r0, [r1, #0x30] bx lr .align 2, 0 -_0238BE68: .word _0238CEA0 +_0238BE68: .word ov13_0238CEA0 arm_func_end WaitForNextStep arm_func_start ov13_0238BE6C @@ -2032,7 +2032,7 @@ ov13_0238BE6C: ; 0x0238BE6C bl InitPreprocessorArgs mov r0, r4 bl sub_02027B1C - ldr r0, _0238BFFC ; =_0238CEA0 + ldr r0, _0238BFFC ; =ov13_0238CEA0 ldr r2, _0238C000 ; =0x000006CA ldr lr, [r0] add r5, sp, #4 @@ -2054,7 +2054,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r2, #0 add r3, sp, #0x54 bl sub_02026214 - ldr r0, _0238BFFC ; =_0238CEA0 + ldr r0, _0238BFFC ; =ov13_0238CEA0 ldr r2, _0238C008 ; =0x000006CB ldr lr, [r0] add r0, sp, #0x54 @@ -2076,7 +2076,7 @@ ov13_0238BE6C: ; 0x0238BE6C add r3, sp, #0x54 bl sub_02026214 mov r1, #0x400 - ldr r0, _0238BFFC ; =_0238CEA0 + ldr r0, _0238BFFC ; =ov13_0238CEA0 mov ip, r5 ldr r5, [r0] add r0, sp, #0x54 @@ -2097,7 +2097,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r2, #0x18 add r3, sp, #0x54 bl sub_02026214 - ldr r0, _0238BFFC ; =_0238CEA0 + ldr r0, _0238BFFC ; =ov13_0238CEA0 ldr r3, _0238C004 ; =0x0000C402 ldr r2, [r0] add ip, sp, #4 @@ -2125,7 +2125,7 @@ ov13_0238BE6C: ; 0x0238BE6C add sp, sp, #0x400 ldmia sp!, {r4, r5, pc} .align 2, 0 -_0238BFFC: .word _0238CEA0 +_0238BFFC: .word ov13_0238CEA0 _0238C000: .word 0x000006CA _0238C004: .word 0x0000C402 _0238C008: .word 0x000006CB @@ -2367,7 +2367,8 @@ _0238C00C: .word 0x000006CD .byte 0x53, 0x45, 0x54, 0x3A, 0x32, 0x38, 0x5D, 0x5B, 0x6B, 0x69, 0x6E, 0x64, 0x3A, 0x30, 0x5D, 0x00 .data -_0238CEA0: + .global ov13_0238CEA0 +ov13_0238CEA0: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x0B, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00 diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 126c7c57..f56f842c 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -10,11 +10,11 @@ SentrySetupState: ; 0x0238A140 ldr r0, _0238A504 ; =0x000038D4 mov r1, #8 bl MemAlloc - ldr r1, _0238A508 ; =_0238DB80 + ldr r1, _0238A508 ; =ov14_0238DB80 str r0, [r1] add r0, r0, #0xa4 bl InitPreprocessorArgs - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 mov r5, #0 ldr r1, [r0] sub r3, r5, #1 @@ -88,7 +88,7 @@ _0238A25C: str r2, [r1, #0x554] cmp r5, #4 blt _0238A25C - ldr r2, _0238A508 ; =_0238DB80 + ldr r2, _0238A508 ; =ov14_0238DB80 mov r0, #0 ldr r1, [r2] mov r3, #0x60 @@ -110,12 +110,12 @@ _0238A2BC: cmp r0, #6 blt _0238A2BC bl GetHeroMemberIdx - ldr r1, _0238A508 ; =_0238DB80 + ldr r1, _0238A508 ; =ov14_0238DB80 ldr r1, [r1] add r1, r1, #0x3800 strh r0, [r1, #0xd0] bl GetPartnerMemberIdx - ldr r3, _0238A508 ; =_0238DB80 + ldr r3, _0238A508 ; =ov14_0238DB80 mvn r1, #1 ldr r2, [r3] add r2, r2, #0x3800 @@ -148,24 +148,24 @@ _0238A2BC: ldr r2, [r3] strb r1, [r2, #0xb] bl ov14_0238AC04 - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 mov r1, #0xad ldr r0, [r0] mov r2, #0x8100000 add r0, r0, #0x120 bl ov11_022F6E60 - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 ldr r2, _0238A50C ; =0x88080000 ldr r0, [r0] mov r1, #0xcd add r0, r0, #0x1e4 bl ov11_022F6E60 - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x2a8 add r1, r1, #0x1e4 bl ov11_022F6F08 - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 mov r1, #0x800 ldr r0, [r0] mov r2, #0 @@ -173,7 +173,7 @@ _0238A2BC: bl ov11_022F52E8 mov sb, #0 ldr r5, _0238A510 ; =0xC8100000 - ldr r4, _0238A508 ; =_0238DB80 + ldr r4, _0238A508 ; =ov14_0238DB80 mov r7, #0x800 mov r6, sb mov sl, #0xc4 @@ -222,7 +222,7 @@ ov14_0238A468: ; 0x0238A468 cmp sb, #0x10 blt _0238A3E8 ldr r8, _0238A510 ; =0xC8100000 - ldr r7, _0238A508 ; =_0238DB80 + ldr r7, _0238A508 ; =ov14_0238DB80 mov r5, #0 mov r6, #0xc4 _0238A494: @@ -242,7 +242,7 @@ _0238A494: add r5, r5, #1 cmp r5, #2 blt _0238A494 - ldr r0, _0238A508 ; =_0238DB80 + ldr r0, _0238A508 ; =ov14_0238DB80 ldr r2, [r0] ldr r0, [r2, #0x11c] cmp r0, #2 @@ -257,7 +257,7 @@ _0238A4FC: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0238A504: .word 0x000038D4 -_0238A508: .word _0238DB80 +_0238A508: .word ov14_0238DB80 _0238A50C: .word 0x88080000 _0238A510: .word 0xC8100000 arm_func_end ov14_0238A468 @@ -265,7 +265,7 @@ _0238A510: .word 0xC8100000 arm_func_start ov14_0238A514 ov14_0238A514: ; 0x0238A514 stmdb sp!, {r3, lr} - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #2 @@ -276,7 +276,7 @@ ov14_0238A514: ; 0x0238A514 beq _0238A540 bl sub_0202F334 _0238A540: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #1 @@ -287,7 +287,7 @@ _0238A540: beq _0238A568 bl sub_0202BC60 _0238A568: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #4 @@ -298,7 +298,7 @@ _0238A568: beq _0238A590 bl HidePortraitBox _0238A590: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #8 @@ -309,7 +309,7 @@ _0238A590: beq _0238A5B8 bl sub_0202F954 _0238A5B8: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x10 @@ -320,7 +320,7 @@ _0238A5B8: beq _0238A5E0 bl sub_0202F954 _0238A5E0: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x20 @@ -331,7 +331,7 @@ _0238A5E0: beq _0238A608 bl sub_0202F954 _0238A608: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x40 @@ -342,7 +342,7 @@ _0238A608: beq _0238A630 bl HidePortraitBox _0238A630: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x80 @@ -353,7 +353,7 @@ _0238A630: beq _0238A658 bl HidePortraitBox _0238A658: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x100 @@ -364,7 +364,7 @@ _0238A658: beq _0238A680 bl HidePortraitBox _0238A680: - ldr r0, _0238A6AC ; =_0238DB80 + ldr r0, _0238A6AC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x200 @@ -376,13 +376,13 @@ _0238A680: bl HidePortraitBox ldmia sp!, {r3, pc} .align 2, 0 -_0238A6AC: .word _0238DB80 +_0238A6AC: .word ov14_0238DB80 arm_func_end ov14_0238A514 arm_func_start ov14_0238A6B0 ov14_0238A6B0: ; 0x0238A6B0 stmdb sp!, {r3, lr} - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #2 @@ -396,11 +396,11 @@ ov14_0238A6B0: ; 0x0238A6B0 cmp r0, #0 movne r2, #0 bne _0238A710 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #1] bl FreeDBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -410,7 +410,7 @@ _0238A710: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A71C: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #1 @@ -424,11 +424,11 @@ _0238A71C: cmp r0, #0 movne r2, #0 bne _0238A778 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0] bl FreeAdvancedMenu - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -438,7 +438,7 @@ _0238A778: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A784: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #4 @@ -452,11 +452,11 @@ _0238A784: cmp r0, #0 movne r2, #0 bne _0238A7E0 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #2] bl FreePortraitBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -466,7 +466,7 @@ _0238A7E0: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A7EC: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #8 @@ -480,11 +480,11 @@ _0238A7EC: cmp r0, #0 movne r2, #0 bne _0238A848 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #3] bl sub_0202F8FC - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -494,7 +494,7 @@ _0238A848: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A854: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x10 @@ -508,11 +508,11 @@ _0238A854: cmp r0, #0 movne r2, #0 bne _0238A8B0 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202F8FC - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -522,7 +522,7 @@ _0238A8B0: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A8BC: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x20 @@ -536,11 +536,11 @@ _0238A8BC: cmp r0, #0 movne r2, #0 bne _0238A918 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #5] bl sub_0202F8FC - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -550,7 +550,7 @@ _0238A918: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A924: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x40 @@ -564,11 +564,11 @@ _0238A924: cmp r0, #0 movne r2, #0 bne _0238A980 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #6] bl FreePortraitBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -578,7 +578,7 @@ _0238A980: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A98C: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x80 @@ -592,11 +592,11 @@ _0238A98C: cmp r0, #0 movne r2, #0 bne _0238A9E8 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #7] bl FreePortraitBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -606,7 +606,7 @@ _0238A9E8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A9F4: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x100 @@ -620,11 +620,11 @@ _0238A9F4: cmp r0, #0 movne r2, #0 bne _0238AA50 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #8] bl FreePortraitBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -634,7 +634,7 @@ _0238AA50: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238AA5C: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x200 @@ -648,11 +648,11 @@ _0238AA5C: cmp r0, #0 movne r2, #0 bne _0238AAB8 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #9] bl FreePortraitBox - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -662,7 +662,7 @@ _0238AAB8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238AAC4: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x40000000 @@ -676,11 +676,11 @@ _0238AAC4: cmp r0, #0 movne r2, #0 bne _0238AB20 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xa] bl FreeNormalMenu - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -690,7 +690,7 @@ _0238AB20: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238AB2C: - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x80000000 @@ -704,11 +704,11 @@ _0238AB2C: cmp r0, #0 movne r2, #0 bne _0238AB88 - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl FreeNormalMenu - ldr r0, _0238AB9C ; =_0238DB80 + ldr r0, _0238AB9C ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -721,7 +721,7 @@ _0238AB94: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238AB9C: .word _0238DB80 +_0238AB9C: .word ov14_0238DB80 arm_func_end ov14_0238A6B0 arm_func_start ov14_0238ABA0 @@ -778,7 +778,7 @@ _0238AC3C: .word 0x0238DB84 arm_func_start ov14_0238AC40 ov14_0238AC40: ; 0x0238AC40 stmdb sp!, {r3, lr} - ldr r1, _0238ACE4 ; =_0238DB80 + ldr r1, _0238ACE4 ; =ov14_0238DB80 ldr ip, [r1] add r0, ip, #0x3000 ldr r2, [r0, #0x880] @@ -791,7 +791,7 @@ ov14_0238AC40: ; 0x0238AC40 ldr r0, [r1] ldrsb r0, [r0, #1] bl ShowDBox - ldr r0, _0238ACE4 ; =_0238DB80 + ldr r0, _0238ACE4 ; =ov14_0238DB80 ldr r1, _0238ACE8 ; =0x00000408 ldr r3, [r0] ldr r2, [r3, #0x114] @@ -800,11 +800,11 @@ ov14_0238AC40: ; 0x0238AC40 mov r2, r2, lsr #0x10 add r3, r3, #0xa4 bl ShowMessageInDBox - ldr r0, _0238ACE4 ; =_0238DB80 + ldr r0, _0238ACE4 ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #1] bl ShowDBox - ldr r1, _0238ACE4 ; =_0238DB80 + ldr r1, _0238ACE4 ; =ov14_0238DB80 ldr r0, [r1] add r0, r0, #0x3000 ldr r2, [r0, #0x888] @@ -819,7 +819,7 @@ ov14_0238AC40: ; 0x0238AC40 str r0, [r2, #0x888] ldmia sp!, {r3, pc} .align 2, 0 -_0238ACE4: .word _0238DB80 +_0238ACE4: .word ov14_0238DB80 _0238ACE8: .word 0x00000408 arm_func_end ov14_0238AC40 @@ -842,7 +842,7 @@ ov14_0238AD04: ; 0x0238AD04 cmp r4, r1 beq _0238ADF0 bl sub_02027B58 - ldr r0, _0238ADF8 ; =_0238DB80 + ldr r0, _0238ADF8 ; =ov14_0238DB80 ldr r1, [r0] ldrsb r0, [r1, #4] cmp r4, r0 @@ -856,7 +856,7 @@ ov14_0238AD04: ; 0x0238AD04 mov r0, r4 sub r2, r1, #3 bl sub_02026214 - ldr r1, _0238ADF8 ; =_0238DB80 + ldr r1, _0238ADF8 ; =ov14_0238DB80 add r0, sp, #0 ldr r1, [r1] add r1, r1, #0x3800 @@ -868,7 +868,7 @@ ov14_0238AD04: ; 0x0238AD04 add r3, sp, #0 bl sub_02026214 _0238AD84: - ldr r0, _0238ADF8 ; =_0238DB80 + ldr r0, _0238ADF8 ; =ov14_0238DB80 ldr r1, [r0] ldrsb r0, [r1, #5] cmp r4, r0 @@ -882,7 +882,7 @@ _0238AD84: mov r0, r4 sub r2, r1, #3 bl sub_02026214 - ldr r1, _0238ADF8 ; =_0238DB80 + ldr r1, _0238ADF8 ; =ov14_0238DB80 add r0, sp, #0 ldr r1, [r1] add r1, r1, #0x3800 @@ -900,7 +900,7 @@ _0238ADF0: add sp, sp, #0x18 ldmia sp!, {r4, pc} .align 2, 0 -_0238ADF8: .word _0238DB80 +_0238ADF8: .word ov14_0238DB80 arm_func_end ov14_0238AD04 arm_func_start SentryUpdateDisplay @@ -908,7 +908,7 @@ SentryUpdateDisplay: ; 0x0238ADFC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x6c ldr r1, _0238B690 ; =0x0238D970 - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, [r1, #0x14] ldr r1, [r1, #0x10] ldr r4, [r0] @@ -935,7 +935,7 @@ SentryUpdateDisplay: ; 0x0238ADFC cmp r1, #2 moveq r1, #3 ldr r4, _0238B698 ; =0x0238DA40 - ldr r7, _0238B694 ; =_0238DB80 + ldr r7, _0238B694 ; =ov14_0238DB80 streq r1, [r0, #0x540] add sb, sp, #0x14 mov r8, r5 @@ -959,7 +959,7 @@ _0238AE88: cmp r5, #4 blt _0238AE88 _0238AECC: - ldr r7, _0238B694 ; =_0238DB80 + ldr r7, _0238B694 ; =ov14_0238DB80 ldr r0, [r7] add r0, r0, #0x3000 ldrb r0, [r0, #0x870] @@ -1034,7 +1034,7 @@ _0238AFD0: cmp sl, #4 blt _0238AF04 _0238AFDC: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, [r0] add r0, r2, #0x3000 ldrb r1, [r0, #0x870] @@ -1050,7 +1050,7 @@ _0238AFDC: mov r2, #0 str r3, [sp, #0x18] bl ov11_022F7064 - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 add r1, sp, #0x14 ldr r0, [r0] mov r2, #0 @@ -1058,7 +1058,7 @@ _0238AFDC: add r0, r0, #0x3400 bl ov11_022F6F14 _0238B038: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, [r0] add r0, r2, #0x3000 ldrb r1, [r0, #0x870] @@ -1084,7 +1084,7 @@ _0238B078: cmp r0, #0 bne _0238B1A8 _0238B098: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x3000 ldr r0, [r0, #0x534] @@ -1096,7 +1096,7 @@ _0238B098: mov r2, #0 bl ov11_022F52E8 _0238B0C4: - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -1112,7 +1112,7 @@ _0238B0EC: add r0, r0, #0x2800 mov r2, #0 bl ov11_022F52E8 - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -1128,7 +1128,7 @@ _0238B128: add r0, r0, #0x2800 mov r2, #0 bl ov11_022F52E8 - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -1148,7 +1148,7 @@ _0238B164: mov r2, #0 bl ov11_022F52E8 _0238B184: - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -1158,7 +1158,7 @@ _0238B184: add r0, r0, #0x3000 str r2, [r0, #0x538] _0238B1A8: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r3, [r0] add r0, r3, #0x3000 ldr r1, [r0, #0x534] @@ -1175,7 +1175,7 @@ _0238B1DC: mov sl, #0 ldr r8, _0238B6B0 ; =0x0238DB84 ldr r7, _0238B6B4 ; =0x0238DA60 - ldr r5, _0238B694 ; =_0238DB80 + ldr r5, _0238B694 ; =ov14_0238DB80 mov fp, sl mov r6, #0xa000 mov r4, #0xc4 @@ -1204,7 +1204,7 @@ _0238B1F8: add sl, sl, #1 cmp sl, #0x10 blt _0238B1F8 - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 ldr r0, [r1] add r0, r0, #0x3000 ldr r3, [r0, #0x884] @@ -1231,7 +1231,7 @@ _0238B1F8: bl PreprocessString mov r1, r4 str r1, [sp] - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, _0238B6C0 ; =0x0238DB18 ldr r0, [r0] ldr r3, _0238B6B8 ; =0x0000C402 @@ -1240,7 +1240,7 @@ _0238B1F8: mov r1, #0x400 bl PreprocessString _0238B2E4: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x3000 ldr r0, [r0, #0x564] @@ -1268,7 +1268,7 @@ _0238B2E4: bl ov14_0238D828 mov r1, #1 str r1, [sp] - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 add r1, sp, #0x10 ldr r0, [r0] add r2, sp, #0xc @@ -1277,7 +1277,7 @@ _0238B2E4: mov r3, #0x16 bl ov14_0238D828 _0238B374: - ldr r1, _0238B694 ; =_0238DB80 + ldr r1, _0238B694 ; =ov14_0238DB80 ldr r0, [r1] add r0, r0, #0x3000 ldr r3, [r0, #0x88c] @@ -1298,7 +1298,7 @@ _0238B374: str r4, [sp] bl PreprocessString _0238B3C4: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x3000 ldr r0, [r0, #0x568] @@ -1325,7 +1325,7 @@ _0238B3C4: str r4, [sp] bl ov14_0238D828 _0238B42C: - ldr r4, _0238B694 ; =_0238DB80 + ldr r4, _0238B694 ; =ov14_0238DB80 ldr r0, [r4] add r0, r0, #0x3000 ldr r8, [r0, #0x56c] @@ -1372,7 +1372,7 @@ _0238B4BC: cmp r7, r0 blt _0238B4A0 _0238B4D0: - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x898] @@ -1380,7 +1380,7 @@ _0238B4D0: _0238B4E4: mov r0, #0x2600 mov r4, #0 - ldr r6, _0238B694 ; =_0238DB80 + ldr r6, _0238B694 ; =ov14_0238DB80 str r0, [sp, #0x18] add r8, sp, #0x14 mov r7, r4 @@ -1400,7 +1400,7 @@ _0238B500: add r4, r4, #1 cmp r4, #2 blt _0238B500 - ldr r6, _0238B694 ; =_0238DB80 + ldr r6, _0238B694 ; =ov14_0238DB80 ldr r0, [r6] add r0, r0, #0x3000 ldrb r1, [r0, #0x870] @@ -1426,7 +1426,7 @@ _0238B574: add r4, r4, #1 cmp r4, #4 blt _0238B574 - ldr r0, _0238B694 ; =_0238DB80 + ldr r0, _0238B694 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r0, [r0, #0x53c] @@ -1435,7 +1435,7 @@ _0238B574: ldr r0, _0238B6D4 ; =0x00002C05 bl sub_02017C80 _0238B5BC: - ldr r6, _0238B694 ; =_0238DB80 + ldr r6, _0238B694 ; =ov14_0238DB80 ldr r0, [r6] add r0, r0, #0x3000 ldr r0, [r0, #0x53c] @@ -1495,7 +1495,7 @@ _0238B688: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0238B690: .word 0x0238D970 -_0238B694: .word _0238DB80 +_0238B694: .word ov14_0238DB80 _0238B698: .word 0x0238DA40 _0238B69C: .word 0x00000806 _0238B6A0: .word 0x00001005 @@ -1517,30 +1517,30 @@ _0238B6D4: .word 0x00002C05 arm_func_start SentrySetExitingState__0238B6D8 SentrySetExitingState__0238B6D8: ; 0x0238B6D8 stmdb sp!, {r3, lr} - ldr r0, _0238B704 ; =_0238DB80 + ldr r0, _0238B704 ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x118] bl ov14_0238A514 - ldr r0, _0238B704 ; =_0238DB80 + ldr r0, _0238B704 ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x104] ldmia sp!, {r3, pc} .align 2, 0 -_0238B704: .word _0238DB80 +_0238B704: .word ov14_0238DB80 arm_func_end SentrySetExitingState__0238B6D8 arm_func_start ov14_0238B708 ov14_0238B708: ; 0x0238B708 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} add r0, r0, #0x2a8 bl ov11_022F6EFC - ldr r7, _0238B7F8 ; =_0238DB80 + ldr r7, _0238B7F8 ; =ov14_0238DB80 mov r4, #0 mov r6, #0xc4 _0238B730: @@ -1562,7 +1562,7 @@ _0238B730: add r4, r4, #1 cmp r4, #0x10 blt _0238B730 - ldr r5, _0238B7F8 ; =_0238DB80 + ldr r5, _0238B7F8 ; =ov14_0238DB80 mov r6, #0 mov r4, #0xc4 _0238B784: @@ -1574,37 +1574,37 @@ _0238B784: add r6, r6, #1 cmp r6, #2 blt _0238B784 - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x120 bl ov11_022F6EFC - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x1e4 bl ov11_022F6EFC - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 ldr r0, [r0] ldr r0, [r0, #0x11c] cmp r0, #2 beq _0238B7DC bl sub_02017B70 _0238B7DC: - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 ldr r0, [r0] bl MemFree - ldr r0, _0238B7F8 ; =_0238DB80 + ldr r0, _0238B7F8 ; =ov14_0238DB80 mov r1, #0 str r1, [r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0238B7F8: .word _0238DB80 +_0238B7F8: .word ov14_0238DB80 arm_func_end ov14_0238B708 arm_func_start SentryRunState SentryRunState: ; 0x0238B7FC stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r2, [r0] ldr r1, [r2, #0x104] cmp r1, #3 @@ -1633,7 +1633,7 @@ _0238B84C: ldr r1, [r1, #0x108] ldr r0, [r0, r1, lsl #2] blx r0 - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r3, [r0] ldr r1, [r3, #0x108] ldr r2, [r3, #0x110] @@ -1650,7 +1650,7 @@ _0238B84C: blx r0 _0238B8A4: bl ov14_0238A514 - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x10c] @@ -1659,7 +1659,7 @@ _0238B8BC: bl ov14_0238A6B0 cmp r0, #0 beq _0238C0D8 - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r3, [r1] ldr r0, [r3, #0x118] tst r0, #1 @@ -1688,7 +1688,7 @@ _0238B8BC: add r2, r2, #0xc str r4, [sp, #4] bl CreateAdvancedMenu - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1] b _0238B96C @@ -1698,11 +1698,11 @@ _0238B94C: add r2, r2, #0xc str r4, [sp, #4] bl CreateAdvancedMenu - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1] _0238B96C: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r3, [r0] ldr r1, [r3, #0x118] tst r1, #2 @@ -1718,15 +1718,15 @@ _0238B96C: bne _0238B9B8 ldr r0, _0238C148 ; =0x0238D9B8 bl CreateDBox - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #1] _0238B9B8: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #1] bl ShowDBox - ldr r2, _0238C12C ; =_0238DB80 + ldr r2, _0238C12C ; =ov14_0238DB80 ldr r0, [r2] ldr r1, [r0, #0x108] cmp r1, #0x21 @@ -1989,7 +1989,7 @@ _0238BD48: _0238BD68: ldr r4, _0238C144 ; =0x00003018 _0238BD6C: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r2, [r0] ldr r1, [r2, #0x114] cmp r1, r5 @@ -2004,7 +2004,7 @@ _0238BD6C: add r3, r3, #0xa4 bl ShowMessageInDBox _0238BDA4: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #4 @@ -2017,30 +2017,30 @@ _0238BDA4: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r2, _0238C12C ; =_0238DB80 + ldr r2, _0238C12C ; =ov14_0238DB80 mov r1, #0x32 ldr r3, [r2] strb r0, [r3, #2] ldr r0, [r2] add r0, r0, #0xf4 bl InitPortraitBoxWithMonsterId - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] add r0, r0, #0xf4 bl SetPortraitUnknownAttr - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] add r0, r0, #0xf4 bl SetPortraitExpressionId - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldrsb r0, [r1, #2] add r1, r1, #0xf4 bl ShowPortraitBox _0238BE30: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #8 @@ -2052,11 +2052,11 @@ _0238BE30: ldr r0, _0238C1A4 ; =0x0238D9F8 ldr r1, _0238C1A8 ; =ov14_0238ACEC bl sub_0202F8C4 - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #3] _0238BE6C: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x10 @@ -2068,11 +2068,11 @@ _0238BE6C: ldr r0, _0238C1AC ; =0x0238D988 ldr r1, _0238C1B0 ; =ov14_0238AD04 bl sub_0202F8C4 - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #4] _0238BEA8: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x20 @@ -2084,11 +2084,11 @@ _0238BEA8: ldr r0, _0238C1B4 ; =0x0238D998 ldr r1, _0238C1B0 ; =ov14_0238AD04 bl sub_0202F8C4 - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #5] _0238BEE4: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x40 @@ -2101,11 +2101,11 @@ _0238BEE4: mov r2, r0 mov r1, #3 bl CreatePortraitBox - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #6] _0238BF24: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x80 @@ -2118,11 +2118,11 @@ _0238BF24: mov r2, r0 mov r1, #4 bl CreatePortraitBox - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #7] _0238BF64: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x100 @@ -2135,11 +2135,11 @@ _0238BF64: mov r2, r0 mov r1, #5 bl CreatePortraitBox - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #8] _0238BFA4: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x200 @@ -2152,11 +2152,11 @@ _0238BFA4: mov r2, r0 mov r1, #6 bl CreatePortraitBox - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #9] _0238BFE4: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x40000000 @@ -2172,11 +2172,11 @@ _0238BFE4: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #0xa] _0238C030: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x118] tst r0, #0x80000000 @@ -2192,11 +2192,11 @@ _0238C030: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C12C ; =_0238DB80 + ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] strb r0, [r1, #0xb] _0238C07C: - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 mov r1, #2 ldr r0, [r0] str r1, [r0, #0x10c] @@ -2215,7 +2215,7 @@ _0238C0B0: _0238C0B4: cmp r0, #0 beq _0238C0D8 - ldr r0, _0238C12C ; =_0238DB80 + ldr r0, _0238C12C ; =ov14_0238DB80 mov r2, #0 ldr r1, [r0] str r2, [r1, #0x10c] @@ -2228,7 +2228,7 @@ _0238C0D8: _0238C0E0: bl ov14_0238A6B0 cmp r0, #0 - ldrne r0, _0238C12C ; =_0238DB80 + ldrne r0, _0238C12C ; =ov14_0238DB80 movne r1, #2 ldrne r0, [r0] strne r1, [r0, #0x104] @@ -2249,7 +2249,7 @@ _0238C124: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238C12C: .word _0238DB80 +_0238C12C: .word ov14_0238DB80 _0238C130: .word 0x0238DB94 _0238C134: .word 0x04080800 _0238C138: .word 0x0238D9C8 @@ -2292,7 +2292,7 @@ _0238C1C4: .word 0x0238DA08 arm_func_start SentrySetStateIntermediate SentrySetStateIntermediate: ; 0x0238C1C8 - ldr r1, _0238C1E4 ; =_0238DB80 + ldr r1, _0238C1E4 ; =ov14_0238DB80 mov r3, #3 ldr r2, [r1] str r3, [r2, #0x10c] @@ -2300,12 +2300,12 @@ SentrySetStateIntermediate: ; 0x0238C1C8 str r0, [r1, #0x110] bx lr .align 2, 0 -_0238C1E4: .word _0238DB80 +_0238C1E4: .word ov14_0238DB80 arm_func_end SentrySetStateIntermediate arm_func_start SentryState0 SentryState0: ; 0x0238C1E8 - ldr r0, _0238C208 ; =_0238DB80 + ldr r0, _0238C208 ; =ov14_0238DB80 mov r3, #0x80000000 ldr r2, [r0] mov r1, #1 @@ -2314,19 +2314,19 @@ SentryState0: ; 0x0238C1E8 str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C208: .word _0238DB80 +_0238C208: .word ov14_0238DB80 arm_func_end SentryState0 arm_func_start SentryState1 SentryState1: ; 0x0238C20C stmdb sp!, {r3, lr} - ldr r0, _0238C260 ; =_0238DB80 + ldr r0, _0238C260 ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C260 ; =_0238DB80 + ldr r0, _0238C260 ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetNormalMenuResult @@ -2343,12 +2343,12 @@ _0238C254: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238C260: .word _0238DB80 +_0238C260: .word ov14_0238DB80 arm_func_end SentryState1 arm_func_start SentryState2 SentryState2: ; 0x0238C264 - ldr r0, _0238C284 ; =_0238DB80 + ldr r0, _0238C284 ; =ov14_0238DB80 mov r3, #0x40000000 ldr r2, [r0] mov r1, #3 @@ -2357,19 +2357,19 @@ SentryState2: ; 0x0238C264 str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C284: .word _0238DB80 +_0238C284: .word ov14_0238DB80 arm_func_end SentryState2 arm_func_start SentryState3 SentryState3: ; 0x0238C288 stmdb sp!, {r3, lr} - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xa] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #0xa] bl GetNormalMenuResult @@ -2388,56 +2388,56 @@ _0238C2C4: ; jump table b _0238C378 ; case 7 b _0238C390 ; case 8 _0238C2E8: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C300: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C318: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #2 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C330: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #3 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C348: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C360: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #5 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C378: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #6 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0x890] b _0238C3A4 _0238C390: - ldr r0, _0238C3AC ; =_0238DB80 + ldr r0, _0238C3AC ; =ov14_0238DB80 mov r1, #7 ldr r0, [r0] add r0, r0, #0x3000 @@ -2446,12 +2446,12 @@ _0238C3A4: bl SentrySetExitingState__0238B6D8 ldmia sp!, {r3, pc} .align 2, 0 -_0238C3AC: .word _0238DB80 +_0238C3AC: .word ov14_0238DB80 arm_func_end SentryState3 arm_func_start SentryState4 SentryState4: ; 0x0238C3B0 - ldr r0, _0238C3D0 ; =_0238DB80 + ldr r0, _0238C3D0 ; =ov14_0238DB80 mov r3, #3 ldr r2, [r0] mov r1, #5 @@ -2460,7 +2460,7 @@ SentryState4: ; 0x0238C3B0 str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C3D0: .word _0238DB80 +_0238C3D0: .word ov14_0238DB80 arm_func_end SentryState4 arm_func_start SentrySetExitingState__0238C3D4 @@ -2473,7 +2473,7 @@ _0238C3DC: .word SentrySetExitingState__0238B6D8 arm_func_start SentryState6 SentryState6: ; 0x0238C3E0 - ldr r0, _0238C400 ; =_0238DB80 + ldr r0, _0238C400 ; =ov14_0238DB80 mov r3, #3 ldr r2, [r0] mov r1, #7 @@ -2482,23 +2482,23 @@ SentryState6: ; 0x0238C3E0 str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C400: .word _0238DB80 +_0238C400: .word ov14_0238DB80 arm_func_end SentryState6 arm_func_start SentryState7 SentryState7: ; 0x0238C404 - ldr r0, _0238C418 ; =_0238DB80 + ldr r0, _0238C418 ; =ov14_0238DB80 mov r1, #8 ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C418: .word _0238DB80 +_0238C418: .word ov14_0238DB80 arm_func_end SentryState7 arm_func_start SentryState8 SentryState8: ; 0x0238C41C - ldr r0, _0238C43C ; =_0238DB80 + ldr r0, _0238C43C ; =ov14_0238DB80 mov r3, #3 ldr r2, [r0] mov r1, #9 @@ -2507,12 +2507,12 @@ SentryState8: ; 0x0238C41C str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C43C: .word _0238DB80 +_0238C43C: .word ov14_0238DB80 arm_func_end SentryState8 arm_func_start SentryState9 SentryState9: ; 0x0238C440 - ldr r0, _0238C460 ; =_0238DB80 + ldr r0, _0238C460 ; =ov14_0238DB80 mov r3, #2 ldr r2, [r0] mov r1, #0xc @@ -2521,43 +2521,43 @@ SentryState9: ; 0x0238C440 str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C460: .word _0238DB80 +_0238C460: .word ov14_0238DB80 arm_func_end SentryState9 arm_func_start SentryStateA SentryStateA: ; 0x0238C464 - ldr r0, _0238C478 ; =_0238DB80 + ldr r0, _0238C478 ; =ov14_0238DB80 mov r1, #0xb ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C478: .word _0238DB80 +_0238C478: .word ov14_0238DB80 arm_func_end SentryStateA arm_func_start SentryStateB SentryStateB: ; 0x0238C47C - ldr r0, _0238C490 ; =_0238DB80 + ldr r0, _0238C490 ; =ov14_0238DB80 mov r1, #0xc ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238C490: .word _0238DB80 +_0238C490: .word ov14_0238DB80 arm_func_end SentryStateB arm_func_start SentryStateGenerateChoices SentryStateGenerateChoices: ; 0x0238C494 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, _0238CA58 ; =0x000003FA ldr r0, [r0] str r1, [r0, #0x118] bl GetHero mov r6, r0 bl GetPartner - ldr r2, _0238CA54 ; =_0238DB80 + ldr r2, _0238CA54 ; =ov14_0238DB80 mov r5, r0 ldr r1, [r2] mov r0, #0 @@ -2569,7 +2569,7 @@ SentryStateGenerateChoices: ; 0x0238C494 mov r1, #4 str r3, [r2, #0x894] bl RandRange - ldr r2, _0238CA54 ; =_0238DB80 + ldr r2, _0238CA54 ; =ov14_0238DB80 ldr r1, [r2] add r1, r1, #0x3000 str r0, [r1, #0x888] @@ -2596,7 +2596,7 @@ SentryStateGenerateChoices: ; 0x0238C494 mov r0, #0 mov r1, #4 bl RandRange - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r1, [r1] add r1, r1, #0x3000 str r0, [r1, #0x87c] @@ -2604,7 +2604,7 @@ _0238C564: mov r0, #0 mov r1, #0x65 bl RandRange - ldr r2, _0238CA54 ; =_0238DB80 + ldr r2, _0238CA54 ; =ov14_0238DB80 ldr r3, _0238CA60 ; =0x020A1BB0 ldr r1, [r2] add r1, r1, #0x3000 @@ -2628,7 +2628,7 @@ _0238C564: ldrsh r1, [r1, #0xa2] cmp r1, r0 beq _0238C564 - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 ldrsh r0, [r5, #4] ldr r2, [r1] add r1, r2, #0x3000 @@ -2641,7 +2641,7 @@ _0238C564: ldrne r0, _0238CA64 ; =0x00000119 cmpne r4, r0 beq _0238C564 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 mov r8, #0 ldr r4, [r0] add r2, r4, #0x3000 @@ -2663,7 +2663,7 @@ _0238C640: _0238C648: cmp r8, r0 blt _0238C564 - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 mov sb, #0 ldr r2, [r1] add r1, r2, #0x3000 @@ -2672,7 +2672,7 @@ _0238C648: add r0, r0, #0x3000 str r1, [r0, #0x8b8] _0238C670: - ldr sl, _0238CA54 ; =_0238DB80 + ldr sl, _0238CA54 ; =ov14_0238DB80 ldr r0, [sl] add r0, r0, #0x3000 ldr r0, [r0, #0x87c] @@ -2731,19 +2731,19 @@ _0238C72C: blt _0238C670 ldr r0, _0238CA68 ; =0x0238DB2C bl DebugPrint0__0200C1FC - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r0, _0238CA6C ; =0x0238DB44 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x880] bl DebugPrint0__0200C1FC - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r0, _0238CA70 ; =0x0238DB58 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x87c] bl DebugPrint0__0200C1FC - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r2, _0238CA74 ; =0x880A0000 ldr r3, [r0] add r0, r3, #0x3000 @@ -2754,27 +2754,27 @@ _0238C72C: add r0, r0, #0x3000 mov r1, r1, asr #0x10 bl ov11_022F6FE0 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, _0238CA78 ; =0x00001001 ldr r0, [r0] mov r2, #0 add r0, r0, #0x3a8 add r0, r0, #0x3000 bl ov11_022F52E8 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x6c add r0, r0, #0x3400 add r1, r1, #0x1e4 bl ov11_022F6F08 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, _0238CA7C ; =0x00001003 ldr r0, [r0] mov r2, #0 add r0, r0, #0x6c add r0, r0, #0x3400 bl ov11_022F52E8 - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 mov r2, #0x60 ldr r0, [r1] add r0, r0, #0x3000 @@ -2784,20 +2784,20 @@ _0238C72C: add r0, r0, #0x2800 add r1, r1, #0x120 bl ov11_022F6F08 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, _0238CA80 ; =0x48140000 ldr r0, [r0] add r0, r0, #0x1b4 add r0, r0, #0x2800 bl ov11_022F495C - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 mov r1, #0x800 ldr r0, [r0] mov r2, #0 add r0, r0, #0x1b4 add r0, r0, #0x2800 bl ov11_022F52E8 - ldr r4, _0238CA54 ; =_0238DB80 + ldr r4, _0238CA54 ; =ov14_0238DB80 mov sb, #0 ldr r0, [r4] ldr r1, _0238CA84 ; =0x0238D970 @@ -2902,15 +2902,15 @@ _0238C9C0: mov sb, r0, asr #0x10 cmp sb, #4 blt _0238C88C - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #4] bl ov14_0238AD04 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #5] bl ov14_0238AD04 - ldr r0, _0238CA54 ; =_0238DB80 + ldr r0, _0238CA54 ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #3] @@ -2918,14 +2918,14 @@ _0238C9C0: beq _0238CA10 bl sub_02027B58 _0238CA10: - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r0, _0238CA90 ; =0x00002C04 ldr r1, [r1] mov r2, #1 add r1, r1, #0x3000 strb r2, [r1, #0x870] bl sub_02017C80 - ldr r1, _0238CA54 ; =_0238DB80 + ldr r1, _0238CA54 ; =ov14_0238DB80 mov r3, #2 ldr r0, [r1] mov r2, #0xd @@ -2936,7 +2936,7 @@ _0238CA10: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0238CA54: .word _0238DB80 +_0238CA54: .word ov14_0238DB80 _0238CA58: .word 0x000003FA _0238CA5C: .word 0x000005DC _0238CA60: .word 0x020A1BB0 @@ -2958,7 +2958,7 @@ _0238CA90: .word 0x00002C04 SentryStateGetUserChoice: ; 0x0238CA94 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x38 - ldr r2, _0238CFA4 ; =_0238DB80 + ldr r2, _0238CFA4 ; =ov14_0238DB80 mov r1, #0x3c ldr r0, [r2] add r0, r0, #0x3000 @@ -2980,7 +2980,7 @@ SentryStateGetUserChoice: ; 0x0238CA94 rsb r0, r1, r8, lsl #28 add r0, r1, r0, ror #28 bl ov14_0238AC04 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #0x3c ldr r4, [r0] add r0, r4, #0x3000 @@ -3024,7 +3024,7 @@ _0238CB64: add r5, r6, #0x28 cmp r3, r5 bgt _0238CBB8 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r4, #1 ldr r0, [r0] add r0, r0, #0x3000 @@ -3049,14 +3049,14 @@ _0238CBCC: _0238CBEC: cmp r4, #0 beq _0238CCCC - ldr r1, _0238CFA4 ; =_0238DB80 + ldr r1, _0238CFA4 ; =ov14_0238DB80 ldr r0, _0238CFAC ; =0x00003F02 ldr r1, [r1] mov r2, #0 add r1, r1, #0x3000 str r2, [r1, #0x8ac] bl sub_02017C80 - ldr r2, _0238CFA4 ; =_0238DB80 + ldr r2, _0238CFA4 ; =ov14_0238DB80 ldr r1, [r2] add r0, r1, #0x3000 ldr r0, [r0, #0x878] @@ -3119,7 +3119,7 @@ ov14_0238CCBC: ; 0x0238CCBC bl SentrySetStateIntermediate b _0238CCE0 _0238CCCC: - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #3 ldr r0, [r0] arm_func_end ov14_0238CCBC @@ -3139,7 +3139,7 @@ _0238CCE0: ov14_0238CCF0: ; 0x0238CCF0 bl sub_02017C80 _0238CCF4: - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x878] @@ -3158,7 +3158,7 @@ _0238CD20: strne r1, [r0, #0x878] tst r2, #0x10 beq _0238CF14 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3000 @@ -3171,7 +3171,7 @@ _0238CD50: strne r1, [r0, #0x878] tst r2, #0x20 beq _0238CF14 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3000 @@ -3184,7 +3184,7 @@ _0238CD80: strne r1, [r0, #0x878] tst r2, #0x10 beq _0238CF14 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #3 ldr r0, [r0] add r0, r0, #0x3000 @@ -3197,7 +3197,7 @@ _0238CDB0: strne r1, [r0, #0x878] tst r2, #0x20 beq _0238CF14 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #2 ldr r0, [r0] add r0, r0, #0x3000 @@ -3206,7 +3206,7 @@ _0238CDB0: _0238CDE0: add r0, r4, #0x3000 mov r2, #1 - ldr r1, _0238CFA4 ; =_0238DB80 + ldr r1, _0238CFA4 ; =ov14_0238DB80 strb r2, [r0, #0x871] ldr r0, [r1] mov r2, #2 @@ -3216,7 +3216,7 @@ _0238CDE0: bl SentrySetStateIntermediate b _0238CF14 _0238CE0C: - ldr r4, _0238CFA4 ; =_0238DB80 + ldr r4, _0238CFA4 ; =ov14_0238DB80 ldr r0, [r4] add r0, r0, #0x3000 ldrb r1, [r0, #0x89d] @@ -3295,7 +3295,7 @@ _0238CF14: _0238CF1C: cmp r8, #5 blt _0238CF5C - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldrb r0, [r0, #0x89e] @@ -3304,7 +3304,7 @@ _0238CF1C: bl ov14_0238AC40 ldr r0, _0238CFC0 ; =0x00002C06 bl sub_02017C80 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3000 @@ -3312,7 +3312,7 @@ _0238CF1C: _0238CF5C: cmp r8, #0xb blt _0238CF9C - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldrb r0, [r0, #0x89f] @@ -3321,7 +3321,7 @@ _0238CF5C: bl ov14_0238AC40 ldr r0, _0238CFC0 ; =0x00002C06 bl sub_02017C80 - ldr r0, _0238CFA4 ; =_0238DB80 + ldr r0, _0238CFA4 ; =ov14_0238DB80 mov r1, #1 ldr r0, [r0] add r0, r0, #0x3000 @@ -3330,7 +3330,7 @@ _0238CF9C: add sp, sp, #0x38 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0238CFA4: .word _0238DB80 +_0238CFA4: .word ov14_0238DB80 _0238CFA8: .word 0x0238DA20 _0238CFAC: .word 0x00003F02 _0238CFB0: .word 0x00003F03 @@ -3344,7 +3344,7 @@ _0238CFC0: .word 0x00002C06 SentryStateFinalizeRound: ; 0x0238CFC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 - ldr r2, _0238D2FC ; =_0238DB80 + ldr r2, _0238D2FC ; =ov14_0238DB80 mov r0, #0 ldr r1, [r2] add r1, r1, #0x3000 @@ -3364,17 +3364,17 @@ SentryStateFinalizeRound: ; 0x0238CFC4 bl ov14_0238AC04 cmp r4, #0 beq _0238D078 - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3a8 add r0, r0, #0x3000 bl ov11_022F7058 - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x6c add r0, r0, #0x3400 bl ov11_022F6EFC - ldr r1, _0238D2FC ; =_0238DB80 + ldr r1, _0238D2FC ; =ov14_0238DB80 mov r3, #1 ldr r0, [r1] mov r2, #0 @@ -3389,7 +3389,7 @@ SentryStateFinalizeRound: ; 0x0238CFC4 bl ov11_022F6EFC _0238D078: ldr r0, _0238D300 ; =0x0238D970 - ldr r4, _0238D2FC ; =_0238DB80 + ldr r4, _0238D2FC ; =ov14_0238DB80 ldr r6, [r0, #8] ldr r5, [r0, #0xc] mov r7, #0 @@ -3459,23 +3459,23 @@ _0238D160: mov r7, r0, asr #0x10 cmp r7, #4 blt _0238D09C - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_02027B58 - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_02027AF0 - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #5] bl sub_02027B58 - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] ldrsb r0, [r0, #5] bl sub_02027AF0 - ldr r1, _0238D2FC ; =_0238DB80 + ldr r1, _0238D2FC ; =ov14_0238DB80 ldr r3, [r1] add r0, r3, #0x3000 ldr r2, [r0, #0x884] @@ -3491,7 +3491,7 @@ _0238D160: bl SetSentryDutyGamePoints cmp r0, #0 beq _0238D25C - ldr r1, _0238D2FC ; =_0238DB80 + ldr r1, _0238D2FC ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -3502,7 +3502,7 @@ _0238D160: cmp r1, #0xfa0 movgt r1, #1 strgt r1, [r0, #0x890] - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r1, _0238D304 ; =0x00001B58 ldr r0, [r0] add r0, r0, #0x3000 @@ -3510,7 +3510,7 @@ _0238D160: cmp r2, r1 movgt r1, #2 strgt r1, [r0, #0x890] - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldrb r1, [r0, #0x89c] @@ -3518,7 +3518,7 @@ _0238D160: movne r1, #3 b _0238D2C0 _0238D25C: - ldr r1, _0238D2FC ; =_0238DB80 + ldr r1, _0238D2FC ; =ov14_0238DB80 mov r2, #4 ldr r0, [r1] add r0, r0, #0x3000 @@ -3529,7 +3529,7 @@ _0238D25C: cmp r1, #0xfa0 movgt r1, #5 strgt r1, [r0, #0x890] - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r1, _0238D304 ; =0x00001B58 ldr r0, [r0] add r0, r0, #0x3000 @@ -3537,7 +3537,7 @@ _0238D25C: cmp r2, r1 movgt r1, #6 strgt r1, [r0, #0x890] - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldrb r1, [r0, #0x89c] @@ -3545,7 +3545,7 @@ _0238D25C: movne r1, #7 _0238D2C0: strne r1, [r0, #0x890] - ldr r0, _0238D2FC ; =_0238DB80 + ldr r0, _0238D2FC ; =ov14_0238DB80 ldr r1, [r0] ldr r0, [r1, #0x11c] cmp r0, #0 @@ -3562,26 +3562,26 @@ _0238D2F4: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0238D2FC: .word _0238DB80 +_0238D2FC: .word ov14_0238DB80 _0238D300: .word 0x0238D970 _0238D304: .word 0x00001B58 arm_func_end SentryStateFinalizeRound arm_func_start SentryStateF SentryStateF: ; 0x0238D308 - ldr r0, _0238D31C ; =_0238DB80 + ldr r0, _0238D31C ; =ov14_0238DB80 mov r1, #0xa ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D31C: .word _0238DB80 +_0238D31C: .word ov14_0238DB80 arm_func_end SentryStateF arm_func_start SentryState10 SentryState10: ; 0x0238D320 stmdb sp!, {r3, lr} - ldr r2, _0238D390 ; =_0238DB80 + ldr r2, _0238D390 ; =ov14_0238DB80 mvn r1, #1 ldr r0, [r2] add r0, r0, #0x3000 @@ -3601,7 +3601,7 @@ SentryState10: ; 0x0238D320 _0238D368: ldr r0, _0238D394 ; =0x00002C08 bl sub_02017C80 - ldr r0, _0238D390 ; =_0238DB80 + ldr r0, _0238D390 ; =ov14_0238DB80 mvn r3, #0 ldr r2, [r0] mov r1, #0x11 @@ -3610,24 +3610,24 @@ _0238D368: str r1, [r0, #0x110] ldmia sp!, {r3, pc} .align 2, 0 -_0238D390: .word _0238DB80 +_0238D390: .word ov14_0238DB80 _0238D394: .word 0x00002C08 arm_func_end SentryState10 arm_func_start SentryState11 SentryState11: ; 0x0238D398 - ldr r0, _0238D3AC ; =_0238DB80 + ldr r0, _0238D3AC ; =ov14_0238DB80 mov r1, #0xd ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D3AC: .word _0238DB80 +_0238D3AC: .word ov14_0238DB80 arm_func_end SentryState11 arm_func_start SentryState12 SentryState12: ; 0x0238D3B0 - ldr r1, _0238D3E0 ; =_0238DB80 + ldr r1, _0238D3E0 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] ldr r3, _0238D3E4 ; =0x00002311 @@ -3640,13 +3640,13 @@ SentryState12: ; 0x0238D3B0 str r2, [r0, #0x110] bx lr .align 2, 0 -_0238D3E0: .word _0238DB80 +_0238D3E0: .word ov14_0238DB80 _0238D3E4: .word 0x00002311 arm_func_end SentryState12 arm_func_start SentryState13 SentryState13: ; 0x0238D3E8 - ldr r1, _0238D40C ; =_0238DB80 + ldr r1, _0238D40C ; =ov14_0238DB80 mov r3, #1 ldr r0, [r1] mov r2, #0x17 @@ -3656,24 +3656,24 @@ SentryState13: ; 0x0238D3E8 str r2, [r0, #0x110] bx lr .align 2, 0 -_0238D40C: .word _0238DB80 +_0238D40C: .word ov14_0238DB80 arm_func_end SentryState13 arm_func_start SentryState14 SentryState14: ; 0x0238D410 - ldr r0, _0238D424 ; =_0238DB80 + ldr r0, _0238D424 ; =ov14_0238DB80 mov r1, #0x15 ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D424: .word _0238DB80 +_0238D424: .word ov14_0238DB80 arm_func_end SentryState14 arm_func_start SentryState15 SentryState15: ; 0x0238D428 stmdb sp!, {r3, lr} - ldr r0, _0238D464 ; =_0238DB80 + ldr r0, _0238D464 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r0, [r0, #0x8ac] @@ -3689,13 +3689,13 @@ _0238D450: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D464: .word _0238DB80 +_0238D464: .word ov14_0238DB80 arm_func_end SentryState15 arm_func_start SentryState16 SentryState16: ; 0x0238D468 stmdb sp!, {r3, lr} - ldr r2, _0238D4BC ; =_0238DB80 + ldr r2, _0238D4BC ; =ov14_0238DB80 mvn r1, #0x3f ldr r0, [r2] add r0, r0, #0x3000 @@ -3716,12 +3716,12 @@ SentryState16: ; 0x0238D468 bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D4BC: .word _0238DB80 +_0238D4BC: .word ov14_0238DB80 arm_func_end SentryState16 arm_func_start SentryState17 SentryState17: ; 0x0238D4C0 - ldr r1, _0238D534 ; =_0238DB80 + ldr r1, _0238D534 ; =ov14_0238DB80 mov r3, #4 ldr r2, [r1] add r0, r2, #0x3000 @@ -3739,7 +3739,7 @@ SentryState17: ; 0x0238D4C0 addeq r0, r2, r0, lsl #2 addeq r0, r0, #0x3000 streq r1, [r0, #0x554] - ldr r1, _0238D534 ; =_0238DB80 + ldr r1, _0238D534 ; =ov14_0238DB80 mov r2, #0x18 ldr ip, [r1] add r0, ip, #0x3000 @@ -3751,13 +3751,13 @@ SentryState17: ; 0x0238D4C0 str r2, [r0, #0x110] bx lr .align 2, 0 -_0238D534: .word _0238DB80 +_0238D534: .word ov14_0238DB80 arm_func_end SentryState17 arm_func_start SentryState18 SentryState18: ; 0x0238D538 stmdb sp!, {r3, lr} - ldr r0, _0238D56C ; =_0238DB80 + ldr r0, _0238D56C ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r0, [r0, #0x8ac] @@ -3771,24 +3771,24 @@ _0238D560: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D56C: .word _0238DB80 +_0238D56C: .word ov14_0238DB80 arm_func_end SentryState18 arm_func_start SentryState19 SentryState19: ; 0x0238D570 - ldr r0, _0238D584 ; =_0238DB80 + ldr r0, _0238D584 ; =ov14_0238DB80 mov r1, #0x1a ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D584: .word _0238DB80 +_0238D584: .word ov14_0238DB80 arm_func_end SentryState19 arm_func_start SentryState1A SentryState1A: ; 0x0238D588 stmdb sp!, {r3, lr} - ldr r0, _0238D5C4 ; =_0238DB80 + ldr r0, _0238D5C4 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r0, [r0, #0x8ac] @@ -3804,13 +3804,13 @@ _0238D5B0: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D5C4: .word _0238DB80 +_0238D5C4: .word ov14_0238DB80 arm_func_end SentryState1A arm_func_start SentryStateFinalizePoints SentryStateFinalizePoints: ; 0x0238D5C8 stmdb sp!, {r3, lr} - ldr r2, _0238D654 ; =_0238DB80 + ldr r2, _0238D654 ; =ov14_0238DB80 mvn r1, #0x3f ldr r0, [r2] add r0, r0, #0x3000 @@ -3837,7 +3837,7 @@ SentryStateFinalizePoints: ; 0x0238D5C8 addne r1, r1, #0x7d0 strne r1, [r0, #0x88c] _0238D634: - ldr r0, _0238D654 ; =_0238DB80 + ldr r0, _0238D654 ; =ov14_0238DB80 mov r2, #0 ldr r1, [r0] mov r0, #0x1c @@ -3846,12 +3846,12 @@ _0238D634: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D654: .word _0238DB80 +_0238D654: .word ov14_0238DB80 arm_func_end SentryStateFinalizePoints arm_func_start SentryState1C SentryState1C: ; 0x0238D658 - ldr r1, _0238D694 ; =_0238DB80 + ldr r1, _0238D694 ; =ov14_0238DB80 ldr r2, _0238D698 ; =0x00002310 ldr r0, [r1] mov r3, #2 @@ -3867,14 +3867,14 @@ SentryState1C: ; 0x0238D658 str r2, [r0, #0x110] bx lr .align 2, 0 -_0238D694: .word _0238DB80 +_0238D694: .word ov14_0238DB80 _0238D698: .word 0x00002310 arm_func_end SentryState1C arm_func_start SentryState1D SentryState1D: ; 0x0238D69C stmdb sp!, {r3, lr} - ldr r0, _0238D6FC ; =_0238DB80 + ldr r0, _0238D6FC ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x3000 ldr r0, [r0, #0x8ac] @@ -3886,7 +3886,7 @@ SentryState1D: ; 0x0238D69C beq _0238D6CC bl sub_02027B58 _0238D6CC: - ldr r0, _0238D6FC ; =_0238DB80 + ldr r0, _0238D6FC ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r0, [r0, #0x8ac] @@ -3900,24 +3900,24 @@ _0238D6F0: bl SentrySetStateIntermediate ldmia sp!, {r3, pc} .align 2, 0 -_0238D6FC: .word _0238DB80 +_0238D6FC: .word ov14_0238DB80 arm_func_end SentryState1D arm_func_start SentryState1E SentryState1E: ; 0x0238D700 - ldr r0, _0238D714 ; =_0238DB80 + ldr r0, _0238D714 ; =ov14_0238DB80 mov r1, #0x1f ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D714: .word _0238DB80 +_0238D714: .word ov14_0238DB80 arm_func_end SentryState1E arm_func_start SentryState1F SentryState1F: ; 0x0238D718 stmdb sp!, {r3, lr} - ldr r0, _0238D790 ; =_0238DB80 + ldr r0, _0238D790 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x8ac] @@ -3925,7 +3925,7 @@ SentryState1F: ; 0x0238D718 bge _0238D754 mov r0, #0x1e bl SentrySetStateIntermediate - ldr r0, _0238D790 ; =_0238DB80 + ldr r0, _0238D790 ; =ov14_0238DB80 mov r1, #0x1e ldr r0, [r0] add r0, r0, #0x3000 @@ -3938,7 +3938,7 @@ _0238D754: mov r0, #0x1e bl sub_02017B7C _0238D768: - ldr r0, _0238D790 ; =_0238DB80 + ldr r0, _0238D790 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x8b4] @@ -3949,24 +3949,24 @@ _0238D768: bl SentrySetExitingState__0238B6D8 ldmia sp!, {r3, pc} .align 2, 0 -_0238D790: .word _0238DB80 +_0238D790: .word ov14_0238DB80 arm_func_end SentryState1F arm_func_start SentryState20 SentryState20: ; 0x0238D794 - ldr r0, _0238D7A8 ; =_0238DB80 + ldr r0, _0238D7A8 ; =ov14_0238DB80 mov r1, #0x21 ldr r0, [r0] str r1, [r0, #0x110] bx lr .align 2, 0 -_0238D7A8: .word _0238DB80 +_0238D7A8: .word ov14_0238DB80 arm_func_end SentryState20 arm_func_start SentryState21 SentryState21: ; 0x0238D7AC stmdb sp!, {r3, lr} - ldr r0, _0238D824 ; =_0238DB80 + ldr r0, _0238D824 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x8ac] @@ -3974,7 +3974,7 @@ SentryState21: ; 0x0238D7AC bge _0238D7E8 mov r0, #0x20 bl SentrySetStateIntermediate - ldr r0, _0238D824 ; =_0238DB80 + ldr r0, _0238D824 ; =ov14_0238DB80 mov r1, #0x1e ldr r0, [r0] add r0, r0, #0x3000 @@ -3987,7 +3987,7 @@ _0238D7E8: mov r0, #0x1e bl sub_02017B7C _0238D7FC: - ldr r0, _0238D824 ; =_0238DB80 + ldr r0, _0238D824 ; =ov14_0238DB80 ldr r0, [r0] add r0, r0, #0x3000 ldr r1, [r0, #0x8b4] @@ -3998,7 +3998,7 @@ _0238D7FC: bl SentrySetExitingState__0238B6D8 ldmia sp!, {r3, pc} .align 2, 0 -_0238D824: .word _0238DB80 +_0238D824: .word ov14_0238DB80 arm_func_end SentryState21 arm_func_start ov14_0238D828 @@ -4126,7 +4126,8 @@ _0238D968: .word 0x0000080F .byte 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3D, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00 .data -_0238DB80: + .global ov14_0238DB80 +ov14_0238DB80: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xE8, 0xC1, 0x38, 0x02, 0x0C, 0xC2, 0x38, 0x02 .byte 0x64, 0xC2, 0x38, 0x02, 0x88, 0xC2, 0x38, 0x02, 0xB0, 0xC3, 0x38, 0x02, 0xD4, 0xC3, 0x38, 0x02 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index fc7948e4..8a629b90 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -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 diff --git a/asm/overlay_16.s b/asm/overlay_16.s index 2ad485dc..06a2b2cd 100644 --- a/asm/overlay_16.s +++ b/asm/overlay_16.s @@ -7,7 +7,7 @@ ov16_0238A140: ; 0x0238A140 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x128 - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r2, [r1] str r0, [r2, #0x70] ldr r0, [r1] @@ -65,19 +65,19 @@ _0238A21C: bl ov16_0238CBD0 cmp r0, #0 bne _0238A240 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0xf ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238B0C4 _0238A240: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #6 ldr r0, [r0] str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B0D0 ; =0x00000431 ldr r3, [r0] mov r1, #0x18 @@ -89,7 +89,7 @@ _0238A274: bl ov16_0238CBD0 cmp r0, #0 bne _0238A298 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0xf ldr r0, [r0] str r1, [r0, #0x70] @@ -97,11 +97,11 @@ _0238A274: b _0238B0C4 _0238A298: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #6 ldr r1, [r0] ldr r2, _0238B0D4 ; =0x00000432 @@ -114,11 +114,11 @@ _0238A298: b _0238B0C4 _0238A2D8: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #1 ldr r1, [r0] add r2, r3, #0x440 @@ -137,7 +137,7 @@ _0238A318: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 @@ -145,7 +145,7 @@ _0238A344: mov r1, #1 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B0E4 ; =0x00000442 ldr r3, [r0] mov r1, #0x18 @@ -157,14 +157,14 @@ _0238A370: mov r1, #5 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldr r0, [r0, #0x88] cmp r0, #0 ble _0238A394 bl sub_020572EC _0238A394: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x88] cmp r1, #1 @@ -177,7 +177,7 @@ _0238A394: add r3, r1, #0xe8 mov r1, #0x18 bl ShowMessageInDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x88] @@ -187,7 +187,7 @@ _0238A3DC: cmp r0, #0 mov r1, #0x18 bne _0238A408 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r2, #0x440 ldr r3, [r0] ldrsb r0, [r3, #0xc1] @@ -195,7 +195,7 @@ _0238A3DC: bl ShowMessageInDBox b _0238B0C4 _0238A408: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 add r2, r1, #0x430 ldr r3, [r0] ldrsb r0, [r3, #0xc1] @@ -212,11 +212,11 @@ _0238A424: b _0238B0C4 _0238A440: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #0x27 ldr r1, [r0] rsb r2, r3, #0x460 @@ -233,14 +233,14 @@ ov16_0238A468: ; 0x0238A468 b _0238B0C4 _0238A480: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r2, #0xa ldr r0, [r0] ldr r1, [r0, #0x3c] add r0, r0, #0x138 add r1, r1, #0x3a bl StrncpySimpleNoPadSafe - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] add r1, r2, #0x138 str r1, [r2, #0x120] @@ -256,7 +256,7 @@ _0238A480: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #8 mov r4, #0x13 ldr r3, [r0] @@ -274,14 +274,14 @@ _0238A50C: ldrsh r0, [r0, #0xc] bl IsMonsterOnTeam cmp r0, #0 - ldrne r0, _0238B0CC ; =_0238CE40 + ldrne r0, _0238B0CC ; =ov16_0238CE40 movne r1, #0x1a - ldreq r0, _0238B0CC ; =_0238CE40 + ldreq r0, _0238B0CC ; =ov16_0238CE40 moveq r1, #0x1c ldr r0, [r0] mov r4, #2 str r1, [r0, #0x74] - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r3, _0238B0EC ; =0x0238CD08 ldr r1, [r0] ldr r0, _0238B0D8 ; =0x0238CDE4 @@ -290,13 +290,13 @@ _0238A50C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 _0238A574: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] ldrsh r1, [r2, #0x44] orr r1, r1, #0x20000 @@ -309,7 +309,7 @@ _0238A574: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #0x11 ldr r1, [r0] ldr r2, _0238B0F4 ; =0x00000434 @@ -332,7 +332,7 @@ _0238A5D8: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 @@ -344,7 +344,7 @@ _0238A614: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 @@ -355,20 +355,20 @@ _0238A640: add r0, sp, #0x18 mov r1, #3 bl sub_0203F150 - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc4] b _0238B0C4 _0238A668: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r2, #0xa ldr r0, [r0] ldr r1, [r0, #0x3c] add r0, r0, #0x138 add r1, r1, #0x3a bl StrncpySimpleNoPadSafe - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] add r1, r2, #0x138 str r1, [r2, #0x120] @@ -384,7 +384,7 @@ _0238A668: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r4, #0x1b ldr r2, [r0] mov r1, #8 @@ -407,7 +407,7 @@ _0238A6F4: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 @@ -434,7 +434,7 @@ _0238A760: blt _0238A760 cmp r2, #1 bne _0238A7D8 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #0 _0238A78C: ldr r2, [r0] @@ -466,27 +466,27 @@ _0238A7DC: beq _0238A820 b _0238A838 _0238A7F0: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsh r0, [r1, #0xc] cmp r0, #0 moveq r0, #1 streq r0, [r1, #0x40] - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x10 ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238B0C4 _0238A820: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238B0C4 _0238A838: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x14 ldr r0, [r0] str r1, [r0, #0x70] @@ -516,7 +516,7 @@ _0238A850: cmp r0, #0 ldreq r0, [r1, #0xfc] streq r0, [r1, #0xf8] - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0 ldr r3, [r0] ldr r2, [r3, #0x40] @@ -553,7 +553,7 @@ _0238A918: _0238A928: bl ov16_0238CAE8 bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #8 ldr r1, [r0] ldr r2, _0238B104 ; =0x0000043E @@ -571,14 +571,14 @@ _0238A95C: ldrsh r0, [r0, #0xc] bl IsMonsterOnTeam cmp r0, #0 - ldrne r0, _0238B0CC ; =_0238CE40 + ldrne r0, _0238B0CC ; =ov16_0238CE40 movne r1, #0x1a - ldreq r0, _0238B0CC ; =_0238CE40 + ldreq r0, _0238B0CC ; =ov16_0238CE40 moveq r1, #0x1c ldr r0, [r0] mov r4, #2 str r1, [r0, #0x74] - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r3, _0238B0EC ; =0x0238CD08 ldr r1, [r0] ldr r0, _0238B0D8 ; =0x0238CDE4 @@ -587,13 +587,13 @@ _0238A95C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 _0238A9C4: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #8 ldr r1, [r0] ldr r2, _0238B108 ; =0x0000043A @@ -607,7 +607,7 @@ _0238A9C4: _0238A9F4: ldrsb r0, [r0, #0xc1] bl sub_0202F2C4 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r3, #0x14 ldr r1, [r0] mov r2, #3 @@ -638,7 +638,7 @@ _0238AA58: ldr r0, [r1] str r2, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B10C ; =0x0000043C ldr r3, [r0] mov r1, #8 @@ -650,7 +650,7 @@ _0238AA94: mov r1, #0x1f str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r2, #3 ldr r1, [r0] ldr r3, _0238B110 ; =0x0000140F @@ -666,7 +666,7 @@ _0238AA94: b _0238B0C4 _0238AAD8: bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x3c] ldrsh r1, [r1, #4] @@ -674,72 +674,72 @@ _0238AAD8: ldr r0, [r0] ldr r0, [r0, #0x3c] bl IsMonsterNotNicknamed - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 mov r2, #1 ldr r3, [r1] strb r0, [r3, #0x46] ldr r0, [r1] strb r2, [r0] bl IncrementNbEvolutions - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldr r0, [r1, #0x40] add r0, r1, r0, lsl #1 ldrsh r0, [r0, #0xc] bl SetPokemonJoined - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl sub_02056410 cmp r0, #0 beq _0238AB84 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl sub_020564B0 - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0x8c] bl SetTeamSetupHeroOnly cmp r0, #0 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 movne r1, #2 ldr r0, [r0] moveq r1, #1 str r1, [r0, #0x88] b _0238AB9C _0238AB84: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x8c] ldr r0, [r0] str r2, [r0, #0x88] _0238AB9C: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x40] add r0, r2, #0x44 add r1, r2, r1, lsl #1 ldrsh r1, [r1, #0xc] bl sub_0205A288 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl ov16_0238CC64 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldrb r0, [r0, #0x8c] cmp r0, #0 beq _0238ABF4 bl sub_02056880 bl GetActiveTeamMember - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] ldrsh r1, [r1, #0x44] strh r1, [r0, #8] _0238ABF4: - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r0, _0238B114 ; =0x020A18C4 ldr r3, [r1] ldrsh r2, [r0] @@ -754,7 +754,7 @@ _0238ABF4: ldrsh r1, [r2, #0xa] cmp r1, r0 strgth r0, [r2, #0xa] - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r0, _0238B120 ; =0x020A18E4 ldr r1, [r1] ldrsh r5, [r0] @@ -776,7 +776,7 @@ _0238ABF4: add r3, r5, r4 mov r2, r2, lsl #0x10 mov r4, r2, asr #0x10 - ldr r2, _0238B0CC ; =_0238CE40 + ldr r2, _0238B0CC ; =ov16_0238CE40 cmp r4, #0xff ldr r1, [r2] mov r3, r3, lsl #0x10 @@ -825,7 +825,7 @@ _0238AD2C: add r0, sp, #8 bl sub_02010260 _0238AD40: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldr r0, [r1, #0x40] add r0, r1, r0, lsl #1 @@ -856,7 +856,7 @@ _0238ADA0: bl sub_02017CB4 mov r0, #8 bl sub_02017C50 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldrb r0, [r1, #0x46] cmp r0, #0 @@ -867,12 +867,12 @@ _0238ADA0: add r0, sp, #0xe ldrsh r1, [r1, #4] bl GetNameRaw - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r0, [r0] ldr r0, [r0, #0x3c] ldrsh r0, [r0, #4] bl GetNameString - ldr r2, _0238B0CC ; =_0238CE40 + ldr r2, _0238B0CC ; =ov16_0238CE40 mov r1, r0 ldr r0, [r2] arm_func_end ov16_0238A468 @@ -883,12 +883,12 @@ ov16_0238ADFC: ; 0x0238ADFC ldr r0, [r0, #0x3c] add r0, r0, #0x3a bl sub_02025314 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x21 ldr r0, [r0] str r1, [r0, #0x74] _0238AE1C: - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B128 ; =0x0000043F ldr r3, [r0] mov r1, #8 @@ -899,7 +899,7 @@ _0238AE1C: _0238AE3C: ldrsb r0, [r0, #0xc1] bl FreeDBox - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0xc1] @@ -916,7 +916,7 @@ _0238AE74: mov r1, #5 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B12C ; =0x0000042D ldr r3, [r0] mov r1, #0x18 @@ -931,7 +931,7 @@ _0238AEA0: mov r1, #0x29 str r1, [r0, #0x70] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B130 ; =0x00000433 ldr r3, [r0] mov r1, #0x18 @@ -941,19 +941,19 @@ _0238AEA0: b _0238B0C4 _0238AED8: bl ov11_02310BDC - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x20 ldr r0, [r0] str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r2, _0238B134 ; =0x00000447 ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 bl ShowMessageInDBox - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 mvn r0, #1 ldr r1, [r1] ldrsb r1, [r1, #0xc2] @@ -963,7 +963,7 @@ _0238AED8: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r2, [r1] strb r0, [r2, #0xc2] ldr r2, [r1] @@ -972,17 +972,17 @@ _0238AED8: add r1, r2, r1, lsl #1 ldrsh r1, [r1, #0xc] bl InitPortraitBoxWithMonsterId - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #4 ldr r0, [r0] add r0, r0, #0xc8 bl SetPortraitUnknownAttr - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] add r0, r0, #0xc8 bl SetPortraitExpressionId - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsb r0, [r1, #0xc2] add r1, r1, #0xc8 @@ -991,7 +991,7 @@ _0238AED8: _0238AF98: ldrsb r0, [r0, #0xc1] bl FreeDBox - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 mvn r3, #1 ldr r2, [r1] mov r0, #2 @@ -1028,7 +1028,7 @@ _0238AFF8: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238B0C4 @@ -1048,7 +1048,7 @@ _0238B040: blt _0238B040 cmp ip, #2 bge _0238B088 - ldr r0, _0238B0CC ; =_0238CE40 + ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x70] @@ -1067,14 +1067,14 @@ _0238B088: add r2, sp, #0x90 str ip, [sp, #4] bl CreateAdvancedMenu - ldr r1, _0238B0CC ; =_0238CE40 + ldr r1, _0238B0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] _0238B0C4: add sp, sp, #0x128 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238B0CC: .word _0238CE40 +_0238B0CC: .word ov16_0238CE40 _0238B0D0: .word 0x00000431 _0238B0D4: .word 0x00000432 _0238B0D8: .word 0x0238CDE4 @@ -1111,7 +1111,7 @@ _0238B144: .word ov16_0238CB30 ov16_0238B148: ; 0x0238B148 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x128 - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r0, [r1] ldr r2, [r0, #0x70] cmp r2, #0x2c @@ -1167,19 +1167,19 @@ _0238B21C: bl ov16_0238CBD0 cmp r0, #0 bne _0238B240 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0xf ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238C0C4 _0238B240: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #6 ldr r0, [r0] str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C0D0 ; =0x00000431 ldr r3, [r0] mov r1, #0x18 @@ -1191,7 +1191,7 @@ _0238B274: bl ov16_0238CBD0 cmp r0, #0 bne _0238B298 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0xf ldr r0, [r0] str r1, [r0, #0x70] @@ -1199,11 +1199,11 @@ _0238B274: b _0238C0C4 _0238B298: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #6 ldr r1, [r0] ldr r2, _0238C0D4 ; =0x00000432 @@ -1216,11 +1216,11 @@ _0238B298: b _0238C0C4 _0238B2D8: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #1 ldr r1, [r0] add r2, r3, #0x440 @@ -1239,7 +1239,7 @@ _0238B318: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 @@ -1247,7 +1247,7 @@ _0238B344: mov r1, #1 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C0E4 ; =0x00000442 ldr r3, [r0] mov r1, #0x18 @@ -1259,14 +1259,14 @@ _0238B370: mov r1, #5 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldr r0, [r0, #0x88] cmp r0, #0 ble _0238B394 bl sub_020572EC _0238B394: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x88] cmp r1, #1 @@ -1279,7 +1279,7 @@ _0238B394: add r3, r1, #0xe8 mov r1, #0x18 bl ShowMessageInDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x88] @@ -1289,7 +1289,7 @@ _0238B3DC: cmp r0, #0 mov r1, #0x18 bne _0238B408 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r2, #0x440 ldr r3, [r0] ldrsb r0, [r3, #0xc1] @@ -1297,7 +1297,7 @@ _0238B3DC: bl ShowMessageInDBox b _0238C0C4 _0238B408: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 add r2, r1, #0x430 ldr r3, [r0] ldrsb r0, [r3, #0xc1] @@ -1314,11 +1314,11 @@ _0238B424: b _0238C0C4 _0238B440: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #0x27 ldr r1, [r0] rsb r2, r3, #0x460 @@ -1331,14 +1331,14 @@ _0238B440: b _0238C0C4 _0238B480: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r2, #0xa ldr r0, [r0] ldr r1, [r0, #0x3c] add r0, r0, #0x138 add r1, r1, #0x3a bl StrncpySimpleNoPadSafe - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] add r1, r2, #0x138 str r1, [r2, #0x120] @@ -1354,7 +1354,7 @@ _0238B480: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #8 mov r4, #0x13 ldr r3, [r0] @@ -1372,14 +1372,14 @@ _0238B50C: ldrsh r0, [r0, #0xc] bl IsMonsterOnTeam cmp r0, #0 - ldrne r0, _0238C0CC ; =_0238CE40 + ldrne r0, _0238C0CC ; =ov16_0238CE40 movne r1, #0x1a - ldreq r0, _0238C0CC ; =_0238CE40 + ldreq r0, _0238C0CC ; =ov16_0238CE40 moveq r1, #0x1c ldr r0, [r0] mov r4, #2 str r1, [r0, #0x74] - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r3, _0238C0EC ; =0x0238CD08 ldr r1, [r0] ldr r0, _0238C0D8 ; =0x0238CDE4 @@ -1388,13 +1388,13 @@ _0238B50C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 _0238B574: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] ldrsh r1, [r2, #0x44] orr r1, r1, #0x20000 @@ -1407,7 +1407,7 @@ _0238B574: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #0x11 ldr r1, [r0] ldr r2, _0238C0F4 ; =0x00000434 @@ -1430,7 +1430,7 @@ _0238B5D8: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 @@ -1442,7 +1442,7 @@ _0238B614: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 @@ -1453,20 +1453,20 @@ _0238B640: add r0, sp, #0xb0 mov r1, #3 bl sub_0203F150 - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc4] b _0238C0C4 _0238B668: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r2, #0xa ldr r0, [r0] ldr r1, [r0, #0x3c] add r0, r0, #0x138 add r1, r1, #0x3a bl StrncpySimpleNoPadSafe - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] add r1, r2, #0x138 str r1, [r2, #0x120] @@ -1482,7 +1482,7 @@ _0238B668: ldr r0, [r0] ldrsb r0, [r0, #0xc1] bl ShowDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r4, #0x1b ldr r2, [r0] mov r1, #8 @@ -1505,7 +1505,7 @@ _0238B6F4: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 @@ -1532,7 +1532,7 @@ _0238B760: blt _0238B760 cmp r2, #1 bne _0238B7D8 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #0 _0238B78C: ldr r2, [r0] @@ -1564,27 +1564,27 @@ _0238B7DC: beq _0238B820 b _0238B838 _0238B7F0: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsh r0, [r1, #0xc] cmp r0, #0 moveq r0, #1 streq r0, [r1, #0x40] - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x10 ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238C0C4 _0238B820: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x70] bl ov16_0238B148 b _0238C0C4 _0238B838: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x14 ldr r0, [r0] str r1, [r0, #0x70] @@ -1614,7 +1614,7 @@ _0238B850: cmp r0, #0 ldreq r0, [r1, #0xfc] streq r0, [r1, #0xf8] - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0 ldr r3, [r0] ldr r2, [r3, #0x40] @@ -1651,7 +1651,7 @@ _0238B918: _0238B928: bl ov16_0238CAE8 bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #8 ldr r1, [r0] ldr r2, _0238C104 ; =0x0000043E @@ -1669,14 +1669,14 @@ _0238B95C: ldrsh r0, [r0, #0xc] bl IsMonsterOnTeam cmp r0, #0 - ldrne r0, _0238C0CC ; =_0238CE40 + ldrne r0, _0238C0CC ; =ov16_0238CE40 movne r1, #0x1a - ldreq r0, _0238C0CC ; =_0238CE40 + ldreq r0, _0238C0CC ; =ov16_0238CE40 moveq r1, #0x1c ldr r0, [r0] mov r4, #2 str r1, [r0, #0x74] - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r3, _0238C0EC ; =0x0238CD08 ldr r1, [r0] ldr r0, _0238C0D8 ; =0x0238CDE4 @@ -1685,13 +1685,13 @@ _0238B95C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 _0238B9C4: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #8 ldr r1, [r0] ldr r2, _0238C108 ; =0x0000043A @@ -1705,7 +1705,7 @@ _0238B9C4: _0238B9F4: ldrsb r0, [r0, #0xc1] bl sub_0202F2C4 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r3, #0x14 ldr r1, [r0] mov r2, #3 @@ -1736,7 +1736,7 @@ _0238BA58: ldr r0, [r1] str r2, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C10C ; =0x0000043C ldr r3, [r0] mov r1, #8 @@ -1748,7 +1748,7 @@ _0238BA94: mov r1, #0x1f str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r2, #3 ldr r1, [r0] ldr r3, _0238C110 ; =0x0000140F @@ -1764,7 +1764,7 @@ _0238BA94: b _0238C0C4 _0238BAD8: bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x3c] ldrsh r1, [r1, #4] @@ -1772,72 +1772,72 @@ _0238BAD8: ldr r0, [r0] ldr r0, [r0, #0x3c] bl IsMonsterNotNicknamed - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 mov r2, #1 ldr r3, [r1] strb r0, [r3, #0x46] ldr r0, [r1] strb r2, [r0] bl IncrementNbEvolutions - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldr r0, [r1, #0x40] add r0, r1, r0, lsl #1 ldrsh r0, [r0, #0xc] bl SetPokemonJoined - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl sub_02056410 cmp r0, #0 beq _0238BB84 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl sub_020564B0 - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0x8c] bl SetTeamSetupHeroOnly cmp r0, #0 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 movne r1, #2 ldr r0, [r0] moveq r1, #1 str r1, [r0, #0x88] b _0238BB9C _0238BB84: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x8c] ldr r0, [r0] str r2, [r0, #0x88] _0238BB9C: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, [r0] ldr r1, [r2, #0x40] add r0, r2, #0x44 add r1, r2, r1, lsl #1 ldrsh r1, [r1, #0xc] bl sub_0205A288 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0x44] bl ov16_0238CC64 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldrb r0, [r0, #0x8c] cmp r0, #0 beq _0238BBF4 bl sub_02056880 bl GetActiveTeamMember - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] ldrsh r1, [r1, #0x44] strh r1, [r0, #8] _0238BBF4: - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r0, _0238C114 ; =0x020A18C4 ldr r3, [r1] ldrsh r2, [r0] @@ -1852,7 +1852,7 @@ _0238BBF4: ldrsh r1, [r2, #0xa] cmp r1, r0 strgth r0, [r2, #0xa] - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r0, _0238C120 ; =0x020A18E4 ldr r1, [r1] ldrsh r5, [r0] @@ -1874,7 +1874,7 @@ _0238BBF4: add r3, r5, r4 mov r2, r2, lsl #0x10 mov r4, r2, asr #0x10 - ldr r2, _0238C0CC ; =_0238CE40 + ldr r2, _0238C0CC ; =ov16_0238CE40 cmp r4, #0xff ldr r1, [r2] mov r3, r3, lsl #0x10 @@ -1923,7 +1923,7 @@ _0238BD2C: add r0, sp, #8 bl sub_02010260 _0238BD40: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldr r0, [r1, #0x40] add r0, r1, r0, lsl #1 @@ -1954,7 +1954,7 @@ _0238BDA0: bl sub_02017CB4 mov r0, #8 bl sub_02017C50 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldrb r0, [r1, #0x46] cmp r0, #0 @@ -1965,24 +1965,24 @@ _0238BDA0: add r0, sp, #0xe ldrsh r1, [r1, #4] bl GetNameRaw - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r0, [r0] ldr r0, [r0, #0x3c] ldrsh r0, [r0, #4] bl GetNameString - ldr r2, _0238C0CC ; =_0238CE40 + ldr r2, _0238C0CC ; =ov16_0238CE40 mov r1, r0 ldr r0, [r2] mov r2, #0xa ldr r0, [r0, #0x3c] add r0, r0, #0x3a bl sub_02025314 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x21 ldr r0, [r0] str r1, [r0, #0x74] _0238BE1C: - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C128 ; =0x0000043F ldr r3, [r0] mov r1, #8 @@ -1993,7 +1993,7 @@ _0238BE1C: _0238BE3C: ldrsb r0, [r0, #0xc1] bl FreeDBox - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0xc1] @@ -2010,7 +2010,7 @@ _0238BE74: mov r1, #5 str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C12C ; =0x0000042D ldr r3, [r0] mov r1, #0x18 @@ -2025,7 +2025,7 @@ _0238BEA0: mov r1, #0x29 str r1, [r0, #0x70] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C130 ; =0x00000433 ldr r3, [r0] mov r1, #0x18 @@ -2035,19 +2035,19 @@ _0238BEA0: b _0238C0C4 _0238BED8: bl ov11_02310BDC - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x20 ldr r0, [r0] str r1, [r0, #0x74] bl ov16_0238CB98 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r2, _0238C134 ; =0x00000447 ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 bl ShowMessageInDBox - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 mvn r0, #1 ldr r1, [r1] ldrsb r1, [r1, #0xc2] @@ -2057,7 +2057,7 @@ _0238BED8: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r2, [r1] strb r0, [r2, #0xc2] ldr r2, [r1] @@ -2066,17 +2066,17 @@ _0238BED8: add r1, r2, r1, lsl #1 ldrsh r1, [r1, #0xc] bl InitPortraitBoxWithMonsterId - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #4 ldr r0, [r0] add r0, r0, #0xc8 bl SetPortraitUnknownAttr - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] add r0, r0, #0xc8 bl SetPortraitExpressionId - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsb r0, [r1, #0xc2] add r1, r1, #0xc8 @@ -2085,7 +2085,7 @@ _0238BED8: _0238BF98: ldrsb r0, [r0, #0xc1] bl FreeDBox - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 mvn r3, #1 ldr r2, [r1] mov r0, #2 @@ -2122,7 +2122,7 @@ _0238BFF8: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] b _0238C0C4 @@ -2142,7 +2142,7 @@ _0238C040: blt _0238C040 cmp ip, #2 bge _0238C088 - ldr r0, _0238C0CC ; =_0238CE40 + ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x70] @@ -2161,14 +2161,14 @@ _0238C088: add r2, sp, #0x18 str ip, [sp, #4] bl CreateAdvancedMenu - ldr r1, _0238C0CC ; =_0238CE40 + ldr r1, _0238C0CC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] _0238C0C4: add sp, sp, #0x128 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238C0CC: .word _0238CE40 +_0238C0CC: .word ov16_0238CE40 _0238C0D0: .word 0x00000431 _0238C0D4: .word 0x00000432 _0238C0D8: .word 0x0238CDE4 @@ -2204,21 +2204,21 @@ _0238C144: .word ov16_0238CB30 arm_func_start ov16_0238C148 ov16_0238C148: ; 0x0238C148 stmdb sp!, {r3, lr} - ldr r0, _0238C1C8 ; =_0238CE40 + ldr r0, _0238C1C8 ; =ov16_0238CE40 ldr r0, [r0] cmp r0, #0 bne _0238C170 mov r0, #0x150 mov r1, #8 bl MemAlloc - ldr r1, _0238C1C8 ; =_0238CE40 + ldr r1, _0238C1C8 ; =ov16_0238CE40 str r0, [r1] _0238C170: - ldr r0, _0238C1C8 ; =_0238CE40 + ldr r0, _0238C1C8 ; =ov16_0238CE40 ldr r0, [r0] add r0, r0, #0xe8 bl InitPreprocessorArgs - ldr r1, _0238C1C8 ; =_0238CE40 + ldr r1, _0238C1C8 ; =ov16_0238CE40 mov r0, #0 ldr r2, [r1] sub r3, r0, #2 @@ -2237,23 +2237,23 @@ _0238C170: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238C1C8: .word _0238CE40 +_0238C1C8: .word ov16_0238CE40 arm_func_end ov16_0238C148 arm_func_start ov16_0238C1CC ov16_0238C1CC: ; 0x0238C1CC stmdb sp!, {r3, lr} - ldr r0, _0238C1F4 ; =_0238CE40 + ldr r0, _0238C1F4 ; =ov16_0238CE40 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0238C1F4 ; =_0238CE40 + ldr r0, _0238C1F4 ; =ov16_0238CE40 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0238C1F4: .word _0238CE40 +_0238C1F4: .word ov16_0238CE40 arm_func_end ov16_0238C1CC _0238C1F8: .byte 0x18, 0x40, 0x2D, 0xE9, 0x04, 0xD0, 0x4D, 0xE2 @@ -2404,31 +2404,31 @@ _0238C1F8: arm_func_start ov16_0238CAE8 ov16_0238CAE8: ; 0x0238CAE8 stmdb sp!, {r3, lr} - ldr r0, _0238CB2C ; =_0238CE40 + ldr r0, _0238CB2C ; =ov16_0238CE40 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0xc3] cmp r0, r1 ldmeqia sp!, {r3, pc} bl sub_0202836C - ldr r0, _0238CB2C ; =_0238CE40 + ldr r0, _0238CB2C ; =ov16_0238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc3] bl FreeNormalMenu - ldr r0, _0238CB2C ; =_0238CE40 + ldr r0, _0238CB2C ; =ov16_0238CE40 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0xc3] ldmia sp!, {r3, pc} .align 2, 0 -_0238CB2C: .word _0238CE40 +_0238CB2C: .word ov16_0238CE40 arm_func_end ov16_0238CAE8 arm_func_start ov16_0238CB30 ov16_0238CB30: ; 0x0238CB30 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x54 - ldr r2, _0238CB8C ; =_0238CE40 + ldr r2, _0238CB8C ; =ov16_0238CE40 ldr r3, _0238CB90 ; =0x0000C402 ldr r6, [r2] ldr r2, _0238CB94 ; =0x0238CE28 @@ -2450,7 +2450,7 @@ ov16_0238CB30: ; 0x0238CB30 add sp, sp, #0x54 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0238CB8C: .word _0238CE40 +_0238CB8C: .word ov16_0238CE40 _0238CB90: .word 0x0000C402 _0238CB94: .word 0x0238CE28 arm_func_end ov16_0238CB30 @@ -2458,7 +2458,7 @@ _0238CB94: .word 0x0238CE28 arm_func_start ov16_0238CB98 ov16_0238CB98: ; 0x0238CB98 stmdb sp!, {r3, lr} - ldr r1, _0238CBCC ; =_0238CE40 + ldr r1, _0238CBCC ; =ov16_0238CE40 mvn r0, #1 ldr r1, [r1] ldrsb r1, [r1, #0xc1] @@ -2466,12 +2466,12 @@ ov16_0238CB98: ; 0x0238CB98 ldmneia sp!, {r3, pc} mov r0, #0 bl CreateDBox - ldr r1, _0238CBCC ; =_0238CE40 + ldr r1, _0238CBCC ; =ov16_0238CE40 ldr r1, [r1] strb r0, [r1, #0xc1] ldmia sp!, {r3, pc} .align 2, 0 -_0238CBCC: .word _0238CE40 +_0238CBCC: .word ov16_0238CE40 arm_func_end ov16_0238CB98 arm_func_start ov16_0238CBD0 @@ -2523,7 +2523,7 @@ _0238CC60: .word 0x0000022B ov16_0238CC64: ; 0x0238CC64 stmdb sp!, {r3, lr} bl GetTeamMember - ldr r1, _0238CC90 ; =_0238CE40 + ldr r1, _0238CC90 ; =ov16_0238CE40 ldr r2, [r1] str r0, [r2, #0x3c] ldr r0, [r1] @@ -2533,61 +2533,61 @@ ov16_0238CC64: ; 0x0238CC64 bl StrcpySimple ldmia sp!, {r3, pc} .align 2, 0 -_0238CC90: .word _0238CE40 +_0238CC90: .word ov16_0238CE40 arm_func_end ov16_0238CC64 arm_func_start ov16_0238CC94 ov16_0238CC94: ; 0x0238CC94 - ldr r0, _0238CCA4 ; =_0238CE40 + ldr r0, _0238CCA4 ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0xdc] bx lr .align 2, 0 -_0238CCA4: .word _0238CE40 +_0238CCA4: .word ov16_0238CE40 arm_func_end ov16_0238CC94 arm_func_start ov16_0238CCA8 ov16_0238CCA8: ; 0x0238CCA8 - ldr r0, _0238CCB8 ; =_0238CE40 + ldr r0, _0238CCB8 ; =ov16_0238CE40 ldr r0, [r0] ldrsh r0, [r0, #0xde] bx lr .align 2, 0 -_0238CCB8: .word _0238CE40 +_0238CCB8: .word ov16_0238CE40 arm_func_end ov16_0238CCA8 arm_func_start ov16_0238CCBC ov16_0238CCBC: ; 0x0238CCBC - ldr r0, _0238CCD4 ; =_0238CE40 + ldr r0, _0238CCD4 ; =ov16_0238CE40 ldr r0, [r0] cmp r0, #0 moveq r0, #0 ldrne r0, [r0, #0xe0] bx lr .align 2, 0 -_0238CCD4: .word _0238CE40 +_0238CCD4: .word ov16_0238CE40 arm_func_end ov16_0238CCBC arm_func_start ov16_0238CCD8 ov16_0238CCD8: ; 0x0238CCD8 - ldr r0, _0238CCEC ; =_0238CE40 + ldr r0, _0238CCEC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] str r1, [r0, #0xe0] bx lr .align 2, 0 -_0238CCEC: .word _0238CE40 +_0238CCEC: .word ov16_0238CE40 arm_func_end ov16_0238CCD8 arm_func_start ov16_0238CCF0 ov16_0238CCF0: ; 0x0238CCF0 - ldr r0, _0238CD04 ; =_0238CE40 + ldr r0, _0238CD04 ; =ov16_0238CE40 mov r1, #4 ldr r0, [r0] str r1, [r0, #0xd8] bx lr .align 2, 0 -_0238CD04: .word _0238CE40 +_0238CD04: .word ov16_0238CE40 arm_func_end ov16_0238CCF0 ; 0x0238CD08 @@ -2612,6 +2612,6 @@ _0238CD04: .word _0238CE40 .byte 0x5B, 0x6B, 0x69, 0x6E, 0x64, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00 .data -_0238CE40: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov16_0238CE40 +ov16_0238CE40: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_17.s b/asm/overlay_17.s index c9d0363f..f5f71095 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -10,14 +10,14 @@ ov17_0238A140: ; 0x0238A140 mov r0, #0x26c mov r1, #8 bl MemAlloc - ldr r1, _0238A270 ; =_0238BE00 + ldr r1, _0238A270 ; =ov17_0238BE00 mov r2, #1 str r0, [r1] strb r2, [r0, #9] ldr r0, [r1] add r0, r0, #0xc bl InitPreprocessorArgs - ldr lr, _0238A270 ; =_0238BE00 + ldr lr, _0238A270 ; =ov17_0238BE00 mov r2, #0 ldr r0, [lr] mov r4, #2 @@ -76,20 +76,20 @@ ov17_0238A140: ; 0x0238A140 ldr r0, [lr] add r0, r0, #0x84 bl sub_02034A38 - ldr r1, _0238A270 ; =_0238BE00 + ldr r1, _0238A270 ; =ov17_0238BE00 ldr r1, [r1] str r0, [r1, #0x80] mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238A270: .word _0238BE00 +_0238A270: .word ov17_0238BE00 _0238A274: .word 0x0238A08C arm_func_end ov17_0238A140 arm_func_start ov17_0238A278 ov17_0238A278: ; 0x0238A278 stmdb sp!, {r3, lr} - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #1 @@ -100,7 +100,7 @@ ov17_0238A278: ; 0x0238A278 beq _0238A2A4 bl sub_0202F334 _0238A2A4: - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #2 @@ -111,14 +111,14 @@ _0238A2A4: beq _0238A2CC bl HidePortraitBox _0238A2CC: - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r0, [r0] ldrh r0, [r0, #0x7e] tst r0, #0x20 bne _0238A2E4 bl sub_0203A618 _0238A2E4: - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x40 @@ -129,7 +129,7 @@ _0238A2E4: beq _0238A30C bl sub_0203088C _0238A30C: - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x80 @@ -140,7 +140,7 @@ _0238A30C: beq _0238A334 bl sub_0203088C _0238A334: - ldr r0, _0238A360 ; =_0238BE00 + ldr r0, _0238A360 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x100 @@ -152,13 +152,13 @@ _0238A334: bl sub_0202E6B0 ldmia sp!, {r3, pc} .align 2, 0 -_0238A360: .word _0238BE00 +_0238A360: .word ov17_0238BE00 arm_func_end ov17_0238A278 arm_func_start ov17_0238A364 ov17_0238A364: ; 0x0238A364 stmdb sp!, {r3, lr} - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #1 @@ -172,11 +172,11 @@ ov17_0238A364: ; 0x0238A364 cmp r0, #0 movne r2, #0 bne _0238A3C4 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0] bl FreeDBox - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -186,7 +186,7 @@ _0238A3C4: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A3D0: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #2 @@ -200,11 +200,11 @@ _0238A3D0: cmp r0, #0 movne r2, #0 bne _0238A42C - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #1] bl FreePortraitBox - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -214,7 +214,7 @@ _0238A42C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A438: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #4 @@ -232,11 +232,11 @@ _0238A438: ov17_0238A468: ; 0x0238A468 movne r2, #0 bne _0238A494 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] bl FreeNormalMenu - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -246,7 +246,7 @@ _0238A494: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A4A0: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x10 @@ -260,11 +260,11 @@ _0238A4A0: cmp r0, #0 movne r2, #0 bne _0238A4FC - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeNormalMenu - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -274,7 +274,7 @@ _0238A4FC: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A508: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrh r0, [r0, #0x7e] tst r0, #0x20 @@ -290,7 +290,7 @@ _0238A534: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A540: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #8 @@ -304,11 +304,11 @@ _0238A540: cmp r0, #0 movne r2, #0 bne _0238A59C - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] bl FreeNormalMenu - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -318,7 +318,7 @@ _0238A59C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A5A8: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r3, [r0] ldrh r2, [r3, #0x7e] tst r2, #0x40 @@ -343,12 +343,12 @@ _0238A5DC: cmp r0, #0 movne r2, #0 bne _0238A630 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #6] bl sub_020308A0 bl sub_020407C0 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -358,7 +358,7 @@ _0238A630: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A63C: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x100 @@ -372,12 +372,12 @@ _0238A63C: cmp r0, #0 movne r2, #0 bne _0238A69C - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #7] bl sub_0202E6C8 bl sub_02041A00 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -387,7 +387,7 @@ _0238A69C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A6A8: - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x200 @@ -401,11 +401,11 @@ _0238A6A8: cmp r0, #0 movne r2, #0 bne _0238A704 - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #8] bl FreeNormalMenu - ldr r0, _0238A718 ; =_0238BE00 + ldr r0, _0238A718 ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -418,26 +418,26 @@ _0238A710: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238A718: .word _0238BE00 +_0238A718: .word ov17_0238BE00 arm_func_end ov17_0238A468 arm_func_start ov17_0238A71C ov17_0238A71C: ; 0x0238A71C stmdb sp!, {r3, lr} - ldr r0, _0238A750 ; =_0238BE00 + ldr r0, _0238A750 ; =ov17_0238BE00 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl sub_0203C760 - ldr r0, _0238A750 ; =_0238BE00 + ldr r0, _0238A750 ; =ov17_0238BE00 ldr r0, [r0] bl MemFree - ldr r0, _0238A750 ; =_0238BE00 + ldr r0, _0238A750 ; =ov17_0238BE00 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0238A750: .word _0238BE00 +_0238A750: .word ov17_0238BE00 arm_func_end ov17_0238A71C arm_func_start ov17_0238A754 @@ -445,7 +445,7 @@ ov17_0238A754: ; 0x0238A754 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x124 bl sub_0203C9E4 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r4, [r0] ldr r1, [r4, #0x6c] cmp r1, #3 @@ -477,7 +477,7 @@ _0238A7BC: ; jump table b _0238AEC8 ; case 2 b _0238A7CC ; case 3 _0238A7CC: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #0 str r1, [r4, #0x74] ldr r1, [r0] @@ -485,7 +485,7 @@ _0238A7CC: ldr r1, [r1, #0x70] ldr r0, [r0, r1, lsl #2] blx r0 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r3, [r0] ldr r1, [r3, #0x70] ldr r2, [r3, #0x78] @@ -502,7 +502,7 @@ _0238A7CC: blx r0 _0238A828: bl ov17_0238A278 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x74] @@ -511,7 +511,7 @@ _0238A840: bl ov17_0238A364 cmp r0, #0 beq _0238AF10 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r2, [r0] ldrh r0, [r2, #0x7e] tst r0, #1 @@ -524,18 +524,18 @@ _0238A840: bne _0238A898 ldr r0, _0238AFA8 ; =0x0238BB64 bl CreateDBox - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 mov r2, #0 ldr r3, [r1] strb r0, [r3] ldr r0, [r1] strh r2, [r0, #0x7c] _0238A898: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0] bl ShowDBox - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldr r0, [r1, #0x70] cmp r0, #0x29 @@ -636,7 +636,7 @@ _0238A9F8: ldrh r0, [r1, #0x7c] cmp r0, r5 beq _0238AA30 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 strh r5, [r1, #0x7c] ldr r2, [r0] ldr r3, _0238AFE0 ; =0x00000186 @@ -648,7 +648,7 @@ _0238A9F8: add r3, r3, #0xc bl ShowMessageInDBox _0238AA30: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #2 @@ -661,30 +661,30 @@ _0238AA30: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r2, _0238AF9C ; =_0238BE00 + ldr r2, _0238AF9C ; =ov17_0238BE00 ldr r1, _0238AFE0 ; =0x00000186 ldr r3, [r2] strb r0, [r3, #1] ldr r0, [r2] add r0, r0, #0x5c bl InitPortraitBoxWithMonsterId - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] add r0, r0, #0x5c bl SetPortraitUnknownAttr - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] add r0, r0, #0x5c bl SetPortraitExpressionId - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrsb r0, [r1, #1] add r1, r1, #0x5c bl ShowPortraitBox _0238AABC: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #4 @@ -699,11 +699,11 @@ _0238AABC: ldr r3, _0238AFEC ; =0x0238BBB4 str r2, [sp] bl CreateNormalMenu - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #2] _0238AB04: - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r3, [r1] ldrh r0, [r3, #0x7e] tst r0, #0x10 @@ -722,11 +722,11 @@ _0238AB04: ldr r3, _0238AFF8 ; =0x0238BB84 add r2, r2, #0x1b4 bl CreateNormalMenu - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #3] _0238AB5C: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r0, [r0] ldrh r0, [r0, #0x7e] tst r0, #0x20 @@ -734,14 +734,14 @@ _0238AB5C: bl sub_0203A998 cmp r0, #0 bne _0238AB94 - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 mov r0, #1 ldr r1, [r1] add r1, r1, #0x5a add r1, r1, #0x200 bl sub_02039C3C _0238AB94: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r2, [r0] ldrh r0, [r2, #0x7e] tst r0, #8 @@ -841,7 +841,7 @@ _0238ACEC: mov r8, #0 mov r4, r8 mov r5, #3 - ldr sb, _0238AF9C ; =_0238BE00 + ldr sb, _0238AF9C ; =ov17_0238BE00 b _0238AD4C _0238AD00: mov r1, r8, lsl #3 @@ -869,7 +869,7 @@ _0238AD4C: cmp r8, #0xc blt _0238AD00 _0238AD54: - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 mov r2, #0 ldr r4, [r1] ldr r0, _0238B018 ; =0x0238BB44 @@ -881,11 +881,11 @@ _0238AD54: mov r3, r7 add r2, r2, #0x11c bl CreateNormalMenu - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #4] _0238AD90: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r2, [r0] ldrh r0, [r2, #0x7e] tst r0, #0x40 @@ -901,11 +901,11 @@ _0238AD90: add r0, sp, #0xac mov r1, #3 bl sub_0203F150 - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #5] _0238ADDC: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x80 @@ -922,14 +922,14 @@ ov17_0238ADFC: ; 0x0238ADFC mov r2, r1 mov r0, #8 bl sub_0204018C - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #6] b _0238AE24 _0238AE20: bl sub_02041178 _0238AE24: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r3, [r0] ldrh r0, [r3, #0x7e] tst r0, #0x100 @@ -944,11 +944,11 @@ _0238AE24: mov r1, #4 mov r3, #1 bl sub_020417A8 - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #7] _0238AE6C: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrh r0, [r1, #0x7e] tst r0, #0x200 @@ -963,11 +963,11 @@ _0238AE6C: mov r1, #0x13 str r2, [sp] bl CreateNormalMenu - ldr r1, _0238AF9C ; =_0238BE00 + ldr r1, _0238AF9C ; =ov17_0238BE00 ldr r1, [r1] strb r0, [r1, #8] _0238AEB4: - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #2 ldr r0, [r0] str r1, [r0, #0x74] @@ -986,7 +986,7 @@ _0238AEE8: _0238AEEC: cmp r0, #0 beq _0238AF10 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r2, #0 ldr r1, [r0] str r2, [r1, #0x74] @@ -1005,7 +1005,7 @@ _0238AF18: cmp r0, #0 bne _0238AF90 bl sub_0203C940 - ldr r0, _0238AF9C ; =_0238BE00 + ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #2 ldr r0, [r0] str r1, [r0, #0x6c] @@ -1036,7 +1036,7 @@ _0238AF94: add sp, sp, #0x124 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0238AF9C: .word _0238BE00 +_0238AF9C: .word ov17_0238BE00 _0238AFA0: .word 0x0238BD44 _0238AFA4: .word 0x00003008 _0238AFA8: .word 0x0238BB64 @@ -1075,7 +1075,7 @@ _0238B024: .word 0x0238BB9C arm_func_start ov17_0238B028 ov17_0238B028: ; 0x0238B028 - ldr r1, _0238B044 ; =_0238BE00 + ldr r1, _0238B044 ; =ov17_0238BE00 mov r3, #3 ldr r2, [r1] str r3, [r2, #0x74] @@ -1083,12 +1083,12 @@ ov17_0238B028: ; 0x0238B028 str r0, [r1, #0x78] bx lr .align 2, 0 -_0238B044: .word _0238BE00 +_0238B044: .word ov17_0238BE00 arm_func_end ov17_0238B028 arm_func_start ov17_0238B048 ov17_0238B048: ; 0x0238B048 - ldr r0, _0238B074 ; =_0238BE00 + ldr r0, _0238B074 ; =ov17_0238BE00 mov r2, #3 ldr r1, [r0] ldr r3, _0238B078 ; =0x00000186 @@ -1100,14 +1100,14 @@ ov17_0238B048: ; 0x0238B048 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B074: .word _0238BE00 +_0238B074: .word ov17_0238BE00 _0238B078: .word 0x00000186 arm_func_end ov17_0238B048 arm_func_start ov17_0238B07C ov17_0238B07C: ; 0x0238B07C stmdb sp!, {r3, lr} - ldr r0, _0238B0B0 ; =_0238BE00 + ldr r0, _0238B0B0 ; =ov17_0238BE00 ldr r0, [r0] ldrb r0, [r0, #9] cmp r0, #0 @@ -1115,19 +1115,19 @@ ov17_0238B07C: ; 0x0238B07C bl GetMainCharacter1MemberIdx bl sub_0203C7E4 _0238B09C: - ldr r0, _0238B0B0 ; =_0238BE00 + ldr r0, _0238B0B0 ; =ov17_0238BE00 mov r1, #2 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B0B0: .word _0238BE00 +_0238B0B0: .word ov17_0238BE00 arm_func_end ov17_0238B07C arm_func_start ov17_0238B0B4 ov17_0238B0B4: ; 0x0238B0B4 stmdb sp!, {r3, lr} - ldr r0, _0238B108 ; =_0238BE00 + ldr r0, _0238B108 ; =ov17_0238BE00 ldr r0, [r0] ldrb r0, [r0, #9] cmp r0, #0 @@ -1135,12 +1135,12 @@ ov17_0238B0B4: ; 0x0238B0B4 bl sub_0203C910 cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r0, _0238B108 ; =_0238BE00 + ldr r0, _0238B108 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] strb r1, [r0, #9] _0238B0E8: - ldr r0, _0238B108 ; =_0238BE00 + ldr r0, _0238B108 ; =ov17_0238BE00 mov r3, #7 ldr r2, [r0] mov r1, #3 @@ -1149,19 +1149,19 @@ _0238B0E8: str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B108: .word _0238BE00 +_0238B108: .word ov17_0238BE00 arm_func_end ov17_0238B0B4 arm_func_start ov17_0238B10C ov17_0238B10C: ; 0x0238B10C stmdb sp!, {r3, lr} - ldr r0, _0238B190 ; =_0238BE00 + ldr r0, _0238B190 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238B190 ; =_0238BE00 + ldr r0, _0238B190 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] bl GetNormalMenuResult @@ -1192,12 +1192,12 @@ _0238B184: bl ov17_0238B028 ldmia sp!, {r3, pc} .align 2, 0 -_0238B190: .word _0238BE00 +_0238B190: .word ov17_0238BE00 arm_func_end ov17_0238B10C arm_func_start ov17_0238B194 ov17_0238B194: ; 0x0238B194 - ldr r0, _0238B1B4 ; =_0238BE00 + ldr r0, _0238B1B4 ; =ov17_0238BE00 mov r3, #3 ldr r2, [r0] mov r1, #5 @@ -1206,29 +1206,29 @@ ov17_0238B194: ; 0x0238B194 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B1B4: .word _0238BE00 +_0238B1B4: .word ov17_0238BE00 arm_func_end ov17_0238B194 arm_func_start ov17_0238B1B8 ov17_0238B1B8: ; 0x0238B1B8 stmdb sp!, {r3, lr} - ldr r0, _0238B1E4 ; =_0238BE00 + ldr r0, _0238B1E4 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] strh r1, [r0, #0x7e] bl ov17_0238A278 - ldr r0, _0238B1E4 ; =_0238BE00 + ldr r0, _0238B1E4 ; =ov17_0238BE00 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x6c] ldmia sp!, {r3, pc} .align 2, 0 -_0238B1E4: .word _0238BE00 +_0238B1E4: .word ov17_0238BE00 arm_func_end ov17_0238B1B8 arm_func_start ov17_0238B1E8 ov17_0238B1E8: ; 0x0238B1E8 - ldr r0, _0238B208 ; =_0238BE00 + ldr r0, _0238B208 ; =ov17_0238BE00 mov r3, #3 ldr r2, [r0] mov r1, #7 @@ -1237,34 +1237,34 @@ ov17_0238B1E8: ; 0x0238B1E8 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B208: .word _0238BE00 +_0238B208: .word ov17_0238BE00 arm_func_end ov17_0238B1E8 arm_func_start ov17_0238B20C ov17_0238B20C: ; 0x0238B20C - ldr r0, _0238B220 ; =_0238BE00 + ldr r0, _0238B220 ; =ov17_0238BE00 mov r1, #8 ldr r0, [r0] str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B220: .word _0238BE00 +_0238B220: .word ov17_0238BE00 arm_func_end ov17_0238B20C arm_func_start ov17_0238B224 ov17_0238B224: ; 0x0238B224 - ldr r0, _0238B238 ; =_0238BE00 + ldr r0, _0238B238 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B238: .word _0238BE00 +_0238B238: .word ov17_0238BE00 arm_func_end ov17_0238B224 arm_func_start ov17_0238B23C ov17_0238B23C: ; 0x0238B23C - ldr r0, _0238B25C ; =_0238BE00 + ldr r0, _0238B25C ; =ov17_0238BE00 mov r3, #3 ldr r2, [r0] mov r1, #0xa @@ -1273,34 +1273,34 @@ ov17_0238B23C: ; 0x0238B23C str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B25C: .word _0238BE00 +_0238B25C: .word ov17_0238BE00 arm_func_end ov17_0238B23C arm_func_start ov17_0238B260 ov17_0238B260: ; 0x0238B260 - ldr r0, _0238B274 ; =_0238BE00 + ldr r0, _0238B274 ; =ov17_0238BE00 mov r1, #0xb ldr r0, [r0] str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B274: .word _0238BE00 +_0238B274: .word ov17_0238BE00 arm_func_end ov17_0238B260 arm_func_start ov17_0238B278 ov17_0238B278: ; 0x0238B278 - ldr r0, _0238B28C ; =_0238BE00 + ldr r0, _0238B28C ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B28C: .word _0238BE00 +_0238B28C: .word ov17_0238BE00 arm_func_end ov17_0238B278 arm_func_start ov17_0238B290 ov17_0238B290: ; 0x0238B290 - ldr r0, _0238B2B0 ; =_0238BE00 + ldr r0, _0238B2B0 ; =ov17_0238BE00 mov r3, #0x20 ldr r2, [r0] mov r1, #0xd @@ -1309,7 +1309,7 @@ ov17_0238B290: ; 0x0238B290 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B2B0: .word _0238BE00 +_0238B2B0: .word ov17_0238BE00 arm_func_end ov17_0238B290 arm_func_start ov17_0238B2B4 @@ -1330,12 +1330,12 @@ ov17_0238B2B4: ; 0x0238B2B4 mov r0, #0 bl sub_02017CCC bl sub_0203AAB0 - ldr r1, _0238B368 ; =_0238BE00 + ldr r1, _0238B368 ; =ov17_0238BE00 ldr r1, [r1] add r1, r1, #0x200 strh r0, [r1, #0x58] bl sub_0203A5F0 - ldr r0, _0238B368 ; =_0238BE00 + ldr r0, _0238B368 ; =ov17_0238BE00 mov r1, #0x1e ldr r0, [r0] str r1, [r0, #0x78] @@ -1350,7 +1350,7 @@ _0238B31C: bl ov17_0238B028 ldmia sp!, {r3, pc} _0238B33C: - ldr r2, _0238B368 ; =_0238BE00 + ldr r2, _0238B368 ; =ov17_0238BE00 ldr r1, [r2] add r1, r1, #0x200 strh r0, [r1, #0x58] @@ -1362,12 +1362,12 @@ _0238B33C: bl ov17_0238B028 ldmia sp!, {r3, pc} .align 2, 0 -_0238B368: .word _0238BE00 +_0238B368: .word ov17_0238BE00 arm_func_end ov17_0238B2B4 arm_func_start ov17_0238B36C ov17_0238B36C: ; 0x0238B36C - ldr r0, _0238B38C ; =_0238BE00 + ldr r0, _0238B38C ; =ov17_0238BE00 mov r3, #0x28 ldr r2, [r0] mov r1, #0xf @@ -1376,19 +1376,19 @@ ov17_0238B36C: ; 0x0238B36C str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B38C: .word _0238BE00 +_0238B38C: .word ov17_0238BE00 arm_func_end ov17_0238B36C arm_func_start ov17_0238B390 ov17_0238B390: ; 0x0238B390 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r0, _0238B4CC ; =_0238BE00 + ldr r0, _0238B4CC ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} - ldr r0, _0238B4CC ; =_0238BE00 + ldr r0, _0238B4CC ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] bl GetNormalMenuResult @@ -1411,7 +1411,7 @@ _0238B3EC: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} _0238B3F8: mov sl, #0 - ldr r6, _0238B4CC ; =_0238BE00 + ldr r6, _0238B4CC ; =ov17_0238BE00 ldr r4, _0238B4D0 ; =0x0000022B ldr r7, _0238B4D4 ; =0x020B0A48 mov r8, sl @@ -1458,7 +1458,7 @@ _0238B490: bl ov17_0238B028 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} _0238B49C: - ldr r0, _0238B4CC ; =_0238BE00 + ldr r0, _0238B4CC ; =ov17_0238BE00 mov r3, #0 ldr r2, [r0] mov r1, #0x22 @@ -1472,14 +1472,14 @@ _0238B4BC: bl ov17_0238B028 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0238B4CC: .word _0238BE00 +_0238B4CC: .word ov17_0238BE00 _0238B4D0: .word 0x0000022B _0238B4D4: .word 0x020B0A48 arm_func_end ov17_0238B390 arm_func_start ov17_0238B4D8 ov17_0238B4D8: ; 0x0238B4D8 - ldr r1, _0238B50C ; =_0238BE00 + ldr r1, _0238B50C ; =ov17_0238BE00 mov r3, #3 ldr r0, [r1] mov r2, #0x11 @@ -1493,7 +1493,7 @@ ov17_0238B4D8: ; 0x0238B4D8 str r2, [r0, #0x78] bx lr .align 2, 0 -_0238B50C: .word _0238BE00 +_0238B50C: .word ov17_0238BE00 arm_func_end ov17_0238B4D8 arm_func_start ov17_0238B510 @@ -1501,13 +1501,13 @@ ov17_0238B510: ; 0x0238B510 stmdb sp!, {r3, lr} mov r0, #5 bl sub_02017C50 - ldr r0, _0238B530 ; =_0238BE00 + ldr r0, _0238B530 ; =ov17_0238BE00 mov r1, #0x12 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B530: .word _0238BE00 +_0238B530: .word ov17_0238BE00 arm_func_end ov17_0238B510 arm_func_start ov17_0238B534 @@ -1517,26 +1517,26 @@ ov17_0238B534: ; 0x0238B534 bl sub_02017C10 cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238B578 ; =_0238BE00 + ldr r0, _0238B578 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] bl sub_02056754 bl sub_02057444 bl ov11_022DC504 - ldr r0, _0238B578 ; =_0238BE00 + ldr r0, _0238B578 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B578: .word _0238BE00 +_0238B578: .word ov17_0238BE00 arm_func_end ov17_0238B534 arm_func_start ov17_0238B57C ov17_0238B57C: ; 0x0238B57C stmdb sp!, {r3, lr} - ldr r1, _0238B5D8 ; =_0238BE00 + ldr r1, _0238B5D8 ; =ov17_0238BE00 mov r3, #3 ldr r0, [r1] add r2, r3, #0x1400 @@ -1553,32 +1553,32 @@ ov17_0238B57C: ; 0x0238B57C ldrsh r0, [r0, #0x58] bl sub_02056554 bl sub_02057444 - ldr r0, _0238B5D8 ; =_0238BE00 + ldr r0, _0238B5D8 ; =ov17_0238BE00 mov r1, #0x14 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B5D8: .word _0238BE00 +_0238B5D8: .word ov17_0238BE00 arm_func_end ov17_0238B57C arm_func_start ov17_0238B5DC ov17_0238B5DC: ; 0x0238B5DC stmdb sp!, {r3, lr} bl ov11_022DC504 - ldr r0, _0238B5F8 ; =_0238BE00 + ldr r0, _0238B5F8 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B5F8: .word _0238BE00 +_0238B5F8: .word ov17_0238BE00 arm_func_end ov17_0238B5DC arm_func_start ov17_0238B5FC ov17_0238B5FC: ; 0x0238B5FC stmdb sp!, {r3, lr} - ldr r1, _0238B684 ; =_0238BE00 + ldr r1, _0238B684 ; =ov17_0238BE00 mov r3, #3 ldr r2, [r1] mov r0, #7 @@ -1591,7 +1591,7 @@ ov17_0238B5FC: ; 0x0238B5FC bl sub_02017C10 cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238B684 ; =_0238BE00 + ldr r0, _0238B684 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] @@ -1600,20 +1600,20 @@ ov17_0238B5FC: ; 0x0238B5FC cmp r0, r1 beq _0238B670 bl sub_02058138 - ldr r0, _0238B684 ; =_0238BE00 + ldr r0, _0238B684 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] bl sub_020566C4 bl sub_02057444 _0238B670: - ldr r0, _0238B684 ; =_0238BE00 + ldr r0, _0238B684 ; =ov17_0238BE00 mov r1, #0x16 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B684: .word _0238BE00 +_0238B684: .word ov17_0238BE00 arm_func_end ov17_0238B5FC arm_func_start ov17_0238B688 @@ -1621,13 +1621,13 @@ ov17_0238B688: ; 0x0238B688 stmdb sp!, {r3, lr} mov r0, #7 bl sub_02017C50 - ldr r0, _0238B6A8 ; =_0238BE00 + ldr r0, _0238B6A8 ; =ov17_0238BE00 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B6A8: .word _0238BE00 +_0238B6A8: .word ov17_0238BE00 arm_func_end ov17_0238B688 arm_func_start ov17_0238B6AC @@ -1637,19 +1637,19 @@ ov17_0238B6AC: ; 0x0238B6AC bl sub_02017C10 cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238B6D8 ; =_0238BE00 + ldr r0, _0238B6D8 ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x78] bl ov11_022DC504 ldmia sp!, {r3, pc} .align 2, 0 -_0238B6D8: .word _0238BE00 +_0238B6D8: .word ov17_0238BE00 arm_func_end ov17_0238B6AC arm_func_start ov17_0238B6DC ov17_0238B6DC: ; 0x0238B6DC - ldr r1, _0238B710 ; =_0238BE00 + ldr r1, _0238B710 ; =ov17_0238BE00 mov r3, #3 ldr r0, [r1] mov r2, #0x19 @@ -1663,12 +1663,12 @@ ov17_0238B6DC: ; 0x0238B6DC str r2, [r0, #0x78] bx lr .align 2, 0 -_0238B710: .word _0238BE00 +_0238B710: .word ov17_0238BE00 arm_func_end ov17_0238B6DC arm_func_start ov17_0238B714 ov17_0238B714: ; 0x0238B714 - ldr r0, _0238B734 ; =_0238BE00 + ldr r0, _0238B734 ; =ov17_0238BE00 mov r3, #0x13 ldr r2, [r0] mov r1, #0x1a @@ -1677,19 +1677,19 @@ ov17_0238B714: ; 0x0238B714 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B734: .word _0238BE00 +_0238B734: .word ov17_0238BE00 arm_func_end ov17_0238B714 arm_func_start ov17_0238B738 ov17_0238B738: ; 0x0238B738 stmdb sp!, {r3, lr} - ldr r0, _0238B7A4 ; =_0238BE00 + ldr r0, _0238B7A4 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238B7A4 ; =_0238BE00 + ldr r0, _0238B7A4 ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] bl GetNormalMenuResult @@ -1701,7 +1701,7 @@ ov17_0238B738: ; 0x0238B738 bl ov17_0238B028 ldmia sp!, {r3, pc} _0238B780: - ldr r1, _0238B7A4 ; =_0238BE00 + ldr r1, _0238B7A4 ; =ov17_0238BE00 mov r0, #0x1b ldr r2, [r1] add r1, r2, #0x200 @@ -1711,12 +1711,12 @@ _0238B780: bl ov17_0238B028 ldmia sp!, {r3, pc} .align 2, 0 -_0238B7A4: .word _0238BE00 +_0238B7A4: .word ov17_0238BE00 arm_func_end ov17_0238B738 arm_func_start ov17_0238B7A8 ov17_0238B7A8: ; 0x0238B7A8 - ldr r0, _0238B7C8 ; =_0238BE00 + ldr r0, _0238B7C8 ; =ov17_0238BE00 mov r3, #3 ldr r2, [r0] mov r1, #0x1c @@ -1725,18 +1725,18 @@ ov17_0238B7A8: ; 0x0238B7A8 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B7C8: .word _0238BE00 +_0238B7C8: .word ov17_0238BE00 arm_func_end ov17_0238B7A8 arm_func_start ov17_0238B7CC ov17_0238B7CC: ; 0x0238B7CC stmdb sp!, {r3, lr} - ldr r1, _0238B850 ; =_0238BE00 + ldr r1, _0238B850 ; =ov17_0238BE00 mov r0, #3 ldr r1, [r1] strh r0, [r1, #0x7e] bl sub_02017C50 - ldr r0, _0238B850 ; =_0238BE00 + ldr r0, _0238B850 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] @@ -1745,13 +1745,13 @@ ov17_0238B7CC: ; 0x0238B7CC cmp r0, r1 beq _0238B81C bl sub_02058138 - ldr r0, _0238B850 ; =_0238BE00 + ldr r0, _0238B850 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] bl sub_020566C4 _0238B81C: - ldr r0, _0238B850 ; =_0238BE00 + ldr r0, _0238B850 ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] @@ -1759,13 +1759,13 @@ _0238B81C: bl sub_0203C9C4 bl sub_0203AF0C bl sub_02057180 - ldr r0, _0238B850 ; =_0238BE00 + ldr r0, _0238B850 ; =ov17_0238BE00 mov r1, #0x1d ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B850: .word _0238BE00 +_0238B850: .word ov17_0238BE00 arm_func_end ov17_0238B7CC arm_func_start ov17_0238B854 @@ -1774,18 +1774,18 @@ ov17_0238B854: ; 0x0238B854 mov r0, #3 bl sub_02017C10 cmp r0, #0 - ldreq r0, _0238B878 ; =_0238BE00 + ldreq r0, _0238B878 ; =ov17_0238BE00 moveq r1, #0 ldreq r0, [r0] streq r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B878: .word _0238BE00 +_0238B878: .word ov17_0238BE00 arm_func_end ov17_0238B854 arm_func_start ov17_0238B87C ov17_0238B87C: ; 0x0238B87C - ldr r0, _0238B89C ; =_0238BE00 + ldr r0, _0238B89C ; =ov17_0238BE00 mov r3, #0x40 ldr r2, [r0] mov r1, #0x1f @@ -1794,7 +1794,7 @@ ov17_0238B87C: ; 0x0238B87C str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B89C: .word _0238BE00 +_0238B89C: .word ov17_0238BE00 arm_func_end ov17_0238B87C arm_func_start ov17_0238B8A0 @@ -1804,7 +1804,7 @@ ov17_0238B8A0: ; 0x0238B8A0 cmp r0, #1 ldmneia sp!, {r3, pc} bl sub_0203F990 - ldr r0, _0238B8D0 ; =_0238BE00 + ldr r0, _0238B8D0 ; =ov17_0238BE00 mvn r2, #1 ldr r1, [r0] mov r0, #0xc @@ -1812,12 +1812,12 @@ ov17_0238B8A0: ; 0x0238B8A0 bl ov17_0238B028 ldmia sp!, {r3, pc} .align 2, 0 -_0238B8D0: .word _0238BE00 +_0238B8D0: .word ov17_0238BE00 arm_func_end ov17_0238B8A0 arm_func_start ov17_0238B8D4 ov17_0238B8D4: ; 0x0238B8D4 - ldr r0, _0238B8F4 ; =_0238BE00 + ldr r0, _0238B8F4 ; =ov17_0238BE00 mov r3, #0x80 ldr r2, [r0] mov r1, #0x21 @@ -1826,7 +1826,7 @@ ov17_0238B8D4: ; 0x0238B8D4 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B8F4: .word _0238BE00 +_0238B8F4: .word ov17_0238BE00 arm_func_end ov17_0238B8D4 arm_func_start ov17_0238B8F8 @@ -1835,7 +1835,7 @@ ov17_0238B8F8: ; 0x0238B8F8 bl sub_020407EC movs r4, r0 beq _0238B91C - ldr r0, _0238B95C ; =_0238BE00 + ldr r0, _0238B95C ; =ov17_0238BE00 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] @@ -1861,13 +1861,13 @@ _0238B950: bl ov17_0238B028 ldmia sp!, {r4, pc} .align 2, 0 -_0238B95C: .word _0238BE00 +_0238B95C: .word ov17_0238BE00 arm_func_end ov17_0238B8F8 arm_func_start ov17_0238B960 ov17_0238B960: ; 0x0238B960 stmdb sp!, {r3, lr} - ldr r1, _0238B9AC ; =_0238BE00 + ldr r1, _0238B9AC ; =ov17_0238BE00 ldr r0, _0238B9B0 ; =0x020B0A48 ldr r2, [r1] ldr r1, [r0] @@ -1880,13 +1880,13 @@ ov17_0238B960: ; 0x0238B960 ldrsh r2, [r1, #8] add r1, r1, #0x14 bl PrintIqSkillsMenu - ldr r0, _0238B9AC ; =_0238BE00 + ldr r0, _0238B9AC ; =ov17_0238BE00 mov r1, #0x23 ldr r0, [r0] str r1, [r0, #0x78] ldmia sp!, {r3, pc} .align 2, 0 -_0238B9AC: .word _0238BE00 +_0238B9AC: .word ov17_0238BE00 _0238B9B0: .word 0x020B0A48 arm_func_end ov17_0238B960 @@ -1905,7 +1905,7 @@ ov17_0238B9B4: ; 0x0238B9B4 arm_func_start ov17_0238B9D8 ov17_0238B9D8: ; 0x0238B9D8 - ldr r0, _0238B9F8 ; =_0238BE00 + ldr r0, _0238B9F8 ; =ov17_0238BE00 mov r3, #0x280 ldr r2, [r0] mov r1, #0x25 @@ -1914,20 +1914,20 @@ ov17_0238B9D8: ; 0x0238B9D8 str r1, [r0, #0x78] bx lr .align 2, 0 -_0238B9F8: .word _0238BE00 +_0238B9F8: .word ov17_0238BE00 arm_func_end ov17_0238B9D8 arm_func_start ov17_0238B9FC ov17_0238B9FC: ; 0x0238B9FC stmdb sp!, {r4, lr} - ldr r0, _0238BA7C ; =_0238BE00 + ldr r0, _0238BA7C ; =ov17_0238BE00 mov r4, #0 ldr r0, [r0] ldrsb r0, [r0, #8] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0238BA7C ; =_0238BE00 + ldr r0, _0238BA7C ; =ov17_0238BE00 ldr r0, [r0] ldrsb r0, [r0, #8] bl GetNormalMenuResult @@ -1944,7 +1944,7 @@ _0238BA48: _0238BA4C: cmp r4, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0238BA7C ; =_0238BE00 + ldr r0, _0238BA7C ; =ov17_0238BE00 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #6] @@ -1956,7 +1956,7 @@ _0238BA70: bl ov17_0238B028 ldmia sp!, {r4, pc} .align 2, 0 -_0238BA7C: .word _0238BE00 +_0238BA7C: .word ov17_0238BE00 arm_func_end ov17_0238B9FC ; 0x0238BA80 @@ -2017,5 +2017,6 @@ _0238BA7C: .word _0238BE00 .byte 0xC8, 0xBA, 0x38, 0x02, 0xE4, 0xBA, 0x38, 0x02, 0x1C, 0xBB, 0x38, 0x02 .data -_0238BE00: + .global ov17_0238BE00 +ov17_0238BE00: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 5e8a1fb1..d0a6aab5 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -9,14 +9,14 @@ ov18_0238A140: ; 0x0238A140 mov r0, #0x3c4 mov r1, #8 bl MemAlloc - ldr r1, _0238A298 ; =_0238D620 + ldr r1, _0238A298 ; =ov18_0238D620 mov r2, #1 str r0, [r1] strb r2, [r0, #0x10] ldr r0, [r1] add r0, r0, #0x14 bl InitPreprocessorArgs - ldr r3, _0238A298 ; =_0238D620 + ldr r3, _0238A298 ; =ov18_0238D620 mov r1, #0 ldr r2, [r3] sub r0, r1, #1 @@ -52,7 +52,7 @@ ov18_0238A140: ; 0x0238A140 bl sub_020573A0 bl sub_02041400 ldr r1, _0238A29C ; =0x0238A090 - ldr r0, _0238A298 ; =_0238D620 + ldr r0, _0238A298 ; =ov18_0238D620 ldr r3, [r1] ldr r2, [r0] mvn r1, #1 @@ -92,14 +92,14 @@ ov18_0238A140: ; 0x0238A140 strb r1, [r2, #0xf] ldmia sp!, {r3, pc} .align 2, 0 -_0238A298: .word _0238D620 +_0238A298: .word ov18_0238D620 _0238A29C: .word 0x0238A090 arm_func_end ov18_0238A140 arm_func_start ov18_0238A2A0 ov18_0238A2A0: ; 0x0238A2A0 stmdb sp!, {r3, lr} - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -110,7 +110,7 @@ ov18_0238A2A0: ; 0x0238A2A0 beq _0238A2CC bl sub_0202F334 _0238A2CC: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -121,7 +121,7 @@ _0238A2CC: beq _0238A2F4 bl HidePortraitBox _0238A2F4: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -132,14 +132,14 @@ _0238A2F4: beq _0238A31C bl sub_0202F954 _0238A31C: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 bne _0238A334 bl sub_0203A618 _0238A334: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x100 @@ -150,7 +150,7 @@ _0238A334: beq _0238A35C bl sub_0203088C _0238A35C: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x200 @@ -161,7 +161,7 @@ _0238A35C: beq _0238A384 bl sub_0203088C _0238A384: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x400 @@ -172,7 +172,7 @@ _0238A384: beq _0238A3AC bl sub_0202E6B0 _0238A3AC: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x1000 @@ -183,7 +183,7 @@ _0238A3AC: beq _0238A3D4 bl sub_0202BC60 _0238A3D4: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -194,7 +194,7 @@ _0238A3D4: beq _0238A3FC bl sub_0203088C _0238A3FC: - ldr r0, _0238A428 ; =_0238D620 + ldr r0, _0238A428 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -206,13 +206,13 @@ _0238A3FC: bl sub_0202F334 ldmia sp!, {r3, pc} .align 2, 0 -_0238A428: .word _0238D620 +_0238A428: .word ov18_0238D620 arm_func_end ov18_0238A2A0 arm_func_start ov18_0238A42C ov18_0238A42C: ; 0x0238A42C stmdb sp!, {r3, lr} - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -230,11 +230,11 @@ ov18_0238A42C: ; 0x0238A42C arm_func_start ov18_0238A468 ov18_0238A468: ; 0x0238A468 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0] bl FreeDBox - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -244,7 +244,7 @@ _0238A48C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A498: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -258,11 +258,11 @@ _0238A498: cmp r0, #0 movne r2, #0 bne _0238A4F4 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #1] bl FreePortraitBox - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -272,7 +272,7 @@ _0238A4F4: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A500: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -286,11 +286,11 @@ _0238A500: cmp r0, #0 movne r2, #0 bne _0238A55C - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #2] bl sub_0202F8FC - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -300,7 +300,7 @@ _0238A55C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A568: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #8 @@ -314,11 +314,11 @@ _0238A568: cmp r0, #0 movne r2, #0 bne _0238A5C4 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #3] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -328,7 +328,7 @@ _0238A5C4: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A5D0: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x20 @@ -342,11 +342,11 @@ _0238A5D0: cmp r0, #0 movne r2, #0 bne _0238A62C - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #4] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -356,7 +356,7 @@ _0238A62C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A638: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10 @@ -370,11 +370,11 @@ _0238A638: cmp r0, #0 movne r2, #0 bne _0238A694 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #5] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -384,7 +384,7 @@ _0238A694: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A6A0: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x40 @@ -398,11 +398,11 @@ _0238A6A0: cmp r0, #0 movne r2, #0 bne _0238A6FC - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #6] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -412,7 +412,7 @@ _0238A6FC: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A708: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 @@ -428,7 +428,7 @@ _0238A734: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A740: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r3, [r0] ldr r2, [r3, #0x88] tst r2, #0x100 @@ -453,12 +453,12 @@ _0238A774: cmp r0, #0 movne r2, #0 bne _0238A7C8 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #8] bl sub_020308A0 bl sub_020407C0 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -468,7 +468,7 @@ _0238A7C8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A7D4: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x400 @@ -482,12 +482,12 @@ _0238A7D4: cmp r0, #0 movne r2, #0 bne _0238A834 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #9] bl sub_0202E6C8 bl sub_02041A00 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -497,7 +497,7 @@ _0238A834: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A840: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x800 @@ -511,11 +511,11 @@ _0238A840: cmp r0, #0 movne r2, #0 bne _0238A89C - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xa] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -525,7 +525,7 @@ _0238A89C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A8A8: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x1000 @@ -539,11 +539,11 @@ _0238A8A8: cmp r0, #0 movne r2, #0 bne _0238A904 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl FreeAdvancedMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -553,7 +553,7 @@ _0238A904: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A910: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x2000 @@ -567,11 +567,11 @@ _0238A910: cmp r0, #0 movne r2, #0 bne _0238A96C - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xc] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -581,7 +581,7 @@ _0238A96C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A978: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -595,12 +595,12 @@ _0238A978: cmp r0, #0 movne r2, #0 bne _0238A9D8 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xd] bl sub_020308A0 bl sub_020407C0 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -610,7 +610,7 @@ _0238A9D8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A9E4: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x8000 @@ -624,11 +624,11 @@ _0238A9E4: cmp r0, #0 movne r2, #0 bne _0238AA40 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] bl FreeNormalMenu - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -638,7 +638,7 @@ _0238AA40: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238AA4C: - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -652,11 +652,11 @@ _0238AA4C: cmp r0, #0 movne r2, #0 bne _0238AAA8 - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xf] bl FreeDBox - ldr r0, _0238AABC ; =_0238D620 + ldr r0, _0238AABC ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -669,7 +669,7 @@ _0238AAB4: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238AABC: .word _0238D620 +_0238AABC: .word ov18_0238D620 arm_func_end ov18_0238A468 arm_func_start ov18_0238AAC0 @@ -991,7 +991,7 @@ _0238AEEC: .word 0x00000216 arm_func_start ov18_0238AEF0 ov18_0238AEF0: ; 0x0238AEF0 stmdb sp!, {r4, lr} - ldr r2, _0238AF34 ; =_0238D620 + ldr r2, _0238AF34 ; =ov18_0238D620 mov r1, r1, lsl #0x10 ldr r2, [r2] mov r4, r0 @@ -1008,7 +1008,7 @@ ov18_0238AEF0: ; 0x0238AEF0 mov r0, r4 ldmia sp!, {r4, pc} .align 2, 0 -_0238AF34: .word _0238D620 +_0238AF34: .word ov18_0238D620 _0238AF38: .word 0x0238D5F8 arm_func_end ov18_0238AEF0 @@ -1058,12 +1058,12 @@ _0238AFD0: .word 0x00000225 arm_func_start ov18_0238AFD4 ov18_0238AFD4: ; 0x0238AFD4 stmdb sp!, {r3, lr} - ldr r0, _0238B018 ; =_0238D620 + ldr r0, _0238B018 ; =ov18_0238D620 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0238B018 ; =_0238D620 + ldr r0, _0238B018 ; =ov18_0238D620 mov r1, #0 str r1, [r0] bl sub_02041414 @@ -1076,14 +1076,14 @@ _0238B010: bl sub_020572EC ldmia sp!, {r3, pc} .align 2, 0 -_0238B018: .word _0238D620 +_0238B018: .word ov18_0238D620 arm_func_end ov18_0238AFD4 arm_func_start ov18_0238B01C ov18_0238B01C: ; 0x0238B01C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x214 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r4, [r0] ldr r0, [r4, #0x74] cmp r0, #3 @@ -1113,7 +1113,7 @@ _0238B078: ; jump table b _0238BC88 ; case 2 b _0238B088 ; case 3 _0238B088: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #0 str r1, [r4, #0x7c] ldr r1, [r0] @@ -1121,7 +1121,7 @@ _0238B088: ldr r1, [r1, #0x78] ldr r0, [r0, r1, lsl #2] blx r0 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r3, [r0] ldr r1, [r3, #0x78] ldr r2, [r3, #0x80] @@ -1138,7 +1138,7 @@ _0238B088: blx r0 _0238B0E4: bl ov18_0238A2A0 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x7c] @@ -1147,7 +1147,7 @@ _0238B0FC: bl ov18_0238A42C cmp r0, #0 beq _0238BCF8 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -1159,18 +1159,18 @@ _0238B0FC: bne _0238B150 ldr r0, _0238BD4C ; =0x0238D310 bl CreateDBox - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 mvn r2, #0 ldr r3, [r1] strb r0, [r3] ldr r0, [r1] str r2, [r0, #0x84] _0238B150: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0] bl ShowDBox - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #0x1fc ldr r3, [r0] ldr r2, [r3, #0x84] @@ -1198,7 +1198,7 @@ _0238B1AC: cmpne r1, #0x4b bne _0238B1E4 _0238B1C8: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r2, [r1] add r1, r2, #0x300 ldrsh r1, [r1, #0x8c] @@ -1209,7 +1209,7 @@ _0238B1E4: mov r1, #0x1fc str r1, [r3, #0x14] _0238B1EC: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r3, [r1] ldr r2, [r3, #0x78] cmp r2, #0x4b @@ -1392,7 +1392,7 @@ _0238B458: ldr r4, _0238BD58 ; =0x00003018 str r1, [r3, #0x38] _0238B468: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 mov r0, r0, lsl #0x10 ldr r3, [r1] mov r5, r0, lsr #0x10 @@ -1408,7 +1408,7 @@ _0238B468: mov r2, r2, lsr #0x10 bl ShowMessageInDBox _0238B4A4: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -1421,30 +1421,30 @@ _0238B4A4: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r2, _0238BD40 ; =_0238D620 + ldr r2, _0238BD40 ; =ov18_0238D620 mov r1, #0x1fc ldr r3, [r2] strb r0, [r3, #1] ldr r0, [r2] add r0, r0, #0x64 bl InitPortraitBoxWithMonsterId - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 bl SetPortraitUnknownAttr - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 bl SetPortraitExpressionId - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldrsb r0, [r1, #1] add r1, r1, #0x64 bl ShowPortraitBox _0238B530: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -1456,11 +1456,11 @@ _0238B530: ldr r0, _0238BDB0 ; =0x0238D270 ldr r1, _0238BDB4 ; =ov18_0238AF3C bl sub_0202F8C4 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #2] _0238B56C: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #8 @@ -1476,11 +1476,11 @@ _0238B56C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #3] _0238B5B8: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x20 @@ -1496,11 +1496,11 @@ _0238B5B8: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #4] _0238B604: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x40 @@ -1519,11 +1519,11 @@ _0238B604: ldr r3, _0238BDD4 ; =0x0238D320 add r2, r2, #0x90 bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #6] _0238B65C: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10 @@ -1539,11 +1539,11 @@ _0238B65C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #5] _0238B6A8: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 @@ -1551,7 +1551,7 @@ _0238B6A8: bl sub_0203A998 cmp r0, #0 bne _0238B6F8 - ldr r2, _0238BD40 ; =_0238D620 + ldr r2, _0238BD40 ; =ov18_0238D620 mov r3, #2 ldr r1, [r2] mov r0, #6 @@ -1564,7 +1564,7 @@ _0238B6A8: add r1, r1, #0x388 bl sub_02039C2C _0238B6F8: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x100 @@ -1580,11 +1580,11 @@ _0238B6F8: add r0, sp, #0x19c mov r1, #3 bl sub_0203F150 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #7] _0238B744: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x200 @@ -1600,21 +1600,21 @@ _0238B744: bge _0238B794 mov r0, #4 bl sub_0204018C - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #8] b _0238B7B0 _0238B794: mov r0, #5 bl sub_0204018C - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #8] b _0238B7B0 _0238B7AC: bl sub_02041178 _0238B7B0: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x400 @@ -1630,7 +1630,7 @@ _0238B7B0: add r0, r0, #0x300 mov r1, #1 bl sub_02041860 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #9] b _0238B820 @@ -1640,11 +1640,11 @@ _0238B800: mov r1, #4 mov r3, #1 bl sub_020417A8 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #9] _0238B820: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x800 @@ -1654,7 +1654,7 @@ _0238B820: cmp r1, r0 bne _0238B984 bl sub_02041094 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 mov r6, r0 ldr r0, [r1] add r0, r0, #0x300 @@ -1670,7 +1670,7 @@ _0238B820: _0238B87C: ldr r4, _0238BDE8 ; =0x0238D480 _0238B880: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r2, #0 ldr r0, [r0] mov r1, r2 @@ -1722,7 +1722,7 @@ _0238B934: cmp ip, #4 blt _0238B900 _0238B93C: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 cmp r6, #0 moveq r0, #3 streqb r0, [r5, #4] @@ -1737,11 +1737,11 @@ _0238B93C: mov r3, r4 add r2, r2, #0x128 bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #0xa] _0238B984: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x1000 @@ -1760,7 +1760,7 @@ _0238B984: add r1, r1, #0x3a mov r2, #0xa bl StrncpySimpleNoPadSafe - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, _0238BDF8 ; =0x0238D5F8 ldr r0, [r0] add r3, sp, #8 @@ -1768,7 +1768,7 @@ _0238B984: add r0, r0, #0x300 mov r2, #0x46 bl ov18_0238AAC0 - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r3, _0238BDFC ; =0x00000A3E ldr r4, [r1] mov r2, #0x10 @@ -1789,7 +1789,7 @@ _0238B984: bl ov18_0238ABB0 str r0, [sp] mov r1, #8 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 str r1, [sp, #4] ldr r1, [r0] ldr r0, _0238BE00 ; =0x0238D2C0 @@ -1797,11 +1797,11 @@ _0238B984: ldr r1, _0238BE04 ; =0x00401833 ldr r3, _0238BE08 ; =ov18_0238AEF0 bl CreateAdvancedMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #0xb] _0238BA70: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x2000 @@ -1820,11 +1820,11 @@ _0238BA70: add r2, r1, #0x258 mov r1, #0x33 bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #0xc] _0238BAC8: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -1837,14 +1837,14 @@ _0238BAC8: mov r2, r1 mov r0, #6 bl sub_0204018C - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #0xd] b _0238BB10 _0238BB0C: bl sub_02041178 _0238BB10: - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x8000 @@ -1861,12 +1861,12 @@ _0238BB10: strb r2, [r0, #0x39e] bl sub_02041094 cmp r0, #4 - ldrge r0, _0238BD40 ; =_0238D620 + ldrge r0, _0238BD40 ; =ov18_0238D620 movge r1, #3 ldrge r0, [r0] mov r3, #1 strgeb r1, [r0, #0x39c] - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 mov r4, #3 ldr r2, [r1] add r0, r2, #0x39c @@ -1880,11 +1880,11 @@ _0238BB10: add r1, r4, #0x230 add r2, r2, #0x2f0 bl CreateNormalMenu - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 ldr r1, [r1] strb r0, [r1, #0xe] _0238BBAC: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -1895,18 +1895,18 @@ _0238BBAC: bne _0238BBF0 ldr r0, _0238BE1C ; =0x0238D300 bl CreateDBox - ldr r1, _0238BD40 ; =_0238D620 + ldr r1, _0238BD40 ; =ov18_0238D620 mvn r2, #0 ldr r3, [r1] strb r0, [r3, #0xf] ldr r0, [r1] str r2, [r0, #0x84] _0238BBF0: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xf] bl ShowDBox - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r3, [r0] ldr r0, [r3, #0x78] cmp r0, #0x12 @@ -1933,14 +1933,14 @@ _0238BC50: ldr r0, [r3, #0x84] cmp r0, r2 beq _0238BC74 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 str r2, [r3, #0x84] ldr r0, [r0] add r3, sp, #0x14c ldrsb r0, [r0, #0xf] bl ShowMessageInDBox _0238BC74: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #2 ldr r0, [r0] str r1, [r0, #0x7c] @@ -1955,7 +1955,7 @@ _0238BC88: movne r0, #0 bne _0238BCD4 _0238BCA8: - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -1970,7 +1970,7 @@ _0238BCD0: _0238BCD4: cmp r0, #0 beq _0238BCF8 - ldr r0, _0238BD40 ; =_0238D620 + ldr r0, _0238BD40 ; =ov18_0238D620 mov r2, #0 ldr r1, [r0] str r2, [r1, #0x7c] @@ -1983,7 +1983,7 @@ _0238BCF8: _0238BD00: bl ov18_0238A42C cmp r0, #0 - ldrne r0, _0238BD40 ; =_0238D620 + ldrne r0, _0238BD40 ; =ov18_0238D620 movne r1, #2 ldrne r0, [r0] strne r1, [r0, #0x74] @@ -2001,7 +2001,7 @@ _0238BD38: add sp, sp, #0x214 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0238BD40: .word _0238D620 +_0238BD40: .word ov18_0238D620 _0238BD44: .word 0x0238D4C8 _0238BD48: .word 0x00003008 _0238BD4C: .word 0x0238D310 @@ -2063,7 +2063,7 @@ _0238BE24: .word 0x00003408 arm_func_start ov18_0238BE28 ov18_0238BE28: ; 0x0238BE28 - ldr r1, _0238BE44 ; =_0238D620 + ldr r1, _0238BE44 ; =ov18_0238D620 mov r3, #3 ldr r2, [r1] str r3, [r2, #0x7c] @@ -2071,12 +2071,12 @@ ov18_0238BE28: ; 0x0238BE28 str r0, [r1, #0x80] bx lr .align 2, 0 -_0238BE44: .word _0238D620 +_0238BE44: .word ov18_0238D620 arm_func_end ov18_0238BE28 arm_func_start ov18_0238BE48 ov18_0238BE48: ; 0x0238BE48 - ldr r0, _0238BE68 ; =_0238D620 + ldr r0, _0238BE68 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #1 @@ -2085,12 +2085,12 @@ ov18_0238BE48: ; 0x0238BE48 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BE68: .word _0238D620 +_0238BE68: .word ov18_0238D620 arm_func_end ov18_0238BE48 arm_func_start ov18_0238BE6C ov18_0238BE6C: ; 0x0238BE6C - ldr r0, _0238BE8C ; =_0238D620 + ldr r0, _0238BE8C ; =ov18_0238D620 mov r3, #0xf ldr r2, [r0] mov r1, #2 @@ -2099,19 +2099,19 @@ ov18_0238BE6C: ; 0x0238BE6C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BE8C: .word _0238D620 +_0238BE8C: .word ov18_0238D620 arm_func_end ov18_0238BE6C arm_func_start ov18_0238BE90 ov18_0238BE90: ; 0x0238BE90 stmdb sp!, {r3, lr} - ldr r0, _0238BF08 ; =_0238D620 + ldr r0, _0238BF08 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #3] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238BF08 ; =_0238D620 + ldr r0, _0238BF08 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #3] bl GetNormalMenuResult @@ -2139,12 +2139,12 @@ _0238BEFC: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238BF08: .word _0238D620 +_0238BF08: .word ov18_0238D620 arm_func_end ov18_0238BE90 arm_func_start ov18_0238BF0C ov18_0238BF0C: ; 0x0238BF0C - ldr r0, _0238BF2C ; =_0238D620 + ldr r0, _0238BF2C ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #4 @@ -2153,29 +2153,29 @@ ov18_0238BF0C: ; 0x0238BF0C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BF2C: .word _0238D620 +_0238BF2C: .word ov18_0238D620 arm_func_end ov18_0238BF0C arm_func_start ov18_0238BF30 ov18_0238BF30: ; 0x0238BF30 stmdb sp!, {r3, lr} - ldr r0, _0238BF5C ; =_0238D620 + ldr r0, _0238BF5C ; =ov18_0238D620 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x88] bl ov18_0238A2A0 - ldr r0, _0238BF5C ; =_0238D620 + ldr r0, _0238BF5C ; =ov18_0238D620 mov r1, #1 ldr r0, [r0] str r1, [r0, #0x74] ldmia sp!, {r3, pc} .align 2, 0 -_0238BF5C: .word _0238D620 +_0238BF5C: .word ov18_0238D620 arm_func_end ov18_0238BF30 arm_func_start ov18_0238BF60 ov18_0238BF60: ; 0x0238BF60 - ldr r0, _0238BF80 ; =_0238D620 + ldr r0, _0238BF80 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #6 @@ -2184,12 +2184,12 @@ ov18_0238BF60: ; 0x0238BF60 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BF80: .word _0238D620 +_0238BF80: .word ov18_0238D620 arm_func_end ov18_0238BF60 arm_func_start ov18_0238BF84 ov18_0238BF84: ; 0x0238BF84 - ldr r0, _0238BFA4 ; =_0238D620 + ldr r0, _0238BFA4 ; =ov18_0238D620 mov r3, #0x23 ldr r2, [r0] mov r1, #7 @@ -2198,19 +2198,19 @@ ov18_0238BF84: ; 0x0238BF84 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BFA4: .word _0238D620 +_0238BFA4: .word ov18_0238D620 arm_func_end ov18_0238BF84 arm_func_start ov18_0238BFA8 ov18_0238BFA8: ; 0x0238BFA8 stmdb sp!, {r3, lr} - ldr r0, _0238C038 ; =_0238D620 + ldr r0, _0238C038 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #4] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C038 ; =_0238D620 + ldr r0, _0238C038 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #4] bl GetNormalMenuResult @@ -2245,12 +2245,12 @@ _0238C02C: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C038: .word _0238D620 +_0238C038: .word ov18_0238D620 arm_func_end ov18_0238BFA8 arm_func_start ov18_0238C03C ov18_0238C03C: ; 0x0238C03C - ldr r0, _0238C05C ; =_0238D620 + ldr r0, _0238C05C ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #9 @@ -2259,23 +2259,23 @@ ov18_0238C03C: ; 0x0238C03C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C05C: .word _0238D620 +_0238C05C: .word ov18_0238D620 arm_func_end ov18_0238C03C arm_func_start ov18_0238C060 ov18_0238C060: ; 0x0238C060 - ldr r0, _0238C074 ; =_0238D620 + ldr r0, _0238C074 ; =ov18_0238D620 mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C074: .word _0238D620 +_0238C074: .word ov18_0238D620 arm_func_end ov18_0238C060 arm_func_start ov18_0238C078 ov18_0238C078: ; 0x0238C078 - ldr r0, _0238C098 ; =_0238D620 + ldr r0, _0238C098 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0xc @@ -2284,12 +2284,12 @@ ov18_0238C078: ; 0x0238C078 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C098: .word _0238D620 +_0238C098: .word ov18_0238D620 arm_func_end ov18_0238C078 arm_func_start ov18_0238C09C ov18_0238C09C: ; 0x0238C09C - ldr r0, _0238C0BC ; =_0238D620 + ldr r0, _0238C0BC ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0xd @@ -2298,23 +2298,23 @@ ov18_0238C09C: ; 0x0238C09C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0BC: .word _0238D620 +_0238C0BC: .word ov18_0238D620 arm_func_end ov18_0238C09C arm_func_start ov18_0238C0C0 ov18_0238C0C0: ; 0x0238C0C0 - ldr r0, _0238C0D4 ; =_0238D620 + ldr r0, _0238C0D4 ; =ov18_0238D620 mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0D4: .word _0238D620 +_0238C0D4: .word ov18_0238D620 arm_func_end ov18_0238C0C0 arm_func_start ov18_0238C0D8 ov18_0238C0D8: ; 0x0238C0D8 - ldr r0, _0238C0F8 ; =_0238D620 + ldr r0, _0238C0F8 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0xf @@ -2323,23 +2323,23 @@ ov18_0238C0D8: ; 0x0238C0D8 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0F8: .word _0238D620 +_0238C0F8: .word ov18_0238D620 arm_func_end ov18_0238C0D8 arm_func_start ov18_0238C0FC ov18_0238C0FC: ; 0x0238C0FC - ldr r0, _0238C110 ; =_0238D620 + ldr r0, _0238C110 ; =ov18_0238D620 mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C110: .word _0238D620 +_0238C110: .word ov18_0238D620 arm_func_end ov18_0238C0FC arm_func_start ov18_0238C114 ov18_0238C114: ; 0x0238C114 - ldr r0, _0238C134 ; =_0238D620 + ldr r0, _0238C134 ; =ov18_0238D620 ldr r3, _0238C138 ; =0x00010002 ldr r2, [r0] mov r1, #0x11 @@ -2348,13 +2348,13 @@ ov18_0238C114: ; 0x0238C114 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C134: .word _0238D620 +_0238C134: .word ov18_0238D620 _0238C138: .word 0x00010002 arm_func_end ov18_0238C114 arm_func_start ov18_0238C13C ov18_0238C13C: ; 0x0238C13C - ldr r0, _0238C15C ; =_0238D620 + ldr r0, _0238C15C ; =ov18_0238D620 ldr r3, _0238C160 ; =0x00010080 ldr r2, [r0] mov r1, #0x12 @@ -2363,7 +2363,7 @@ ov18_0238C13C: ; 0x0238C13C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C15C: .word _0238D620 +_0238C15C: .word ov18_0238D620 _0238C160: .word 0x00010080 arm_func_end ov18_0238C13C @@ -2385,12 +2385,12 @@ ov18_0238C164: ; 0x0238C164 mov r0, #0 bl sub_02017CCC bl sub_0203AAB0 - ldr r1, _0238C218 ; =_0238D620 + ldr r1, _0238C218 ; =ov18_0238D620 ldr r1, [r1] add r1, r1, #0x300 strh r0, [r1, #0x8c] bl sub_0203A5F0 - ldr r0, _0238C218 ; =_0238D620 + ldr r0, _0238C218 ; =ov18_0238D620 mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x80] @@ -2405,7 +2405,7 @@ _0238C1CC: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238C1EC: - ldr r2, _0238C218 ; =_0238D620 + ldr r2, _0238C218 ; =ov18_0238D620 ldr r1, [r2] add r1, r1, #0x300 strh r0, [r1, #0x8c] @@ -2417,12 +2417,12 @@ _0238C1EC: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C218: .word _0238D620 +_0238C218: .word ov18_0238D620 arm_func_end ov18_0238C164 arm_func_start ov18_0238C21C ov18_0238C21C: ; 0x0238C21C - ldr r0, _0238C23C ; =_0238D620 + ldr r0, _0238C23C ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x14 @@ -2431,23 +2431,23 @@ ov18_0238C21C: ; 0x0238C21C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C23C: .word _0238D620 +_0238C23C: .word ov18_0238D620 arm_func_end ov18_0238C21C arm_func_start ov18_0238C240 ov18_0238C240: ; 0x0238C240 - ldr r0, _0238C254 ; =_0238D620 + ldr r0, _0238C254 ; =ov18_0238D620 mov r1, #0x11 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C254: .word _0238D620 +_0238C254: .word ov18_0238D620 arm_func_end ov18_0238C240 arm_func_start ov18_0238C258 ov18_0238C258: ; 0x0238C258 - ldr r0, _0238C278 ; =_0238D620 + ldr r0, _0238C278 ; =ov18_0238D620 mov r3, #0x90 ldr r2, [r0] mov r1, #0x16 @@ -2456,19 +2456,19 @@ ov18_0238C258: ; 0x0238C258 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C278: .word _0238D620 +_0238C278: .word ov18_0238D620 arm_func_end ov18_0238C258 arm_func_start ov18_0238C27C ov18_0238C27C: ; 0x0238C27C stmdb sp!, {r3, lr} - ldr r0, _0238C33C ; =_0238D620 + ldr r0, _0238C33C ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #5] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C33C ; =_0238D620 + ldr r0, _0238C33C ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #5] bl GetNormalMenuResult @@ -2498,7 +2498,7 @@ _0238C2F4: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238C300: - ldr r0, _0238C33C ; =_0238D620 + ldr r0, _0238C33C ; =ov18_0238D620 mov r3, #0 ldr r2, [r0] mov r1, #0x1b @@ -2516,12 +2516,12 @@ _0238C32C: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C33C: .word _0238D620 +_0238C33C: .word ov18_0238D620 arm_func_end ov18_0238C27C arm_func_start ov18_0238C340 ov18_0238C340: ; 0x0238C340 - ldr r0, _0238C360 ; =_0238D620 + ldr r0, _0238C360 ; =ov18_0238D620 mov r3, #0x100 ldr r2, [r0] mov r1, #0x18 @@ -2530,7 +2530,7 @@ ov18_0238C340: ; 0x0238C340 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C360: .word _0238D620 +_0238C360: .word ov18_0238D620 arm_func_end ov18_0238C340 arm_func_start ov18_0238C364 @@ -2540,7 +2540,7 @@ ov18_0238C364: ; 0x0238C364 cmp r0, #1 ldmneia sp!, {r3, pc} bl sub_0203F990 - ldr r0, _0238C394 ; =_0238D620 + ldr r0, _0238C394 ; =ov18_0238D620 mvn r2, #1 ldr r1, [r0] mov r0, #0x11 @@ -2548,12 +2548,12 @@ ov18_0238C364: ; 0x0238C364 bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C394: .word _0238D620 +_0238C394: .word ov18_0238D620 arm_func_end ov18_0238C364 arm_func_start ov18_0238C398 ov18_0238C398: ; 0x0238C398 - ldr r0, _0238C3B8 ; =_0238D620 + ldr r0, _0238C3B8 ; =ov18_0238D620 ldr r3, _0238C3BC ; =0x00000201 ldr r2, [r0] mov r1, #0x1a @@ -2562,7 +2562,7 @@ ov18_0238C398: ; 0x0238C398 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C3B8: .word _0238D620 +_0238C3B8: .word ov18_0238D620 _0238C3BC: .word 0x00000201 arm_func_end ov18_0238C398 @@ -2572,7 +2572,7 @@ ov18_0238C3C0: ; 0x0238C3C0 bl sub_020407EC movs r4, r0 beq _0238C3E4 - ldr r0, _0238C424 ; =_0238D620 + ldr r0, _0238C424 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -2598,13 +2598,13 @@ _0238C418: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C424: .word _0238D620 +_0238C424: .word ov18_0238D620 arm_func_end ov18_0238C3C0 arm_func_start ov18_0238C428 ov18_0238C428: ; 0x0238C428 stmdb sp!, {r3, lr} - ldr r1, _0238C474 ; =_0238D620 + ldr r1, _0238C474 ; =ov18_0238D620 ldr r0, _0238C478 ; =0x020B0A48 ldr r2, [r1] ldr r1, [r0] @@ -2617,13 +2617,13 @@ ov18_0238C428: ; 0x0238C428 ldrsh r2, [r1, #8] add r1, r1, #0x14 bl PrintIqSkillsMenu - ldr r0, _0238C474 ; =_0238D620 + ldr r0, _0238C474 ; =ov18_0238D620 mov r1, #0x1c ldr r0, [r0] str r1, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238C474: .word _0238D620 +_0238C474: .word ov18_0238D620 _0238C478: .word 0x020B0A48 arm_func_end ov18_0238C428 @@ -2644,11 +2644,11 @@ ov18_0238C47C: ; 0x0238C47C ov18_0238C4A0: ; 0x0238C4A0 stmdb sp!, {r3, lr} bl sub_0203FD38 - ldr r1, _0238C4E4 ; =_0238D620 + ldr r1, _0238C4E4 ; =ov18_0238D620 ldr r1, [r1] str r0, [r1, #0x3a0] bl sub_02041094 - ldr r2, _0238C4E4 ; =_0238D620 + ldr r2, _0238C4E4 ; =ov18_0238D620 mov ip, #0x400 ldr r1, [r2] mov r3, #0x1e @@ -2660,7 +2660,7 @@ ov18_0238C4A0: ; 0x0238C4A0 str r3, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238C4E4: .word _0238D620 +_0238C4E4: .word ov18_0238D620 arm_func_end ov18_0238C4A0 arm_func_start ov18_0238C4E8 @@ -2676,7 +2676,7 @@ ov18_0238C4E8: ; 0x0238C4E8 arm_func_start ov18_0238C504 ov18_0238C504: ; 0x0238C504 - ldr r0, _0238C524 ; =_0238D620 + ldr r0, _0238C524 ; =ov18_0238D620 mov r3, #0xa00 ldr r2, [r0] mov r1, #0x20 @@ -2685,13 +2685,13 @@ ov18_0238C504: ; 0x0238C504 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C524: .word _0238D620 +_0238C524: .word ov18_0238D620 arm_func_end ov18_0238C504 arm_func_start ov18_0238C528 ov18_0238C528: ; 0x0238C528 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0238C714 ; =_0238D620 + ldr r0, _0238C714 ; =ov18_0238D620 mov r4, #0 ldr r0, [r0] ldrsb r0, [r0, #0xa] @@ -2699,7 +2699,7 @@ ov18_0238C528: ; 0x0238C528 cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} bl sub_02041094 - ldr r1, _0238C714 ; =_0238D620 + ldr r1, _0238C714 ; =ov18_0238D620 mov r5, r0 ldr r0, [r1] ldrsb r0, [r0, #0xa] @@ -2819,7 +2819,7 @@ _0238C6E0: _0238C6E4: cmp r4, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0238C714 ; =_0238D620 + ldr r0, _0238C714 ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #8] @@ -2831,7 +2831,7 @@ _0238C708: bl ov18_0238BE28 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238C714: .word _0238D620 +_0238C714: .word ov18_0238D620 _0238C718: .word 0x00003F07 _0238C71C: .word 0x00001308 arm_func_end ov18_0238C528 @@ -2842,7 +2842,7 @@ ov18_0238C720: ; 0x0238C720 bl sub_02041094 mov r4, r0 bl sub_02041154 - ldr r1, _0238C788 ; =_0238D620 + ldr r1, _0238C788 ; =ov18_0238D620 cmp r4, #0 ldr r1, [r1] str r0, [r1, #0x24] @@ -2867,12 +2867,12 @@ _0238C77C: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C788: .word _0238D620 +_0238C788: .word ov18_0238D620 arm_func_end ov18_0238C720 arm_func_start ov18_0238C78C ov18_0238C78C: ; 0x0238C78C - ldr r0, _0238C7AC ; =_0238D620 + ldr r0, _0238C7AC ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x23 @@ -2881,7 +2881,7 @@ ov18_0238C78C: ; 0x0238C78C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C7AC: .word _0238D620 +_0238C7AC: .word ov18_0238D620 arm_func_end ov18_0238C78C arm_func_start ov18_0238C7B0 @@ -2895,7 +2895,7 @@ _0238C7BC: .word ov18_0238BE28 arm_func_start ov18_0238C7C0 ov18_0238C7C0: ; 0x0238C7C0 - ldr r0, _0238C7E0 ; =_0238D620 + ldr r0, _0238C7E0 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x25 @@ -2904,12 +2904,12 @@ ov18_0238C7C0: ; 0x0238C7C0 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C7E0: .word _0238D620 +_0238C7E0: .word ov18_0238D620 arm_func_end ov18_0238C7C0 arm_func_start ov18_0238C7E4 ov18_0238C7E4: ; 0x0238C7E4 - ldr r0, _0238C804 ; =_0238D620 + ldr r0, _0238C804 ; =ov18_0238D620 mov r3, #0x43 ldr r2, [r0] mov r1, #0x26 @@ -2918,20 +2918,20 @@ ov18_0238C7E4: ; 0x0238C7E4 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C804: .word _0238D620 +_0238C804: .word ov18_0238D620 arm_func_end ov18_0238C7E4 arm_func_start ov18_0238C808 ov18_0238C808: ; 0x0238C808 stmdb sp!, {r4, lr} - ldr r0, _0238C884 ; =_0238D620 + ldr r0, _0238C884 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #6] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238C884 ; =_0238D620 + ldr r1, _0238C884 ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -2944,7 +2944,7 @@ ov18_0238C808: ; 0x0238C808 _0238C850: mov r0, r4 bl sub_02041484 - ldr r0, _0238C884 ; =_0238D620 + ldr r0, _0238C884 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -2957,12 +2957,12 @@ _0238C878: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C884: .word _0238D620 +_0238C884: .word ov18_0238D620 arm_func_end ov18_0238C808 arm_func_start ov18_0238C888 ov18_0238C888: ; 0x0238C888 - ldr r0, _0238C8A8 ; =_0238D620 + ldr r0, _0238C8A8 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x28 @@ -2971,12 +2971,12 @@ ov18_0238C888: ; 0x0238C888 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C8A8: .word _0238D620 +_0238C8A8: .word ov18_0238D620 arm_func_end ov18_0238C888 arm_func_start ov18_0238C8AC ov18_0238C8AC: ; 0x0238C8AC - ldr r0, _0238C8CC ; =_0238D620 + ldr r0, _0238C8CC ; =ov18_0238D620 mov r3, #0x43 ldr r2, [r0] mov r1, #0x29 @@ -2985,20 +2985,20 @@ ov18_0238C8AC: ; 0x0238C8AC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C8CC: .word _0238D620 +_0238C8CC: .word ov18_0238D620 arm_func_end ov18_0238C8AC arm_func_start ov18_0238C8D0 ov18_0238C8D0: ; 0x0238C8D0 stmdb sp!, {r4, lr} - ldr r0, _0238C94C ; =_0238D620 + ldr r0, _0238C94C ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #6] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238C94C ; =_0238D620 + ldr r1, _0238C94C ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3011,7 +3011,7 @@ ov18_0238C8D0: ; 0x0238C8D0 _0238C918: mov r0, r4 bl sub_02041484 - ldr r0, _0238C94C ; =_0238D620 + ldr r0, _0238C94C ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3024,12 +3024,12 @@ _0238C940: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C94C: .word _0238D620 +_0238C94C: .word ov18_0238D620 arm_func_end ov18_0238C8D0 arm_func_start ov18_0238C950 ov18_0238C950: ; 0x0238C950 - ldr r0, _0238C970 ; =_0238D620 + ldr r0, _0238C970 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x2b @@ -3038,7 +3038,7 @@ ov18_0238C950: ; 0x0238C950 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C970: .word _0238D620 +_0238C970: .word ov18_0238D620 arm_func_end ov18_0238C950 arm_func_start ov18_0238C974 @@ -3052,7 +3052,7 @@ _0238C980: .word ov18_0238BE28 arm_func_start ov18_0238C984 ov18_0238C984: ; 0x0238C984 - ldr r0, _0238C9A4 ; =_0238D620 + ldr r0, _0238C9A4 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x2d @@ -3061,7 +3061,7 @@ ov18_0238C984: ; 0x0238C984 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C9A4: .word _0238D620 +_0238C9A4: .word ov18_0238D620 arm_func_end ov18_0238C984 arm_func_start ov18_0238C9A8 @@ -3078,33 +3078,33 @@ ov18_0238C9B8: ; 0x0238C9B8 stmdb sp!, {r3, lr} bl sub_0204159C cmp r0, #0 - ldreq r0, _0238CA14 ; =_0238D620 + ldreq r0, _0238CA14 ; =ov18_0238D620 moveq r1, #0x2f ldreq r0, [r0] streq r1, [r0, #0x80] ldmeqia sp!, {r3, pc} - ldr r0, _0238CA14 ; =_0238D620 + ldr r0, _0238CA14 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ABB0 cmp r0, #0 - ldrle r0, _0238CA14 ; =_0238D620 + ldrle r0, _0238CA14 ; =ov18_0238D620 movle r1, #0x31 ldrle r0, [r0] strle r1, [r0, #0x80] - ldrgt r0, _0238CA14 ; =_0238D620 + ldrgt r0, _0238CA14 ; =ov18_0238D620 movgt r1, #0x33 ldrgt r0, [r0] strgt r1, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238CA14: .word _0238D620 +_0238CA14: .word ov18_0238D620 arm_func_end ov18_0238C9B8 arm_func_start ov18_0238CA18 ov18_0238CA18: ; 0x0238CA18 - ldr r0, _0238CA38 ; =_0238D620 + ldr r0, _0238CA38 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x30 @@ -3113,7 +3113,7 @@ ov18_0238CA18: ; 0x0238CA18 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CA38: .word _0238D620 +_0238CA38: .word ov18_0238D620 arm_func_end ov18_0238CA18 arm_func_start ov18_0238CA3C @@ -3127,7 +3127,7 @@ _0238CA48: .word ov18_0238BE28 arm_func_start ov18_0238CA4C ov18_0238CA4C: ; 0x0238CA4C - ldr r0, _0238CA6C ; =_0238D620 + ldr r0, _0238CA6C ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x32 @@ -3136,7 +3136,7 @@ ov18_0238CA4C: ; 0x0238CA4C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CA6C: .word _0238D620 +_0238CA6C: .word ov18_0238D620 arm_func_end ov18_0238CA4C arm_func_start ov18_0238CA70 @@ -3150,7 +3150,7 @@ _0238CA7C: .word ov18_0238BE28 arm_func_start ov18_0238CA80 ov18_0238CA80: ; 0x0238CA80 - ldr r0, _0238CAAC ; =_0238D620 + ldr r0, _0238CAAC ; =ov18_0238D620 mov r2, #3 ldr r1, [r0] mov r3, #0 @@ -3162,12 +3162,12 @@ ov18_0238CA80: ; 0x0238CA80 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CAAC: .word _0238D620 +_0238CAAC: .word ov18_0238D620 arm_func_end ov18_0238CA80 arm_func_start ov18_0238CAB0 ov18_0238CAB0: ; 0x0238CAB0 - ldr r0, _0238CAD0 ; =_0238D620 + ldr r0, _0238CAD0 ; =ov18_0238D620 mov r3, #0x1000 ldr r2, [r0] mov r1, #0x35 @@ -3176,7 +3176,7 @@ ov18_0238CAB0: ; 0x0238CAB0 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CAD0: .word _0238D620 +_0238CAD0: .word ov18_0238D620 arm_func_end ov18_0238CAB0 arm_func_start ov18_0238CAD4 @@ -3186,11 +3186,11 @@ ov18_0238CAD4: ; 0x0238CAD4 add r1, sp, #0 mov r0, #0 bl GetPressedButtons - ldr r0, _0238CBD8 ; =_0238D620 + ldr r0, _0238CBD8 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuCurrentOption - ldr r1, _0238CBD8 ; =_0238D620 + ldr r1, _0238CBD8 ; =ov18_0238D620 ldr r2, [r1] strh r0, [r2, #0x8c] ldrh r0, [sp] @@ -3200,13 +3200,13 @@ ov18_0238CAD4: ; 0x0238CAD4 ldrsb r0, [r1, #0xb] ldrsh r4, [r1, #0x8c] bl sub_0202C1E4 - ldr r0, _0238CBD8 ; =_0238D620 + ldr r0, _0238CBD8 ; =ov18_0238D620 mov r1, r4 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ADA8 - ldr r2, _0238CBD8 ; =_0238D620 + ldr r2, _0238CBD8 ; =ov18_0238D620 mov lr, #0 ldr r1, [r2] mov ip, #1 @@ -3233,7 +3233,7 @@ _0238CB8C: bl sub_0202BCBC cmp r0, #0 bne _0238CBD0 - ldr r0, _0238CBD8 ; =_0238D620 + ldr r0, _0238CBD8 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuResult @@ -3250,12 +3250,12 @@ _0238CBD0: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0238CBD8: .word _0238D620 +_0238CBD8: .word ov18_0238D620 arm_func_end ov18_0238CAD4 arm_func_start ov18_0238CBDC ov18_0238CBDC: ; 0x0238CBDC - ldr r0, _0238CBFC ; =_0238D620 + ldr r0, _0238CBFC ; =ov18_0238D620 mov r3, #0x3000 ldr r2, [r0] mov r1, #0x37 @@ -3264,24 +3264,24 @@ ov18_0238CBDC: ; 0x0238CBDC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CBFC: .word _0238D620 +_0238CBFC: .word ov18_0238D620 arm_func_end ov18_0238CBDC arm_func_start ov18_0238CC00 ov18_0238CC00: ; 0x0238CC00 stmdb sp!, {r4, lr} - ldr r0, _0238CD84 ; =_0238D620 + ldr r0, _0238CD84 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuResult - ldr r1, _0238CD84 ; =_0238D620 + ldr r1, _0238CD84 ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0xc] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0238CD84 ; =_0238D620 + ldr r0, _0238CD84 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xc] bl GetNormalMenuResult @@ -3301,7 +3301,7 @@ _0238CC50: ; jump table b _0238CD5C ; case 8 b _0238CC78 ; case 9 _0238CC78: - ldr r1, _0238CD84 ; =_0238D620 + ldr r1, _0238CD84 ; =ov18_0238D620 mov r0, r4, lsl #0x10 ldr r2, [r1] mov r1, r0, asr #0x10 @@ -3312,7 +3312,7 @@ _0238CC78: arm_func_start ov18_0238CC94 ov18_0238CC94: ; 0x0238CC94 - ldr r1, _0238CD84 ; =_0238D620 + ldr r1, _0238CD84 ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] str r4, [r0, #0x24] @@ -3325,7 +3325,7 @@ ov18_0238CCA8: ; 0x0238CCA8 mov r0, r4 beq _0238CCCC bl sub_0203FD14 - ldr r0, _0238CD84 ; =_0238D620 + ldr r0, _0238CD84 ; =ov18_0238D620 arm_func_end ov18_0238CCA8 arm_func_start ov18_0238CCBC @@ -3336,7 +3336,7 @@ ov18_0238CCBC: ; 0x0238CCBC ldmia sp!, {r4, pc} _0238CCCC: bl sub_02041614 - ldr r0, _0238CD84 ; =_0238D620 + ldr r0, _0238CD84 ; =ov18_0238D620 ldr r0, [r0] arm_func_end ov18_0238CCBC @@ -3350,14 +3350,14 @@ ov18_0238CCD8: ; 0x0238CCD8 ldmia sp!, {r4, pc} arm_func_end ov18_0238CCD8 ov18_0238CCF0: - ldr r1, _0238CD84 ; =_0238D620 + ldr r1, _0238CD84 ; =ov18_0238D620 mov r0, r4, lsl #0x10 ldr r2, [r1] mov r1, r0, asr #0x10 add r0, r2, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ADA8 - ldr r2, _0238CD84 ; =_0238D620 + ldr r2, _0238CD84 ; =ov18_0238D620 mov r4, #0 ldr r1, [r2] mov r3, #1 @@ -3378,7 +3378,7 @@ ov18_0238CCF0: bl ov18_0238BE28 ldmia sp!, {r4, pc} _0238CD5C: - ldr r0, _0238CD84 ; =_0238D620 + ldr r0, _0238CD84 ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0xb] @@ -3390,11 +3390,11 @@ _0238CD78: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238CD84: .word _0238D620 +_0238CD84: .word ov18_0238D620 arm_func_start ov18_0238CD88 ov18_0238CD88: ; 0x0238CD88 - ldr r0, _0238CDA8 ; =_0238D620 + ldr r0, _0238CDA8 ; =ov18_0238D620 mov r3, #0x400 ldr r2, [r0] mov r1, #0x39 @@ -3403,7 +3403,7 @@ ov18_0238CD88: ; 0x0238CD88 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CDA8: .word _0238D620 +_0238CDA8: .word ov18_0238D620 arm_func_end ov18_0238CD88 arm_func_start ov18_0238CDAC @@ -3419,7 +3419,7 @@ ov18_0238CDAC: ; 0x0238CDAC arm_func_start ov18_0238CDC8 ov18_0238CDC8: ; 0x0238CDC8 - ldr r0, _0238CDE8 ; =_0238D620 + ldr r0, _0238CDE8 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x3b @@ -3428,7 +3428,7 @@ ov18_0238CDC8: ; 0x0238CDC8 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CDE8: .word _0238D620 +_0238CDE8: .word ov18_0238D620 arm_func_end ov18_0238CDC8 arm_func_start ov18_0238CDEC @@ -3442,7 +3442,7 @@ _0238CDF8: .word ov18_0238BE28 arm_func_start ov18_0238CDFC ov18_0238CDFC: ; 0x0238CDFC - ldr r0, _0238CE1C ; =_0238D620 + ldr r0, _0238CE1C ; =ov18_0238D620 mov r3, #0x14000 ldr r2, [r0] mov r1, #0x3d @@ -3451,7 +3451,7 @@ ov18_0238CDFC: ; 0x0238CDFC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CE1C: .word _0238D620 +_0238CE1C: .word ov18_0238D620 arm_func_end ov18_0238CDFC arm_func_start ov18_0238CE20 @@ -3460,7 +3460,7 @@ ov18_0238CE20: ; 0x0238CE20 bl sub_020407EC movs r4, r0 beq _0238CE44 - ldr r0, _0238CE84 ; =_0238D620 + ldr r0, _0238CE84 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3486,24 +3486,24 @@ _0238CE78: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238CE84: .word _0238D620 +_0238CE84: .word ov18_0238D620 arm_func_end ov18_0238CE20 arm_func_start ov18_0238CE88 ov18_0238CE88: ; 0x0238CE88 stmdb sp!, {r3, lr} - ldr r0, _0238CED4 ; =_0238D620 + ldr r0, _0238CED4 ; =ov18_0238D620 mov r1, #0xc000 ldr r0, [r0] str r1, [r0, #0x88] bl sub_02041094 bl sub_02041154 - ldr r1, _0238CED4 ; =_0238D620 + ldr r1, _0238CED4 ; =ov18_0238D620 ldr r1, [r1] str r0, [r1, #0x24] mov r0, #4 bl sub_02041154 - ldr r1, _0238CED4 ; =_0238D620 + ldr r1, _0238CED4 ; =ov18_0238D620 mov r2, #0x3f ldr r3, [r1] str r0, [r3, #0x28] @@ -3511,21 +3511,21 @@ ov18_0238CE88: ; 0x0238CE88 str r2, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238CED4: .word _0238D620 +_0238CED4: .word ov18_0238D620 arm_func_end ov18_0238CE88 arm_func_start ov18_0238CED8 ov18_0238CED8: ; 0x0238CED8 stmdb sp!, {r3, lr} bl sub_02041094 - ldr r0, _0238CF94 ; =_0238D620 + ldr r0, _0238CF94 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} bl sub_0203FD38 - ldr r0, _0238CF94 ; =_0238D620 + ldr r0, _0238CF94 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] bl GetNormalMenuResult @@ -3558,7 +3558,7 @@ _0238CF60: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238CF6C: - ldr r0, _0238CF94 ; =_0238D620 + ldr r0, _0238CF94 ; =ov18_0238D620 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0xb] @@ -3570,7 +3570,7 @@ _0238CF88: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238CF94: .word _0238D620 +_0238CF94: .word ov18_0238D620 arm_func_end ov18_0238CED8 arm_func_start ov18_0238CF98 @@ -3582,14 +3582,14 @@ ov18_0238CF98: ; 0x0238CF98 cmp r0, #4 blt _0238CFF0 bl sub_0203FD2C - ldr r2, _0238D030 ; =_0238D620 + ldr r2, _0238D030 ; =ov18_0238D620 mov r1, r0 ldr r0, [r2] mov r2, #8 add r0, r0, #0xa6 add r0, r0, #0x300 bl Memcpy - ldr r0, _0238D030 ; =_0238D620 + ldr r0, _0238D030 ; =ov18_0238D620 mov r2, #0 ldr r1, [r0] str r2, [r1, #0x3a0] @@ -3598,16 +3598,16 @@ ov18_0238CF98: ; 0x0238CF98 strh r2, [r0, #0xa4] b _0238D010 _0238CFF0: - ldr r0, _0238D030 ; =_0238D620 + ldr r0, _0238D030 ; =ov18_0238D620 ldr r0, [r0] str r4, [r0, #0x3a0] bl sub_02041094 - ldr r1, _0238D030 ; =_0238D620 + ldr r1, _0238D030 ; =ov18_0238D620 ldr r1, [r1] add r1, r1, #0x300 strh r0, [r1, #0xa4] _0238D010: - ldr r0, _0238D030 ; =_0238D620 + ldr r0, _0238D030 ; =ov18_0238D620 mov r3, #0x400 ldr r2, [r0] mov r1, #0x41 @@ -3616,7 +3616,7 @@ _0238D010: str r1, [r0, #0x80] ldmia sp!, {r4, pc} .align 2, 0 -_0238D030: .word _0238D620 +_0238D030: .word ov18_0238D620 arm_func_end ov18_0238CF98 arm_func_start ov18_0238D034 @@ -3632,7 +3632,7 @@ ov18_0238D034: ; 0x0238D034 arm_func_start ov18_0238D050 ov18_0238D050: ; 0x0238D050 - ldr r0, _0238D070 ; =_0238D620 + ldr r0, _0238D070 ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x43 @@ -3641,12 +3641,12 @@ ov18_0238D050: ; 0x0238D050 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D070: .word _0238D620 +_0238D070: .word ov18_0238D620 arm_func_end ov18_0238D050 arm_func_start ov18_0238D074 ov18_0238D074: ; 0x0238D074 - ldr r0, _0238D094 ; =_0238D620 + ldr r0, _0238D094 ; =ov18_0238D620 mov r3, #0x43 ldr r2, [r0] mov r1, #0x44 @@ -3655,20 +3655,20 @@ ov18_0238D074: ; 0x0238D074 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D094: .word _0238D620 +_0238D094: .word ov18_0238D620 arm_func_end ov18_0238D074 arm_func_start ov18_0238D098 ov18_0238D098: ; 0x0238D098 stmdb sp!, {r4, lr} - ldr r0, _0238D128 ; =_0238D620 + ldr r0, _0238D128 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #6] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238D128 ; =_0238D620 + ldr r1, _0238D128 ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3684,12 +3684,12 @@ _0238D0E0: bl sub_0203FD2C ldrh r0, [r0, #4] bl sub_02041614 - ldr r0, _0238D128 ; =_0238D620 + ldr r0, _0238D128 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl sub_0203FD80 - ldr r0, _0238D128 ; =_0238D620 + ldr r0, _0238D128 ; =ov18_0238D620 mov r1, #0x48 ldr r0, [r0] str r1, [r0, #0x80] @@ -3699,12 +3699,12 @@ _0238D11C: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238D128: .word _0238D620 +_0238D128: .word ov18_0238D620 arm_func_end ov18_0238D098 arm_func_start ov18_0238D12C ov18_0238D12C: ; 0x0238D12C - ldr r0, _0238D14C ; =_0238D620 + ldr r0, _0238D14C ; =ov18_0238D620 mov r3, #3 ldr r2, [r0] mov r1, #0x46 @@ -3713,12 +3713,12 @@ ov18_0238D12C: ; 0x0238D12C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D14C: .word _0238D620 +_0238D14C: .word ov18_0238D620 arm_func_end ov18_0238D12C arm_func_start ov18_0238D150 ov18_0238D150: ; 0x0238D150 - ldr r0, _0238D170 ; =_0238D620 + ldr r0, _0238D170 ; =ov18_0238D620 mov r3, #0x43 ldr r2, [r0] mov r1, #0x47 @@ -3727,20 +3727,20 @@ ov18_0238D150: ; 0x0238D150 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D170: .word _0238D620 +_0238D170: .word ov18_0238D620 arm_func_end ov18_0238D150 arm_func_start ov18_0238D174 ov18_0238D174: ; 0x0238D174 stmdb sp!, {r4, lr} - ldr r0, _0238D204 ; =_0238D620 + ldr r0, _0238D204 ; =ov18_0238D620 ldr r0, [r0] ldrsb r0, [r0, #6] bl IsNormalMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238D204 ; =_0238D620 + ldr r1, _0238D204 ; =ov18_0238D620 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3756,12 +3756,12 @@ _0238D1BC: bl sub_0203FD2C ldrh r0, [r0, #4] bl sub_02041614 - ldr r0, _0238D204 ; =_0238D620 + ldr r0, _0238D204 ; =ov18_0238D620 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl sub_0203FD80 - ldr r0, _0238D204 ; =_0238D620 + ldr r0, _0238D204 ; =ov18_0238D620 mov r1, #0x4a ldr r0, [r0] str r1, [r0, #0x80] @@ -3771,7 +3771,7 @@ _0238D1F8: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238D204: .word _0238D620 +_0238D204: .word ov18_0238D620 arm_func_end ov18_0238D174 ; 0x0238D208 @@ -3843,6 +3843,6 @@ _0238D204: .word _0238D620 .byte 0x52, 0x5D, 0x00, 0x00 .data -_0238D620: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov18_0238D620 +ov18_0238D620: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_19.s b/asm/overlay_19.s index 2a9835aa..0f1e9a1e 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -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 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 9edb9f3f..eaa2d7a4 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -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 diff --git a/asm/overlay_21.s b/asm/overlay_21.s index 31e0195d..db368a33 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -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 diff --git a/asm/overlay_22.s b/asm/overlay_22.s index c401c7d2..d4049987 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -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 diff --git a/asm/overlay_23.s b/asm/overlay_23.s index 5f69aa3c..74c41caf 100644 --- a/asm/overlay_23.s +++ b/asm/overlay_23.s @@ -7,7 +7,7 @@ ov23_0238A140: ; 0x0238A140 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x30c - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r1] str r0, [r2, #8] ldr r2, [r1] @@ -65,7 +65,7 @@ _0238A218: mov r0, #0 strb r1, [r2, #0x88] bl CreateDBox - ldr r2, _0238B0DC ; =_0238D8A0 + ldr r2, _0238B0DC ; =ov23_0238D8A0 mov r4, #0x73 ldr r3, [r2] mov r1, #3 @@ -75,19 +75,19 @@ _0238A218: mov r2, #1 str r4, [r3, #0x9c] bl CreatePortraitBox - ldr r2, _0238B0DC ; =_0238D8A0 + ldr r2, _0238B0DC ; =ov23_0238D8A0 mov r1, r4 ldr r3, [r2] strb r0, [r3, #0x96] ldr r0, [r2] add r0, r0, #0x1ac bl InitPortraitBoxWithMonsterId - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1ac bl SetPortraitUnknownAttr - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, _0238B0E0 ; =0x00003008 ldr r3, [r0] mov r2, #0x318 @@ -98,7 +98,7 @@ _0238A218: _0238A2A0: ldr r0, _0238B0E4 ; =0x0238D448 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r3, [r0] add r1, r3, #0x90 str r1, [sp, #0x6c] @@ -113,7 +113,7 @@ _0238A2A0: strb r2, [r0, #0x92] bl GetNbItemsInBag cmp r0, #0 - ldreq r0, _0238B0DC ; =_0238D8A0 + ldreq r0, _0238B0DC ; =ov23_0238D8A0 moveq r1, #3 ldreq r0, [r0] streqb r1, [r0, #0x90] @@ -121,7 +121,7 @@ _0238A2A0: mov r0, #0 bl sub_02043380 cmp r0, #0 - ldrne r0, _0238B0DC ; =_0238D8A0 + ldrne r0, _0238B0DC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x90] @@ -129,19 +129,19 @@ _0238A314: mov r0, #1 bl sub_02043320 cmp r0, #0 - ldrne r0, _0238B0DC ; =_0238D8A0 + ldrne r0, _0238B0DC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x91] bne _0238A34C bl IsBagFull cmp r0, #0 - ldrne r0, _0238B0DC ; =_0238D8A0 + ldrne r0, _0238B0DC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x91] _0238A34C: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0] cmp r0, #1 @@ -153,7 +153,7 @@ _0238A34C: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -165,7 +165,7 @@ _0238A38C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -176,7 +176,7 @@ _0238A3B8: bl sub_020434D4 bl ov23_0238D098 mov r3, #0 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r4, #0x73 ldr r2, [r0] ldr r1, _0238B0E0 ; =0x00003008 @@ -193,7 +193,7 @@ _0238A404: ldr r0, _0238B100 ; =0x0238D484 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -214,7 +214,7 @@ _0238A454: ldr r0, _0238B108 ; =0x0238D4A4 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #4 ldr r1, [r0] mov r2, #1 @@ -235,7 +235,7 @@ _0238A4A4: ldr r0, _0238B110 ; =0x0238D4C0 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -256,7 +256,7 @@ _0238A4F4: ldr r0, _0238B114 ; =0x0238D4DC bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -277,7 +277,7 @@ _0238A544: ldr r0, _0238B11C ; =0x0238D4F8 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -298,7 +298,7 @@ _0238A594: ldr r0, _0238B120 ; =0x0238D51C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -319,7 +319,7 @@ _0238A5E4: ldr r0, _0238B128 ; =0x0238D540 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -340,7 +340,7 @@ _0238A634: ldr r0, _0238B12C ; =0x0238D55C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] mov r2, #0 @@ -355,7 +355,7 @@ _0238A634: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, _0238B104 ; =0x00003018 ldr r4, [r0] mov r2, #0x328 @@ -370,7 +370,7 @@ _0238A6A8: ldr r0, _0238B134 ; =0x0238D578 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0xf ldr r1, [r0] mov r4, #0x73 @@ -396,7 +396,7 @@ _0238A704: bl DebugPrint0__0200C1FC bl sub_02042730 bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r4, #0x73 mov r2, #0xe ldr r1, [r0] @@ -416,7 +416,7 @@ _0238A704: _0238A758: ldr r0, _0238B140 ; =0x0238D5CC bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] mov r2, #0 @@ -436,15 +436,15 @@ _0238A758: _0238A7A4: ldr r0, _0238B144 ; =0x0238D5E8 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -453,22 +453,22 @@ _0238A7A4: mov r2, #8 mov r3, #1 bl sub_02042258 - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x97] b _0238B230 _0238A800: ldr r0, _0238B148 ; =0x0238D608 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -477,14 +477,14 @@ _0238A800: mov r2, #8 mov r3, #1 bl sub_02042258 - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x97] b _0238B230 _0238A85C: ldr r0, _0238B14C ; =0x0238D628 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r0] add r0, r1, #0x90 str r0, [sp, #0x104] @@ -494,11 +494,11 @@ _0238A85C: ldrsh r0, [r1, #0x1c] bl sub_0200CCA8 cmp r0, #0 - ldrne r0, _0238B0DC ; =_0238D8A0 + ldrne r0, _0238B0DC ; =ov23_0238D8A0 movne r1, #0 ldrne r0, [r0] strneb r1, [r0, #0x90] - ldreq r0, _0238B0DC ; =_0238D8A0 + ldreq r0, _0238B0DC ; =ov23_0238D8A0 moveq r1, #3 ldreq r0, [r0] streqb r1, [r0, #0x90] @@ -507,7 +507,7 @@ _0238A8B0: mov r0, #0 strb r0, [r1, #0x90] _0238A8B8: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0 ldr r1, [r0] mov r4, #3 @@ -520,7 +520,7 @@ _0238A8B8: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -536,20 +536,20 @@ _0238A8FC: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 _0238A938: ldr r0, _0238B160 ; =0x0238D670 bl DebugPrint0__0200C1FC - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r0, _0238B164 ; =0x0238D68C ldr r2, [r1] ldrsh r1, [r2, #0x1c] ldrh r2, [r2, #0x1a] bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov lr, #0 ldr ip, [r0] ldr r2, _0238B168 ; =0x0238D69C @@ -576,7 +576,7 @@ _0238A938: bl PreprocessString add r0, sp, #0x1d4 bl InitPreprocessorArgs - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 add r1, sp, #0x1d4 ldr r3, [r0] ldr r0, _0238B170 ; =0x0238D428 @@ -594,20 +594,20 @@ _0238A938: ldr r3, _0238B178 ; =0x00000315 mov r2, #0 bl sub_0202E3CC - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] b _0238B230 _0238AA1C: ldr r0, _0238B17C ; =0x0238D6A8 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238AA54 bl ov23_0238D278 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #0x15 ldr r0, [r0] str r1, [r0, #8] @@ -627,7 +627,7 @@ _0238AA54: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238B0E0 ; =0x00003008 @@ -644,13 +644,13 @@ _0238AA54: _0238AAC0: ldr r0, _0238B180 ; =0x0238D6CC bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238AAF8 bl ov23_0238D1B8 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #0x16 ldr r0, [r0] str r1, [r0, #8] @@ -670,7 +670,7 @@ _0238AAF8: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238B0E0 ; =0x00003008 @@ -694,7 +694,7 @@ _0238AB64: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -708,7 +708,7 @@ _0238AB98: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -724,13 +724,13 @@ _0238ABCC: cmp r0, #0 beq _0238AC08 _0238ABF4: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #1 ldr r0, [r0] str r1, [r0, #0xc] b _0238AC28 _0238AC08: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r0] ldr r0, [r1, #8] cmp r0, #0x16 @@ -741,7 +741,7 @@ _0238AC08: _0238AC28: bl sub_02042AF8 bl sub_020434D4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov ip, #0x73 ldr r1, [r0] mov r2, #1 @@ -760,7 +760,7 @@ _0238AC68: bl DebugPrint0__0200C1FC bl sub_02043218 bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0x19 ldr r1, [r0] mov r2, #0 @@ -781,7 +781,7 @@ _0238ACBC: ldr r0, _0238B1A0 ; =0x0238D75C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0x19 ldr r1, [r0] mov ip, #0x73 @@ -801,18 +801,18 @@ _0238ACBC: _0238AD0C: ldr r0, _0238B1A4 ; =0x0238D77C bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0x2b ldr r1, [r0] str r2, [r1, #0xc] ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -822,22 +822,22 @@ _0238AD54: mov r1, #0 mov r2, #8 bl sub_02042CF0 - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x98] b _0238B230 _0238AD74: ldr r0, _0238B1A8 ; =0x0238D79C bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -845,7 +845,7 @@ _0238AD74: mov r1, #0 mov r2, #8 bl sub_02042CF0 - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x98] b _0238B230 @@ -859,7 +859,7 @@ _0238ADCC: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] arm_func_end ov23_0238A140 @@ -879,14 +879,14 @@ _0238AE00: add r1, ip, #0x210 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 _0238AE3C: ldr r0, _0238B1B8 ; =0x0238D7E0 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, _0238B168 ; =0x0238D69C ldr lr, [r0] ldr r3, _0238B16C ; =0x0000C402 @@ -906,7 +906,7 @@ _0238AE3C: bl PreprocessString add r0, sp, #0x2bc bl InitPreprocessorArgs - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 add r1, sp, #0x2bc ldr r3, [r0] ldr r0, _0238B170 ; =0x0238D428 @@ -924,20 +924,20 @@ _0238AE3C: ldr r3, _0238B178 ; =0x00000315 mov r2, #0 bl sub_0202E3CC - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] b _0238B230 _0238AEEC: ldr r0, _0238B1BC ; =0x0238D7FC bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238AF24 bl ov23_0238D238 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #0x20 ldr r0, [r0] str r1, [r0, #8] @@ -951,7 +951,7 @@ _0238AF24: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238B0E0 ; =0x00003008 @@ -964,7 +964,7 @@ _0238AF24: ldrsb r0, [r3, #0x95] add r3, r3, #0x9c bl ov23_0238D0E0 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0x24 ldr r2, [r0] mov r1, #0x25 @@ -982,20 +982,20 @@ _0238AF94: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 _0238AFC8: ldr r0, _0238B1C8 ; =0x0238D834 bl DebugPrint0__0200C1FC - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238B000 bl ov23_0238D148 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #0x21 ldr r0, [r0] str r1, [r0, #8] @@ -1015,7 +1015,7 @@ _0238B000: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238B0E0 ; =0x00003008 @@ -1039,7 +1039,7 @@ _0238B06C: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238B0DC ; =_0238D8A0 + ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238B230 @@ -1055,13 +1055,13 @@ _0238B0A0: cmp r0, #0 beq _0238B1D4 _0238B0C8: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r1, #1 ldr r0, [r0] str r1, [r0, #0xc] b _0238B1F4 .align 2, 0 -_0238B0DC: .word _0238D8A0 +_0238B0DC: .word ov23_0238D8A0 _0238B0E0: .word 0x00003008 _0238B0E4: .word 0x0238D448 _0238B0E8: .word 0x0238D438 @@ -1124,7 +1124,7 @@ _0238B1C8: .word 0x0238D834 _0238B1CC: .word 0x0238D854 _0238B1D0: .word 0x0238D868 _0238B1D4: - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r0] ldr r0, [r1, #8] cmp r0, #0x21 @@ -1135,7 +1135,7 @@ _0238B1D4: _0238B1F4: bl sub_02042AF8 bl sub_020434D4 - ldr r0, _0238B0DC ; =_0238D8A0 + ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r3, #0x73 @@ -1157,7 +1157,7 @@ _0238B230: ov23_0238B238: ; 0x0238B238 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x30c - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r0, [r2, #8] cmp r0, #0x2b @@ -1213,7 +1213,7 @@ _0238B308: mov r0, #0 strb r1, [r2, #0x88] bl CreateDBox - ldr r2, _0238C1CC ; =_0238D8A0 + ldr r2, _0238C1CC ; =ov23_0238D8A0 mov r4, #0x73 ldr r3, [r2] mov r1, #3 @@ -1223,19 +1223,19 @@ _0238B308: mov r2, #1 str r4, [r3, #0x9c] bl CreatePortraitBox - ldr r2, _0238C1CC ; =_0238D8A0 + ldr r2, _0238C1CC ; =ov23_0238D8A0 mov r1, r4 ldr r3, [r2] strb r0, [r3, #0x96] ldr r0, [r2] add r0, r0, #0x1ac bl InitPortraitBoxWithMonsterId - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1ac bl SetPortraitUnknownAttr - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, _0238C1D0 ; =0x00003008 ldr r3, [r0] mov r2, #0x318 @@ -1246,7 +1246,7 @@ _0238B308: _0238B390: ldr r0, _0238C1D4 ; =0x0238D448 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r3, [r0] add r1, r3, #0x90 str r1, [sp, #0x2d4] @@ -1261,7 +1261,7 @@ _0238B390: strb r2, [r0, #0x92] bl GetNbItemsInBag cmp r0, #0 - ldreq r0, _0238C1CC ; =_0238D8A0 + ldreq r0, _0238C1CC ; =ov23_0238D8A0 moveq r1, #3 ldreq r0, [r0] streqb r1, [r0, #0x90] @@ -1269,7 +1269,7 @@ _0238B390: mov r0, #0 bl sub_02043380 cmp r0, #0 - ldrne r0, _0238C1CC ; =_0238D8A0 + ldrne r0, _0238C1CC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x90] @@ -1277,19 +1277,19 @@ _0238B404: mov r0, #1 bl sub_02043320 cmp r0, #0 - ldrne r0, _0238C1CC ; =_0238D8A0 + ldrne r0, _0238C1CC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x91] bne _0238B43C bl IsBagFull cmp r0, #0 - ldrne r0, _0238C1CC ; =_0238D8A0 + ldrne r0, _0238C1CC ; =ov23_0238D8A0 movne r1, #3 ldrne r0, [r0] strneb r1, [r0, #0x91] _0238B43C: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0] cmp r0, #1 @@ -1301,7 +1301,7 @@ _0238B43C: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -1313,7 +1313,7 @@ _0238B47C: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -1324,7 +1324,7 @@ _0238B4A8: bl sub_020434D4 bl ov23_0238D098 mov r3, #0 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r4, #0x73 ldr r2, [r0] ldr r1, _0238C1D0 ; =0x00003008 @@ -1341,7 +1341,7 @@ _0238B4F4: ldr r0, _0238C1F0 ; =0x0238D484 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -1362,7 +1362,7 @@ _0238B544: ldr r0, _0238C1F8 ; =0x0238D4A4 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #4 ldr r1, [r0] mov r2, #1 @@ -1383,7 +1383,7 @@ _0238B594: ldr r0, _0238C200 ; =0x0238D4C0 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -1404,7 +1404,7 @@ _0238B5E4: ldr r0, _0238C204 ; =0x0238D4DC bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -1425,7 +1425,7 @@ _0238B634: ldr r0, _0238C20C ; =0x0238D4F8 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r4, #0x73 @@ -1446,7 +1446,7 @@ _0238B684: ldr r0, _0238C210 ; =0x0238D51C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -1467,7 +1467,7 @@ _0238B6D4: ldr r0, _0238C218 ; =0x0238D540 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -1488,7 +1488,7 @@ _0238B724: ldr r0, _0238C21C ; =0x0238D55C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] mov r2, #0 @@ -1503,7 +1503,7 @@ _0238B724: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, _0238C1F4 ; =0x00003018 ldr r4, [r0] mov r2, #0x328 @@ -1518,7 +1518,7 @@ _0238B798: ldr r0, _0238C224 ; =0x0238D578 bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0xf ldr r1, [r0] mov r4, #0x73 @@ -1544,7 +1544,7 @@ _0238B7F4: bl DebugPrint0__0200C1FC bl sub_02042730 bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r4, #0x73 mov r2, #0xe ldr r1, [r0] @@ -1564,7 +1564,7 @@ _0238B7F4: _0238B848: ldr r0, _0238C230 ; =0x0238D5CC bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] mov r2, #0 @@ -1584,15 +1584,15 @@ _0238B848: _0238B894: ldr r0, _0238C234 ; =0x0238D5E8 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -1601,22 +1601,22 @@ _0238B894: mov r2, #8 mov r3, #1 bl sub_02042258 - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x97] b _0238C320 _0238B8F0: ldr r0, _0238C238 ; =0x0238D608 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -1625,14 +1625,14 @@ _0238B8F0: mov r2, #8 mov r3, #1 bl sub_02042258 - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x97] b _0238C320 _0238B94C: ldr r0, _0238C23C ; =0x0238D628 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r0] add r0, r1, #0x90 str r0, [sp, #0x23c] @@ -1642,11 +1642,11 @@ _0238B94C: ldrsh r0, [r1, #0x1c] bl sub_0200CCA8 cmp r0, #0 - ldrne r0, _0238C1CC ; =_0238D8A0 + ldrne r0, _0238C1CC ; =ov23_0238D8A0 movne r1, #0 ldrne r0, [r0] strneb r1, [r0, #0x90] - ldreq r0, _0238C1CC ; =_0238D8A0 + ldreq r0, _0238C1CC ; =ov23_0238D8A0 moveq r1, #3 ldreq r0, [r0] streqb r1, [r0, #0x90] @@ -1655,7 +1655,7 @@ _0238B9A0: mov r0, #0 strb r0, [r1, #0x90] _0238B9A8: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0 ldr r1, [r0] mov r4, #3 @@ -1668,7 +1668,7 @@ _0238B9A8: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -1684,20 +1684,20 @@ _0238B9EC: add r1, r4, #0x210 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 _0238BA28: ldr r0, _0238C250 ; =0x0238D670 bl DebugPrint0__0200C1FC - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r0, _0238C254 ; =0x0238D68C ldr r2, [r1] ldrsh r1, [r2, #0x1c] ldrh r2, [r2, #0x1a] bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov lr, #0 ldr ip, [r0] ldr r2, _0238C258 ; =0x0238D69C @@ -1724,7 +1724,7 @@ _0238BA28: bl PreprocessString add r0, sp, #0xf4 bl InitPreprocessorArgs - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 add r1, sp, #0xf4 ldr r3, [r0] ldr r0, _0238C260 ; =0x0238D428 @@ -1742,20 +1742,20 @@ _0238BA28: ldr r3, _0238C268 ; =0x00000315 mov r2, #0 bl sub_0202E3CC - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] b _0238C320 _0238BB0C: ldr r0, _0238C26C ; =0x0238D6A8 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238BB44 bl ov23_0238D278 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #0x15 ldr r0, [r0] str r1, [r0, #8] @@ -1775,7 +1775,7 @@ _0238BB44: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238C1D0 ; =0x00003008 @@ -1792,13 +1792,13 @@ _0238BB44: _0238BBB0: ldr r0, _0238C270 ; =0x0238D6CC bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238BBE8 bl ov23_0238D1B8 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #0x16 ldr r0, [r0] str r1, [r0, #8] @@ -1818,7 +1818,7 @@ _0238BBE8: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238C1D0 ; =0x00003008 @@ -1842,7 +1842,7 @@ _0238BC54: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -1856,7 +1856,7 @@ _0238BC88: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -1872,13 +1872,13 @@ _0238BCBC: cmp r0, #0 beq _0238BCF8 _0238BCE4: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #1 ldr r0, [r0] str r1, [r0, #0xc] b _0238BD18 _0238BCF8: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r0] ldr r0, [r1, #8] cmp r0, #0x16 @@ -1889,7 +1889,7 @@ _0238BCF8: _0238BD18: bl sub_02042AF8 bl sub_020434D4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov ip, #0x73 ldr r1, [r0] mov r2, #1 @@ -1908,7 +1908,7 @@ _0238BD58: bl DebugPrint0__0200C1FC bl sub_02043218 bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0x19 ldr r1, [r0] mov r2, #0 @@ -1929,7 +1929,7 @@ _0238BDAC: ldr r0, _0238C290 ; =0x0238D75C bl DebugPrint0__0200C1FC bl ov23_0238D098 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0x19 ldr r1, [r0] mov ip, #0x73 @@ -1949,18 +1949,18 @@ _0238BDAC: _0238BDFC: ldr r0, _0238C294 ; =0x0238D77C bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0x2b ldr r1, [r0] str r2, [r1, #0xc] ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -1970,22 +1970,22 @@ _0238BE44: mov r1, #0 mov r2, #8 bl sub_02042CF0 - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x98] b _0238C320 _0238BE64: ldr r0, _0238C298 ; =0x0238D79C bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -1993,7 +1993,7 @@ _0238BE64: mov r1, #0 mov r2, #8 bl sub_02042CF0 - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x98] b _0238C320 @@ -2007,7 +2007,7 @@ _0238BEBC: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -2023,14 +2023,14 @@ _0238BEF0: add r1, ip, #0x210 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 _0238BF2C: ldr r0, _0238C2A8 ; =0x0238D7E0 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, _0238C258 ; =0x0238D69C ldr lr, [r0] ldr r3, _0238C25C ; =0x0000C402 @@ -2050,7 +2050,7 @@ _0238BF2C: bl PreprocessString add r0, sp, #0xc bl InitPreprocessorArgs - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 add r1, sp, #0xc ldr r3, [r0] ldr r0, _0238C260 ; =0x0238D428 @@ -2068,20 +2068,20 @@ _0238BF2C: ldr r3, _0238C268 ; =0x00000315 mov r2, #0 bl sub_0202E3CC - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] b _0238C320 _0238BFDC: ldr r0, _0238C2AC ; =0x0238D7FC bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238C014 bl ov23_0238D238 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #0x20 ldr r0, [r0] str r1, [r0, #8] @@ -2095,7 +2095,7 @@ _0238C014: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238C1D0 ; =0x00003008 @@ -2108,7 +2108,7 @@ _0238C014: ldrsb r0, [r3, #0x95] add r3, r3, #0x9c bl ov23_0238D0E0 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0x24 ldr r2, [r0] mov r1, #0x25 @@ -2126,20 +2126,20 @@ _0238C084: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 _0238C0B8: ldr r0, _0238C2B8 ; =0x0238D834 bl DebugPrint0__0200C1FC - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] cmp r1, #1 bne _0238C0F0 bl ov23_0238D148 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #0x21 ldr r0, [r0] str r1, [r0, #8] @@ -2159,7 +2159,7 @@ _0238C0F0: add r0, r1, #0x12c add r1, r1, #0x18 bl sub_0200D670 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov ip, #0x73 ldr r3, [r0] ldr r1, _0238C1D0 ; =0x00003008 @@ -2183,7 +2183,7 @@ _0238C15C: mov r2, #0 str ip, [sp] bl CreateNormalMenu - ldr r1, _0238C1CC ; =_0238D8A0 + ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] b _0238C320 @@ -2199,13 +2199,13 @@ _0238C190: cmp r0, #0 beq _0238C2C4 _0238C1B8: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r1, #1 ldr r0, [r0] str r1, [r0, #0xc] b _0238C2E4 .align 2, 0 -_0238C1CC: .word _0238D8A0 +_0238C1CC: .word ov23_0238D8A0 _0238C1D0: .word 0x00003008 _0238C1D4: .word 0x0238D448 _0238C1D8: .word 0x0238D438 @@ -2268,7 +2268,7 @@ _0238C2B8: .word 0x0238D834 _0238C2BC: .word 0x0238D854 _0238C2C0: .word 0x0238D868 _0238C2C4: - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r0] ldr r0, [r1, #8] cmp r0, #0x21 @@ -2279,7 +2279,7 @@ _0238C2C4: _0238C2E4: bl sub_02042AF8 bl sub_020434D4 - ldr r0, _0238C1CC ; =_0238D8A0 + ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 ldr r1, [r0] mov r3, #0x73 @@ -2308,7 +2308,7 @@ ov23_0238C328: ; 0x0238C328 mov r1, #8 ldr r4, [r2] bl MemAlloc - ldr r1, _0238C444 ; =_0238D8A0 + ldr r1, _0238C444 ; =ov23_0238D8A0 mov r2, #0 str r0, [r1] str r2, [r0, #0x28] @@ -2321,7 +2321,7 @@ ov23_0238C328: ; 0x0238C328 ldr r0, [r1] add r0, r0, #0x9c bl InitPreprocessorArgs - ldr r0, _0238C444 ; =_0238D8A0 + ldr r0, _0238C444 ; =ov23_0238D8A0 mov r3, #0x73 ldr r1, [r0] mov r2, #0 @@ -2343,7 +2343,7 @@ ov23_0238C328: ; 0x0238C328 ldr r0, [r0] add r0, r0, #0x1c0 bl sub_02034A38 - ldr r1, _0238C444 ; =_0238D8A0 + ldr r1, _0238C444 ; =ov23_0238D8A0 mov r2, #0xff ldr r3, [r1] str r0, [r3, #0x1bc] @@ -2351,7 +2351,7 @@ ov23_0238C328: ; 0x0238C328 str r2, [r0, #4] _0238C3F0: mov r3, #0 - ldr r1, _0238C444 ; =_0238D8A0 + ldr r1, _0238C444 ; =ov23_0238D8A0 mov r0, r3 _0238C3FC: ldr r2, [r1] @@ -2360,7 +2360,7 @@ _0238C3FC: strb r0, [r2, #0x90] cmp r3, #5 blt _0238C3FC - ldr r1, _0238C444 ; =_0238D8A0 + ldr r1, _0238C444 ; =ov23_0238D8A0 mvn r3, #1 ldr r2, [r1] strb r3, [r2, #0x97] @@ -2373,29 +2373,29 @@ _0238C3FC: ldmia sp!, {r4, pc} .align 2, 0 _0238C440: .word 0x0238A134 -_0238C444: .word _0238D8A0 +_0238C444: .word ov23_0238D8A0 arm_func_end ov23_0238C328 arm_func_start ov23_0238C448 ov23_0238C448: ; 0x0238C448 stmdb sp!, {r3, lr} - ldr r0, _0238C470 ; =_0238D8A0 + ldr r0, _0238C470 ; =ov23_0238D8A0 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0238C470 ; =_0238D8A0 + ldr r0, _0238C470 ; =ov23_0238D8A0 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0238C470: .word _0238D8A0 +_0238C470: .word ov23_0238D8A0 arm_func_end ov23_0238C448 arm_func_start ov23_0238C474 ov23_0238C474: ; 0x0238C474 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r1, [r0] ldr r2, [r1, #0x8c] cmp r2, #3 @@ -2479,7 +2479,7 @@ _0238C598: bne _0238CFD0 mov r0, #0x23 bl ov23_0238A140 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox @@ -2493,7 +2493,7 @@ _0238C5C4: b _0238C66C _0238C5DC: bl sub_02042664 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r3, #0x2a @@ -2514,15 +2514,15 @@ _0238C60C: _0238C624: bne _0238C634 bl sub_02042B50 - ldr r1, _0238D090 ; =_0238D8A0 + ldr r1, _0238D090 ; =ov23_0238D8A0 b _0238C63C _0238C634: bl sub_02042ADC - ldr r1, _0238D090 ; =_0238D8A0 + ldr r1, _0238D090 ; =ov23_0238D8A0 _0238C63C: ldr r1, [r1] str r0, [r1, #0x20] - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r1, [r0] ldr r0, [r1, #0x20] add r1, r1, #0x18 @@ -2546,7 +2546,7 @@ _0238C66C: mov r0, #0 bl sub_02017CCC bl sub_02042ADC - ldr r1, _0238D090 ; =_0238D8A0 + ldr r1, _0238D090 ; =ov23_0238D8A0 ldr r2, [r1] str r0, [r2, #0x20] ldr r1, [r1] @@ -2556,12 +2556,12 @@ _0238C66C: mov r0, r0, asr #0x10 bl CopyItemAtIdx bl sub_02042664 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x97] bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r3, #5 ldr r1, [r0] mov r2, #0x12 @@ -2582,7 +2582,7 @@ _0238C704: beq _0238C7D0 b _0238CFD0 _0238C728: - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2, #8] cmp r1, #0x10 @@ -2591,7 +2591,7 @@ _0238C728: bl sub_0200CCA8 cmp r0, #0 bne _0238C76C - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r3, #9 ldr r2, [r0] mov r1, #0x2a @@ -2600,7 +2600,7 @@ _0238C728: str r1, [r0, #8] b _0238C7A0 _0238C76C: - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r3, #0x2a ldr r2, [r0] mov r1, #0x13 @@ -2617,12 +2617,12 @@ _0238C78C: _0238C7A0: bl ov23_0238D098 bl sub_02042664 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x97] bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0x2a ldr r0, [r0] str r1, [r0, #8] @@ -2630,12 +2630,12 @@ _0238C7A0: _0238C7D0: bl ov23_0238D098 bl sub_02042664 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x97] bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r3, #0x12 ldr r2, [r0] mov r1, #0x2a @@ -2646,7 +2646,7 @@ _0238C7D0: _0238C80C: bl ov23_0238D098 bl sub_02042744 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0xf ldr r0, [r0] str r1, [r0, #8] @@ -2656,11 +2656,11 @@ _0238C828: bl sub_0202E6E4 cmp r0, #0 bne _0238CFD0 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x9a] bl sub_0202E6C8 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r0, #0xf @@ -2685,11 +2685,11 @@ _0238C888: b _0238CFD0 _0238C89C: bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #5 ldr r1, [r0] mov r3, #0xf @@ -2714,7 +2714,7 @@ _0238C900: bl ov23_0238D1B8 bl ov23_0238D098 bl sub_02042AF8 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r3, #6 ldr r1, [r0] mov r2, #0x16 @@ -2726,11 +2726,11 @@ _0238C900: b _0238CFD0 _0238C934: bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #5 ldr r1, [r0] mov r3, #0xf @@ -2752,7 +2752,7 @@ _0238C974: bne _0238C9C8 bl sub_0204317C bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r3, #1 @@ -2774,16 +2774,16 @@ _0238C9C8: bl ov23_0238A140 b _0238CFD0 _0238C9EC: - ldrne r0, _0238D090 ; =_0238D8A0 + ldrne r0, _0238D090 ; =ov23_0238D8A0 ldrne r0, [r0] strneh r4, [r0, #0x24] bne _0238CA0C bl sub_0204352C - ldr r1, _0238D090 ; =_0238D8A0 + ldr r1, _0238D090 ; =ov23_0238D8A0 ldr r1, [r1] strh r0, [r1, #0x24] _0238CA0C: - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r1, [r0] ldrsh r0, [r1, #0x24] add r1, r1, #0x18 @@ -2806,7 +2806,7 @@ _0238CA2C: bl sub_02017CCC mov r0, r4 bl sub_0204323C - ldr r2, _0238D090 ; =_0238D8A0 + ldr r2, _0238D090 ; =ov23_0238D8A0 ldr r1, _0238D094 ; =0x020AF6B8 ldr r0, [r2] mov r3, #0 @@ -2829,7 +2829,7 @@ _0238CA2C: strb r3, [r0, #0x18] bl sub_0204317C bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r3, #1 ldr r1, [r0] mov r2, #0x1d @@ -2856,7 +2856,7 @@ _0238CB0C: bl ov23_0238D098 bl sub_0204317C bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r3, #6 @@ -2871,7 +2871,7 @@ _0238CB50: bl ov23_0238D098 bl sub_0204317C bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] strb r2, [r1, #0x98] @@ -2881,7 +2881,7 @@ _0238CB50: moveq r0, #0x1e movne r0, #0x1f str r0, [r1, #0xc] - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0x29 ldr r0, [r0] str r1, [r0, #8] @@ -2889,7 +2889,7 @@ _0238CB50: _0238CB98: bl sub_0204317C bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r3, #0x1d @@ -2901,7 +2901,7 @@ _0238CB98: str r1, [r0, #8] b _0238CFD0 _0238CBCC: - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0x1a ldr r0, [r0] str r1, [r0, #8] @@ -2913,11 +2913,11 @@ _0238CBE8: bl sub_0202E6E4 cmp r0, #0 bne _0238CFD0 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x9a] bl sub_0202E6C8 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r2, #1 ldr r1, [r0] mov r0, #0x1a @@ -2937,7 +2937,7 @@ _0238CC24: _0238CC48: bl ov23_0238D238 bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #5 ldr r1, [r0] mov r3, #0x20 @@ -2950,11 +2950,11 @@ _0238CC48: b _0238CFD0 _0238CC7C: bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 arm_func_end ov23_0238C474 arm_func_start ov23_0238CC94 @@ -2981,7 +2981,7 @@ ov23_0238CCBC: ; 0x0238CCBC bl IsDBoxActive cmp r0, #0 bne _0238CFD0 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x99] arm_func_end ov23_0238CCBC @@ -3004,7 +3004,7 @@ _0238CCF8: bl ov23_0238D148 bl ov23_0238D098 bl sub_020434D4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #5 ldr r1, [r0] mov r3, #0x21 @@ -3017,11 +3017,11 @@ _0238CCF8: b _0238CFD0 _0238CD30: bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #5 ldr r1, [r0] mov r3, #0x1a @@ -3041,18 +3041,18 @@ _0238CD7C: bl IsDBoxActive cmp r0, #0 bne _0238CFD0 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #0x2e ldr r1, [r0] str r2, [r1, #8] ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox @@ -3061,7 +3061,7 @@ _0238CDCC: ldrsb r0, [r1, #0x99] bl GetNormalMenuResult cmp r0, #1 - ldrne r1, _0238D090 ; =_0238D8A0 + ldrne r1, _0238D090 ; =ov23_0238D8A0 ldrne r1, [r1] strne r0, [r1, #0x28] cmp r0, #6 @@ -3087,7 +3087,7 @@ _0238CE28: bl HasStorableItems cmp r0, #0 bne _0238CE54 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0] cmp r0, #1 @@ -3150,7 +3150,7 @@ _0238CEE0: b _0238CFD0 _0238CF08: bl ov23_0238D098 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x98] @@ -3158,7 +3158,7 @@ _0238CF08: _0238CF20: ldr r0, [r1, #0xc] bl ov23_0238A140 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x10] @@ -3180,7 +3180,7 @@ _0238CF64: _0238CF6C: ldr r0, [r1, #0xc] bl ov23_0238A140 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x10] @@ -3198,11 +3198,11 @@ _0238CFA0: bl IsDBoxActive cmp r0, #0 bne _0238CFD0 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl ShowDBox - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0, #0xc] bl ov23_0238A140 @@ -3211,18 +3211,18 @@ _0238CFD0: _0238CFD4: cmp r0, #3 bne _0238D088 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 mov r2, #2 ldr r1, [r0] str r2, [r1, #0x8c] ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202F2C4 - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl HidePortraitBox - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl sub_0202836C @@ -3232,11 +3232,11 @@ _0238D01C: str r0, [r1, #0x8c] bl sub_020440B8 bl sub_02042BBC - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] bl FreeDBox - ldr r0, _0238D090 ; =_0238D8A0 + ldr r0, _0238D090 ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] bl FreePortraitBox @@ -3262,37 +3262,37 @@ _0238D088: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238D090: .word _0238D8A0 +_0238D090: .word ov23_0238D8A0 arm_func_end ov23_0238CCF0 _0238D094: .word 0x020AF6B8 arm_func_start ov23_0238D098 ov23_0238D098: ; 0x0238D098 stmdb sp!, {r3, lr} - ldr r0, _0238D0DC ; =_0238D8A0 + ldr r0, _0238D0DC ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0x99] cmp r0, r1 ldmeqia sp!, {r3, pc} bl sub_0202836C - ldr r0, _0238D0DC ; =_0238D8A0 + ldr r0, _0238D0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x99] bl FreeNormalMenu - ldr r0, _0238D0DC ; =_0238D8A0 + ldr r0, _0238D0DC ; =ov23_0238D8A0 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x99] ldmia sp!, {r3, pc} .align 2, 0 -_0238D0DC: .word _0238D8A0 +_0238D0DC: .word ov23_0238D8A0 arm_func_end ov23_0238D098 arm_func_start ov23_0238D0E0 ov23_0238D0E0: ; 0x0238D0E0 stmdb sp!, {r4, r5, r6, lr} - ldr r3, _0238D144 ; =_0238D8A0 + ldr r3, _0238D144 ; =ov23_0238D8A0 mov r6, r0 ldr r3, [r3] mov r5, r1 @@ -3303,12 +3303,12 @@ ov23_0238D0E0: ; 0x0238D0E0 ldrsb r1, [r3, #0x88] add r0, r3, #0x1ac bl SetPortraitExpressionId - ldr r0, _0238D144 ; =_0238D8A0 + ldr r0, _0238D144 ; =ov23_0238D8A0 ldr r1, [r0] ldrsb r0, [r1, #0x96] add r1, r1, #0x1ac bl ShowPortraitBox - ldr r1, _0238D144 ; =_0238D8A0 + ldr r1, _0238D144 ; =ov23_0238D8A0 mov r0, r6 ldr r3, [r1] mov r1, r5 @@ -3317,7 +3317,7 @@ ov23_0238D0E0: ; 0x0238D0E0 bl ShowMessageInDBox ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0238D144: .word _0238D8A0 +_0238D144: .word ov23_0238D8A0 arm_func_end ov23_0238D0E0 arm_func_start ov23_0238D148 @@ -3396,11 +3396,11 @@ _0238D21C: arm_func_start ov23_0238D238 ov23_0238D238: ; 0x0238D238 stmdb sp!, {r3, lr} - ldr r0, _0238D274 ; =_0238D8A0 + ldr r0, _0238D274 ; =ov23_0238D8A0 ldr r0, [r0] ldrsh r0, [r0, #0x24] bl sub_02010154 - ldr r1, _0238D274 ; =_0238D8A0 + ldr r1, _0238D274 ; =ov23_0238D8A0 add r0, sp, #0 ldr r2, [r1] ldrsh r1, [r2, #0x1c] @@ -3411,13 +3411,13 @@ ov23_0238D238: ; 0x0238D238 bl sub_020434D4 ldmia sp!, {r3, pc} .align 2, 0 -_0238D274: .word _0238D8A0 +_0238D274: .word ov23_0238D8A0 arm_func_end ov23_0238D238 arm_func_start ov23_0238D278 ov23_0238D278: ; 0x0238D278 stmdb sp!, {r3, lr} - ldr r0, _0238D2E4 ; =_0238D8A0 + ldr r0, _0238D2E4 ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0, #0x20] mov r0, r0, lsl #0x10 @@ -3432,20 +3432,20 @@ ov23_0238D278: ; 0x0238D278 bl sub_02042AF8 ldmia sp!, {r3, pc} _0238D2B4: - ldr r0, _0238D2E4 ; =_0238D8A0 + ldr r0, _0238D2E4 ; =ov23_0238D8A0 ldr r0, [r0] ldr r0, [r0, #0x20] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl RemoveItemNoHole - ldr r0, _0238D2E4 ; =_0238D8A0 + ldr r0, _0238D2E4 ; =ov23_0238D8A0 ldr r0, [r0] add r0, r0, #0x18 bl sub_020103AC bl sub_02042AF8 ldmia sp!, {r3, pc} .align 2, 0 -_0238D2E4: .word _0238D8A0 +_0238D2E4: .word ov23_0238D8A0 arm_func_end ov23_0238D278 ; 0x0238D2E8 @@ -3541,6 +3541,6 @@ _0238D2E4: .word _0238D8A0 .byte 0x5F, 0x47, 0x45, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x3A, 0x0A, 0x00, 0x00, 0x00 .data -_0238D8A0: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov23_0238D8A0 +ov23_0238D8A0: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_24.s b/asm/overlay_24.s index f5e8bf20..033fadda 100644 --- a/asm/overlay_24.s +++ b/asm/overlay_24.s @@ -6,7 +6,7 @@ arm_func_start ov24_0238A140 ov24_0238A140: ; 0x0238A140 stmdb sp!, {r3, lr} - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r2, [r0] ldr r1, [r2] cmp r1, #0x26 @@ -60,7 +60,7 @@ _0238A1F8: bne _0238A604 mov r0, #0x1a bl ov24_0238A610 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] @@ -78,7 +78,7 @@ _0238A22C: b _0238A604 _0238A250: bl ov11_02306C64 - ldr r1, _0238A60C ; =_0238C600 + ldr r1, _0238A60C ; =ov24_0238C600 ldr r1, [r1] str r0, [r1, #0x1e8] mov r0, #0x26 @@ -113,19 +113,19 @@ _0238A2C0: bl ov00_0230D220 cmp r0, #0 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl IsDBoxActive cmp r0, #0 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl ShowDBox - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mov r2, #0x27 ldr r1, [r0] str r2, [r1] @@ -133,7 +133,7 @@ _0238A2C0: add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202F2C4 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] @@ -144,7 +144,7 @@ _0238A334: ldrsb r0, [r0, #0x8f] bl GetNormalMenuResult cmp r0, #1 - ldrne r1, _0238A60C ; =_0238C600 + ldrne r1, _0238A60C ; =ov24_0238C600 ldrne r1, [r1] strne r0, [r1, #0x1c] cmp r0, #1 @@ -193,12 +193,12 @@ _0238A3DC: cmp r0, #3 bne _0238A604 bl GetKeyboardStringResult - ldr r2, _0238A60C ; =_0238C600 + ldr r2, _0238A60C ; =ov24_0238C600 mov r1, r0 ldr r0, [r2] add r0, r0, #0x42 bl StrcpySimple - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mov r2, #0x10 ldr r1, [r0] add r0, r1, #0x22 @@ -218,7 +218,7 @@ _0238A43C: bl sub_0203931C cmp r0, #0 bne _0238A464 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mov r2, #0x10 ldr r1, [r0] mov r0, #0x23 @@ -232,7 +232,7 @@ _0238A464: arm_func_start ov24_0238A468 ov24_0238A468: ; 0x0238A468 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mov r2, #0x21 ldr r1, [r0] mov r0, #0x23 @@ -243,7 +243,7 @@ _0238A488: bl sub_02039218 cmp r0, #0 beq _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] ldr r0, [r0, #4] bl ov24_0238A610 @@ -265,7 +265,7 @@ _0238A4D8: add r0, r1, #0x200 ldrsb r0, [r0, #0x8e] bl sub_0202836C - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8e] @@ -274,7 +274,7 @@ _0238A4D8: _0238A4FC: ldr r0, [r1, #8] bl ov24_0238A610 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mov r1, #0 ldr r0, [r0] str r1, [r0, #0xc] @@ -285,12 +285,12 @@ _0238A518: bl IsDBoxActive cmp r0, #0 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl FreeDBox - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 mvn r2, #1 ldr r1, [r0] mov r0, #0x18 @@ -328,19 +328,19 @@ _0238A5B8: bl ov00_0230D220 cmp r0, #0 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl IsDBoxActive cmp r0, #0 bne _0238A604 - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl ShowDBox - ldr r0, _0238A60C ; =_0238C600 + ldr r0, _0238A60C ; =ov24_0238C600 ldr r0, [r0] ldr r0, [r0, #8] bl ov24_0238A610 @@ -348,14 +348,14 @@ _0238A604: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0238A60C: .word _0238C600 +_0238A60C: .word ov24_0238C600 arm_func_end ov24_0238A468 arm_func_start ov24_0238A610 ov24_0238A610: ; 0x0238A610 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x1c - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 ldr r3, _0238B388 ; =0x0238C50A ldr r1, [r1] add r2, sp, #8 @@ -366,7 +366,7 @@ _0238A630: subs r1, r1, #1 strh r0, [r2], #2 bne _0238A630 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] ldr r2, [r1] cmp r2, #0x26 @@ -416,38 +416,38 @@ _0238A6F4: mov r0, #0 strb r0, [r1, #0x1f0] bl CreateDBox - ldr r2, _0238B384 ; =_0238C600 + ldr r2, _0238B384 ; =ov24_0238C600 mov r1, #3 ldr r3, [r2] mov r2, #1 strb r0, [r3, #0x28c] mov r0, #0 bl CreatePortraitBox - ldr r2, _0238B384 ; =_0238C600 + ldr r2, _0238B384 ; =ov24_0238C600 mov r1, #0x71 ldr r3, [r2] strb r0, [r3, #0x28d] ldr r0, [r2] add r0, r0, #0x294 bl InitPortraitBoxWithMonsterId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0 ldr r0, [r0] add r0, r0, #0x294 bl SetPortraitUnknownAttr - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, [r0] add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r3, [r0] ldrb r0, [r3, #0x21] cmp r0, #0 @@ -467,7 +467,7 @@ _0238A7B8: add r3, r3, #0x1f8 bl ShowMessageInDBox _0238A7C4: - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #4 ldr r2, [r0] mov r1, #0x19 @@ -491,13 +491,13 @@ _0238A800: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 ldr r1, [r1] strb r0, [r1, #0x28f] b _0238B37C _0238A82C: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x1f0] @@ -506,13 +506,13 @@ _0238A82C: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B398 ; =0x00003008 ldr r3, [r0] ldr r2, _0238B39C ; =0x0000038F @@ -523,7 +523,7 @@ _0238A82C: b _0238B37C _0238A890: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -535,13 +535,13 @@ _0238A890: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3AC ; =0x00000391 @@ -552,7 +552,7 @@ _0238A890: b _0238B37C _0238A900: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r2, #4 ldr r1, [r0] str r2, [r1, #8] @@ -561,13 +561,13 @@ _0238A900: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] mov r2, #0x390 @@ -578,7 +578,7 @@ _0238A900: b _0238B37C _0238A964: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3B0 ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -593,13 +593,13 @@ _0238A964: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3B4 ; =0x00000392 @@ -610,7 +610,7 @@ _0238A964: b _0238B37C _0238A9E0: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3B0 ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -625,13 +625,13 @@ _0238A9E0: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3B4 ; =0x00000392 @@ -642,7 +642,7 @@ _0238A9E0: b _0238B37C _0238AA5C: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3B0 ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -657,13 +657,13 @@ _0238AA5C: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3B4 ; =0x00000392 @@ -676,7 +676,7 @@ _0238AAD8: ldr r0, _0238B3B0 ; =0x0000220F bl sub_02017CB4 bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -688,13 +688,13 @@ _0238AAD8: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] mov r2, #0x398 @@ -705,7 +705,7 @@ _0238AAD8: b _0238B37C _0238AB50: bl ov24_0238C47C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r2, #0xa ldr r1, [r0] mov r3, #0 @@ -721,17 +721,17 @@ _0238AB50: add r0, r2, #0x294 bl SetPortraitExpressionId bl sub_0201077C - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 ldr r1, [r1] str r0, [r1, #0x1f8] bl IncrementNbEggsHatched - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3B8 ; =0x00000393 @@ -762,7 +762,7 @@ _0238ABF8: mov r0, #3 bl sub_02017C50 _0238AC2C: - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 mov r2, #4 ldr r0, [r1] mov r3, #0x1b @@ -774,7 +774,7 @@ _0238AC2C: add r1, r2, #0x52 str r1, [r2, #0x230] bl sub_02010794 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3BC ; =0x00000397 ldr r3, [r0] mov r1, #0x1c @@ -793,7 +793,7 @@ _0238AC80: add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3C0 ; =0x00000396 ldr r4, [r0] mov r1, #4 @@ -811,7 +811,7 @@ _0238AC80: _0238ACE0: ldr r0, _0238B3B0 ; =0x0000220F bl sub_02017CB4 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3C4 ; =0x00000715 ldr r1, [r0] mov r3, #5 @@ -829,7 +829,7 @@ _0238ACE0: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #0x1b ldr r1, [r0] mov r2, #0xe @@ -841,7 +841,7 @@ _0238ACE0: ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r4, [r0] ldr r2, _0238B3C8 ; =0x00000395 @@ -860,20 +860,20 @@ _0238AD90: mov r1, #0x11 str r0, [sp] bl CreateNormalMenu - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 ldr r1, [r1] strb r0, [r1, #0x28f] b _0238B37C _0238ADB8: add r0, r1, #0x1bc bl sub_0206351C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0x71 ldr r0, [r0] add r0, r0, #0x100 strh r1, [r0, #0xbc] bl sub_0201077C - ldr r2, _0238B384 ; =_0238C600 + ldr r2, _0238B384 ; =ov24_0238C600 mov r4, #6 ldr r1, [r2] mov r3, #0 @@ -899,13 +899,13 @@ ov24_0238ADFC: ; 0x0238ADFC mov r0, #1 str r2, [sp] str r0, [sp, #4] - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r3, _0238B3D0 ; =0x0238C508 ldr r2, [r0] add r0, r2, #0x248 add r2, r2, #0x42 bl sub_02052F8C - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #1 ldr r0, [r0] add r0, r0, #0x248 @@ -917,24 +917,24 @@ _0238AE60: mvn r1, #0 cmp r0, r1 bne _0238AEB4 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202F2C4 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0x14 ldr r0, [r0] str r1, [r0] bl ov24_0238B3F8 b _0238B37C _0238AEB4: - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0xf ldr r0, [r0] str r1, [r0] @@ -962,7 +962,7 @@ _0238AF00: ldrsh r0, [r0] cmp r1, r0 bge _0238B094 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] ldrsh r0, [r1, #0x16] cmp r0, #0 @@ -973,7 +973,7 @@ _0238AF00: bl IsBagFull cmp r0, #0 beq _0238AFC0 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r2, #0x16 ldr r1, [r0] mov r3, #0x1b @@ -988,13 +988,13 @@ _0238AF00: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3DC ; =0x000003A1 @@ -1004,7 +1004,7 @@ _0238AF00: bl ShowMessageInDBox b _0238B37C _0238AFC0: - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x1f0] @@ -1013,13 +1013,13 @@ _0238AFC0: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, _0238B38C ; =0x00003018 ldr r3, [r0] ldr r2, _0238B3DC ; =0x000003A1 @@ -1027,7 +1027,7 @@ _0238AFC0: ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 bl ShowMessageInDBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #0x25 ldr r2, [r0] mov r1, #0 @@ -1040,7 +1040,7 @@ _0238AFC0: bl SpecialProcAddItemToBag mov r0, #0 strb r0, [sp, #0x14] - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldrsh r2, [sp, #0x10] ldrh r1, [sp, #0x12] ldr r0, [r0] @@ -1051,14 +1051,14 @@ _0238AFC0: add r1, sp, #0x14 add r0, r0, #0x100 bl sub_0200D670 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x7a add r0, r0, #0x100 str r0, [r1, #0x230] b _0238B37C _0238B094: - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #4 ldr r0, [r0] str r1, [r0] @@ -1067,7 +1067,7 @@ _0238B0A8: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202F2C4 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] @@ -1076,7 +1076,7 @@ _0238B0A8: _0238B0CC: add r0, r1, #0x1bc bl sub_0206351C - ldr r3, _0238B384 ; =_0238C600 + ldr r3, _0238B384 ; =ov24_0238C600 mov r2, #1 ldr r0, [r3] mov r1, #0 @@ -1102,13 +1102,13 @@ _0238B114: bl sub_0201077C mov r2, #1 str r2, [sp] - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3D0 ; =0x0238C508 ldr r1, [r1] add r3, sp, #8 add r1, r1, #0x42 bl sub_02055DD0 - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 mov r2, #0x26 ldr r3, [r1] str r0, [r3, #0x1e8] @@ -1122,7 +1122,7 @@ _0238B170: add r0, r0, #0x3a mov r2, #0xa bl StrncpySimple - ldr r2, _0238B384 ; =_0238C600 + ldr r2, _0238B384 ; =ov24_0238C600 ldr r0, _0238B3E4 ; =0x020A18B8 ldr r1, [r2] ldrsh r3, [r0] @@ -1158,14 +1158,14 @@ _0238B170: strb r0, [r2, #0xf] bl sub_0201077C bl SetPokemonJoined - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 mov r0, #0 ldr r2, [r1] add r1, r2, #0x22 str r1, [r2, #0x230] bl sub_02010794 mov r3, #0x15 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0x1b ldr r2, [r0] str r3, [r2, #8] @@ -1174,7 +1174,7 @@ _0238B170: bl ov24_0238C4CC mov r0, #5 bl sub_02017C50 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0x1c ldr r3, [r0] ldr r2, _0238B3F0 ; =0x00000399 @@ -1191,12 +1191,12 @@ _0238B284: mov r0, #0x20 str r0, [r1, #8] bl ov11_02310BDC - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, _0238B3F4 ; =0x000003A3 ldr ip, [r0] mov r1, #0x1c @@ -1212,7 +1212,7 @@ _0238B2D4: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] bl FreeDBox - ldr r1, _0238B384 ; =_0238C600 + ldr r1, _0238B384 ; =ov24_0238C600 mvn r3, #1 ldr r2, [r1] mov r0, #2 @@ -1242,7 +1242,7 @@ _0238B338: bl HidePortraitBox mov r0, #4 bl sub_02017C50 - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #0x18 ldr r3, [r0] mov r2, #0x274 @@ -1250,7 +1250,7 @@ _0238B338: ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 bl ShowMessageInDBox - ldr r0, _0238B384 ; =_0238C600 + ldr r0, _0238B384 ; =ov24_0238C600 mov r1, #4 ldr r0, [r0] str r1, [r0, #8] @@ -1258,7 +1258,7 @@ _0238B37C: add sp, sp, #0x1c ldmia sp!, {r3, r4, pc} .align 2, 0 -_0238B384: .word _0238C600 +_0238B384: .word ov24_0238C600 _0238B388: .word 0x0238C50A _0238B38C: .word 0x00003018 _0238B390: .word 0x0000038A @@ -1301,7 +1301,7 @@ _0238B40C: subs r1, r1, #1 strh r0, [r2], #2 bne _0238B40C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] ldr r2, [r1] cmp r2, #0x26 @@ -1351,38 +1351,38 @@ _0238B4D0: mov r0, #0 strb r0, [r1, #0x1f0] bl CreateDBox - ldr r2, _0238C164 ; =_0238C600 + ldr r2, _0238C164 ; =ov24_0238C600 mov r1, #3 ldr r3, [r2] mov r2, #1 strb r0, [r3, #0x28c] mov r0, #0 bl CreatePortraitBox - ldr r2, _0238C164 ; =_0238C600 + ldr r2, _0238C164 ; =ov24_0238C600 mov r1, #0x71 ldr r3, [r2] strb r0, [r3, #0x28d] ldr r0, [r2] add r0, r0, #0x294 bl InitPortraitBoxWithMonsterId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0 ldr r0, [r0] add r0, r0, #0x294 bl SetPortraitUnknownAttr - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, [r0] add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r3, [r0] ldrb r0, [r3, #0x21] cmp r0, #0 @@ -1402,7 +1402,7 @@ _0238B594: add r3, r3, #0x1f8 bl ShowMessageInDBox _0238B5A0: - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #4 ldr r2, [r0] mov r1, #0x19 @@ -1426,13 +1426,13 @@ _0238B5DC: mov r2, #0 str r4, [sp] bl CreateNormalMenu - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 ldr r1, [r1] strb r0, [r1, #0x28f] b _0238C158 _0238B608: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x1f0] @@ -1441,13 +1441,13 @@ _0238B608: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C174 ; =0x00003008 ldr r3, [r0] ldr r2, _0238C178 ; =0x0000038F @@ -1458,7 +1458,7 @@ _0238B608: b _0238C158 _0238B66C: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -1470,13 +1470,13 @@ _0238B66C: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C188 ; =0x00000391 @@ -1487,7 +1487,7 @@ _0238B66C: b _0238C158 _0238B6DC: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r2, #4 ldr r1, [r0] str r2, [r1, #8] @@ -1496,13 +1496,13 @@ _0238B6DC: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] mov r2, #0x390 @@ -1513,7 +1513,7 @@ _0238B6DC: b _0238C158 _0238B740: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C18C ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -1528,13 +1528,13 @@ _0238B740: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C190 ; =0x00000392 @@ -1545,7 +1545,7 @@ _0238B740: b _0238C158 _0238B7BC: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C18C ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -1560,13 +1560,13 @@ _0238B7BC: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C190 ; =0x00000392 @@ -1577,7 +1577,7 @@ _0238B7BC: b _0238C158 _0238B838: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C18C ; =0x0000220F ldr r1, [r0] mov r3, #8 @@ -1592,13 +1592,13 @@ _0238B838: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C190 ; =0x00000392 @@ -1611,7 +1611,7 @@ _0238B8B4: ldr r0, _0238C18C ; =0x0000220F bl sub_02017CB4 bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #1 ldr r1, [r0] mov r2, #0 @@ -1623,13 +1623,13 @@ _0238B8B4: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] mov r2, #0x398 @@ -1640,7 +1640,7 @@ _0238B8B4: b _0238C158 _0238B92C: bl ov24_0238C47C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r2, #0xa ldr r1, [r0] mov r3, #0 @@ -1656,17 +1656,17 @@ _0238B92C: add r0, r2, #0x294 bl SetPortraitExpressionId bl sub_0201077C - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 ldr r1, [r1] str r0, [r1, #0x1f8] bl IncrementNbEggsHatched - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C194 ; =0x00000393 @@ -1697,7 +1697,7 @@ _0238B9D4: mov r0, #3 bl sub_02017C50 _0238BA08: - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 mov r2, #4 ldr r0, [r1] mov r3, #0x1b @@ -1709,7 +1709,7 @@ _0238BA08: add r1, r2, #0x52 str r1, [r2, #0x230] bl sub_02010794 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C198 ; =0x00000397 ldr r3, [r0] mov r1, #0x1c @@ -1728,7 +1728,7 @@ _0238BA5C: add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C19C ; =0x00000396 ldr r4, [r0] mov r1, #4 @@ -1746,7 +1746,7 @@ _0238BA5C: _0238BABC: ldr r0, _0238C18C ; =0x0000220F bl sub_02017CB4 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C1A0 ; =0x00000715 ldr r1, [r0] mov r3, #5 @@ -1764,7 +1764,7 @@ _0238BABC: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #0x1b ldr r1, [r0] mov r2, #0xe @@ -1776,7 +1776,7 @@ _0238BABC: ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r4, [r0] ldr r2, _0238C1A4 ; =0x00000395 @@ -1795,20 +1795,20 @@ _0238BB6C: mov r1, #0x11 str r0, [sp] bl CreateNormalMenu - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 ldr r1, [r1] strb r0, [r1, #0x28f] b _0238C158 _0238BB94: add r0, r1, #0x1bc bl sub_0206351C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0x71 ldr r0, [r0] add r0, r0, #0x100 strh r1, [r0, #0xbc] bl sub_0201077C - ldr r2, _0238C164 ; =_0238C600 + ldr r2, _0238C164 ; =ov24_0238C600 mov r4, #6 ldr r1, [r2] mov r3, #0 @@ -1830,13 +1830,13 @@ _0238BB94: mov r0, #1 str r2, [sp] str r0, [sp, #4] - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r3, _0238C1AC ; =0x0238C508 ldr r2, [r0] add r0, r2, #0x248 add r2, r2, #0x42 bl sub_02052F8C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #1 ldr r0, [r0] add r0, r0, #0x248 @@ -1848,24 +1848,24 @@ _0238BC3C: mvn r1, #0 cmp r0, r1 bne _0238BC90 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202F2C4 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0x14 ldr r0, [r0] str r1, [r0] bl ov24_0238B3F8 b _0238C158 _0238BC90: - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0xf ldr r0, [r0] str r1, [r0] @@ -1893,7 +1893,7 @@ _0238BCDC: ldrsh r0, [r0] cmp r1, r0 bge _0238BE70 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] ldrsh r0, [r1, #0x16] cmp r0, #0 @@ -1904,7 +1904,7 @@ _0238BCDC: bl IsBagFull cmp r0, #0 beq _0238BD9C - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r2, #0x16 ldr r1, [r0] mov r3, #0x1b @@ -1919,13 +1919,13 @@ _0238BCDC: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C1B8 ; =0x000003A1 @@ -1935,7 +1935,7 @@ _0238BCDC: bl ShowMessageInDBox b _0238C158 _0238BD9C: - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x1f0] @@ -1944,13 +1944,13 @@ _0238BD9C: ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 bl SetPortraitExpressionId - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 ldrsb r0, [r0, #0x8d] add r1, r1, #0x294 bl ShowPortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, _0238C168 ; =0x00003018 ldr r3, [r0] ldr r2, _0238C1B8 ; =0x000003A1 @@ -1958,7 +1958,7 @@ _0238BD9C: ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 bl ShowMessageInDBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #0x25 ldr r2, [r0] mov r1, #0 @@ -1971,7 +1971,7 @@ _0238BD9C: bl SpecialProcAddItemToBag mov r0, #0 strb r0, [sp, #8] - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldrsh r2, [sp, #0xe] ldrh r1, [sp, #0x10] ldr r0, [r0] @@ -1982,14 +1982,14 @@ _0238BD9C: add r1, sp, #8 add r0, r0, #0x100 bl sub_0200D670 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x7a add r0, r0, #0x100 str r0, [r1, #0x230] b _0238C158 _0238BE70: - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #4 ldr r0, [r0] str r1, [r0] @@ -1998,7 +1998,7 @@ _0238BE84: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202F2C4 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] @@ -2007,7 +2007,7 @@ _0238BE84: _0238BEA8: add r0, r1, #0x1bc bl sub_0206351C - ldr r3, _0238C164 ; =_0238C600 + ldr r3, _0238C164 ; =ov24_0238C600 mov r2, #1 ldr r0, [r3] mov r1, #0 @@ -2033,13 +2033,13 @@ _0238BEF0: bl sub_0201077C mov r2, #1 str r2, [sp] - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 ldr r2, _0238C1AC ; =0x0238C508 ldr r1, [r1] add r3, sp, #0x12 add r1, r1, #0x42 bl sub_02055DD0 - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 mov r2, #0x26 ldr r3, [r1] str r0, [r3, #0x1e8] @@ -2053,7 +2053,7 @@ _0238BF4C: add r0, r0, #0x3a mov r2, #0xa bl StrncpySimple - ldr r2, _0238C164 ; =_0238C600 + ldr r2, _0238C164 ; =ov24_0238C600 ldr r0, _0238C1C0 ; =0x020A18B8 ldr r1, [r2] ldrsh r3, [r0] @@ -2089,14 +2089,14 @@ _0238BF4C: strb r0, [r2, #0xf] bl sub_0201077C bl SetPokemonJoined - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 mov r0, #0 ldr r2, [r1] add r1, r2, #0x22 str r1, [r2, #0x230] bl sub_02010794 mov r3, #0x15 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0x1b ldr r2, [r0] str r3, [r2, #8] @@ -2105,7 +2105,7 @@ _0238BF4C: bl ov24_0238C4CC mov r0, #5 bl sub_02017C50 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0x1c ldr r3, [r0] ldr r2, _0238C1CC ; =0x00000399 @@ -2122,12 +2122,12 @@ _0238C060: mov r0, #0x20 str r0, [r1, #8] bl ov11_02310BDC - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl HidePortraitBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, _0238C1D0 ; =0x000003A3 ldr ip, [r0] mov r1, #0x1c @@ -2143,7 +2143,7 @@ _0238C0B0: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] bl FreeDBox - ldr r1, _0238C164 ; =_0238C600 + ldr r1, _0238C164 ; =ov24_0238C600 mvn r3, #1 ldr r2, [r1] mov r0, #2 @@ -2173,7 +2173,7 @@ _0238C114: bl HidePortraitBox mov r0, #4 bl sub_02017C50 - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #0x18 ldr r3, [r0] mov r2, #0x274 @@ -2181,7 +2181,7 @@ _0238C114: ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 bl ShowMessageInDBox - ldr r0, _0238C164 ; =_0238C600 + ldr r0, _0238C164 ; =ov24_0238C600 mov r1, #4 ldr r0, [r0] str r1, [r0, #8] @@ -2190,7 +2190,7 @@ _0238C158: ldmia sp!, {r3, r4, pc} .align 2, 0 _0238C160: .word 0x0238C50A -_0238C164: .word _0238C600 +_0238C164: .word ov24_0238C600 _0238C168: .word 0x00003018 _0238C16C: .word 0x0000038A _0238C170: .word 0x0000038B @@ -2226,7 +2226,7 @@ ov24_0238C1D4: ; 0x0238C1D4 mov r0, #0x2a8 mov r1, #6 bl MemAlloc - ldr r1, _0238C33C ; =_0238C600 + ldr r1, _0238C33C ; =ov24_0238C600 mov r3, #0 str r0, [r1] str r3, [r0, #0x1c] @@ -2238,23 +2238,23 @@ ov24_0238C1D4: ; 0x0238C1D4 ldr r0, [r1] strb r2, [r0, #0x28d] bl sub_0201077C - ldr r2, _0238C33C ; =_0238C600 + ldr r2, _0238C33C ; =ov24_0238C600 mov r1, r0 ldr r0, [r2] add r0, r0, #0x52 bl GetNameRaw - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x66 add r0, r0, #0x100 add r1, r1, #0x52 bl SpecialStrcpy - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x22 add r1, r1, #0x52 bl Strcpy - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x42 add r1, r1, #0x66 @@ -2262,17 +2262,17 @@ ov24_0238C1D4: ; 0x0238C1D4 bl StrcpySimple bl sub_0201077C mov r1, r0 - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 mov r2, #0x4e ldr r0, [r0] add r0, r0, #0x66 bl GetNameWithGender - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x1f8 bl InitPreprocessorArgs mov r3, #0x71 - ldr r0, _0238C33C ; =_0238C600 + ldr r0, _0238C33C ; =ov24_0238C600 mov r2, #0 ldr r1, [r0] str r3, [r1, #0x244] @@ -2287,7 +2287,7 @@ ov24_0238C1D4: ; 0x0238C1D4 bne _0238C2FC mov r0, #8 bl GetAdventureLogCompleted - ldr r1, _0238C33C ; =_0238C600 + ldr r1, _0238C33C ; =ov24_0238C600 mov r2, #0 ldr r3, [r1] strb r0, [r3, #0x20] @@ -2298,7 +2298,7 @@ ov24_0238C1D4: ; 0x0238C1D4 b _0238C32C _0238C2FC: bl sub_020107AC - ldr r1, _0238C33C ; =_0238C600 + ldr r1, _0238C33C ; =ov24_0238C600 mov r2, #1 ldr r3, [r1] strb r0, [r3, #0x20] @@ -2306,7 +2306,7 @@ _0238C2FC: strb r2, [r0, #0x21] bl sub_0201077C bl sub_0200EB90 - ldr r1, _0238C33C ; =_0238C600 + ldr r1, _0238C33C ; =ov24_0238C600 ldr r1, [r1] strh r0, [r1, #0x16] _0238C32C: @@ -2315,29 +2315,29 @@ _0238C32C: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238C33C: .word _0238C600 +_0238C33C: .word ov24_0238C600 arm_func_end ov24_0238C1D4 arm_func_start ov24_0238C340 ov24_0238C340: ; 0x0238C340 stmdb sp!, {r3, lr} - ldr r0, _0238C368 ; =_0238C600 + ldr r0, _0238C368 ; =ov24_0238C600 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0238C368 ; =_0238C600 + ldr r0, _0238C368 ; =ov24_0238C600 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0238C368: .word _0238C600 +_0238C368: .word ov24_0238C600 arm_func_end ov24_0238C340 arm_func_start ov24_0238C36C ov24_0238C36C: ; 0x0238C36C stmdb sp!, {r3, lr} - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 ldr r2, [r0] ldr r1, [r2, #0x1f4] cmp r1, #3 @@ -2356,7 +2356,7 @@ _0238C3A4: bl ov24_0238A140 cmp r0, #3 bne _0238C470 - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 mov r3, #2 ldr r2, [r0] sub r1, r3, #4 @@ -2367,13 +2367,13 @@ _0238C3A4: cmp r0, r1 beq _0238C3F0 bl sub_0202F2C4 - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] bl sub_0202836C _0238C3F0: - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] @@ -2389,17 +2389,17 @@ _0238C408: cmp r0, r1 beq _0238C43C bl FreeDBox - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x28c] _0238C43C: - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8d] bl FreePortraitBox - ldr r0, _0238C478 ; =_0238C600 + ldr r0, _0238C478 ; =ov24_0238C600 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x28d] @@ -2412,13 +2412,13 @@ _0238C470: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238C478: .word _0238C600 +_0238C478: .word ov24_0238C600 arm_func_end ov24_0238C36C arm_func_start ov24_0238C47C ov24_0238C47C: ; 0x0238C47C stmdb sp!, {r3, lr} - ldr r0, _0238C4C8 ; =_0238C600 + ldr r0, _0238C4C8 ; =ov24_0238C600 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x200 @@ -2426,24 +2426,24 @@ ov24_0238C47C: ; 0x0238C47C cmp r0, r1 ldmeqia sp!, {r3, pc} bl sub_0202836C - ldr r0, _0238C4C8 ; =_0238C600 + ldr r0, _0238C4C8 ; =ov24_0238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8f] bl FreeNormalMenu - ldr r0, _0238C4C8 ; =_0238C600 + ldr r0, _0238C4C8 ; =ov24_0238C600 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x28f] ldmia sp!, {r3, pc} .align 2, 0 -_0238C4C8: .word _0238C600 +_0238C4C8: .word ov24_0238C600 arm_func_end ov24_0238C47C arm_func_start ov24_0238C4CC ov24_0238C4CC: ; 0x0238C4CC stmdb sp!, {r3, lr} - ldr r0, _0238C504 ; =_0238C600 + ldr r0, _0238C504 ; =ov24_0238C600 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x200 @@ -2452,12 +2452,12 @@ ov24_0238C4CC: ; 0x0238C4CC ldmneia sp!, {r3, pc} mov r0, #0 bl CreateDBox - ldr r1, _0238C504 ; =_0238C600 + ldr r1, _0238C504 ; =ov24_0238C600 ldr r1, [r1] strb r0, [r1, #0x28c] ldmia sp!, {r3, pc} .align 2, 0 -_0238C504: .word _0238C600 +_0238C504: .word ov24_0238C600 arm_func_end ov24_0238C4CC ; 0x0238C508 @@ -2477,6 +2477,6 @@ _0238C504: .word _0238C600 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .data -_0238C600: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov24_0238C600 +ov24_0238C600: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 443e4180..eba318d8 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -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 diff --git a/asm/overlay_26.s b/asm/overlay_26.s index 34e1c03e..eab4214a 100644 --- a/asm/overlay_26.s +++ b/asm/overlay_26.s @@ -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 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index 12b12b7d..9de263de 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -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 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index eb1002db..9f84384d 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -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 diff --git a/asm/overlay_29_022DC240.s b/asm/overlay_29_022DC240.s index 8a51e2d1..b2897dee 100644 --- a/asm/overlay_29_022DC240.s +++ b/asm/overlay_29_022DC240.s @@ -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 diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index 25ed3574..b47c76ab 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -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 diff --git a/asm/overlay_30.s b/asm/overlay_30.s index c17d8bd9..ec7c886c 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -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 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 1ead8d64..9e48ad09 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -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 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 6ced1e4d..b733458c 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -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