diff --git a/asm/include/overlay_06.inc b/asm/include/overlay_06.inc index f4267864..22578d6c 100644 --- a/asm/include/overlay_06.inc +++ b/asm/include/overlay_06.inc @@ -1,86 +1,86 @@ #pragma once -.public GetHeldButtons -.public ov01_02338E54 -.public sub_0204AE60 -.public ov01_02337624 -.public sub_02029FBC -.public sub_02046BA0 -.public sub_02046A20 -.public GetLanguageType -.public MemZero -.public ov00_022BD780 -.public sub_0205F0B8 -.public sub_02046C78 -.public sub_0205C854 -.public sub_0205FA38 -.public ov01_02339888 -.public ov00_022BCA80 -.public sub_02066A44 -.public MemFree -.public sub_0205B440 -.public ov01_02337718 -.public sub_020698B8 -.public sub_02046BE8 -.public ov01_02338E68 -.public ov00_022BD264 -.public ov01_0232F3F4 -.public GetKeyboardStringResult -.public sub_020668B4 -.public sub_02046A9C -.public ov01_023310B8 -.public sub_02069DC0 -.public ov01_02337614 -.public sub_0205EC98 -.public MemAlloc -.public ov01_02338BEC -.public sub_0205E238 -.public sub_0204A018 -.public NoteSaveBase -.public GetAdventureLogDungeonFloor -.public sub_02069800 -.public ov01_023398A4 -.public sub_02037468 -.public sub_0204C94C .public CanSendItem -.public ShowKeyboard -.public ov01_02338B08 -.public sub_0205D1F4 -.public sub_02029F88 -.public ov00_022BD274 -.public sub_02066990 -.public sub_0204A1CC -.public sub_0205ED84 -.public GetKeyboardStatus -.public MemcpySimple -.public DungeonRequestsDoneWrapper -.public ov01_02338E48 -.public sub_02003BFC .public DebugPrint0 -.public sub_0204DD80 -.public ov01_02338A24 -.public ov00_022BCBAC -.public sub_0204C978 -.public sub_02004F80 +.public DungeonRequestsDoneWrapper +.public GetAdventureLogDungeonFloor +.public GetHeldButtons +.public GetKeyboardStatus +.public GetKeyboardStringResult +.public GetLanguageType .public GetReleasedStylus +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero +.public NoteSaveBase +.public ov00_022BCA80 +.public ov00_022BCBAC +.public ov00_022BD264 +.public ov00_022BD274 +.public ov00_022BD780 .public ov01_0232E94C +.public ov01_0232F3F4 +.public ov01_023310B8 +.public ov01_02337614 +.public ov01_02337624 +.public ov01_0233769C +.public ov01_023376DC +.public ov01_02337718 +.public ov01_02338A24 +.public ov01_02338B08 +.public ov01_02338BEC +.public ov01_02338C34 +.public ov01_02338E48 +.public ov01_02338E54 +.public ov01_02338E68 +.public ov01_02338EC4 +.public ov01_02339888 +.public ov01_023398A4 +.public ShowKeyboard +.public sub_02003B94 +.public sub_02003BC8 +.public sub_02003BFC +.public sub_02004F80 +.public sub_02006C8C +.public sub_02029F88 +.public sub_02029FBC +.public sub_02037468 +.public sub_02046A20 +.public sub_02046A9C +.public sub_02046B04 +.public sub_02046BA0 +.public sub_02046BB4 +.public sub_02046BE8 +.public sub_02046C78 +.public sub_02046D20 +.public sub_0204A018 +.public sub_0204A1CC +.public sub_0204AE60 +.public sub_0204C94C +.public sub_0204C978 +.public sub_0204DD80 +.public sub_0204E210 +.public sub_02050974 +.public sub_020509BC +.public sub_0205B440 +.public sub_0205C854 +.public sub_0205D1F4 +.public sub_0205E238 +.public sub_0205EC98 +.public sub_0205ED84 +.public sub_0205F0B8 .public sub_0205F5A8 +.public sub_0205F710 +.public sub_0205FA38 +.public sub_0205FD88 +.public sub_020668B4 +.public sub_02066990 +.public sub_02066A44 .public sub_020674CC .public sub_02067664 -.public sub_0204E210 +.public sub_02069800 +.public sub_020698B8 .public sub_02069904 -.public ov01_02338EC4 -.public sub_02003B94 -.public ov01_0233769C -.public sub_0205FD88 -.public sub_02069D94 -.public sub_02006C8C -.public ov01_02338C34 -.public sub_02050974 -.public sub_0205F710 -.public sub_020509BC -.public ov01_023376DC .public sub_02069D40 -.public sub_02046B04 -.public sub_02046BB4 -.public sub_02003BC8 -.public sub_02046D20 +.public sub_02069D94 +.public sub_02069DC0 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index d20c39b1..12f41323 100644 --- a/asm/overlay_06.s +++ b/asm/overlay_06.s @@ -107,7 +107,7 @@ _0233CB74: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233CD40 ; =0x0233ED1C + ldr r2, _0233CD40 ; =ov06_0233ED1C ldr r3, _0233CD44 ; =0x000037A9 mov r1, r0 bl ov06_0233CD54 @@ -137,7 +137,7 @@ _0233CBA8: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233CD48 ; =0x0233ED34 + ldr r2, _0233CD48 ; =ov06_0233ED34 ldr r3, _0233CD4C ; =0x000037AC mov r1, r0 bl ov06_0233CD54 @@ -172,7 +172,7 @@ _0233CC60: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233CD40 ; =0x0233ED1C + ldr r2, _0233CD40 ; =ov06_0233ED1C ldr r3, _0233CD44 ; =0x000037A9 mov r1, r0 bl ov06_0233CD54 @@ -206,7 +206,7 @@ _0233CCD4: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233CD40 ; =0x0233ED1C + ldr r2, _0233CD40 ; =ov06_0233ED1C ldr r3, _0233CD44 ; =0x000037A9 mov r1, r0 bl ov06_0233CD54 @@ -228,9 +228,9 @@ _0233CD34: ldmia sp!, {r3, r4, pc} .align 2, 0 _0233CD3C: .word ov06_0233EEC0 -_0233CD40: .word 0x0233ED1C +_0233CD40: .word ov06_0233ED1C _0233CD44: .word 0x000037A9 -_0233CD48: .word 0x0233ED34 +_0233CD48: .word ov06_0233ED34 _0233CD4C: .word 0x000037AC _0233CD50: .word 0x000037AF arm_func_end ov06_0233CB3C @@ -314,39 +314,39 @@ ov06_0233CDFC: ; 0x0233CDFC mov r0, #0x70 mov r1, #8 bl MemAlloc - ldr r2, _0233CE30 ; =0x0233EEC4 + ldr r2, _0233CE30 ; =ov06_0233EEC4 mov r1, #0x70 str r0, [r2] bl MemZero - ldr r0, _0233CE30 ; =0x0233EEC4 + ldr r0, _0233CE30 ; =ov06_0233EEC4 mov r1, #0 ldr r0, [r0] str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0233CE30: .word 0x0233EEC4 +_0233CE30: .word ov06_0233EEC4 arm_func_end ov06_0233CDFC arm_func_start ov06_0233CE34 ov06_0233CE34: ; 0x0233CE34 stmdb sp!, {r3, lr} - ldr r0, _0233CE5C ; =0x0233EEC4 + ldr r0, _0233CE5C ; =ov06_0233EEC4 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0233CE5C ; =0x0233EEC4 + ldr r0, _0233CE5C ; =ov06_0233EEC4 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0233CE5C: .word 0x0233EEC4 +_0233CE5C: .word ov06_0233EEC4 arm_func_end ov06_0233CE34 arm_func_start ov06_0233CE60 ov06_0233CE60: ; 0x0233CE60 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4D0 ; =0x00000401 ldr r4, [r0] ldr r2, [r4] @@ -419,7 +419,7 @@ _0233CF44: beq _0233D4C4 bl ov06_0233CAA8 cmp r0, #1 - ldreq r0, _0233D4CC ; =0x0233EEC4 + ldreq r0, _0233D4CC ; =ov06_0233EEC4 moveq r1, #0x320 ldreq r0, [r0] streq r1, [r0] @@ -430,7 +430,7 @@ _0233CF78: add r1, r4, #0x44 mov r0, #6 bl ShowKeyboard - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4D4 ; =0x00000321 ldr r0, [r0] str r1, [r0] @@ -438,7 +438,7 @@ _0233CF78: b _0233D4C4 _0233CFA4: bl GetKeyboardStatus - ldr r1, _0233D4CC ; =0x0233EEC4 + ldr r1, _0233D4CC ; =ov06_0233EEC4 ldr r2, [r1] str r0, [r2, #0x40] ldr r1, [r1] @@ -446,13 +446,13 @@ _0233CFA4: cmp r0, #3 bne _0233CFF4 bl GetKeyboardStringResult - ldr r2, _0233D4CC ; =0x0233EEC4 + ldr r2, _0233D4CC ; =ov06_0233EEC4 mov r1, r0 ldr r0, [r2] mov r2, #0x22 add r0, r0, #0x44 bl MemcpySimple - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4D8 ; =0x00000323 ldr r0, [r0] str r1, [r0] @@ -466,13 +466,13 @@ _0233D004: bl sub_02037468 cmp r0, #1 bne _0233D4C4 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r0, [r0] ldr r0, [r0, #0x40] cmp r0, #3 bne _0233D290 bl ov06_0233CAA8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r4, [r0] add r0, r4, #0x44 add r1, r4, #0x20 @@ -535,10 +535,10 @@ _0233D0D8: movge r4, #6 movlt r4, #0 _0233D110: - ldr r0, _0233D4DC ; =0x0233EDCC + ldr r0, _0233D4DC ; =ov06_0233EDCC bl DebugPrint0 - ldr r6, _0233D4E0 ; =0x0233EDD0 - ldr r5, _0233D4CC ; =0x0233EEC4 + ldr r6, _0233D4E0 ; =ov06_0233EDD0 + ldr r5, _0233D4CC ; =ov06_0233EEC4 mov r7, #0 _0233D124: ldr r1, [r5] @@ -549,9 +549,9 @@ _0233D124: add r7, r7, #1 cmp r7, #0x22 blt _0233D124 - ldr r0, _0233D4DC ; =0x0233EDCC + ldr r0, _0233D4DC ; =ov06_0233EDCC bl DebugPrint0 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 cmp r4, #7 ldr r1, [r0] str r4, [r1, #0x6c] @@ -570,12 +570,12 @@ _0233D184: mov r0, #0x1c add r1, r0, #0x3780 bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0 ldr r0, [r0] add r0, r0, #0x20 bl sub_02069800 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r2, #0x324 ldr r1, [r0] str r2, [r1] @@ -592,12 +592,12 @@ _0233D1CC: mov r0, #0x1c add r1, r0, #0x3780 bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0 ldr r0, [r0] add r0, r0, #0x20 bl sub_02069800 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0x324 ldr r0, [r0] str r1, [r0] @@ -607,11 +607,11 @@ _0233D20C: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233D4E4 ; =0x0233ED04 + ldr r2, _0233D4E4 ; =ov06_0233ED04 ldr r3, _0233D4E8 ; =0x00003799 mov r1, r0 bl ov06_0233CD54 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4EC ; =0x000003F2 ldr r0, [r0] str r1, [r0] @@ -620,7 +620,7 @@ _0233D240: ldr r1, _0233D4F0 ; =0x000037A7 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4F4 ; =0x0000032A ldr r0, [r0] str r1, [r0] @@ -629,7 +629,7 @@ _0233D260: ldr r1, _0233D4F8 ; =0x000037A8 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4F4 ; =0x0000032A ldr r0, [r0] str r1, [r0] @@ -649,7 +649,7 @@ _0233D298: cmp r4, #0x12 bne _0233D4C4 bl sub_02069904 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0x400 ldr r0, [r0] str r1, [r0] @@ -658,7 +658,7 @@ _0233D2C4: ldr r1, _0233D4FC ; =0x0000023B mov r0, #0 bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4D0 ; =0x00000401 ldr r0, [r0] str r1, [r0] @@ -671,7 +671,7 @@ _0233D2E4: mov r1, #0x88 mov r2, #1 bl sub_02029F88 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D500 ; =0x00000402 ldr r0, [r0] str r1, [r0] @@ -688,7 +688,7 @@ _0233D318: mov r0, #0x1c mov r1, #0x23c bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D504 ; =0x00000403 ldr r0, [r0] str r1, [r0] @@ -700,7 +700,7 @@ _0233D354: ldr r1, _0233D508 ; =0x00000239 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D50C ; =0x00000404 ldr r0, [r0] str r1, [r0] @@ -709,7 +709,7 @@ _0233D380: bl ov06_0233CDE4 cmp r0, #0x12 bne _0233D4C4 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r0, [r0] ldr r0, [r0, #0x6c] cmp r0, #1 @@ -722,7 +722,7 @@ _0233D3B0: ldr r1, _0233D514 ; =0x0000379D bl ov06_0233CDC8 _0233D3B8: - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D4F4 ; =0x0000032A ldr r0, [r0] str r1, [r0] @@ -748,7 +748,7 @@ _0233D3F4: mov r0, #5 bl ov01_02337624 cmp r4, #0x10 - ldreq r0, _0233D4CC ; =0x0233EEC4 + ldreq r0, _0233D4CC ; =ov06_0233EEC4 moveq r1, #0x320 ldreq r0, [r0] streq r1, [r0] @@ -760,7 +760,7 @@ _0233D3F4: ldmia sp!, {r3, r4, r5, r6, r7, pc} _0233D43C: bl ov06_0233CAD8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r1, _0233D518 ; =0x00000701 ldr r0, [r0] str r1, [r0] @@ -770,7 +770,7 @@ _0233D454: cmp r0, #2 bne _0233D4B0 bl ov06_0233CB10 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 ldr r0, [r0] add r0, r0, #0x20 bl sub_0205F0B8 @@ -779,12 +779,12 @@ _0233D454: mov r0, #0x1c add r1, r0, #0x3780 bl ov06_0233CDC8 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0 ldr r0, [r0] add r0, r0, #0x20 bl sub_02069800 - ldr r0, _0233D4CC ; =0x0233EEC4 + ldr r0, _0233D4CC ; =ov06_0233EEC4 mov r1, #0x324 ldr r0, [r0] str r1, [r0] @@ -799,13 +799,13 @@ _0233D4C4: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233D4CC: .word 0x0233EEC4 +_0233D4CC: .word ov06_0233EEC4 _0233D4D0: .word 0x00000401 _0233D4D4: .word 0x00000321 _0233D4D8: .word 0x00000323 -_0233D4DC: .word 0x0233EDCC -_0233D4E0: .word 0x0233EDD0 -_0233D4E4: .word 0x0233ED04 +_0233D4DC: .word ov06_0233EDCC +_0233D4E0: .word ov06_0233EDD0 +_0233D4E4: .word ov06_0233ED04 _0233D4E8: .word 0x00003799 _0233D4EC: .word 0x000003F2 _0233D4F0: .word 0x000037A7 @@ -827,12 +827,12 @@ ov06_0233D51C: ; 0x0233D51C ldr r0, _0233D59C ; =0x000004B4 mov r1, #8 bl MemAlloc - ldr r2, _0233D5A0 ; =0x0233EEEC + ldr r2, _0233D5A0 ; =ov06_0233EEEC ldr r1, _0233D59C ; =0x000004B4 str r0, [r2] bl MemZero mov r2, #0 - ldr r0, _0233D5A0 ; =0x0233EEEC + ldr r0, _0233D5A0 ; =ov06_0233EEEC mov lr, r2 _0233D548: ldr r1, [r0] @@ -841,7 +841,7 @@ _0233D548: strb lr, [r1, #0x10] cmp r2, #4 blt _0233D548 - ldr r0, _0233D5A0 ; =0x0233EEEC + ldr r0, _0233D5A0 ; =ov06_0233EEEC mvn r3, #0 ldr ip, [r0] mov r1, #0xc @@ -858,14 +858,14 @@ _0233D548: ldmia sp!, {r3, pc} .align 2, 0 _0233D59C: .word 0x000004B4 -_0233D5A0: .word 0x0233EEEC +_0233D5A0: .word ov06_0233EEEC arm_func_end ov06_0233D51C arm_func_start ov06_0233D5A4 ov06_0233D5A4: ; 0x0233D5A4 stmdb sp!, {r4, lr} sub sp, sp, #8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DC78 ; =0x00003001 ldr r3, [r0] ldr r2, [r3, #0xc] @@ -938,19 +938,19 @@ _0233D690: bl ov06_0233CA80 bl sub_0205ED84 cmp r0, #0 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #3 - ldrne r0, _0233DC74 ; =0x0233EEEC + ldrne r0, _0233DC74 ; =ov06_0233EEEC movne r1, #0 ldr r0, [r0] strb r1, [r0, #0x10] mov r0, #0 bl ov01_02337614 - ldr r2, _0233DC7C ; =0x0233ED68 - ldr r1, _0233DC74 ; =0x0233EEEC + ldr r2, _0233DC7C ; =ov06_0233ED68 + ldr r1, _0233DC74 ; =ov06_0233EEEC ldr r2, [r2, r0, lsl #3] ldr r0, [r1] - ldr r3, _0233DC80 ; =0x0233ED64 + ldr r3, _0233DC80 ; =ov06_0233ED64 str r2, [r0, #0x14] ldr r2, _0233DC84 ; =0x00003787 str r3, [sp] @@ -961,7 +961,7 @@ _0233D690: mov r1, r0 add r3, r3, #0x14 bl ov06_0233CD68 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #1 ldr r0, [r0] str r1, [r0, #0xc] @@ -977,7 +977,7 @@ _0233D718: bne _0233D758 mov r0, #0 bl ov06_0233CA98 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x1000 ldr r0, [r0] str r1, [r0, #0xc] @@ -996,7 +996,7 @@ _0233D758: ldr r1, _0233DC8C ; =0x0000378A mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #2 ldr r0, [r0] str r1, [r0, #0xc] @@ -1004,14 +1004,14 @@ _0233D758: _0233D7A0: mov r0, #1 bl ov06_0233CA98 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x2000 ldr r0, [r0] str r1, [r0, #0xc] b _0233DC68 _0233D7BC: cmp r4, #0x12 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #3 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1019,7 +1019,7 @@ _0233D7BC: _0233D7D4: bl ov06_0233CDE4 cmp r0, #0x12 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1040,11 +1040,11 @@ _0233D80C: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233DC90 ; =0x0233ED84 + ldr r2, _0233DC90 ; =ov06_0233ED84 ldr r3, _0233DC94 ; =0x0000378B mov r1, r0 bl ov06_0233CD54 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DC98 ; =0x00001001 ldr r0, [r0] str r1, [r0, #0xc] @@ -1063,7 +1063,7 @@ _0233D848: ldr r1, _0233DC9C ; =0x0000378F mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x6000 ldr r0, [r0] str r1, [r0, #0xc] @@ -1076,14 +1076,14 @@ _0233D894: ldr r1, _0233DCA0 ; =0x00003790 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x6000 ldr r0, [r0] str r1, [r0, #0xc] b _0233DC68 _0233D8C4: cmp r4, #0x12 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1096,11 +1096,11 @@ _0233D8DC: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233DCA4 ; =0x0233EDA4 + ldr r2, _0233DCA4 ; =ov06_0233EDA4 ldr r3, _0233DCA8 ; =0x00003794 mov r1, r0 bl ov06_0233CD54 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DCAC ; =0x00002001 ldr r0, [r0] str r1, [r0, #0xc] @@ -1116,7 +1116,7 @@ _0233D918: bne _0233D958 mov r0, #0 bl ov06_0233CAB8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x3000 ldr r0, [r0] str r1, [r0, #0xc] @@ -1130,7 +1130,7 @@ _0233D958: arm_func_start ov06_0233D964 ov06_0233D964: ; 0x0233D964 bl ov06_0233CAB8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x4000 ldr r0, [r0] str r1, [r0, #0xc] @@ -1140,14 +1140,14 @@ _0233D97C: bne _0233D9A0 mov r0, #1 bl ov06_0233CAB8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x5000 ldr r0, [r0] str r1, [r0, #0xc] b _0233DC68 _0233D9A0: cmp r4, #0x12 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1155,7 +1155,7 @@ _0233D9A0: _0233D9B8: ldrsh r0, [r3, #0xb0] bl sub_02069D40 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DC78 ; =0x00003001 ldr r0, [r0] str r1, [r0, #0xc] @@ -1167,14 +1167,14 @@ _0233D9D0: bl sub_02069D94 bl ov06_0233CAA8 cmp r0, #0 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x1000 ldreq r0, [r0] streq r1, [r0, #0xc] beq _0233DC68 bl ov06_0233CAA8 cmp r0, #1 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x2000 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1183,7 +1183,7 @@ _0233DA1C: cmp r0, #2 bne _0233DA3C bl sub_02069D94 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0 ldr r0, [r0] str r1, [r0, #0xc] @@ -1197,7 +1197,7 @@ _0233DA3C: b _0233DC6C _0233DA54: bl ov06_0233DCF8 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DCB0 ; =0x00004001 ldr r0, [r0] str r1, [r0, #0xc] @@ -1209,14 +1209,14 @@ _0233DA68: bl ov06_0233DD40 bl ov06_0233CAA8 cmp r0, #0 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x1000 ldreq r0, [r0] streq r1, [r0, #0xc] beq _0233DC68 bl ov06_0233CAA8 cmp r0, #1 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x2000 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1225,7 +1225,7 @@ _0233DAB4: cmp r0, #2 bne _0233DAD4 bl ov06_0233DD40 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0 ldr r0, [r0] str r1, [r0, #0xc] @@ -1239,7 +1239,7 @@ _0233DAD4: b _0233DC6C _0233DAEC: bl ov06_0233CDFC - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DCB4 ; =0x00005001 ldr r0, [r0] str r1, [r0, #0xc] @@ -1250,14 +1250,14 @@ _0233DB00: bl ov06_0233CE34 bl ov06_0233CAA8 cmp r0, #0 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x1000 ldreq r0, [r0] streq r1, [r0, #0xc] beq _0233DC68 bl ov06_0233CAA8 cmp r0, #1 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x2000 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1266,7 +1266,7 @@ _0233DB48: cmp r0, #2 bne _0233DB68 bl ov06_0233CE34 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0 ldr r0, [r0] str r1, [r0, #0xc] @@ -1281,7 +1281,7 @@ _0233DB68: _0233DB80: bl ov06_0233CDE4 cmp r0, #0x12 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC ldreq r1, _0233DCB8 ; =0x00006001 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1298,7 +1298,7 @@ _0233DBB8: mov r0, #0xf bl sub_020668B4 _0233DBC0: - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC ldr r1, _0233DCBC ; =0x00006002 ldr r0, [r0] str r1, [r0, #0xc] @@ -1309,7 +1309,7 @@ _0233DBD4: cmp r0, r1 bne _0233DBFC bl sub_02067664 - ldr r0, _0233DC74 ; =0x0233EEEC + ldr r0, _0233DC74 ; =ov06_0233EEEC mov r1, #0x1000 ldr r0, [r0] str r1, [r0, #0xc] @@ -1318,27 +1318,27 @@ _0233DBFC: cmp r0, #1 bne _0233DC68 bl sub_020674CC - ldr r1, _0233DC74 ; =0x0233EEEC + ldr r1, _0233DC74 ; =ov06_0233EEEC ldr r1, [r1] strh r0, [r1, #0xb0] bl sub_02067664 bl ov06_0233CAC8 cmp r0, #0 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x3000 ldreq r0, [r0] streq r1, [r0, #0xc] beq _0233DC68 bl ov06_0233CAC8 cmp r0, #2 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x4000 ldreq r0, [r0] streq r1, [r0, #0xc] beq _0233DC68 bl ov06_0233CAC8 cmp r0, #1 - ldreq r0, _0233DC74 ; =0x0233EEEC + ldreq r0, _0233DC74 ; =ov06_0233EEEC moveq r1, #0x1000 ldreq r0, [r0] streq r1, [r0, #0xc] @@ -1348,19 +1348,19 @@ _0233DC6C: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0233DC74: .word 0x0233EEEC +_0233DC74: .word ov06_0233EEEC _0233DC78: .word 0x00003001 -_0233DC7C: .word 0x0233ED68 -_0233DC80: .word 0x0233ED64 +_0233DC7C: .word ov06_0233ED68 +_0233DC80: .word ov06_0233ED64 _0233DC84: .word 0x00003787 _0233DC88: .word 0x00000233 _0233DC8C: .word 0x0000378A -_0233DC90: .word 0x0233ED84 +_0233DC90: .word ov06_0233ED84 _0233DC94: .word 0x0000378B _0233DC98: .word 0x00001001 _0233DC9C: .word 0x0000378F _0233DCA0: .word 0x00003790 -_0233DCA4: .word 0x0233EDA4 +_0233DCA4: .word ov06_0233EDA4 _0233DCA8: .word 0x00003794 _0233DCAC: .word 0x00002001 _0233DCB0: .word 0x00004001 @@ -1372,20 +1372,20 @@ _0233DCBC: .word 0x00006002 arm_func_start ov06_0233DCC0 ov06_0233DCC0: ; 0x0233DCC0 stmdb sp!, {r3, lr} - ldr r0, _0233DCF4 ; =0x0233EEEC + ldr r0, _0233DCF4 ; =ov06_0233EEEC ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl sub_02046D20 - ldr r0, _0233DCF4 ; =0x0233EEEC + ldr r0, _0233DCF4 ; =ov06_0233EEEC ldr r0, [r0] bl MemFree - ldr r0, _0233DCF4 ; =0x0233EEEC + ldr r0, _0233DCF4 ; =ov06_0233EEEC mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0233DCF4: .word 0x0233EEEC +_0233DCF4: .word ov06_0233EEEC arm_func_end ov06_0233DCC0 arm_func_start ov06_0233DCF8 @@ -1394,11 +1394,11 @@ ov06_0233DCF8: ; 0x0233DCF8 mov r0, #0x228 mov r1, #8 bl MemAlloc - ldr r2, _0233DD3C ; =0x0233EEC8 + ldr r2, _0233DD3C ; =ov06_0233EEC8 mov r1, #0x228 str r0, [r2] bl MemZero - ldr r0, _0233DD3C ; =0x0233EEC8 + ldr r0, _0233DD3C ; =ov06_0233EEC8 mov r2, #0 ldr r1, [r0] str r2, [r1] @@ -1408,34 +1408,34 @@ ov06_0233DCF8: ; 0x0233DCF8 strb r2, [r0, #0x224] ldmia sp!, {r3, pc} .align 2, 0 -_0233DD3C: .word 0x0233EEC8 +_0233DD3C: .word ov06_0233EEC8 arm_func_end ov06_0233DCF8 arm_func_start ov06_0233DD40 ov06_0233DD40: ; 0x0233DD40 stmdb sp!, {r3, lr} - ldr r0, _0233DD78 ; =0x0233EEC8 + ldr r0, _0233DD78 ; =ov06_0233EEC8 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} mov r0, #1 bl ov00_022BCBAC - ldr r0, _0233DD78 ; =0x0233EEC8 + ldr r0, _0233DD78 ; =ov06_0233EEC8 ldr r0, [r0] bl MemFree - ldr r0, _0233DD78 ; =0x0233EEC8 + ldr r0, _0233DD78 ; =ov06_0233EEC8 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0233DD78: .word 0x0233EEC8 +_0233DD78: .word ov06_0233EEC8 arm_func_end ov06_0233DD40 arm_func_start ov06_0233DD7C ov06_0233DD7C: ; 0x0233DD7C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x40 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8E4 ; =0x00004003 ldr r3, [r0] ldr r2, [r3] @@ -1511,13 +1511,13 @@ _0233DE80: bl sub_0204A1CC bl ov00_022BCA80 cmp r0, #3 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 movne r1, #0x1000 ldrne r0, [r0] strne r1, [r0] bne _0233E8D4 bl ov01_02339888 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #1 ldr r0, [r0] str r1, [r0] @@ -1525,14 +1525,14 @@ _0233DE80: _0233DEB8: bl ov01_023398A4 cmp r0, #0 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 movne r1, #0x1000 ldrne r0, [r0] strne r1, [r0] b _0233E8D4 _0233DED4: bl ov01_02338A24 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8F0 ; =0x00001001 ldr r0, [r0] str r1, [r0] @@ -1550,14 +1550,14 @@ _0233DF0C: ldr r1, _0233E8F4 ; =0x000037A1 mov r0, #0 bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8F8 ; =0x00001002 ldr r0, [r0] str r1, [r0] b _0233E8D4 _0233DF2C: bl ov01_02338B08 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x6000 ldr r0, [r0] str r1, [r0] @@ -1570,7 +1570,7 @@ _0233DF44: bne _0233DF74 bl sub_02046D20 bl ov01_02338C34 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8E8 ; =0x00001005 ldr r0, [r0] str r1, [r0] @@ -1580,7 +1580,7 @@ _0233DF74: bne _0233E8D4 mov r0, #0 bl ov01_02338E48 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8FC ; =0x00001003 ldr r0, [r0] str r1, [r0] @@ -1593,7 +1593,7 @@ _0233DF98: mov r8, r0 cmp r8, #0 bgt _0233DFD4 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r3, #0 ldr r2, [r0] mov r1, #0x5000 @@ -1607,7 +1607,7 @@ _0233DFD4: mov r6, sl mov r5, #0xff ldr fp, _0233E900 ; =0x50443357 - ldr r4, _0233E8E0 ; =0x0233EEC8 + ldr r4, _0233E8E0 ; =ov06_0233EEC8 b _0233E0F4 _0233DFF0: mov r0, sb @@ -1617,7 +1617,7 @@ _0233DFF0: ldr r0, [r7] cmp r0, fp beq _0233E018 - ldr r0, _0233E904 ; =0x0233EDD4 + ldr r0, _0233E904 ; =ov06_0233EDD4 bl DebugPrint0 b _0233E0F0 _0233E018: @@ -1625,7 +1625,7 @@ _0233E018: ldr r0, _0233E908 ; =0x08261522 cmp r1, r0 beq _0233E034 - ldr r0, _0233E90C ; =0x0233EDFC + ldr r0, _0233E90C ; =ov06_0233EDFC bl DebugPrint0 b _0233E0F0 _0233E034: @@ -1633,7 +1633,7 @@ _0233E034: ldr r1, [r7, #0xc] cmp r1, r0 beq _0233E050 - ldr r0, _0233E910 ; =0x0233EE24 + ldr r0, _0233E910 ; =ov06_0233EE24 bl DebugPrint0 b _0233E0F0 _0233E050: @@ -1645,7 +1645,7 @@ _0233E050: ldr r1, [r7, #8] cmp r1, r2 beq _0233E07C - ldr r0, _0233E914 ; =0x0233EE4C + ldr r0, _0233E914 ; =ov06_0233EE4C bl DebugPrint0 b _0233E0F0 _0233E07C: @@ -1670,7 +1670,7 @@ _0233E07C: bl sub_0205D1F4 cmp r0, #0 bne _0233E0EC - ldr r0, _0233E918 ; =0x0233EE84 + ldr r0, _0233E918 ; =ov06_0233EE84 bl DebugPrint0 strb r6, [r7] strb r5, [r7, #4] @@ -1684,7 +1684,7 @@ _0233E0F0: _0233E0F4: cmp sb, r8 blt _0233DFF0 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] str sl, [r1, #0x14] ldr r2, [r0] @@ -1709,7 +1709,7 @@ _0233E148: cmpne r0, #6 bne _0233E8D4 bl ov01_02338B08 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x6000 ldr r0, [r0] str r1, [r0] @@ -1719,7 +1719,7 @@ _0233E16C: cmp r0, #6 bne _0233E1A0 bl ov01_02338B08 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldrb r0, [r1, #0x21c] cmp r0, #0 @@ -1732,7 +1732,7 @@ _0233E1A0: cmp r0, #8 bne _0233E8D4 bl ov01_02338B08 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x6000 ldr r0, [r0] str r1, [r0] @@ -1742,7 +1742,7 @@ _0233E1C0: cmp r0, #0 beq _0233E8D4 bl ov01_02338B08 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x6000 ldr r0, [r0] str r1, [r0] @@ -1767,7 +1767,7 @@ _0233E21C: ldr r1, _0233E91C ; =0x000037A2 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E920 ; =0x00002A30 ldr r2, [r0] mov r1, #1 @@ -1793,11 +1793,11 @@ _0233E27C: ldrh r1, [sp, #4] cmp r1, #0 cmpeq r0, #0 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 ldrne r1, _0233E920 ; =0x00002A30 ldrne r0, [r0] strne r1, [r0, #0x220] - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x220] cmp r0, #0 @@ -1806,7 +1806,7 @@ _0233E27C: bl ov06_0233CDE4 cmp r0, #0x12 beq _0233E2D0 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r0, [r0] ldr r0, [r0, #0x220] cmp r0, #0 @@ -1818,7 +1818,7 @@ _0233E2D8: sub r1, r1, #0x860 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #3 ldr r0, [r0] str r1, [r0, #4] @@ -1826,21 +1826,21 @@ _0233E2D8: _0233E2F8: bl ov06_0233CDE4 cmp r0, #0x12 - ldreq r0, _0233E8E0 ; =0x0233EEC8 + ldreq r0, _0233E8E0 ; =ov06_0233EEC8 moveq r1, #4 ldreq r0, [r0] streq r1, [r0, #4] b _0233E69C _0233E314: bl sub_02046D20 - ldr r1, _0233E8E0 ; =0x0233EEC8 + ldr r1, _0233E8E0 ; =ov06_0233EEC8 mov r0, #0x14 ldr r1, [r1] sub r3, r0, #0x15 ldr r2, [r1, #0x14] add r1, r1, #0x18 bl sub_02066990 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #5 ldr r0, [r0] str r1, [r0, #4] @@ -1855,11 +1855,11 @@ _0233E348: bl ov01_02337614 str r0, [sp] mov r0, #0 - ldr r2, _0233E924 ; =0x0233ED4C + ldr r2, _0233E924 ; =ov06_0233ED4C ldr r3, _0233E928 ; =0x000037A4 mov r1, r0 bl ov06_0233CD54 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #7 ldr r0, [r0] str r1, [r0, #4] @@ -1868,11 +1868,11 @@ _0233E390: cmp r0, #1 bne _0233E69C bl sub_020674CC - ldr r1, _0233E8E0 ; =0x0233EEC8 + ldr r1, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r1] str r0, [r1, #0x218] bl sub_02067664 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x218] add r1, r1, #0x18 @@ -1884,14 +1884,14 @@ _0233E390: bl sub_0204C94C cmp r0, #0 beq _0233E418 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E92C ; =0x000037A8 ldr r2, [r0] mov r3, #0 mov r0, #0x1c strb r3, [r2, #0x21c] bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E920 ; =0x00002A30 ldr r2, [r0] mov r1, #6 @@ -1900,7 +1900,7 @@ _0233E390: str r1, [r0, #4] b _0233E69C _0233E418: - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #1 ldr r2, [r0] mov r0, #2 @@ -1909,14 +1909,14 @@ _0233E418: ldr r1, _0233E930 ; =0x000037A5 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0 ldr r2, [r0] ldr r0, [r2, #0x218] add r2, r2, #0x18 add r0, r2, r0, lsl #5 bl sub_02069800 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E920 ; =0x00002A30 ldr r2, [r0] mov r1, #6 @@ -1925,35 +1925,35 @@ _0233E418: str r1, [r0, #4] b _0233E69C _0233E478: - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x218] add r1, r1, #0x18 add r0, r1, r0, lsl #5 bl sub_0205F0B8 cmp r0, #0 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 movne r1, #8 ldrne r0, [r0] strne r1, [r0, #4] bne _0233E69C bl sub_0205F5A8 bl sub_0205F710 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E930 ; =0x000037A5 ldr r2, [r0] mov r3, #1 mov r0, #0x1c strb r3, [r2, #0x21c] bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0 ldr r2, [r0] ldr r0, [r2, #0x218] add r2, r2, #0x18 add r0, r2, r0, lsl #5 bl sub_02069800 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E920 ; =0x00002A30 ldr r2, [r0] mov r1, #6 @@ -1979,11 +1979,11 @@ _0233E53C: ldrh r1, [sp, #4] cmp r1, #0 cmpeq r0, #0 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 ldrne r1, _0233E920 ; =0x00002A30 ldrne r0, [r0] strne r1, [r0, #0x220] - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x220] cmp r0, #0 @@ -1994,7 +1994,7 @@ _0233E53C: bl sub_020698B8 cmp r4, #0x12 beq _0233E598 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r0, [r0] ldr r0, [r0, #0x220] cmp r0, #0 @@ -2016,14 +2016,14 @@ _0233E5A4: beq _0233E6A0 sub r0, r4, #0x11 cmp r0, #1 - ldrls r0, _0233E8E0 ; =0x0233EEC8 + ldrls r0, _0233E8E0 ; =ov06_0233EEC8 movls r1, #4 ldrls r0, [r0] strls r1, [r0, #4] b _0233E69C _0233E5E8: bl ov06_0233CAD8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #9 ldr r0, [r0] str r1, [r0, #4] @@ -2033,7 +2033,7 @@ _0233E600: cmp r0, #2 bne _0233E688 bl ov06_0233CB10 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x218] add r1, r1, #0x18 @@ -2041,21 +2041,21 @@ _0233E600: bl sub_0205F0B8 bl sub_0205F5A8 bl sub_0205F710 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E930 ; =0x000037A5 ldr r2, [r0] mov r3, #1 mov r0, #0x1c strb r3, [r2, #0x21c] bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0 ldr r2, [r0] ldr r0, [r2, #0x218] add r2, r2, #0x18 add r0, r2, r0, lsl #5 bl sub_02069800 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E920 ; =0x00002A30 ldr r2, [r0] mov r1, #6 @@ -2081,7 +2081,7 @@ _0233E6A0: bl sub_02046BB4 bl sub_02046D20 bl ov01_02338C34 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8E8 ; =0x00001005 ldr r0, [r0] str r1, [r0] @@ -2092,7 +2092,7 @@ _0233E6D8: mov r0, #1 mov r1, #0 bl ov01_02338BEC - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E934 ; =0x00001004 ldr r0, [r0] str r1, [r0] @@ -2102,7 +2102,7 @@ _0233E700: ldr r1, _0233E938 ; =0x0000023B mov r0, #0 bl ov06_0233CDC8 - ldr r1, _0233E8E0 ; =0x0233EEC8 + ldr r1, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E93C ; =0x00004002 ldr r2, [r1] mov r0, #0 @@ -2119,7 +2119,7 @@ _0233E734: mov r1, #0x88 mov r2, #1 bl sub_02029F88 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E940 ; =0x00004001 ldr r0, [r0] str r1, [r0] @@ -2136,7 +2136,7 @@ _0233E768: mov r0, #0x1c mov r1, #0x23c bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r3, _0233E8E4 ; =0x00004003 ldr r2, [r0] mov r1, #1 @@ -2151,7 +2151,7 @@ _0233E7B0: ldr r1, _0233E944 ; =0x00000239 mov r0, #0x1c bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E948 ; =0x00004004 ldr r0, [r0] str r1, [r0] @@ -2160,7 +2160,7 @@ _0233E7DC: bl ov06_0233CDE4 cmp r0, #0x12 bne _0233E8D4 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, [r0] ldr r0, [r1, #0x218] add r1, r1, #0x18 @@ -2171,7 +2171,7 @@ _0233E7DC: beq _0233E828 ldr r1, _0233E94C ; =0x0000379E bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x8000 ldr r0, [r0] str r1, [r0] @@ -2179,7 +2179,7 @@ _0233E7DC: _0233E828: ldr r1, _0233E950 ; =0x000037A6 bl ov06_0233CDC8 - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 mov r1, #0x8000 ldr r0, [r0] str r1, [r0] @@ -2199,7 +2199,7 @@ _0233E858: _0233E86C: bl ov00_022BD274 cmp r0, #0 - ldrne r0, _0233E8E0 ; =0x0233EEC8 + ldrne r0, _0233E8E0 ; =ov06_0233EEC8 ldrne r1, _0233E954 ; =0x00006001 ldrne r0, [r0] strne r1, [r0] @@ -2208,7 +2208,7 @@ _0233E86C: b _0233E8D8 _0233E890: bl ov01_0233769C - ldr r0, _0233E8E0 ; =0x0233EEC8 + ldr r0, _0233E8E0 ; =ov06_0233EEC8 ldr r1, _0233E8EC ; =0x00006002 ldr r0, [r0] str r1, [r0] @@ -2232,7 +2232,7 @@ _0233E8D8: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233E8E0: .word 0x0233EEC8 +_0233E8E0: .word ov06_0233EEC8 _0233E8E4: .word 0x00004003 _0233E8E8: .word 0x00001005 _0233E8EC: .word 0x00006002 @@ -2241,15 +2241,15 @@ _0233E8F4: .word 0x000037A1 _0233E8F8: .word 0x00001002 _0233E8FC: .word 0x00001003 _0233E900: .word 0x50443357 -_0233E904: .word 0x0233EDD4 +_0233E904: .word ov06_0233EDD4 _0233E908: .word 0x08261522 -_0233E90C: .word 0x0233EDFC -_0233E910: .word 0x0233EE24 -_0233E914: .word 0x0233EE4C -_0233E918: .word 0x0233EE84 +_0233E90C: .word ov06_0233EDFC +_0233E910: .word ov06_0233EE24 +_0233E914: .word ov06_0233EE4C +_0233E918: .word ov06_0233EE84 _0233E91C: .word 0x000037A2 _0233E920: .word 0x00002A30 -_0233E924: .word 0x0233ED4C +_0233E924: .word ov06_0233ED4C _0233E928: .word 0x000037A4 _0233E92C: .word 0x000037A8 _0233E930: .word 0x000037A5 @@ -2270,12 +2270,12 @@ ov06_0233E958: ; 0x0233E958 mov r0, #0x270 mov r1, #8 bl MemAlloc - ldr r2, _0233EA18 ; =0x0233EEF0 + ldr r2, _0233EA18 ; =ov06_0233EEF0 mov r1, #0x270 str r0, [r2] bl MemZero mov r2, #0 - ldr r0, _0233EA18 ; =0x0233EEF0 + ldr r0, _0233EA18 ; =ov06_0233EEF0 mov r4, r2 _0233E984: ldr r1, [r0] @@ -2284,7 +2284,7 @@ _0233E984: strb r4, [r1, #4] cmp r2, #4 blt _0233E984 - ldr r0, _0233EA18 ; =0x0233EEF0 + ldr r0, _0233EA18 ; =ov06_0233EEF0 mvn r1, #0 ldr r3, [r0] add r2, r3, #4 @@ -2299,7 +2299,7 @@ _0233E984: ldr r0, [r0] strh r1, [r0, #0xa0] bl sub_0205B440 - ldr r4, _0233EA18 ; =0x0233EEF0 + ldr r4, _0233EA18 ; =ov06_0233EEF0 mov r6, r0 mov r7, #0 mov r5, #0x20 @@ -2317,7 +2317,7 @@ _0233E9E8: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233EA18: .word 0x0233EEF0 +_0233EA18: .word ov06_0233EEF0 arm_func_end ov06_0233E958 _0233EA1C: .byte 0xF0, 0x4F, 0x2D, 0xE9 @@ -2368,56 +2368,105 @@ _0233EA1C: arm_func_start ov06_0233ECCC ov06_0233ECCC: ; 0x0233ECCC stmdb sp!, {r3, lr} - ldr r0, _0233ED00 ; =0x0233EEF0 + ldr r0, _0233ED00 ; =ov06_0233EEF0 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl sub_02046D20 - ldr r0, _0233ED00 ; =0x0233EEF0 + ldr r0, _0233ED00 ; =ov06_0233EEF0 ldr r0, [r0] bl MemFree - ldr r0, _0233ED00 ; =0x0233EEF0 + ldr r0, _0233ED00 ; =ov06_0233EEF0 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0233ED00: .word 0x0233EEF0 +_0233ED00: .word ov06_0233EEF0 arm_func_end ov06_0233ECCC ; 0x0233ED04 + .global ov06_0233ED04 +ov06_0233ED04: .byte 0x9A, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x9B, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233ED1C +ov06_0233ED1C: + .byte 0xAA, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 .byte 0xAB, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233ED34 +ov06_0233ED34: .byte 0xAD, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xAE, 0x37, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x5A, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233ED4C +ov06_0233ED4C: + .byte 0x5A, 0x37, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 .byte 0x5B, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x88, 0x37, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .global ov06_0233ED64 +ov06_0233ED64: + .byte 0x88, 0x37, 0x00, 0x00 + .global ov06_0233ED68 +ov06_0233ED68: + .byte 0x01, 0x00, 0x00, 0x00, 0x89, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x86, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233ED84 +ov06_0233ED84: .byte 0x8C, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x8D, 0x37, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .byte 0x8E, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233EDA4 +ov06_0233EDA4: .byte 0x95, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x97, 0x37, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .byte 0x96, 0x37, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x98, 0x37, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x00, 0x00, 0x00, 0x25, 0x63, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov06_0233EDCC +ov06_0233EDCC: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov06_0233EDD0 +ov06_0233EDD0: + .byte 0x25, 0x63, 0x00, 0x00 + .global ov06_0233EDD4 +ov06_0233EDD4: .byte 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F, 0x75, 0x73, 0x20, 0x57, 0x69, 0x46, 0x69, 0x3A .byte 0x20, 0x49, 0x6C, 0x6C, 0x65, 0x67, 0x61, 0x6C, 0x20, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x66 - .byte 0x69, 0x65, 0x72, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F + .byte 0x69, 0x65, 0x72, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov06_0233EDFC +ov06_0233EDFC: + .byte 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F .byte 0x75, 0x73, 0x20, 0x57, 0x69, 0x46, 0x69, 0x3A, 0x20, 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65 .byte 0x6E, 0x63, 0x65, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov06_0233EE24 +ov06_0233EE24: .byte 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F, 0x75, 0x73, 0x20, 0x57, 0x69, 0x46, 0x69, 0x3A .byte 0x20, 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x63, 0x65, 0x20, 0x4C, 0x61, 0x6E, 0x67 - .byte 0x75, 0x61, 0x67, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F + .byte 0x75, 0x61, 0x67, 0x65, 0x0A, 0x00, 0x00, 0x00 + .global ov06_0233EE4C +ov06_0233EE4C: + .byte 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F .byte 0x75, 0x73, 0x20, 0x57, 0x69, 0x46, 0x69, 0x3A, 0x20, 0x44, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65 .byte 0x6E, 0x63, 0x65, 0x20, 0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x53, 0x75, 0x6D, 0x3A, 0x20, 0x30 .byte 0x78, 0x25, 0x30, 0x38, 0x78, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x0A, 0x00, 0x00, 0x00 + .global ov06_0233EE84 +ov06_0233EE84: .byte 0x4D, 0x79, 0x73, 0x74, 0x65, 0x72, 0x69, 0x6F, 0x75, 0x73, 0x20, 0x57, 0x69, 0x46, 0x69, 0x3A .byte 0x20, 0x49, 0x6C, 0x6C, 0x65, 0x67, 0x61, 0x6C, 0x20, 0x44, 0x61, 0x74, 0x61, 0x0A, 0x00, 0x00 .data .global ov06_0233EEC0 ov06_0233EEC0: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov06_0233EEC4 +ov06_0233EEC4: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov06_0233EEC8 +ov06_0233EEC8: + .byte 0x00, 0x00, 0x00, 0x00 .bss .global ov06_0233EEE0 ov06_0233EEE0: - .space 0x20 + .space 0xC + .global ov06_0233EEEC +ov06_0233EEEC: + .space 0x4 + .global ov06_0233EEF0 +ov06_0233EEF0: + .space 0x10