diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 6e5c29db..6c128af0 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -77,7 +77,7 @@ .public sub_0201DC90 .public sub_02003A40 .public sub_02079B14 -.public FUN_02000088 +.public sub_02000088 .public sub_0201BE84 .public Memset .public sub_020024B0 diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 6df4ad77..33bb4ad2 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -69,7 +69,7 @@ .public sub_02008F4C .public ItemZInit .public sub_02046BE8 -.public FUN_02035024 +.public sub_02035024 .public sub_020038E8 .public sub_0202FBBC .public sub_02008F88 @@ -275,7 +275,7 @@ .public sub_02008F64 .public IncrementNbBigTreasureWins .public InitPortraitBoxWithMonsterId -.public FUN_0206C120 +.public sub_0206C120 .public sub_0205730C .public sub_0206A878 .public sub_02063600 @@ -373,8 +373,8 @@ .public sub_02065B3C .public ov10_022BCC7C .public sub_0206B9DC -.public FUN_0204BECC -.public FUN_0204CA48 +.public sub_0204BECC +.public sub_0204CA48 .public sub_0205EC78 .public ov10_022BDB80 .public sub_0201BCF4 @@ -410,7 +410,7 @@ .public ScriptSpecialProcess0x3 .public GetLearnableIqSkills .public GetNameWithGender -.public FUN_02065974 +.public sub_02065974 .public sub_02028A64 .public sub_0200B908 .public sub_02017B94 @@ -506,7 +506,7 @@ .public sub_02055DD0 .public ShowKeyboard .public sub_02017B88 -.public FUN_02034E60 +.public sub_02034E60 .public sub_0204C880 .public sub_0200A5B0 .public sub_02009194 @@ -528,7 +528,7 @@ .public GetMaxReachedFloor .public EnableIqSkill .public sub_0203F398 -.public FUN_02065BD8 +.public sub_02065BD8 .public LoadOverlay .public sub_0201DF38 .public GetItemMoveId16 @@ -596,7 +596,7 @@ .public sub_0204804C .public sub_0203FA64 .public ShowPortraitBox -.public FUN_0206C144 +.public sub_0206C144 .public GetNormalMenuResult .public sub_02034F20 .public MemArenaAlloc @@ -693,7 +693,7 @@ .public sub_02041364 .public sub_0202F16C .public sub_0201BF64 -.public FUN_020367B4 +.public sub_020367B4 .public sub_0204F050 .public sub_0203909C .public GetAdvancedMenuCurrentOption diff --git a/asm/include/overlay_29.inc b/asm/include/overlay_29.inc index b32d3e26..838a719f 100644 --- a/asm/include/overlay_29.inc +++ b/asm/include/overlay_29.inc @@ -654,4 +654,7 @@ .public GetDamageSource .public GetVictoriesOnOneFloor .public GetRegenSpeed -.public ov30_02382874 \ No newline at end of file +.public ov30_02382874 +.public DebugPrint0__0200C1FC +.public GetSpriteIndex__020526EC +.public GetSpriteIndex__02052708 diff --git a/asm/main.s b/asm/main.s index b871edf7..a220f8a1 100644 --- a/asm/main.s +++ b/asm/main.s @@ -4,11 +4,11 @@ .text - thumb_func_start FUN_02000088 -FUN_02000088: ; 0x02000088 + thumb_func_start sub_02000088 +sub_02000088: ; 0x02000088 swi 3 bx lr - thumb_func_end FUN_02000088 + thumb_func_end sub_02000088 _0200008C: .byte 0x45, 0x41, 0x78, 0x28 .byte 0x94, 0x55, 0x54, 0x8C, 0x07, 0x9D, 0xAB, 0xBE, 0x6D, 0x58, 0x6E, 0xE2, 0x00, 0x97, 0x11, 0x2A @@ -124,11 +124,11 @@ _0200008C: .byte 0xBE, 0xBA, 0x9C, 0xDD, 0xF4, 0xF3, 0xE1, 0x16, 0x18, 0xF5, 0x4A, 0x7A, 0x96, 0xB4, 0x33, 0x5C .byte 0xCC, 0x39, 0xAF, 0x99, 0x91, 0x1D, 0x94, 0xA4, 0x91, 0x7A, 0x32, 0xF8, 0x6A, 0x10 - non_word_aligned_thumb_func_start FUN_0200078E -FUN_0200078E: ; 0x0200078E + non_word_aligned_thumb_func_start sub_0200078E +sub_0200078E: ; 0x0200078E swi 0xb bx lr - thumb_func_end FUN_0200078E + thumb_func_end sub_0200078E _02000792: .byte 0x4B, 0xB8, 0x8C, 0x61, 0xEF, 0xBC, 0x38, 0x56, 0xED, 0xA3, 0x4A, 0x82, 0x63, 0xDE .byte 0x2E, 0xE5, 0x89, 0xA4, 0x26, 0x99, 0x41, 0x4B, 0x48, 0xA0, 0x4B, 0x4D, 0x09, 0xE0, 0x15, 0x24 @@ -138,8 +138,8 @@ _02000792: .byte 0xAF, 0xBF, 0xA0, 0x34, 0xC5, 0xD4, 0xDE, 0x28, 0x1E, 0xEF, 0x93, 0xD2, 0x85, 0x83, 0x49, 0x41 .byte 0xA6, 0x20, 0x03, 0x5E, 0xAA, 0xB6, 0x53, 0x4A, 0xE1, 0x86, 0xDB, 0x3A, 0xF3, 0xC5, 0x00, 0x00 - arm_func_start EntryArm9 -EntryArm9: ; 0x02000800 + arm_func_start NitroMain +NitroMain: ; 0x02000800 mov ip, #0x4000000 str ip, [ip, #0x208] _02000808: @@ -235,7 +235,7 @@ _02000944: .word 0x027FFF9C _02000948: .word 0x01FF95E8 _0200094C: .word 0x02000C6C _02000950: .word 0xFFFF0000 - arm_func_end EntryArm9 + arm_func_end NitroMain arm_func_start sub_02000954 sub_02000954: ; 0x02000954 @@ -4270,7 +4270,7 @@ _02003C5C: beq _02003CAC ldr r0, _02003CC0 ; =0x020924F8 bl DebugPrint0__0200C1FC - bl FUN_02017DB4 + bl sub_02017DB4 ldr r1, _02003CBC ; =0x0229B21C strh r0, [r1, #2] bl sub_02017FF0 @@ -28097,10 +28097,10 @@ _02017B08: .word sub_02017D80 arm_func_start sub_02017B0C sub_02017B0C: ; 0x02017B0C - ldr ip, _02017B14 ; =FUN_02017DE8 + ldr ip, _02017B14 ; =sub_02017DE8 bx ip .align 2, 0 -_02017B14: .word FUN_02017DE8 +_02017B14: .word sub_02017DE8 arm_func_end sub_02017B0C arm_func_start sub_02017B18 @@ -28411,8 +28411,8 @@ _02017DAC: .word 0x000003E7 _02017DB0: .word 0x022A4BEC arm_func_end sub_02017D80 - arm_func_start FUN_02017DB4 -FUN_02017DB4: ; 0x02017DB4 + arm_func_start sub_02017DB4 +sub_02017DB4: ; 0x02017DB4 stmdb sp!, {r3, lr} bl sub_02019824 ldr r2, _02017DE0 ; =0x000003E7 @@ -28427,15 +28427,15 @@ FUN_02017DB4: ; 0x02017DB4 .align 2, 0 _02017DE0: .word 0x000003E7 _02017DE4: .word 0x022A4BEC - arm_func_end FUN_02017DB4 + arm_func_end sub_02017DB4 - arm_func_start FUN_02017DE8 -FUN_02017DE8: ; 0x02017DE8 + arm_func_start sub_02017DE8 +sub_02017DE8: ; 0x02017DE8 ldr ip, _02017DF0 ; =sub_02019850 bx ip .align 2, 0 _02017DF0: .word sub_02019850 - arm_func_end FUN_02017DE8 + arm_func_end sub_02017DE8 arm_func_start sub_02017DF4 sub_02017DF4: ; 0x02017DF4 @@ -33142,8 +33142,8 @@ sub_0201BF64: ; 0x0201BF64 _0201BFA8: .word 0x020AFC4C arm_func_end sub_0201BF64 - arm_func_start FUN_0201BFAC -FUN_0201BFAC: ; 0x0201BFAC + arm_func_start sub_0201BFAC +sub_0201BFAC: ; 0x0201BFAC stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr ip, _0201BFEC ; =0x020AFC4C @@ -33162,7 +33162,7 @@ FUN_0201BFAC: ; 0x0201BFAC ldmdb sp!, {r3, r4, pc} .align 2, 0 _0201BFEC: .word 0x020AFC4C - arm_func_end FUN_0201BFAC + arm_func_end sub_0201BFAC arm_func_start sub_0201BFF0 sub_0201BFF0: ; 0x0201BFF0 @@ -35197,8 +35197,8 @@ _0201DA9C: .word 0x020AFC64 _0201DAA0: .word sub_0201DA44 arm_func_end sub_0201DA80 - arm_func_start FUN_0201DAA4 -FUN_0201DAA4: ; 0x0201DAA4 + arm_func_start sub_0201DAA4 +sub_0201DAA4: ; 0x0201DAA4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r5, [r0, #4] mov sl, r1 @@ -35221,7 +35221,7 @@ _0201DAE0: ldr r0, [r0, r8, lsl #2] mov r1, sl mov r3, sb - bl FUN_0201BFAC + bl sub_0201BFAC ldr r2, [r5, #4] ldr r1, [fp] ldrh r3, [r2, #4] @@ -35252,7 +35252,7 @@ _0201DB48: str r4, [sp] ldr r2, [r5, #4] mov r0, r6 - bl FUN_0201BFAC + bl sub_0201BFAC ldr r2, [r5, #4] ldr r0, _0201DBB4 ; =0x020AFC4C ldrh r3, [r2, #4] @@ -35275,7 +35275,7 @@ _0201DBA4: .align 2, 0 _0201DBB0: .word 0x020AFC30 _0201DBB4: .word 0x020AFC4C - arm_func_end FUN_0201DAA4 + arm_func_end sub_0201DAA4 arm_func_start sub_0201DBB8 sub_0201DBB8: ; 0x0201DBB8 @@ -35285,7 +35285,7 @@ sub_0201DBB8: ; 0x0201DBB8 ldr lr, [lr, #4] smlabb r0, r0, ip, lr ldr r0, [r0, #0x30] - bl FUN_0201DAA4 + bl sub_0201DAA4 ldmdb sp!, {r3, pc} .align 2, 0 _0201DBD8: .word 0x020AFC64 @@ -57313,8 +57313,8 @@ sub_02030044: ; 0x02030044 ldmdb sp!, {r3, r4, r5, pc} arm_func_end sub_02030044 - arm_func_start FUN_0203007C -FUN_0203007C: ; 0x0203007C + arm_func_start sub_0203007C +sub_0203007C: ; 0x0203007C add r0, r0, #0x600 ldrsh r1, [r0, #0x44] add r1, r1, #1 @@ -57324,10 +57324,10 @@ FUN_0203007C: ; 0x0203007C movge r1, #0 strgeh r1, [r0, #0x44] bx lr - arm_func_end FUN_0203007C + arm_func_end sub_0203007C - arm_func_start FUN_020300A0 -FUN_020300A0: ; 0x020300A0 + arm_func_start sub_020300A0 +sub_020300A0: ; 0x020300A0 add r0, r0, #0x600 ldrsh r0, [r0, #0x44] add r0, r0, #1 @@ -57336,7 +57336,7 @@ FUN_020300A0: ; 0x020300A0 cmp r0, #4 movge r0, #0 bx lr - arm_func_end FUN_020300A0 + arm_func_end sub_020300A0 arm_func_start sub_020300C0 sub_020300C0: ; 0x020300C0 @@ -57380,7 +57380,7 @@ sub_0203010C: ; 0x0203010C str r0, [r4, #4] _02030144: mov r0, r4 - bl FUN_020300A0 + bl sub_020300A0 add r1, r4, #0x600 ldrsh r2, [r1, #0x46] cmp r2, r0 @@ -57420,7 +57420,7 @@ _02030144: ldrsh r1, [r1, #0x44] smlabb r1, r1, r2, r4 strb r3, [r1, #0x128] - bl FUN_0203007C + bl sub_0203007C mov r0, #1 ldmdb sp!, {r3, r4, r5, r6, r7, pc} arm_func_end sub_0203010C @@ -63265,8 +63265,15 @@ sub_02034E28: ; 0x02034E28 .align 2, 0 _02034E5C: .word 0x020AFDBC arm_func_end sub_02034E28 -_02034E60: - .byte 0x04, 0x20, 0x9F, 0xE5, 0x03, 0x00, 0x82, 0xE8, 0x1E, 0xFF, 0x2F, 0xE1, 0xBC, 0xFD, 0x0A, 0x02 + + arm_func_start sub_02034E60 +sub_02034E60: ; 0x02034E60 + ldr r2, _02034E6C ; =0x020AFDBC + stmia r2, {r0, r1} + bx lr + .align 2, 0 +_02034E6C: .word 0x020AFDBC + arm_func_end sub_02034E60 arm_func_start sub_02034E70 sub_02034E70: ; 0x02034E70 @@ -63398,15 +63405,40 @@ _02034FE8: _0203501C: .word 0x020AFDBC _02035020: .word 0x0209B09C arm_func_end sub_02034F98 -_02035024: - .byte 0xF8, 0x40, 0x2D, 0xE9, 0x00, 0x70, 0xA0, 0xE1, 0x01, 0x60, 0xA0, 0xE1 - .byte 0x02, 0x50, 0xA0, 0xE1, 0x03, 0x40, 0xA0, 0xE1, 0x44, 0xFF, 0xFF, 0xEB, 0x4C, 0x10, 0x9F, 0xE5 - .byte 0x00, 0x00, 0xA0, 0xE3, 0x10, 0x00, 0x81, 0xE5, 0x0C, 0x00, 0x91, 0xE5, 0x02, 0x30, 0xA0, 0xE3 - .byte 0x6C, 0x74, 0x80, 0xE5, 0x0C, 0x20, 0x91, 0xE5, 0x34, 0x00, 0x9F, 0xE5, 0x74, 0x64, 0x82, 0xE5 - .byte 0x0C, 0x20, 0x91, 0xE5, 0x78, 0x54, 0x82, 0xE5, 0x0C, 0x20, 0x91, 0xE5, 0x68, 0x34, 0x82, 0xE5 - .byte 0x0C, 0x10, 0x91, 0xE5, 0x7C, 0x44, 0x81, 0xE5, 0xF0, 0xFD, 0xFF, 0xEB, 0x00, 0x00, 0x50, 0xE3 - .byte 0xF8, 0x80, 0xBD, 0x18, 0x08, 0x00, 0x9F, 0xE5, 0x15, 0xFE, 0xFF, 0xEB, 0xF8, 0x80, 0xBD, 0xE8 - .byte 0xBC, 0xFD, 0x0A, 0x02, 0x9C, 0xB0, 0x09, 0x02 + + arm_func_start sub_02035024 +sub_02035024: ; 0x02035024 + stmdb sp!, {r3, r4, r5, r6, r7, lr} + mov r7, r0 + mov r6, r1 + mov r5, r2 + mov r4, r3 + bl sub_02034D50 + ldr r1, _02035090 ; =0x020AFDBC + mov r0, #0 + str r0, [r1, #0x10] + ldr r0, [r1, #0xc] + mov r3, #2 + str r7, [r0, #0x46c] + ldr r2, [r1, #0xc] + ldr r0, _02035094 ; =0x0209B09C + str r6, [r2, #0x474] + ldr r2, [r1, #0xc] + str r5, [r2, #0x478] + ldr r2, [r1, #0xc] + str r3, [r2, #0x468] + ldr r1, [r1, #0xc] + str r4, [r1, #0x47c] + bl sub_02034840 + cmp r0, #0 + ldmnedb sp!, {r3, r4, r5, r6, r7, pc} + ldr r0, _02035094 ; =0x0209B09C + bl sub_020348E4 + ldmdb sp!, {r3, r4, r5, r6, r7, pc} + .align 2, 0 +_02035090: .word 0x020AFDBC +_02035094: .word 0x0209B09C + arm_func_end sub_02035024 arm_func_start sub_02035098 sub_02035098: ; 0x02035098 @@ -63546,7 +63578,7 @@ sub_020355DC: ; 0x020355DC ldr r0, _02035638 ; =0x020AFDD0 mov r1, #1 strb r1, [r0] - bl FUN_02035640 + bl sub_02035640 ldr r0, _02035638 ; =0x020AFDD0 mov r1, #0 ldr r2, [r0, #4] @@ -63558,8 +63590,8 @@ _02035638: .word 0x020AFDD0 _0203563C: .word 0x0209B10C arm_func_end sub_020355DC - arm_func_start FUN_02035640 -FUN_02035640: ; 0x02035640 + arm_func_start sub_02035640 +sub_02035640: ; 0x02035640 stmdb sp!, {r3, lr} ldr r0, _02035764 ; =0x020AFDD0 ldrb r0, [r0] @@ -63636,7 +63668,7 @@ _02035708: ldmdb sp!, {r3, pc} .align 2, 0 _02035764: .word 0x020AFDD0 - arm_func_end FUN_02035640 + arm_func_end sub_02035640 arm_func_start sub_02035768 sub_02035768: ; 0x02035768 @@ -64687,11 +64719,26 @@ _020367A8: .align 2, 0 _020367B0: .word 0x020AFDE8 arm_func_end sub_020366C0 -_020367B4: - .byte 0x70, 0x40, 0x2D, 0xE9, 0x00, 0x60, 0xA0, 0xE1, 0x28, 0x00, 0x9F, 0xE5 - .byte 0x01, 0x50, 0xA0, 0xE1, 0x02, 0x40, 0xA0, 0xE1, 0x45, 0xF8, 0xFF, 0xEB, 0x00, 0x00, 0x50, 0xE3 - .byte 0x70, 0x80, 0xBD, 0x08, 0x06, 0x00, 0xA0, 0xE1, 0x05, 0x10, 0xA0, 0xE1, 0x04, 0x30, 0xA0, 0xE1 - .byte 0x00, 0x20, 0xA0, 0xE3, 0x01, 0x00, 0x00, 0xEB, 0x70, 0x80, 0xBD, 0xE8, 0x98, 0xB2, 0x09, 0x02 + + arm_func_start sub_020367B4 +sub_020367B4: ; 0x020367B4 + stmdb sp!, {r4, r5, r6, lr} + mov r6, r0 + ldr r0, _020367EC ; =0x0209B298 + mov r5, r1 + mov r4, r2 + bl sub_020348E4 + cmp r0, #0 + ldmeqdb sp!, {r4, r5, r6, pc} + mov r0, r6 + mov r1, r5 + mov r3, r4 + mov r2, #0 + bl ShowKeyboard + ldmdb sp!, {r4, r5, r6, pc} + .align 2, 0 +_020367EC: .word 0x0209B298 + arm_func_end sub_020367B4 arm_func_start ShowKeyboard ShowKeyboard: ; 0x020367F0 @@ -81822,8 +81869,8 @@ _0204665C: .byte 0x00, 0x10, 0x91, 0xE5, 0x04, 0x10, 0x81, 0xE2, 0x1C, 0xFF, 0x2F, 0xE1, 0xD8, 0xFE, 0x0A, 0x02 .byte 0xDC, 0xC5, 0x00, 0x02 - arm_func_start FUN_020467B4 -FUN_020467B4: ; 0x020467B4 + arm_func_start sub_020467B4 +sub_020467B4: ; 0x020467B4 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x24 mov r4, r0 @@ -81840,15 +81887,15 @@ FUN_020467B4: ; 0x020467B4 _020467E8: add sp, sp, #0x24 ldmdb sp!, {r3, r4, pc} - arm_func_end FUN_020467B4 + arm_func_end sub_020467B4 arm_func_start sub_020467F0 sub_020467F0: ; 0x020467F0 - ldr ip, _020467FC ; =FUN_020467B4 + ldr ip, _020467FC ; =sub_020467B4 ldr r0, _02046800 ; =0x0209CC90 bx ip .align 2, 0 -_020467FC: .word FUN_020467B4 +_020467FC: .word sub_020467B4 _02046800: .word 0x0209CC90 arm_func_end sub_020467F0 @@ -82818,8 +82865,8 @@ _020474B8: .byte 0x08, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0xA0, 0xE3, 0x00, 0x10, 0x80, 0xE5, 0x08, 0x80, 0xBD, 0xE8 .byte 0x68, 0xAE, 0x2A, 0x02 - arm_func_start FUN_020475B4 -FUN_020475B4: ; 0x020475B4 + arm_func_start sub_020475B4 +sub_020475B4: ; 0x020475B4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -82865,16 +82912,16 @@ _02047650: .align 2, 0 _02047658: .word 0x022AAE68 _0204765C: .word 0x0209CCB0 - arm_func_end FUN_020475B4 + arm_func_end sub_020475B4 - arm_func_start FUN_02047660 -FUN_02047660: ; 0x02047660 + arm_func_start sub_02047660 +sub_02047660: ; 0x02047660 ldr r0, _0204766C ; =0x022AAE68 ldr r0, [r0, #4] bx lr .align 2, 0 _0204766C: .word 0x022AAE68 - arm_func_end FUN_02047660 + arm_func_end sub_02047660 arm_func_start sub_02047670 sub_02047670: ; 0x02047670 @@ -83749,7 +83796,7 @@ _02048338: .word 0x0209CCE0 arm_func_start sub_0204833C sub_0204833C: ; 0x0204833C ldr r0, _02048358 ; =0x020AFEF4 - ldr ip, _0204835C ; =FUN_020475B4 + ldr ip, _0204835C ; =sub_020475B4 ldr r0, [r0] mov r1, #9 add r2, r0, #0x3100 @@ -83757,13 +83804,13 @@ sub_0204833C: ; 0x0204833C bx ip .align 2, 0 _02048358: .word 0x020AFEF4 -_0204835C: .word FUN_020475B4 +_0204835C: .word sub_020475B4 arm_func_end sub_0204833C arm_func_start sub_02048360 sub_02048360: ; 0x02048360 stmdb sp!, {r3, lr} - bl FUN_02047660 + bl sub_02047660 cmp r0, #1 moveq r0, #1 ldmeqdb sp!, {r3, pc} @@ -88117,9 +88164,14 @@ _0204BEBC: _0204BEC4: .word 0x0209CEAC _0204BEC8: .word 0x0209CF48 arm_func_end sub_0204BD98 -_0204BECC: - .byte 0x00, 0xC0, 0x9F, 0xE5 - .byte 0x1C, 0xFF, 0x2F, 0xE1, 0xAC, 0xBC, 0x04, 0x02 + + arm_func_start sub_0204BECC +sub_0204BECC: ; 0x0204BECC + ldr ip, _0204BED4 ; =sub_0204BCAC + bx ip + .align 2, 0 +_0204BED4: .word sub_0204BCAC + arm_func_end sub_0204BECC arm_func_start sub_0204BED8 sub_0204BED8: ; 0x0204BED8 @@ -88986,10 +89038,21 @@ sub_0204CA1C: ; 0x0204CA1C and r0, r0, #0xff ldmdb sp!, {r3, pc} arm_func_end sub_0204CA1C -_0204CA48: - .byte 0x1C, 0xC0, 0x9F, 0xE5, 0x00, 0x00, 0x51, 0xE3 - .byte 0x01, 0x30, 0xA0, 0x13, 0x00, 0x08, 0xA0, 0xE1, 0x20, 0x28, 0xA0, 0xE1, 0x00, 0x30, 0xA0, 0x03 - .byte 0x00, 0x00, 0xA0, 0xE3, 0x4D, 0x10, 0xA0, 0xE3, 0x1C, 0xFF, 0x2F, 0xE1, 0x88, 0xB9, 0x04, 0x02 + + arm_func_start sub_0204CA48 +sub_0204CA48: ; 0x0204CA48 + ldr ip, _0204CA6C ; =SaveScriptVariableValueAtIndex + cmp r1, #0 + movne r3, #1 + mov r0, r0, lsl #0x10 + mov r2, r0, lsr #0x10 + moveq r3, #0 + mov r0, #0 + mov r1, #0x4d + bx ip + .align 2, 0 +_0204CA6C: .word SaveScriptVariableValueAtIndex + arm_func_end sub_0204CA48 arm_func_start HasPlayedOldGame HasPlayedOldGame: ; 0x0204CA70 @@ -92768,11 +92831,11 @@ _0204F9DC: .word 0x022AB694 arm_func_start sub_0204F9E0 sub_0204F9E0: ; 0x0204F9E0 - ldr ip, _0204F9EC ; =FUN_02050E54 + ldr ip, _0204F9EC ; =sub_02050E54 ldr r0, _0204F9F0 ; =0x022AB694 bx ip .align 2, 0 -_0204F9EC: .word FUN_02050E54 +_0204F9EC: .word sub_02050E54 _0204F9F0: .word 0x022AB694 arm_func_end sub_0204F9E0 @@ -94448,11 +94511,11 @@ sub_02050E18: ; 0x02050E18 _02050E50: .word 0x022550FF arm_func_end sub_02050E18 - arm_func_start FUN_02050E54 -FUN_02050E54: ; 0x02050E54 + arm_func_start sub_02050E54 +sub_02050E54: ; 0x02050E54 ldr r0, [r0] bx lr - arm_func_end FUN_02050E54 + arm_func_end sub_02050E54 arm_func_start sub_02050E5C sub_02050E5C: ; 0x02050E5C @@ -95253,14 +95316,14 @@ _02051780: bx lr arm_func_end JoinedAtRangeCheck2 - arm_func_start FUN_02051788 -FUN_02051788: ; 0x02051788 + arm_func_start sub_02051788 +sub_02051788: ; 0x02051788 ldr r1, _02051794 ; =0x020A20B1 ldrb r0, [r1, r0, lsl #1] bx lr .align 2, 0 _02051794: .word 0x020A20B1 - arm_func_end FUN_02051788 + arm_func_end sub_02051788 arm_func_start sub_02051798 sub_02051798: ; 0x02051798 @@ -101487,8 +101550,8 @@ _020565E8: _020565F0: .word 0x020B0A48 arm_func_end sub_02056554 - arm_func_start FUN_020565F4 -FUN_020565F4: ; 0x020565F4 + arm_func_start sub_020565F4 +sub_020565F4: ; 0x020565F4 stmdb sp!, {r4, lr} mvn r2, #0 cmp r0, r2 @@ -101537,7 +101600,7 @@ _0205668C: ldmdb sp!, {r4, pc} .align 2, 0 _02056694: .word 0x020B0A48 - arm_func_end FUN_020565F4 + arm_func_end sub_020565F4 arm_func_start sub_02056698 sub_02056698: ; 0x02056698 @@ -103013,7 +103076,7 @@ _02057A08: cmp sb, #4 add sl, sl, #0x68 blt _020579C0 - bl FUN_02058064 + bl sub_02058064 add sp, sp, #0x4c ldmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -103452,7 +103515,7 @@ _02057F90: beq _02057FE4 mov r0, sb mov r1, #0 - bl FUN_020565F4 + bl sub_020565F4 _02057FE4: mov r0, sb mov r1, #2 @@ -103461,7 +103524,7 @@ _02057FE4: beq _02058004 mov r0, sb mov r1, #2 - bl FUN_020565F4 + bl sub_020565F4 _02058004: mov r0, sb mov r1, #0 @@ -103470,7 +103533,7 @@ _02058004: beq _02058024 mov r0, sb mov r1, #0 - bl FUN_020565F4 + bl sub_020565F4 _02058024: mov r0, sb mov r1, #2 @@ -103479,10 +103542,10 @@ _02058024: beq _0205804C mov r0, sb mov r1, #2 - bl FUN_020565F4 + bl sub_020565F4 b _0205804C _02058048: - bl FUN_020565F4 + bl sub_020565F4 _0205804C: add r8, r8, #1 cmp r8, #4 @@ -103493,8 +103556,8 @@ _0205804C: _02058060: .word 0x020B0A48 arm_func_end sub_02057EF4 - arm_func_start FUN_02058064 -FUN_02058064: ; 0x02058064 + arm_func_start sub_02058064 +sub_02058064: ; 0x02058064 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r0, _020580C0 ; =0x020B0A48 mov r4, #0 @@ -103522,7 +103585,7 @@ _020580A4: ldmdb sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _020580C0: .word 0x020B0A48 - arm_func_end FUN_02058064 + arm_func_end sub_02058064 arm_func_start sub_020580C4 sub_020580C4: ; 0x020580C4 @@ -107398,14 +107461,14 @@ _0205B550: .word 0x022B57BC arm_func_start sub_0205B554 sub_0205B554: ; 0x0205B554 - ldr ip, _0205B55C ; =FUN_0205B560 + ldr ip, _0205B55C ; =sub_0205B560 bx ip .align 2, 0 -_0205B55C: .word FUN_0205B560 +_0205B55C: .word sub_0205B560 arm_func_end sub_0205B554 - arm_func_start FUN_0205B560 -FUN_0205B560: ; 0x0205B560 + arm_func_start sub_0205B560 +sub_0205B560: ; 0x0205B560 ldr r3, [r0] ldr r2, [r1] cmp r3, r2 @@ -107415,7 +107478,7 @@ FUN_0205B560: ; 0x0205B560 moveq r0, #1 movne r0, #0 bx lr - arm_func_end FUN_0205B560 + arm_func_end sub_0205B560 arm_func_start sub_0205B584 sub_0205B584: ; 0x0205B584 @@ -107704,7 +107767,7 @@ _0205B8E0: mov r1, r6 add r0, r0, #4 add r0, r0, r5, lsl #3 - bl FUN_0205B560 + bl sub_0205B560 cmp r0, #0 movne r0, #1 ldmnedb sp!, {r4, r5, r6, pc} @@ -107736,7 +107799,7 @@ _0205B934: bne _0205B964 mov r1, r5 add r0, r2, #0x14 - bl FUN_0205B560 + bl sub_0205B560 cmp r0, #0 movne r0, #1 ldmnedb sp!, {r4, r5, r6, r7, r8, pc} @@ -107819,7 +107882,7 @@ _0205BA28: bne _0205BA58 mov r1, r5 add r0, r2, #0x14 - bl FUN_0205B560 + bl sub_0205B560 cmp r0, #0 movne r0, r4 ldmnedb sp!, {r4, r5, r6, r7, r8, pc} @@ -107976,7 +108039,7 @@ _0205BC58: ldr r0, _0205BC90 ; =0x020B0A54 ldr r0, [r0, #8] ldrb r0, [r0, #2] - bl FUN_02051788 + bl sub_02051788 ldr r1, _0205BC90 ; =0x020B0A54 ldr r1, [r1, #8] strb r0, [r1, #2] @@ -117417,7 +117480,7 @@ sub_020639B4: ; 0x020639B4 mov r1, r4 mov r2, lr mov r3, ip - bl FUN_020646CC + bl sub_020646CC ldmdb sp!, {r4, pc} .align 2, 0 _020639E4: .word 0x020B0B04 @@ -117426,7 +117489,7 @@ _020639E4: .word 0x020B0B04 arm_func_start sub_020639E8 sub_020639E8: ; 0x020639E8 ldr r2, _02063A04 ; =0x020B0B04 - ldr ip, _02063A08 ; =FUN_02064C18 + ldr ip, _02063A08 ; =sub_02064C18 ldr r3, [r2] mov r2, r1 mov r1, r0 @@ -117434,7 +117497,7 @@ sub_020639E8: ; 0x020639E8 bx ip .align 2, 0 _02063A04: .word 0x020B0B04 -_02063A08: .word FUN_02064C18 +_02063A08: .word sub_02064C18 arm_func_end sub_020639E8 arm_func_start sub_02063A0C @@ -117727,7 +117790,7 @@ sub_02063DE4: ; 0x02063DE4 cmp r0, #0 ldmeqdb sp!, {r3, pc} add r0, r0, #0x58 - bl FUN_02064AFC + bl sub_02064AFC ldr r0, _02063E1C ; =0x020B0B04 ldr r0, [r0] bl MemFree @@ -118434,14 +118497,14 @@ _0206468C: ldmdb sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end sub_0206466C - arm_func_start FUN_020646CC -FUN_020646CC: ; 0x020646CC + arm_func_start sub_020646CC +sub_020646CC: ; 0x020646CC stmib r0, {r1, r2} mov r1, #0 str r1, [r0, #0xc] str r3, [r0, #0x10] bx lr - arm_func_end FUN_020646CC + arm_func_end sub_020646CC arm_func_start sub_020646E0 sub_020646E0: ; 0x020646E0 @@ -118779,13 +118842,13 @@ sub_02064ADC: ; 0x02064ADC ldmdb sp!, {r4, pc} arm_func_end sub_02064ADC - arm_func_start FUN_02064AFC -FUN_02064AFC: ; 0x02064AFC + arm_func_start sub_02064AFC +sub_02064AFC: ; 0x02064AFC add r0, r0, #0x600 mov r1, #0 strh r1, [r0] bx lr - arm_func_end FUN_02064AFC + arm_func_end sub_02064AFC arm_func_start sub_02064B0C sub_02064B0C: ; 0x02064B0C @@ -118868,12 +118931,12 @@ sub_02064C0C: ; 0x02064C0C _02064C14: .word sub_02064974 arm_func_end sub_02064C0C - arm_func_start FUN_02064C18 -FUN_02064C18: ; 0x02064C18 + arm_func_start sub_02064C18 +sub_02064C18: ; 0x02064C18 str r1, [r0, #4] strh r2, [r0, #8] bx lr - arm_func_end FUN_02064C18 + arm_func_end sub_02064C18 arm_func_start sub_02064C24 sub_02064C24: ; 0x02064C24 @@ -119859,10 +119922,19 @@ _02065968: .word 0x020A68BC _0206596C: .word 0x020B0A48 _02065970: .word 0x020B0B08 arm_func_end sub_0206549C -_02065974: - .byte 0x0F, 0x00, 0x2D, 0xE9, 0x08, 0x40, 0x2D, 0xE9, 0x08, 0x00, 0x8D, 0xE2 - .byte 0x00, 0x10, 0x8D, 0xE2, 0xC4, 0xFE, 0xFF, 0xEB, 0xF0, 0x00, 0xDD, 0xE1, 0x08, 0x40, 0xBD, 0xE8 - .byte 0x10, 0xD0, 0x8D, 0xE2, 0x1E, 0xFF, 0x2F, 0xE1 + + arm_func_start sub_02065974 +sub_02065974: ; 0x02065974 + stmdb sp!, {r0, r1, r2, r3} + stmdb sp!, {r3, lr} + add r0, sp, #8 + add r1, sp, #0 + bl sub_0206549C + ldrsh r0, [sp] + ldmdb sp!, {r3, lr} + add sp, sp, #0x10 + bx lr + arm_func_end sub_02065974 arm_func_start GetActorMatchingStorageId GetActorMatchingStorageId: ; 0x02065998 @@ -120069,9 +120141,17 @@ sub_02065BC8: ; 0x02065BC8 .align 2, 0 _02065BD4: .word 0x020B0B08 arm_func_end sub_02065BC8 -_02065BD8: - .byte 0x08, 0xC0, 0x9F, 0xE5, 0x01, 0x20, 0xA0, 0xE1 - .byte 0x04, 0x10, 0x9F, 0xE5, 0x1C, 0xFF, 0x2F, 0xE1, 0x1C, 0x51, 0x02, 0x02, 0x10, 0x73, 0x2B, 0x02 + + arm_func_start sub_02065BD8 +sub_02065BD8: ; 0x02065BD8 + ldr ip, _02065BE8 ; =StrncpySimple + mov r2, r1 + ldr r1, _02065BEC ; =0x022B7310 + bx ip + .align 2, 0 +_02065BE8: .word StrncpySimple +_02065BEC: .word 0x022B7310 + arm_func_end sub_02065BD8 arm_func_start sub_02065BF0 sub_02065BF0: ; 0x02065BF0 @@ -127471,9 +127551,16 @@ sub_0206C110: ; 0x0206C110 .align 2, 0 _0206C11C: .word 0x020B0B70 arm_func_end sub_0206C110 -_0206C120: - .byte 0x08, 0x10, 0x9F, 0xE5, 0xF0, 0x10, 0xD1, 0xE1, 0xB0, 0x10, 0xC0, 0xE1, 0x1E, 0xFF, 0x2F, 0xE1 - .byte 0x70, 0x0B, 0x0B, 0x02 + + arm_func_start sub_0206C120 +sub_0206C120: ; 0x0206C120 + ldr r1, _0206C130 ; =0x020B0B70 + ldrsh r1, [r1] + strh r1, [r0] + bx lr + .align 2, 0 +_0206C130: .word 0x020B0B70 + arm_func_end sub_0206C120 arm_func_start sub_0206C134 sub_0206C134: ; 0x0206C134 @@ -127483,10 +127570,20 @@ sub_0206C134: ; 0x0206C134 .align 2, 0 _0206C140: .word 0x020B0B70 arm_func_end sub_0206C134 -_0206C144: - .byte 0x14, 0x30, 0x9F, 0xE5, 0x08, 0x20, 0xA0, 0xE3, 0x01, 0x10, 0xD3, 0xE4 - .byte 0x01, 0x20, 0x52, 0xE2, 0x01, 0x10, 0xC0, 0xE4, 0xFB, 0xFF, 0xFF, 0x1A, 0x1E, 0xFF, 0x2F, 0xE1 - .byte 0x74, 0x0B, 0x0B, 0x02 + + arm_func_start sub_0206C144 +sub_0206C144: ; 0x0206C144 + ldr r3, _0206C160 ; =0x020B0B74 + mov r2, #8 +_0206C14C: + ldrb r1, [r3], #1 + subs r2, r2, #1 + strb r1, [r0], #1 + bne _0206C14C + bx lr + .align 2, 0 +_0206C160: .word 0x020B0B74 + arm_func_end sub_0206C144 arm_func_start sub_0206C164 sub_0206C164: ; 0x0206C164 @@ -140328,8 +140425,8 @@ sub_0207741C: ; 0x0207741C _02077438: .word 0x04001008 arm_func_end sub_0207741C - arm_func_start FUN_0207743C -FUN_0207743C: ; 0x0207743C + arm_func_start sub_0207743C +sub_0207743C: ; 0x0207743C ldr r1, _0207746C ; =0x0400000A mov r0, #0x4000000 ldrh r1, [r1] @@ -140344,10 +140441,10 @@ FUN_0207743C: ; 0x0207743C bx lr .align 2, 0 _0207746C: .word 0x0400000A - arm_func_end FUN_0207743C + arm_func_end sub_0207743C - arm_func_start FUN_02077470 -FUN_02077470: ; 0x02077470 + arm_func_start sub_02077470 +sub_02077470: ; 0x02077470 ldr r0, _0207748C ; =0x0400100A ldrh r0, [r0] and r0, r0, #0x1f00 @@ -140357,10 +140454,10 @@ FUN_02077470: ; 0x02077470 bx lr .align 2, 0 _0207748C: .word 0x0400100A - arm_func_end FUN_02077470 + arm_func_end sub_02077470 - arm_func_start FUN_02077490 -FUN_02077490: ; 0x02077490 + arm_func_start sub_02077490 +sub_02077490: ; 0x02077490 mov r0, #0x4000000 ldr r1, [r0] ldrh r3, [r0, #0xc] @@ -140399,7 +140496,7 @@ _02077504: _0207750C: mov r0, #0 bx lr - arm_func_end FUN_02077490 + arm_func_end sub_02077490 _02077514: .byte 0x01, 0x03, 0xA0, 0xE3, 0x00, 0x10, 0x90, 0xE5, 0xBE, 0x30, 0xD0, 0xE1 .byte 0x00, 0x00, 0x90, 0xE5, 0x07, 0xC0, 0x01, 0xE2, 0x0E, 0x03, 0x00, 0xE2, 0xA0, 0x1D, 0xA0, 0xE1 @@ -140429,8 +140526,8 @@ sub_02077598: ; 0x02077598 _020775C8: .word 0x04000008 arm_func_end sub_02077598 - arm_func_start FUN_020775CC -FUN_020775CC: ; 0x020775CC + arm_func_start sub_020775CC +sub_020775CC: ; 0x020775CC ldr r0, _020775E8 ; =0x04001008 ldrh r0, [r0] and r0, r0, #0x3c @@ -140440,7 +140537,7 @@ FUN_020775CC: ; 0x020775CC bx lr .align 2, 0 _020775E8: .word 0x04001008 - arm_func_end FUN_020775CC + arm_func_end sub_020775CC _020775EC: .byte 0x28, 0x10, 0x9F, 0xE5 .byte 0x01, 0x03, 0xA0, 0xE3, 0xB0, 0x10, 0xD1, 0xE1, 0x00, 0x00, 0x90, 0xE5, 0x07, 0x04, 0x00, 0xE2 @@ -141062,7 +141159,7 @@ sub_02078010: ; 0x02078010 mov r6, r0 mov r5, r1 mov r4, r2 - bl FUN_0207743C + bl sub_0207743C ldr r1, _0207806C ; =0x020B2B98 mov ip, r0 ldr r0, [r1] @@ -141092,7 +141189,7 @@ sub_02078070: ; 0x02078070 mov r6, r0 mov r5, r1 mov r4, r2 - bl FUN_02077470 + bl sub_02077470 ldr r1, _020780CC ; =0x020B2B98 mov ip, r0 ldr r0, [r1] @@ -141122,7 +141219,7 @@ sub_020780D0: ; 0x020780D0 mov r6, r0 mov r5, r1 mov r4, r2 - bl FUN_02077490 + bl sub_02077490 ldr r1, _0207812C ; =0x020B2B98 mov ip, r0 ldr r0, [r1] @@ -141189,7 +141286,7 @@ sub_020781F0: ; 0x020781F0 mov r6, r0 mov r5, r1 mov r4, r2 - bl FUN_020775CC + bl sub_020775CC ldr r1, _0207824C ; =0x020B2B98 mov ip, r0 ldr r0, [r1] @@ -141970,7 +142067,7 @@ sub_02078D28: ; 0x02078D28 mov r4, #0x400 _02078D6C: mov r0, r4 - blx FUN_02000088 + blx sub_02000088 ldrh r0, [r5, #6] cmp r0, #0 bne _02078D6C @@ -142020,7 +142117,7 @@ sub_02078DF4: ; 0x02078DF4 mov r4, #0x400 _02078E18: mov r0, r4 - blx FUN_02000088 + blx sub_02000088 mov r0, r8 mov r1, r7 mov r2, r6 @@ -145356,7 +145453,7 @@ _0207B854: sub_0207B860: ; 0x0207B860 stmdb sp!, {r3, lr} mov r0, #1 - blx FUN_02000088 + blx sub_02000088 mov r0, #1 mov r1, r0 bl sub_02078900 @@ -153431,8 +153528,8 @@ sub_02082440: ; 0x02082440 _02082458: .word 0x04000304 arm_func_end sub_02082440 - arm_func_start FUN_0208245C -FUN_0208245C: ; 0x0208245C + arm_func_start sub_0208245C +sub_0208245C: ; 0x0208245C stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -153452,14 +153549,14 @@ FUN_0208245C: ; 0x0208245C ldmdb sp!, {r4, r5, r6, pc} .align 2, 0 _020824A0: .word 0x022BB6AC - arm_func_end FUN_0208245C + arm_func_end sub_0208245C arm_func_start sub_020824A4 sub_020824A4: ; 0x020824A4 stmdb sp!, {r3, lr} ldr r1, _020824C8 ; =0x02081A7C add r2, sp, #0 - bl FUN_0208245C + bl sub_0208245C cmp r0, #0 ldmnedb sp!, {r3, pc} bl sub_02081A3C @@ -153469,8 +153566,8 @@ sub_020824A4: ; 0x020824A4 _020824C8: .word 0x02081A7C arm_func_end sub_020824A4 - arm_func_start FUN_020824CC -FUN_020824CC: ; 0x020824CC + arm_func_start sub_020824CC +sub_020824CC: ; 0x020824CC stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -153490,14 +153587,14 @@ FUN_020824CC: ; 0x020824CC .align 2, 0 _0208250C: .word 0x022BB6AC _02082510: .word 0x03006700 - arm_func_end FUN_020824CC + arm_func_end sub_020824CC arm_func_start sub_02082514 sub_02082514: ; 0x02082514 stmdb sp!, {r3, lr} ldr r1, _02082538 ; =0x02081A7C add r2, sp, #0 - bl FUN_020824CC + bl sub_020824CC cmp r0, #0 ldmnedb sp!, {r3, pc} bl sub_02081A3C @@ -153507,17 +153604,17 @@ sub_02082514: ; 0x02082514 _02082538: .word 0x02081A7C arm_func_end sub_02082514 - arm_func_start FUN_0208253C -FUN_0208253C: ; 0x0208253C + arm_func_start sub_0208253C +sub_0208253C: ; 0x0208253C cmp r0, #0 ldrne r2, [r0] strne r2, [r1, #8] strne r1, [r0] bx lr - arm_func_end FUN_0208253C + arm_func_end sub_0208253C - arm_func_start FUN_02082550 -FUN_02082550: ; 0x02082550 + arm_func_start sub_02082550 +sub_02082550: ; 0x02082550 cmp r0, #0 bxeq lr ldr r2, [r0] @@ -153540,10 +153637,10 @@ _02082590: str r0, [r1, #8] str r1, [r2, #8] bx lr - arm_func_end FUN_02082550 + arm_func_end sub_02082550 - arm_func_start FUN_0208259C -FUN_0208259C: ; 0x0208259C + arm_func_start sub_0208259C +sub_0208259C: ; 0x0208259C cmp r0, #0 ldrne r2, [r0] movne r3, r2 @@ -153564,7 +153661,7 @@ _020825D0: cmp r2, #0 bne _020825B0 bx lr - arm_func_end FUN_0208259C + arm_func_end sub_0208259C arm_func_start sub_020825E4 sub_020825E4: ; 0x020825E4 @@ -153583,45 +153680,45 @@ _020825F0: arm_func_start sub_0208260C sub_0208260C: ; 0x0208260C - ldr ip, _0208261C ; =FUN_0208253C + ldr ip, _0208261C ; =sub_0208253C mov r1, r0 ldr r0, _02082620 ; =0x022BB6B8 bx ip .align 2, 0 -_0208261C: .word FUN_0208253C +_0208261C: .word sub_0208253C _02082620: .word 0x022BB6B8 arm_func_end sub_0208260C arm_func_start sub_02082624 sub_02082624: ; 0x02082624 - ldr ip, _02082634 ; =FUN_02082550 + ldr ip, _02082634 ; =sub_02082550 mov r1, r0 ldr r0, _02082638 ; =0x022BB6C4 bx ip .align 2, 0 -_02082634: .word FUN_02082550 +_02082634: .word sub_02082550 _02082638: .word 0x022BB6C4 arm_func_end sub_02082624 arm_func_start sub_0208263C sub_0208263C: ; 0x0208263C - ldr ip, _0208264C ; =FUN_0208259C + ldr ip, _0208264C ; =sub_0208259C mov r1, r0 ldr r0, _02082650 ; =0x022BB6B8 bx ip .align 2, 0 -_0208264C: .word FUN_0208259C +_0208264C: .word sub_0208259C _02082650: .word 0x022BB6B8 arm_func_end sub_0208263C arm_func_start sub_02082654 sub_02082654: ; 0x02082654 - ldr ip, _02082664 ; =FUN_0208259C + ldr ip, _02082664 ; =sub_0208259C mov r1, r0 ldr r0, _02082668 ; =0x022BB6C4 bx ip .align 2, 0 -_02082664: .word FUN_0208259C +_02082664: .word sub_0208259C _02082668: .word 0x022BB6C4 arm_func_end sub_02082654 @@ -156097,7 +156194,7 @@ sub_020846E4: ; 0x020846E4 mov r4, #0 _02084710: mov r0, r6 - blx FUN_02000088 + blx sub_02000088 mov r0, r5 mov r1, r7 mov r2, r4 @@ -156115,7 +156212,7 @@ sub_02084734: ; 0x02084734 ldr r2, _02084764 ; =0x05000001 add r0, sp, #0 str r3, [sp] - blx FUN_0200078E + blx sub_0200078E bl sub_0207902C ldr r1, _02084768 ; =0x022BC048 strh r0, [r1, #6] @@ -156291,7 +156388,7 @@ _02084948: ldr r0, [r6, #4] bl SetIrqFlag mov r0, r4 - blx FUN_02000088 + blx sub_02000088 b _02084948 _02084988: .byte 0xF8, 0x80, 0xBD, 0xE8 @@ -156327,7 +156424,7 @@ sub_020849B4: ; 0x020849B4 mov r4, #0 _020849E0: mov r0, r6 - blx FUN_02000088 + blx sub_02000088 mov r0, r5 mov r1, r7 mov r2, r4 @@ -156522,7 +156619,7 @@ _02084C60: b _02084CA0 _02084C98: mov r0, r7 - blx FUN_02000088 + blx sub_02000088 _02084CA0: ldrh r0, [r6] cmp r0, #1 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index b720078f..071a4064 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -10560,8 +10560,8 @@ _022C565C: _022C5668: .word 0x0231F580 arm_func_end ov00_022C5628 - arm_func_start FUN_022C566C -FUN_022C566C: ; 0x022C566C + arm_func_start ov00_022C566C +ov00_022C566C: ; 0x022C566C ldr r0, _022C5690 ; =0x0231F580 mov r2, #0 str r2, [r0, #0x18] @@ -10574,7 +10574,7 @@ FUN_022C566C: ; 0x022C566C .align 2, 0 _022C5690: .word 0x0231F580 _022C5694: .word ov00_022C5698 - arm_func_end FUN_022C566C + arm_func_end ov00_022C566C arm_func_start ov00_022C5698 ov00_022C5698: ; 0x022C5698 @@ -12464,8 +12464,8 @@ _022C70D8: .word 0x0000FFFF _022C70DC: .word 0x02318820 arm_func_end ov00_022C6EFC - arm_func_start FUN_022C70E0 -FUN_022C70E0: ; 0x022C70E0 + arm_func_start ov00_022C70E0 +ov00_022C70E0: ; 0x022C70E0 ldr r3, _022C7148 ; =0x000001FE cmp r0, r3 bhi _022C70F4 @@ -12499,7 +12499,7 @@ _022C7114: .align 2, 0 _022C7148: .word 0x000001FE _022C714C: .word 0x000015E0 - arm_func_end FUN_022C70E0 + arm_func_end ov00_022C70E0 arm_func_start ov00_022C7150 ov00_022C7150: ; 0x022C7150 @@ -12520,7 +12520,7 @@ _022C7184: mov r0, r5 mov r2, r4 mov r1, #8 - bl FUN_022C70E0 + bl ov00_022C70E0 cmp r0, #0 bne _022C71AC mov r0, r6 @@ -12546,8 +12546,8 @@ _022C71AC: _022C71E4: .word 0x02325020 arm_func_end ov00_022C7150 - arm_func_start FUN_022C71E8 -FUN_022C71E8: ; 0x022C71E8 + arm_func_start ov00_022C71E8 +ov00_022C71E8: ; 0x022C71E8 stmdb sp!, {r4, lr} ldr r2, _022C72B8 ; =0x02325020 mov r3, #0 @@ -12564,7 +12564,7 @@ FUN_022C71E8: ; 0x022C71E8 ldr r1, [r2, #8] add r1, r1, #0x500 strh r3, [r1, #0x48] - bl FUN_022C7764 + bl ov00_022C7764 ldr r4, _022C72B8 ; =0x02325020 ldr r0, [r4, #0xc] add r0, r0, #0x1000 @@ -12604,10 +12604,10 @@ _022C7290: ldmdb sp!, {r4, pc} .align 2, 0 _022C72B8: .word 0x02325020 - arm_func_end FUN_022C71E8 + arm_func_end ov00_022C71E8 - arm_func_start FUN_022C72BC -FUN_022C72BC: ; 0x022C72BC + arm_func_start ov00_022C72BC +ov00_022C72BC: ; 0x022C72BC stmdb sp!, {r4, r5, r6, lr} mov r5, r0 bl EnableIrqFlag @@ -12644,7 +12644,7 @@ FUN_022C72BC: ; 0x022C72BC ldr r0, [r0, #0xc] add r0, r0, #0x138 add r0, r0, #0x1400 - bl FUN_022C7E50 + bl ov00_022C7E50 mov r5, #0 ldr r2, _022C748C ; =0x02325020 mov r0, r5 @@ -12711,8 +12711,8 @@ _022C7360: bic r1, r1, #0x1f mov r1, r1, lsl #1 strh r1, [r0, #0x1a] - bl FUN_022C566C - bl FUN_022C71E8 + bl ov00_022C566C + bl ov00_022C71E8 mov r5, r0 mov r0, r4 bl SetIrqFlag @@ -12731,12 +12731,12 @@ _022C7490: .word 0x000069C0 _022C7494: .word 0x00005D40 _022C7498: .word ov00_022C3510 _022C749C: .word ov00_022C5DA0 - arm_func_end FUN_022C72BC + arm_func_end ov00_022C72BC arm_func_start ov00_022C74A0 ov00_022C74A0: ; 0x022C74A0 ldr r1, _022C74BC ; =0x02325020 - ldr ip, _022C74C0 ; =FUN_022C72BC + ldr ip, _022C74C0 ; =ov00_022C72BC ldr r1, [r1, #0xc] mov r2, #1 add r1, r1, #0x1000 @@ -12744,7 +12744,7 @@ ov00_022C74A0: ; 0x022C74A0 bx ip .align 2, 0 _022C74BC: .word 0x02325020 -_022C74C0: .word FUN_022C72BC +_022C74C0: .word ov00_022C72BC arm_func_end ov00_022C74A0 arm_func_start ov00_022C74C4 @@ -12941,14 +12941,14 @@ _022C775C: .word 0x02325020 _022C7760: .word 0x000005D4 arm_func_end ov00_022C75D8 - arm_func_start FUN_022C7764 -FUN_022C7764: ; 0x022C7764 + arm_func_start ov00_022C7764 +ov00_022C7764: ; 0x022C7764 ldr r1, _022C7770 ; =0x02325020 strh r0, [r1, #0x26] bx lr .align 2, 0 _022C7770: .word 0x02325020 - arm_func_end FUN_022C7764 + arm_func_end ov00_022C7764 arm_func_start ov00_022C7774 ov00_022C7774: ; 0x022C7774 @@ -13507,8 +13507,8 @@ ov00_022C7E20: ; 0x022C7E20 _022C7E4C: .word 0x02325064 arm_func_end ov00_022C7E20 - arm_func_start FUN_022C7E50 -FUN_022C7E50: ; 0x022C7E50 + arm_func_start ov00_022C7E50 +ov00_022C7E50: ; 0x022C7E50 ldr r3, _022C7E68 ; =0x02325064 ldr ip, _022C7E6C ; =sub_0207C40C mov r1, #0 @@ -13518,7 +13518,7 @@ FUN_022C7E50: ; 0x022C7E50 .align 2, 0 _022C7E68: .word 0x02325064 _022C7E6C: .word sub_0207C40C - arm_func_end FUN_022C7E50 + arm_func_end ov00_022C7E50 arm_func_start ov00_022C7E70 ov00_022C7E70: ; 0x022C7E70 @@ -57895,7 +57895,7 @@ _022EDD08: b _022ED9D0 _022EDD10: mov r0, #0x4000 - blx FUN_02000088 + blx sub_02000088 b _022ED9D0 _022EDD1C: add sp, sp, #0x3c @@ -57950,7 +57950,7 @@ _022EDDA8: cmp r0, #1 beq _022EDDD0 mov r0, r7 - blx FUN_02000088 + blx sub_02000088 b _022EDDA8 _022EDDD0: mov r0, r4 @@ -57993,7 +57993,7 @@ _022EDE34: cmp r0, #1 ldmeqdb sp!, {r4, r5, r6, r7, r8, pc} mov r0, r4 - blx FUN_02000088 + blx sub_02000088 b _022EDE34 _022EDE5C: .byte 0xF0, 0x81, 0xBD, 0xE8 @@ -58049,7 +58049,7 @@ _022EDEE8: cmp r0, #1 beq _022EDF10 mov r0, r4 - blx FUN_02000088 + blx sub_02000088 b _022EDEE8 _022EDF10: mov r0, #1 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index ab437d5e..7e5e4ae1 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -11340,8 +11340,8 @@ _02330BF4: .byte 0x09, 0xD0, 0x03, 0x20, 0x90, 0x47, 0x08, 0xBD, 0x04, 0x48, 0x02, 0x68, 0x00, 0x2A, 0x02, 0xD0 .byte 0x01, 0x20, 0x00, 0x21, 0x90, 0x47, 0x08, 0xBD, 0xD0, 0x94, 0x35, 0x02, 0x50, 0x95, 0x35, 0x02 - thumb_func_start FUN_02330F00 -FUN_02330F00: ; 0x02330F00 + thumb_func_start ov02_02330F00 +ov02_02330F00: ; 0x02330F00 push {r3, lr} ldr r1, _02330F60 ; =0x023594D0 ldr r0, [r1, #0x2c] @@ -11395,7 +11395,7 @@ _02330F5A: nop _02330F60: .word 0x023594D0 _02330F64: .word 0x02330BF5 - thumb_func_end FUN_02330F00 + thumb_func_end ov02_02330F00 _02330F68: .byte 0xF8, 0xB5, 0x05, 0x1C, 0x01, 0x20, 0x0F, 0x1C .byte 0xA5, 0xF7, 0x8A, 0xEE, 0xA5, 0xF7, 0x5C, 0xEE, 0x06, 0x1C, 0x00, 0x2E, 0x10, 0xDD, 0x00, 0x24 @@ -11421,8 +11421,8 @@ _02330F68: .byte 0xC1, 0x62, 0x20, 0x1C, 0x4A, 0xF5, 0xA0, 0xEB, 0x01, 0x20, 0x10, 0xBD, 0x20, 0x1C, 0x4A, 0xF5 .byte 0x9C, 0xEB, 0x00, 0x20, 0x10, 0xBD, 0xC0, 0x46, 0xD0, 0x94, 0x35, 0x02 - thumb_func_start FUN_023310CC -FUN_023310CC: ; 0x023310CC + thumb_func_start ov02_023310CC +ov02_023310CC: ; 0x023310CC push {r4, lr} blx EnableIrqFlag add r4, r0, #0 @@ -11446,7 +11446,7 @@ _023310EE: mov r0, #1 pop {r4, pc} _023310FE: - bl FUN_02330F00 + bl ov02_02330F00 cmp r0, #1 bne _02331116 ldr r0, _02331120 ; =0x023594D0 @@ -11463,7 +11463,7 @@ _02331116: pop {r4, pc} .align 2, 0 _02331120: .word 0x023594D0 - thumb_func_end FUN_023310CC + thumb_func_end ov02_023310CC _02331124: .byte 0xF8, 0xB5, 0x07, 0x1C, 0x0D, 0x1C, 0x16, 0x1C, 0x4A, 0xF5, 0x5A, 0xEB .byte 0x1C, 0x49, 0x04, 0x1C, 0x8E, 0x65, 0x00, 0x2D, 0x05, 0xD0, 0x89, 0x6A, 0x28, 0x1C, 0x60, 0x22 @@ -11718,11 +11718,11 @@ _02331400: .word 0x00002490 _02331404: .word 0x02331329 thumb_func_end ov02_02331364 - thumb_func_start FUN_02331408 -FUN_02331408: ; 0x02331408 + thumb_func_start ov02_02331408 +ov02_02331408: ; 0x02331408 push {r3, r4, r5, r6, r7, lr} mov r5, #1 - bl FUN_023310CC + bl ov02_023310CC cmp r0, #0 beq _02331446 mov r6, #0 @@ -11767,7 +11767,7 @@ _02331458: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _0233145C: .word 0x023594D0 - thumb_func_end FUN_02331408 + thumb_func_end ov02_02331408 _02331460: .byte 0xF8, 0xB5, 0x8C, 0xB0, 0x42, 0x48, 0x01, 0x24, 0xC3, 0x6D, 0x80, 0x69, 0xC0, 0x22, 0x01, 0x1C .byte 0x51, 0x43, 0xE5, 0x1E, 0x5E, 0x18, 0x02, 0xD1, 0x0C, 0xB0, 0x00, 0x20, 0xF8, 0xBD, 0x30, 0x1C @@ -12692,7 +12692,7 @@ _02334350: ldr r0, [r0, #0x74] cmp r0, #0 ble _02334364 - bl FUN_02331408 + bl ov02_02331408 ldr r1, _0233436C ; =0x023594D0 mov r2, #0 str r2, [r1, #0x74] diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 54aa1d75..52c13380 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -2862,13 +2862,13 @@ _022DE8C8: b _022E2474 _022DE8DC: mov r0, r6 - bl FUN_022E5A38 + bl ov11_022E5A38 mov r0, r6 bl ov11_022E5BB8 b _022E2474 _022DE8F0: mov r0, r6 - bl FUN_022E5A50 + bl ov11_022E5A50 mov r0, r6 bl ov11_022E5BB8 b _022E2474 @@ -2886,7 +2886,7 @@ _022DE91C: b _022E2474 _022DE928: mov r0, r6 - bl FUN_022E5D14 + bl ov11_022E5D14 b _022E2474 arm_func_end ov11_022DE834 @@ -2985,7 +2985,7 @@ ov11_022DEA08: ; 0x022DEA08 movne r2, #0 mov r0, r6 and r2, r2, #0xff - bl FUN_022F722C + bl ov11_022F722C ldr r0, _022DED18 ; =0x02324E80 ldrsh r1, [r0, #0xa] cmp r1, r6 @@ -3046,7 +3046,7 @@ ov11_022DEAC4: ; 0x022DEAC4 mov r0, r7 mov r2, r6 and r3, r3, #0xff - bl FUN_022F72A0 + bl ov11_022F72A0 ldr r0, _022DED18 ; =0x02324E80 ldrsh r1, [r0, #0xa] cmp r1, r7 @@ -3355,7 +3355,7 @@ ov11_022DEF8C: ; 0x022DEF8C blt _022DEFC0 sub r0, r4, #0x3e8 mov r1, #1 - bl FUN_0204CA48 + bl sub_0204CA48 ldr r0, _022DFE08 ; =0x02316B0C sub r1, r4, #0x3e8 ldrb r0, [r0, r1] @@ -3661,7 +3661,7 @@ _022DF3DC: bl LoadScriptVariableValue mov r1, r5 mov r2, r7 - bl FUN_0204BECC + bl sub_0204BECC mov r7, r0 b _022DF6FC _022DF424: @@ -3686,7 +3686,7 @@ _022DF424: mov r2, r7 mov r1, r0 mov r0, r5 - bl FUN_0204BECC + bl sub_0204BECC mov r7, r0 b _022DF6FC _022DF484: @@ -3731,7 +3731,7 @@ _022DF504: bl ov11_022E48AC mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 - bl FUN_02065974 + bl sub_02065974 mov r7, r0 b _022DF6FC _022DF520: @@ -3913,7 +3913,7 @@ ov11_022DF760: ; 0x022DF760 mov r1, r7, lsl #0x10 mov r4, r0 mov r0, r1, asr #0x10 - bl FUN_02065974 + bl sub_02065974 mov r1, r0, lsl #0x10 ldr r2, _022DFE18 ; =0x02324ECC orr r3, r7, #0x10000 @@ -3947,7 +3947,7 @@ ov11_022DF7CC: ; 0x022DF7CC mov r3, #0x60000 mov r0, r1, asr #0x10 str r3, [r2, #0x4c] - bl FUN_02065974 + bl sub_02065974 mov r1, r0 ldr r0, _022DFE1C ; =0x02324EA4 bl InitPortraitBoxWithMonsterId @@ -3977,7 +3977,7 @@ ov11_022DF834: ; 0x022DF834 mov r3, #0x70000 mov r0, r1, asr #0x10 str r3, [r2, #0x4c] - bl FUN_02065974 + bl sub_02065974 mov r1, r0 ldr r0, _022DFE1C ; =0x02324EA4 bl InitPortraitBoxWithMonsterId @@ -4033,7 +4033,7 @@ ov11_022DF8F4: ; 0x022DF8F4 mov r1, r0 str r1, [r2, #0x10] ldr r0, [r2, #0xc] - bl FUN_02034E60 + bl sub_02034E60 b _022E2474 arm_func_end ov11_022DF8F4 @@ -4139,7 +4139,7 @@ ov11_022DFA50: ; 0x022DFA50 ldr r1, _022DFE18 ; =0x02324ECC ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_02300ACC + bl ov11_02300ACC mov r0, #5 b _022E2478 arm_func_end ov11_022DFA50 @@ -4250,7 +4250,7 @@ _022DFBDC: b _022E2478 _022DFBF0: mov r0, #0x2f - bl FUN_02065974 + bl sub_02065974 cmp r0, #0 mvneq r6, #0 beq _022DFC44 @@ -4505,7 +4505,7 @@ _022DFED8: add r1, r3, #8 orrgt r0, r0, #0x8000 mov r3, #0x14 - bl FUN_02035024 + bl sub_02035024 mov r0, #5 b _022E2478 _022DFFAC: @@ -4542,7 +4542,7 @@ ov11_022DFFE8: ; 0x022DFFE8 bl ov11_022E9B24 b _022E0010 _022E000C: - bl FUN_022E9B40 + bl ov11_022E9B40 _022E0010: cmp r4, #0 beq _022E2474 @@ -4572,7 +4572,7 @@ ov11_022E0020: ; 0x022E0020 mov r0, r4 mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 - bl FUN_022E9B5C + bl ov11_022E9B5C b _022E0098 _022E0078: rsb r1, r8, #0x100 @@ -4582,7 +4582,7 @@ _022E0078: mov r0, r4 mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 - bl FUN_022E9B5C + bl ov11_022E9B5C _022E0098: cmp r7, #0 beq _022E2474 @@ -4690,7 +4690,7 @@ ov11_022E01B8: ; 0x022E01B8 bl ov11_022E9CB0 b _022E01E0 _022E01DC: - bl FUN_022E9CCC + bl ov11_022E9CCC _022E01E0: cmp r4, #0 beq _022E2474 @@ -4720,7 +4720,7 @@ ov11_022E01F0: ; 0x022E01F0 mov r0, r4 mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 - bl FUN_022E9CE8 + bl ov11_022E9CE8 b _022E0268 _022E0248: rsb r1, r8, #0x100 @@ -4730,7 +4730,7 @@ _022E0248: mov r0, r4 mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 - bl FUN_022E9CE8 + bl ov11_022E9CE8 _022E0268: cmp r7, #0 beq _022E2474 @@ -4787,25 +4787,25 @@ _022E031C: add r2, sp, #0xcc mov r0, r8 mov r1, r7 - bl FUN_022E9D44 + bl ov11_022E9D44 b _022E0368 _022E0330: add r2, sp, #0xcc mov r0, r8 mov r1, r7 - bl FUN_022E9D6C + bl ov11_022E9D6C b _022E0368 _022E0344: add r2, sp, #0xcc mov r0, r8 mov r1, r7 - bl FUN_022E9D94 + bl ov11_022E9D94 b _022E0368 _022E0358: add r2, sp, #0xcc mov r0, r8 mov r1, r7 - bl FUN_022E9DBC + bl ov11_022E9DBC _022E0368: cmp r4, #0 beq _022E2474 @@ -11044,8 +11044,8 @@ ov11_022E5A10: ; 0x022E5A10 ldmdb sp!, {r4, pc} arm_func_end ov11_022E5A10 - arm_func_start FUN_022E5A38 -FUN_022E5A38: ; 0x022E5A38 + arm_func_start ov11_022E5A38 +ov11_022E5A38: ; 0x022E5A38 ldr ip, _022E5A4C ; =ov11_022E4CD4 mov r1, r0 mov r0, #3 @@ -11053,10 +11053,10 @@ FUN_022E5A38: ; 0x022E5A38 bx ip .align 2, 0 _022E5A4C: .word ov11_022E4CD4 - arm_func_end FUN_022E5A38 + arm_func_end ov11_022E5A38 - arm_func_start FUN_022E5A50 -FUN_022E5A50: ; 0x022E5A50 + arm_func_start ov11_022E5A50 +ov11_022E5A50: ; 0x022E5A50 ldr ip, _022E5A64 ; =ov11_022E4CD4 mov r1, r0 mov r0, #3 @@ -11064,7 +11064,7 @@ FUN_022E5A50: ; 0x022E5A50 bx ip .align 2, 0 _022E5A64: .word ov11_022E4CD4 - arm_func_end FUN_022E5A50 + arm_func_end ov11_022E5A50 arm_func_start ov11_022E5A68 ov11_022E5A68: ; 0x022E5A68 @@ -11278,8 +11278,8 @@ _022E5D08: _022E5D10: .word 0x02324F74 arm_func_end ov11_022E5C84 - arm_func_start FUN_022E5D14 -FUN_022E5D14: ; 0x022E5D14 + arm_func_start ov11_022E5D14 +ov11_022E5D14: ; 0x022E5D14 stmdb sp!, {r4, lr} mov r4, r0 mov r1, r4 @@ -11287,15 +11287,15 @@ FUN_022E5D14: ; 0x022E5D14 bl ov11_022F8E70 mov r1, r4 mov r0, #3 - bl FUN_022FCA9C + bl ov11_022FCA9C mov r1, r4 mov r0, #3 - bl FUN_022FE1AC + bl ov11_022FE1AC mov r0, #0 mov r1, #0xa bl ov11_022F881C ldmdb sp!, {r4, pc} - arm_func_end FUN_022E5D14 + arm_func_end ov11_022E5D14 arm_func_start ov11_022E5D50 ov11_022E5D50: ; 0x022E5D50 @@ -11663,22 +11663,22 @@ _022E624C: mov r0, #0 mov r1, r0 mov r2, r0 - bl FUN_020367B4 + bl sub_020367B4 b _022E68AC _022E6260: mov r1, #0 mov r2, r1 mov r0, #3 - bl FUN_020367B4 + bl sub_020367B4 b _022E68AC _022E6274: add r0, sp, #0xc0 mov r1, #0xa - bl FUN_02065BD8 + bl sub_02065BD8 add r1, sp, #0xc0 mov r0, #2 mov r2, r1 - bl FUN_020367B4 + bl sub_020367B4 b _022E68AC _022E6294: bl ov11_02310BDC @@ -11695,32 +11695,32 @@ _022E6294: add r1, sp, #0xa0 mov r0, #1 mov r2, r1 - bl FUN_020367B4 + bl sub_020367B4 b _022E68AC _022E62D4: mov r0, #0 - bl FUN_0230CD84 + bl ov11_0230CD84 b _022E68AC _022E62E0: - bl FUN_0230CBB0 + bl ov11_0230CBB0 b _022E68AC _022E62E8: mov r0, #0 - bl FUN_0230CD5C + bl ov11_0230CD5C b _022E68AC _022E62F4: - bl FUN_0230CD5C + bl ov11_0230CD5C b _022E68AC _022E62FC: - bl FUN_0230CD84 + bl ov11_0230CD84 b _022E68AC _022E6304: mov r0, #0 - bl FUN_0230CBD8 + bl ov11_0230CBD8 b _022E68AC _022E6310: mov r0, #0 - bl FUN_0230CC00 + bl ov11_0230CC00 b _022E68AC _022E631C: add r1, sp, #0x5a @@ -11728,7 +11728,7 @@ _022E631C: bl sub_02065CD8 add r0, sp, #0x5a mov r1, #0 - bl FUN_02302CE0 + bl ov11_02302CE0 b _022E68AC _022E6338: add r1, sp, #0x54 @@ -11736,53 +11736,53 @@ _022E6338: bl sub_02065CD8 add r0, sp, #0x54 mov r1, #1 - bl FUN_02303208 + bl ov11_02303208 b _022E68AC _022E6354: add r0, sp, #0x100 bl ov11_022E8090 add r0, sp, #0x100 mov r1, #1 - bl FUN_023025E8 + bl ov11_023025E8 b _022E68AC _022E636C: mov r0, #3 - bl FUN_023039AC + bl ov11_023039AC b _022E68AC _022E6378: mov r0, #2 - bl FUN_023039AC + bl ov11_023039AC b _022E68AC _022E6384: - bl FUN_023039AC + bl ov11_023039AC b _022E68AC _022E638C: mov r0, #0 - bl FUN_023039AC + bl ov11_023039AC b _022E68AC _022E6398: - bl FUN_0230CBC4 + bl ov11_0230CBC4 b _022E68AC _022E63A0: - bl FUN_0230CD48 + bl ov11_0230CD48 b _022E68AC _022E63A8: - bl FUN_0230CDB8 + bl ov11_0230CDB8 b _022E68AC _022E63B0: - bl FUN_0230CC28 + bl ov11_0230CC28 b _022E68AC _022E63B8: - bl FUN_0230CC4C + bl ov11_0230CC4C b _022E68AC _022E63C0: - bl FUN_0230CC80 + bl ov11_0230CC80 b _022E68AC _022E63C8: - bl FUN_0230CCA8 + bl ov11_0230CCA8 b _022E68AC _022E63D0: - bl FUN_0230CDA4 + bl ov11_0230CDA4 b _022E68AC _022E63D8: mov r0, #0x12 @@ -11821,7 +11821,7 @@ _022E6440: bl GetSosMailCount cmp r0, #0 ble _022E645C - bl FUN_023043A8 + bl ov11_023043A8 b _022E68AC _022E645C: ldr r0, _022E68D0 ; =0x02324F94 @@ -11872,14 +11872,14 @@ _022E6504: str r0, [r4] b _022E68BC _022E6510: - bl FUN_02304514 + bl ov11_02304514 b _022E68AC _022E6518: mov r0, #0 - bl FUN_02304664 + bl ov11_02304664 b _022E68AC _022E6524: - bl FUN_02304664 + bl ov11_02304664 b _022E68AC _022E652C: add r0, sp, #0x11 @@ -11996,7 +11996,7 @@ _022E6678: ldrb r0, [sp, #0x24] cmp r0, #0 beq _022E66F8 - bl FUN_0230CDCC + bl ov11_0230CDCC ldr r0, _022E68C8 ; =0x02324C9C mov r1, #0 strb r1, [r0] @@ -12016,17 +12016,17 @@ _022E6718: bl ov11_0230CDE0 b _022E68AC _022E6720: - bl FUN_0230CDF4 + bl ov11_0230CDF4 b _022E68AC _022E6728: - bl FUN_0230CE08 + bl ov11_0230CE08 b _022E68AC _022E6730: mov r0, #0 bl sub_0204F244 cmp r0, #0 beq _022E6748 - bl FUN_0230CE1C + bl ov11_0230CE1C b _022E68AC _022E6748: mvn r0, #0 @@ -12075,10 +12075,10 @@ _022E67B8: str r1, [r4] b _022E68BC _022E67D4: - bl FUN_0230CE30 + bl ov11_0230CE30 b _022E68AC _022E67DC: - bl FUN_0230CE44 + bl ov11_0230CE44 b _022E68AC _022E67E4: bl sub_02050C74 @@ -12128,13 +12128,13 @@ _022E6878: bl sub_0206C0FC ldrsh r1, [sp, #0x16] mov r0, #0xa - bl FUN_022FF1D4 + bl ov11_022FF1D4 b _022E68AC _022E6890: add r0, sp, #0x14 - bl FUN_0206C120 + bl sub_0206C120 add r0, sp, #0x18 - bl FUN_0206C144 + bl sub_0206C144 ldrsh r0, [sp, #0x14] add r1, sp, #0x18 bl ov11_022FF490 @@ -15951,8 +15951,8 @@ _022E9B38: .word sub_0200BB74 _022E9B3C: .word 0x0238905C arm_func_end ov11_022E9B24 - arm_func_start FUN_022E9B40 -FUN_022E9B40: ; 0x022E9B40 + arm_func_start ov11_022E9B40 +ov11_022E9B40: ; 0x022E9B40 ldr ip, _022E9B54 ; =sub_0200BB74 mov r2, r0 ldr r0, _022E9B58 ; =0x0238905C @@ -15961,10 +15961,10 @@ FUN_022E9B40: ; 0x022E9B40 .align 2, 0 _022E9B54: .word sub_0200BB74 _022E9B58: .word 0x0238905C - arm_func_end FUN_022E9B40 + arm_func_end ov11_022E9B40 - arm_func_start FUN_022E9B5C -FUN_022E9B5C: ; 0x022E9B5C + arm_func_start ov11_022E9B5C +ov11_022E9B5C: ; 0x022E9B5C stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -15976,7 +15976,7 @@ FUN_022E9B5C: ; 0x022E9B5C ldmdb sp!, {r3, pc} .align 2, 0 _022E9B80: .word 0x0238905C - arm_func_end FUN_022E9B5C + arm_func_end ov11_022E9B5C arm_func_start ov11_022E9B84 ov11_022E9B84: ; 0x022E9B84 @@ -16093,8 +16093,8 @@ _022E9CC4: .word sub_0200BB74 _022E9CC8: .word 0x02389018 arm_func_end ov11_022E9CB0 - arm_func_start FUN_022E9CCC -FUN_022E9CCC: ; 0x022E9CCC + arm_func_start ov11_022E9CCC +ov11_022E9CCC: ; 0x022E9CCC ldr ip, _022E9CE0 ; =sub_0200BB74 mov r2, r0 ldr r0, _022E9CE4 ; =0x02389018 @@ -16103,10 +16103,10 @@ FUN_022E9CCC: ; 0x022E9CCC .align 2, 0 _022E9CE0: .word sub_0200BB74 _022E9CE4: .word 0x02389018 - arm_func_end FUN_022E9CCC + arm_func_end ov11_022E9CCC - arm_func_start FUN_022E9CE8 -FUN_022E9CE8: ; 0x022E9CE8 + arm_func_start ov11_022E9CE8 +ov11_022E9CE8: ; 0x022E9CE8 stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -16118,7 +16118,7 @@ FUN_022E9CE8: ; 0x022E9CE8 ldmdb sp!, {r3, pc} .align 2, 0 _022E9D0C: .word 0x02389018 - arm_func_end FUN_022E9CE8 + arm_func_end ov11_022E9CE8 arm_func_start ov11_022E9D10 ov11_022E9D10: ; 0x022E9D10 @@ -16139,8 +16139,8 @@ _022E9D34: _022E9D40: .word 0x02389018 arm_func_end ov11_022E9D10 - arm_func_start FUN_022E9D44 -FUN_022E9D44: ; 0x022E9D44 + arm_func_start ov11_022E9D44 +ov11_022E9D44: ; 0x022E9D44 stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -16152,10 +16152,10 @@ FUN_022E9D44: ; 0x022E9D44 ldmdb sp!, {r3, pc} .align 2, 0 _022E9D68: .word 0x023890E4 - arm_func_end FUN_022E9D44 + arm_func_end ov11_022E9D44 - arm_func_start FUN_022E9D6C -FUN_022E9D6C: ; 0x022E9D6C + arm_func_start ov11_022E9D6C +ov11_022E9D6C: ; 0x022E9D6C stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -16167,10 +16167,10 @@ FUN_022E9D6C: ; 0x022E9D6C ldmdb sp!, {r3, pc} .align 2, 0 _022E9D90: .word 0x023890E4 - arm_func_end FUN_022E9D6C + arm_func_end ov11_022E9D6C - arm_func_start FUN_022E9D94 -FUN_022E9D94: ; 0x022E9D94 + arm_func_start ov11_022E9D94 +ov11_022E9D94: ; 0x022E9D94 stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -16182,10 +16182,10 @@ FUN_022E9D94: ; 0x022E9D94 ldmdb sp!, {r3, pc} .align 2, 0 _022E9DB8: .word 0x023890A0 - arm_func_end FUN_022E9D94 + arm_func_end ov11_022E9D94 - arm_func_start FUN_022E9DBC -FUN_022E9DBC: ; 0x022E9DBC + arm_func_start ov11_022E9DBC +ov11_022E9DBC: ; 0x022E9DBC stmdb sp!, {r3, lr} mov lr, r0 mov ip, r1 @@ -16197,7 +16197,7 @@ FUN_022E9DBC: ; 0x022E9DBC ldmdb sp!, {r3, pc} .align 2, 0 _022E9DE0: .word 0x023890A0 - arm_func_end FUN_022E9DBC + arm_func_end ov11_022E9DBC arm_func_start ov11_022E9DE4 ov11_022E9DE4: ; 0x022E9DE4 @@ -31823,8 +31823,8 @@ _022F7224: .word 0x023214E4 _022F7228: .word 0x02324CF4 arm_func_end ov11_022F71E4 - arm_func_start FUN_022F722C -FUN_022F722C: ; 0x022F722C + arm_func_start ov11_022F722C +ov11_022F722C: ; 0x022F722C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -31856,10 +31856,10 @@ _022F7290: .align 2, 0 _022F7298: .word 0x0232150C _022F729C: .word 0x02324CF4 - arm_func_end FUN_022F722C + arm_func_end ov11_022F722C - arm_func_start FUN_022F72A0 -FUN_022F72A0: ; 0x022F72A0 + arm_func_start ov11_022F72A0 +ov11_022F72A0: ; 0x022F72A0 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 mov r7, r0 @@ -31909,7 +31909,7 @@ _022F7344: .align 2, 0 _022F734C: .word 0x02321548 _022F7350: .word 0x02324CF4 - arm_func_end FUN_022F72A0 + arm_func_end ov11_022F72A0 arm_func_start ov11_022F7354 ov11_022F7354: ; 0x022F7354 @@ -38054,8 +38054,8 @@ _022FCA94: .word 0x02321FE0 _022FCA98: .word 0x02321FF4 arm_func_end ov11_022FC8C4 - arm_func_start FUN_022FCA9C -FUN_022FCA9C: ; 0x022FCA9C + arm_func_start ov11_022FCA9C +ov11_022FCA9C: ; 0x022FCA9C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 sub r0, sl, #1 @@ -38148,7 +38148,7 @@ _022FCBE0: .word 0x02322034 _022FCBE4: .word 0x02324D00 _022FCBE8: .word 0x02321FE0 _022FCBEC: .word 0x02322074 - arm_func_end FUN_022FCA9C + arm_func_end ov11_022FCA9C arm_func_start ov11_022FCBF0 ov11_022FCBF0: ; 0x022FCBF0 @@ -39652,8 +39652,8 @@ _022FE1A4: .word 0x02322288 _022FE1A8: .word 0x0232229C arm_func_end ov11_022FDFD4 - arm_func_start FUN_022FE1AC -FUN_022FE1AC: ; 0x022FE1AC + arm_func_start ov11_022FE1AC +ov11_022FE1AC: ; 0x022FE1AC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 sub r0, sl, #1 @@ -39746,7 +39746,7 @@ _022FE2F0: .word 0x023222E0 _022FE2F4: .word 0x02324D04 _022FE2F8: .word 0x02322288 _022FE2FC: .word 0x02322324 - arm_func_end FUN_022FE1AC + arm_func_end ov11_022FE1AC arm_func_start ov11_022FE300 ov11_022FE300: ; 0x022FE300 @@ -40669,8 +40669,8 @@ _022FF1CC: .word 0x00000221 _022FF1D0: .word 0x00000226 arm_func_end ov11_022FEFA4 - arm_func_start FUN_022FF1D4 -FUN_022FF1D4: ; 0x022FF1D4 + arm_func_start ov11_022FF1D4 +ov11_022FF1D4: ; 0x022FF1D4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, _022FF20C ; =0x0232247C @@ -40690,7 +40690,7 @@ _022FF20C: .word 0x0232247C _022FF210: .word 0x02324D0C _022FF214: .word 0x0238A074 _022FF218: .word 0x000002BD - arm_func_end FUN_022FF1D4 + arm_func_end ov11_022FF1D4 _022FF21C: .byte 0x70, 0x40, 0x2D, 0xE9 .byte 0x08, 0xD0, 0x4D, 0xE2, 0x62, 0x0E, 0xA0, 0xE3, 0x08, 0x10, 0xA0, 0xE3, 0x00, 0x40, 0xA0, 0xE3 @@ -42300,8 +42300,8 @@ _02300AC4: .word 0x02324D2C _02300AC8: .word 0x023225DC arm_func_end ov11_02300A60 - arm_func_start FUN_02300ACC -FUN_02300ACC: ; 0x02300ACC + arm_func_start ov11_02300ACC +ov11_02300ACC: ; 0x02300ACC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -42336,7 +42336,7 @@ FUN_02300ACC: ; 0x02300ACC .align 2, 0 _02300B48: .word 0x02324D2C _02300B4C: .word 0x023225DC - arm_func_end FUN_02300ACC + arm_func_end ov11_02300ACC _02300B50: .byte 0x08, 0x40, 0x2D, 0xE9, 0x0C, 0x00, 0xA0, 0xE3, 0x08, 0x10, 0xA0, 0xE3, 0x83, 0x01, 0xF4, 0xEB .byte 0x2C, 0x10, 0x9F, 0xE5, 0x00, 0x20, 0xA0, 0xE3, 0x00, 0x00, 0x81, 0xE5, 0x04, 0x20, 0x80, 0xE5 @@ -42833,8 +42833,8 @@ _023013D4: .word 0x023226C4 _023013D8: .word 0x02324D40 arm_func_end ov11_023013A0 - arm_func_start FUN_023013DC -FUN_023013DC: ; 0x023013DC + arm_func_start ov11_023013DC +ov11_023013DC: ; 0x023013DC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -42884,15 +42884,15 @@ _02301468: strb r3, [r1, #0x254] ldr r1, [r2] strb r3, [r1, #0x255] - bl FUN_023014AC + bl ov11_023014AC mov r0, #1 ldmdb sp!, {r3, r4, r5, pc} .align 2, 0 _023014A8: .word 0x02324D48 - arm_func_end FUN_023013DC + arm_func_end ov11_023013DC - arm_func_start FUN_023014AC -FUN_023014AC: ; 0x023014AC + arm_func_start ov11_023014AC +ov11_023014AC: ; 0x023014AC stmdb sp!, {r3, lr} ldr r3, _02301A10 ; =0x02324D48 ldr r1, [r3] @@ -42946,7 +42946,7 @@ _02301554: bne _0230157C mov r0, #8 str r0, [r2] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _0230157C: ldrsh r1, [r0, #0x4c] @@ -42966,19 +42966,19 @@ _0230157C: bl ShowMessageInDBox ldmdb sp!, {r3, pc} _023015BC: - bl FUN_02302618 + bl ov11_02302618 ldr r0, _02301A10 ; =0x02324D48 mov r1, #2 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _023015D8: mov r1, #2 str r1, [r2, #0x20] ldr r0, [r3] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _023015F0: ldr r0, _02301A18 ; =0x023226FC @@ -43063,7 +43063,7 @@ _023016E8: bne _02301730 mov r0, #5 str r0, [r1] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301730: ldr r0, _02301A10 ; =0x02324D48 @@ -43078,14 +43078,14 @@ _02301730: mov r1, #9 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301768: ldr r0, _02301A10 ; =0x02324D48 mov r1, #6 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301780: mov r0, #0xc @@ -43152,7 +43152,7 @@ _0230180C: mov r1, #0x11 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _0230187C: mov r0, #1 @@ -43193,7 +43193,7 @@ _0230187C: mov r1, #0x11 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _0230191C: bl ov11_0230D220 @@ -43271,10 +43271,10 @@ _02301A20: .word 0x0232271C _02301A24: .word 0x0000038F _02301A28: .word 0x023226F4 _02301A2C: .word 0x000003A3 - arm_func_end FUN_023014AC + arm_func_end ov11_023014AC - arm_func_start FUN_02301A30 -FUN_02301A30: ; 0x02301A30 + arm_func_start ov11_02301A30 +ov11_02301A30: ; 0x02301A30 stmdb sp!, {r3, lr} ldr r0, _02301F8C ; =0x02324D48 ldr r2, [r0] @@ -43326,7 +43326,7 @@ _02301AD0: bne _02301AF8 mov r0, #8 str r0, [r2] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301AF8: ldrsh r1, [r0, #0x4c] @@ -43346,19 +43346,19 @@ _02301AF8: bl ShowMessageInDBox ldmdb sp!, {r3, pc} _02301B38: - bl FUN_02302618 + bl ov11_02302618 ldr r0, _02301F8C ; =0x02324D48 mov r1, #2 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301B54: mov r1, #2 str r1, [r2, #0x20] ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301B6C: ldr r0, _02301F94 ; =0x023226FC @@ -43443,7 +43443,7 @@ _02301C64: bne _02301CAC mov r0, #5 str r0, [r1] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301CAC: ldr r0, _02301F8C ; =0x02324D48 @@ -43458,14 +43458,14 @@ _02301CAC: mov r1, #9 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301CE4: ldr r0, _02301F8C ; =0x02324D48 mov r1, #6 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301CFC: mov r1, #0xc @@ -43532,7 +43532,7 @@ _02301D88: mov r1, #0x11 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301DF8: mov r1, #1 @@ -43573,7 +43573,7 @@ _02301DF8: mov r1, #0x11 ldr r0, [r0] str r1, [r0] - bl FUN_02301A30 + bl ov11_02301A30 ldmdb sp!, {r3, pc} _02301E98: bl ov11_0230D220 @@ -43651,7 +43651,7 @@ _02301F9C: .word 0x0232271C _02301FA0: .word 0x0000038F _02301FA4: .word 0x023226F4 _02301FA8: .word 0x000003A3 - arm_func_end FUN_02301A30 + arm_func_end ov11_02301A30 _02301FAC: .byte 0x08, 0x40, 0x2D, 0xE9 .byte 0x9A, 0x2C, 0x00, 0xEB, 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x18, 0x3C, 0x00, 0x9F, 0xE5 @@ -43755,8 +43755,8 @@ _02301FAC: .byte 0x2D, 0x92, 0xFF, 0xEB, 0x04, 0x00, 0xA0, 0xE3, 0x10, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3 .byte 0x10, 0x80, 0xBD, 0xE8, 0x48, 0x4D, 0x32, 0x02 - arm_func_start FUN_023025E8 -FUN_023025E8: ; 0x023025E8 + arm_func_start ov11_023025E8 +ov11_023025E8: ; 0x023025E8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, _02302614 ; =0x0232270C @@ -43766,14 +43766,14 @@ FUN_023025E8: ; 0x023025E8 ldmeqdb sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, r4 - bl FUN_023013DC + bl ov11_023013DC ldmdb sp!, {r3, r4, r5, pc} .align 2, 0 _02302614: .word 0x0232270C - arm_func_end FUN_023025E8 + arm_func_end ov11_023025E8 - arm_func_start FUN_02302618 -FUN_02302618: ; 0x02302618 + arm_func_start ov11_02302618 +ov11_02302618: ; 0x02302618 stmdb sp!, {r3, lr} ldr r0, _02302664 ; =0x02324D48 mvn r1, #1 @@ -43795,7 +43795,7 @@ FUN_02302618: ; 0x02302618 ldmdb sp!, {r3, pc} .align 2, 0 _02302664: .word 0x02324D48 - arm_func_end FUN_02302618 + arm_func_end ov11_02302618 _02302668: .byte 0x08, 0x40, 0x2D, 0xE9, 0xD0, 0x01, 0x9F, 0xE5 .byte 0x00, 0x20, 0x90, 0xE5, 0x00, 0x10, 0x92, 0xE5, 0x0C, 0x00, 0x51, 0xE3, 0x01, 0xF1, 0x8F, 0x90 @@ -43829,8 +43829,8 @@ _02302668: .byte 0x00, 0x00, 0x90, 0xE5, 0x04, 0x00, 0x90, 0xE5, 0x04, 0x00, 0x00, 0xEB, 0x00, 0x00, 0xA0, 0xE3 .byte 0x08, 0x80, 0xBD, 0xE8, 0x4C, 0x4D, 0x32, 0x02, 0x76, 0x02, 0x00, 0x00, 0x87, 0x02, 0x00, 0x00 - arm_func_start FUN_02302850 -FUN_02302850: ; 0x02302850 + arm_func_start ov11_02302850 +ov11_02302850: ; 0x02302850 stmdb sp!, {lr} sub sp, sp, #0x14 ldr r1, _02302A44 ; =0x02324D4C @@ -43872,7 +43872,7 @@ _023028C0: bl sub_0200CF6C add r0, sp, #0 mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302A3C _023028EC: mov r2, #7 @@ -43913,16 +43913,16 @@ _02302950: bl sub_0200CF6C add r0, sp, #6 mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302A3C _0230297C: str r2, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302A3C _02302988: mov r0, #0 str r0, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302A3C _02302998: mov r3, #0 @@ -43962,25 +43962,25 @@ _023029FC: bl sub_0200CF6C add r0, sp, #0xc mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302A3C _02302A24: mov r0, #7 str r0, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302A3C _02302A34: str r3, [r1] - bl FUN_02302A48 + bl ov11_02302A48 _02302A3C: add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 _02302A44: .word 0x02324D4C - arm_func_end FUN_02302850 + arm_func_end ov11_02302850 - arm_func_start FUN_02302A48 -FUN_02302A48: ; 0x02302A48 + arm_func_start ov11_02302A48 +ov11_02302A48: ; 0x02302A48 stmdb sp!, {lr} sub sp, sp, #0x14 ldr r0, _02302C34 ; =0x02324D4C @@ -44020,7 +44020,7 @@ _02302AB0: bl sub_0200CF6C add r0, sp, #0xc mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302C2C _02302ADC: mov r2, #7 @@ -44061,16 +44061,16 @@ _02302B40: bl sub_0200CF6C add r0, sp, #6 mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302C2C _02302B6C: str r2, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302C2C _02302B78: mov r0, #0 str r0, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302C2C _02302B88: mov r3, #0 @@ -44110,16 +44110,16 @@ _02302BEC: bl sub_0200CF6C add r0, sp, #0 mov r1, #0 - bl FUN_02304CAC + bl ov11_02304CAC b _02302C2C _02302C14: mov r0, #7 str r0, [r1] - bl FUN_02302A48 + bl ov11_02302A48 b _02302C2C _02302C24: str r3, [r1] - bl FUN_02302A48 + bl ov11_02302A48 _02302C2C: add sp, sp, #0x14 ldmia sp!, {pc} @@ -44130,7 +44130,7 @@ _02302C38: .byte 0x00, 0x00, 0x90, 0xE5, 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x08, 0x4D, 0xF9, 0xF3, 0xEB .byte 0x08, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0xA0, 0xE3, 0x00, 0x10, 0x80, 0xE5, 0x08, 0x80, 0xBD, 0xE8 _02302C60: .word 0x02324D4C - arm_func_end FUN_02302A48 + arm_func_end ov11_02302A48 _02302C64: .byte 0x08, 0x40, 0x2D, 0xE9, 0x6C, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0x90, 0xE5 .byte 0x28, 0x00, 0x91, 0xE5, 0x03, 0x00, 0x50, 0xE3, 0x00, 0xF1, 0x8F, 0x90, 0x14, 0x00, 0x00, 0xEA @@ -44141,8 +44141,8 @@ _02302C64: .byte 0x03, 0x00, 0x00, 0xEA, 0x20, 0x00, 0x91, 0xE5, 0x6F, 0x90, 0xFF, 0xEB, 0x04, 0x00, 0xA0, 0xE3 .byte 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x4C, 0x4D, 0x32, 0x02 - arm_func_start FUN_02302CE0 -FUN_02302CE0: ; 0x02302CE0 + arm_func_start ov11_02302CE0 +ov11_02302CE0: ; 0x02302CE0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, _02302D84 ; =0x02322740 @@ -44182,12 +44182,12 @@ FUN_02302CE0: ; 0x02302CE0 ldr r1, [r0] mov r0, #7 str r2, [r1, #0x3c] - bl FUN_02302850 + bl ov11_02302850 ldmdb sp!, {r3, r4, r5, pc} .align 2, 0 _02302D84: .word 0x02322740 _02302D88: .word 0x02324D4C - arm_func_end FUN_02302CE0 + arm_func_end ov11_02302CE0 _02302D8C: .byte 0x08, 0x40, 0x2D, 0xE9 .byte 0x1C, 0x00, 0x9F, 0xE5, 0x04, 0x00, 0x90, 0xE5, 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x08 @@ -44263,8 +44263,8 @@ _02302D8C: .byte 0x50, 0x27, 0x32, 0x02, 0x11, 0x00, 0x30, 0x00, 0xC9, 0x02, 0x00, 0x00, 0x60, 0x27, 0x32, 0x02 .byte 0x13, 0x00, 0x30, 0x00, 0x98, 0x27, 0x32, 0x02 - arm_func_start FUN_02303208 -FUN_02303208: ; 0x02303208 + arm_func_start ov11_02303208 +ov11_02303208: ; 0x02303208 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, _023032B4 ; =0x02322770 @@ -44314,10 +44314,10 @@ _023032B4: .word 0x02322770 _023032B8: .word 0x02324D4C _023032BC: .word 0x00000498 _023032C0: .word 0x02322734 - arm_func_end FUN_02303208 + arm_func_end ov11_02303208 - arm_func_start FUN_023032C4 -FUN_023032C4: ; 0x023032C4 + arm_func_start ov11_023032C4 +ov11_023032C4: ; 0x023032C4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r4, r0 @@ -44390,7 +44390,7 @@ _02303390: cmp r8, #0x1e blt _02303390 mov r0, #0 - bl FUN_023035C0 + bl ov11_023035C0 mov r0, #1 add sp, sp, #4 ldmdb sp!, {r3, r4, r5, r6, r7, r8, pc} @@ -44398,7 +44398,7 @@ _02303390: _023033F0: .word 0x02324D54 _023033F4: .word 0x0000C402 _023033F8: .word 0x023227B0 - arm_func_end FUN_023032C4 + arm_func_end ov11_023032C4 _023033FC: .byte 0x08, 0x40, 0x2D, 0xE9 .byte 0xB4, 0x01, 0x9F, 0xE5, 0x00, 0x20, 0x90, 0xE5, 0x00, 0x10, 0x92, 0xE5, 0x0C, 0x00, 0x51, 0xE3 @@ -44430,8 +44430,8 @@ _023033FC: .byte 0x7D, 0x1C, 0xC0, 0xE5, 0x10, 0x00, 0x9F, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x08, 0x00, 0x90, 0xE5 .byte 0x02, 0x00, 0x00, 0xEB, 0x00, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x54, 0x4D, 0x32, 0x02 - arm_func_start FUN_023035C0 -FUN_023035C0: ; 0x023035C0 + arm_func_start ov11_023035C0 +ov11_023035C0: ; 0x023035C0 stmdb sp!, {r3, lr} sub sp, sp, #0xa0 ldr r1, _02303724 ; =0x02324D54 @@ -44527,7 +44527,7 @@ _02303700: mov r1, #1 ldr r0, [r0] str r1, [r0] - bl FUN_0230377C + bl ov11_0230377C _0230371C: add sp, sp, #0xa0 ldmdb sp!, {r3, pc} @@ -44543,7 +44543,7 @@ _02303740: .word 0x02322828 _02303744: .word 0x02322850 _02303748: .word 0x0232287C _0230374C: .word 0x02322894 - arm_func_end FUN_023035C0 + arm_func_end ov11_023035C0 arm_func_start ov11_02303750 ov11_02303750: ; 0x02303750 @@ -44561,8 +44561,8 @@ ov11_02303750: ; 0x02303750 _02303778: .word 0x02324D54 arm_func_end ov11_02303750 - arm_func_start FUN_0230377C -FUN_0230377C: ; 0x0230377C + arm_func_start ov11_0230377C +ov11_0230377C: ; 0x0230377C stmdb sp!, {r3, lr} sub sp, sp, #0xa0 ldr r0, _023038D8 ; =0x02324D54 @@ -44656,7 +44656,7 @@ _023038B4: mov r1, #1 ldr r0, [r0] str r1, [r0] - bl FUN_0230377C + bl ov11_0230377C _023038D0: add sp, sp, #0xa0 ldmdb sp!, {r3, pc} @@ -44672,7 +44672,7 @@ _023038F4: .word 0x02322828 _023038F8: .word 0x02322850 _023038FC: .word 0x0232287C _02303900: .word 0x02322894 - arm_func_end FUN_0230377C + arm_func_end ov11_0230377C _02303904: .byte 0x08, 0x40, 0x2D, 0xE9, 0x1C, 0x00, 0x9F, 0xE5, 0x00, 0x00, 0x90, 0xE5 .byte 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x08, 0x1A, 0xF6, 0xF3, 0xEB, 0x08, 0x00, 0x9F, 0xE5 @@ -44686,8 +44686,8 @@ _02303904: .byte 0x18, 0x00, 0x91, 0xE5, 0x3C, 0x8D, 0xFF, 0xEB, 0x04, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8 .byte 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x54, 0x4D, 0x32, 0x02 - arm_func_start FUN_023039AC -FUN_023039AC: ; 0x023039AC + arm_func_start ov11_023039AC +ov11_023039AC: ; 0x023039AC stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _023039D0 ; =0x023227C8 @@ -44695,11 +44695,11 @@ FUN_023039AC: ; 0x023039AC cmp r0, #0 ldmeqdb sp!, {r4, pc} mov r0, r4 - bl FUN_023032C4 + bl ov11_023032C4 ldmdb sp!, {r4, pc} .align 2, 0 _023039D0: .word 0x023227C8 - arm_func_end FUN_023039AC + arm_func_end ov11_023039AC arm_func_start ov11_023039D4 ov11_023039D4: ; 0x023039D4 @@ -44766,7 +44766,7 @@ _02303A20: str r2, [r0, #8] ldr r0, [r1, #4] ldr r0, [r0, #8] - bl FUN_02303BC0 + bl ov11_02303BC0 ldr r0, _02303AF8 ; =0x02324D58 ldr r0, [r0, #4] add r0, r0, #0x1bc @@ -44784,8 +44784,8 @@ _02303AFC: .word 0x023228E0 _02303B00: .word ov11_023042A8 arm_func_end ov11_023039D4 - arm_func_start FUN_02303B04 -FUN_02303B04: ; 0x02303B04 + arm_func_start ov11_02303B04 +ov11_02303B04: ; 0x02303B04 stmdb sp!, {r3, lr} ldr r0, _02303B4C ; =0x02324D58 ldr r0, [r0, #4] @@ -44806,7 +44806,7 @@ FUN_02303B04: ; 0x02303B04 ldmdb sp!, {r3, pc} .align 2, 0 _02303B4C: .word 0x02324D58 - arm_func_end FUN_02303B04 + arm_func_end ov11_02303B04 _02303B50: .byte 0x08, 0x40, 0x2D, 0xE9, 0x60, 0x00, 0x9F, 0xE5, 0x04, 0x20, 0x90, 0xE5, 0x04, 0x10, 0x92, 0xE5 .byte 0x00, 0x00, 0x51, 0xE3, 0x04, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x51, 0xE3, 0x10, 0x00, 0x00, 0x0A @@ -44816,8 +44816,8 @@ _02303B50: .byte 0xE8, 0x00, 0x92, 0xE5, 0xE4, 0x20, 0x92, 0xE5, 0x32, 0xFF, 0x2F, 0xE1, 0x04, 0x00, 0xA0, 0xE3 .byte 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x58, 0x4D, 0x32, 0x02 - arm_func_start FUN_02303BC0 -FUN_02303BC0: ; 0x02303BC0 + arm_func_start ov11_02303BC0 +ov11_02303BC0: ; 0x02303BC0 stmdb sp!, {r3, lr} ldr r1, _02303D68 ; =0x02324D58 ldr r2, [r1, #4] @@ -44938,7 +44938,7 @@ _02303D70: .word 0x023228D0 _02303D74: .word 0x023228F0 _02303D78: .word 0x02322910 _02303D7C: .word 0x0000FFF2 - arm_func_end FUN_02303BC0 + arm_func_end ov11_02303BC0 arm_func_start ov11_02303D80 ov11_02303D80: ; 0x02303D80 @@ -45271,7 +45271,7 @@ _0230422C: ldr r0, [r0, #0x14] cmp r0, #1 bne _02304248 - bl FUN_02303B04 + bl ov11_02303B04 _02304248: mvn r0, #0 b _02304290 @@ -45280,7 +45280,7 @@ _02304250: str r1, [r2, #8] ldr r0, [r0, #4] ldr r0, [r0, #8] - bl FUN_02303BC0 + bl ov11_02303BC0 b _0230428C _02304268: ldrsb r0, [r2, #2] @@ -45377,15 +45377,15 @@ _023043A0: .word 0x023229B8 _023043A4: .word 0x0000C402 arm_func_end ov11_023042A8 - arm_func_start FUN_023043A8 -FUN_023043A8: ; 0x023043A8 + arm_func_start ov11_023043A8 +ov11_023043A8: ; 0x023043A8 ldr ip, _023043B4 ; =sub_020348E4 ldr r0, _023043B8 ; =0x023229DC bx ip .align 2, 0 _023043B4: .word sub_020348E4 _023043B8: .word 0x023229DC - arm_func_end FUN_023043A8 + arm_func_end ov11_023043A8 _023043BC: .byte 0x08, 0x40, 0x2D, 0xE9 .byte 0x08, 0x00, 0xA0, 0xE3, 0x00, 0x10, 0xA0, 0xE1, 0x68, 0xF3, 0xF3, 0xEB, 0x10, 0x10, 0x9F, 0xE5 @@ -45426,15 +45426,15 @@ _02304414: .byte 0x04, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8 .byte 0x6C, 0x4D, 0x32, 0x02 - arm_func_start FUN_02304514 -FUN_02304514: ; 0x02304514 + arm_func_start ov11_02304514 +ov11_02304514: ; 0x02304514 ldr ip, _02304520 ; =sub_020348E4 ldr r0, _02304524 ; =0x023229EC bx ip .align 2, 0 _02304520: .word sub_020348E4 _02304524: .word 0x023229EC - arm_func_end FUN_02304514 + arm_func_end ov11_02304514 _02304528: .byte 0x08, 0x40, 0x2D, 0xE9, 0x0C, 0x00, 0xA0, 0xE3 .byte 0x08, 0x10, 0xA0, 0xE3, 0x0D, 0xF3, 0xF3, 0xEB, 0x10, 0x10, 0x9F, 0xE5, 0x00, 0x20, 0xA0, 0xE3 @@ -45511,8 +45511,8 @@ _02304658: _02304660: .word 0x02324D70 arm_func_end ov11_02304580 - arm_func_start FUN_02304664 -FUN_02304664: ; 0x02304664 + arm_func_start ov11_02304664 +ov11_02304664: ; 0x02304664 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _02304684 ; =0x023229FC @@ -45524,7 +45524,7 @@ FUN_02304664: ; 0x02304664 .align 2, 0 _02304684: .word 0x023229FC _02304688: .word 0x0238A084 - arm_func_end FUN_02304664 + arm_func_end ov11_02304664 _0230468C: .byte 0x08, 0x40, 0x2D, 0xE9 .byte 0x0C, 0x00, 0xA0, 0xE3, 0x08, 0x10, 0xA0, 0xE3, 0xB4, 0xF2, 0xF3, 0xEB, 0x10, 0x10, 0x9F, 0xE5 @@ -45771,8 +45771,8 @@ _02304CA0: _02304CA8: .word 0x02324D80 arm_func_end ov11_02304C30 - arm_func_start FUN_02304CAC -FUN_02304CAC: ; 0x02304CAC + arm_func_start ov11_02304CAC +ov11_02304CAC: ; 0x02304CAC stmdb sp!, {r3, r4, r5, lr} ldr r2, _02304D8C ; =0x02324D84 mov r5, r0 @@ -45834,7 +45834,7 @@ _02304D50: .align 2, 0 _02304D8C: .word 0x02324D84 _02304D90: .word 0x000004C4 - arm_func_end FUN_02304CAC + arm_func_end ov11_02304CAC _02304D94: .byte 0x10, 0x40, 0x2D, 0xE9, 0x24, 0xC0, 0x9F, 0xE5, 0x02, 0x30, 0xA0, 0xE1 .byte 0x00, 0x20, 0x9C, 0xE5, 0x00, 0xE0, 0xA0, 0xE3, 0x01, 0xC0, 0x82, 0xE0, 0x01, 0x20, 0xA0, 0xE3 @@ -52577,8 +52577,8 @@ _0230AE7C: .word 0x02322F98 _0230AE80: .word 0x0230AF38 arm_func_end ov11_0230AE10 - arm_func_start FUN_0230AE84 -FUN_0230AE84: ; 0x0230AE84 + arm_func_start ov11_0230AE84 +ov11_0230AE84: ; 0x0230AE84 stmdb sp!, {r3, lr} ldr r0, _0230AECC ; =0x02324DA0 ldr r0, [r0] @@ -52600,10 +52600,10 @@ _0230AEC4: ldmdb sp!, {r3, pc} .align 2, 0 _0230AECC: .word 0x02324DA0 - arm_func_end FUN_0230AE84 + arm_func_end ov11_0230AE84 - arm_func_start FUN_0230AED0 -FUN_0230AED0: ; 0x0230AED0 + arm_func_start ov11_0230AED0 +ov11_0230AED0: ; 0x0230AED0 stmdb sp!, {r3, lr} ldr r0, _0230AF08 ; =0x02324DA0 ldr r0, [r0] @@ -52620,10 +52620,10 @@ FUN_0230AED0: ; 0x0230AED0 ldmdb sp!, {r3, pc} .align 2, 0 _0230AF08: .word 0x02324DA0 - arm_func_end FUN_0230AED0 + arm_func_end ov11_0230AED0 - arm_func_start FUN_0230AF0C -FUN_0230AF0C: ; 0x0230AF0C + arm_func_start ov11_0230AF0C +ov11_0230AF0C: ; 0x0230AF0C ldr r1, _0230AF30 ; =0x02324DA0 ldr r2, [r0] ldr r3, [r1] @@ -52636,7 +52636,7 @@ FUN_0230AF0C: ; 0x0230AF0C .align 2, 0 _0230AF30: .word 0x02324DA0 _0230AF34: .word sub_02047188 - arm_func_end FUN_0230AF0C + arm_func_end ov11_0230AF0C _0230AF38: .byte 0xF0, 0x4F, 0x2D, 0xE9, 0x57, 0xDF, 0x4D, 0xE2 .byte 0x94, 0x12, 0x9F, 0xE5, 0x00, 0x70, 0xA0, 0xE1, 0x00, 0x60, 0x91, 0xE5, 0x0A, 0x00, 0x8D, 0xE2 @@ -52733,8 +52733,8 @@ _0230B2A8: ; jump table b _0230B308 ; case 2 b _0230B428 ; case 3 _0230B2B8: - bl FUN_0230C3CC - bl FUN_0230C61C + bl ov11_0230C3CC + bl ov11_0230C61C mov r0, sb ldr r0, [r0, #4] add r0, r0, #0xe6 @@ -52747,7 +52747,7 @@ _0230B2B8: strh r1, [r0, #0x34] b _0230B474 _0230B2EC: - bl FUN_0230C4D4 + bl ov11_0230C4D4 mov r0, sb ldr r0, [r0, #4] ldr r1, _0230B678 ; =0x000003A7 @@ -52866,7 +52866,7 @@ _0230B474: add sb, r0, #0x1400 ldrh r0, [sb, r8] add sl, sb, r8 - bl FUN_0230C9EC + bl ov11_0230C9EC ldr r1, _0230B664 ; =0x02324DA4 str r0, [sp, #0x18] ldrh r0, [r1] @@ -52913,7 +52913,7 @@ _0230B538: mla r0, r1, r0, r2 add r0, r0, #0x1400 ldrh r0, [r0, #0xe6] - bl FUN_0230C9EC + bl ov11_0230C9EC mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 cmp r0, #1 @@ -52980,8 +52980,8 @@ _0230B5A8: add r0, r0, #0x1400 ldrsb r0, [r0, #0xe4] bl sub_0202C7BC - bl FUN_0230CAA4 - bl FUN_0230C9F8 + bl ov11_0230CAA4 + bl ov11_0230C9F8 _0230B65C: add sp, sp, #0x20 ldmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -53025,7 +53025,7 @@ ov11_0230B724: ; 0x0230B724 str r0, [r1, #4] _0230B74C: bl ov11_0230BF98 - bl FUN_0230C4D4 + bl ov11_0230C4D4 ldr r0, _0230B784 ; =0x02324DA4 ldr r0, [r0, #4] add r1, r0, #0x4600 @@ -53112,8 +53112,8 @@ ov11_0230B8C0: ; 0x0230B8C0 _0230B910: .word 0x02324DA4 arm_func_end ov11_0230B8C0 - arm_func_start FUN_0230B914 -FUN_0230B914: ; 0x0230B914 + arm_func_start ov11_0230B914 +ov11_0230B914: ; 0x0230B914 stmdb sp!, {r3, lr} ldr r0, _0230B954 ; =0x02324DA4 ldr r0, [r0, #4] @@ -53128,14 +53128,14 @@ FUN_0230B914: ; 0x0230B914 mla r0, r1, r0, r2 add r0, r0, #0x1400 ldrh r0, [r0, #0xe6] - bl FUN_0230C9EC + bl ov11_0230C9EC ldmdb sp!, {r3, pc} .align 2, 0 _0230B954: .word 0x02324DA4 - arm_func_end FUN_0230B914 + arm_func_end ov11_0230B914 - arm_func_start FUN_0230B958 -FUN_0230B958: ; 0x0230B958 + arm_func_start ov11_0230B958 +ov11_0230B958: ; 0x0230B958 stmdb sp!, {r3, lr} ldr r0, _0230B9B8 ; =0x02324DA4 ldr r0, [r0, #4] @@ -53162,7 +53162,7 @@ FUN_0230B958: ; 0x0230B958 ldmdb sp!, {r3, pc} .align 2, 0 _0230B9B8: .word 0x02324DA4 - arm_func_end FUN_0230B958 + arm_func_end ov11_0230B958 arm_func_start ov11_0230B9BC ov11_0230B9BC: ; 0x0230B9BC @@ -53171,8 +53171,8 @@ ov11_0230B9BC: ; 0x0230B9BC ldr r0, [r0, #4] cmp r0, #0 ldmeqdb sp!, {r3, pc} - bl FUN_0230AED0 - bl FUN_0230CAE4 + bl ov11_0230AED0 + bl ov11_0230CAE4 bl ov11_0230CA38 ldr r0, _0230BA60 ; =0x02324DA4 ldr r0, [r0, #4] @@ -53226,22 +53226,22 @@ ov11_0230BA64: ; 0x0230BA64 ldrsb r0, [r0, #0xe4] bl sub_0202D0EC mov r5, r0 - bl FUN_0230AE84 + bl ov11_0230AE84 cmp r0, #0 addne r0, r4, #0x4600 ldrneh r0, [r0, #0xd0] cmpne r0, r5 beq _0230BAD8 - bl FUN_0230B914 + bl ov11_0230B914 mov r1, r5, lsl #0x10 str r0, [sp] mov r0, r1, lsr #0x10 bl ov11_0230C970 strh r0, [sp, #4] - bl FUN_0230B958 + bl ov11_0230B958 strh r0, [sp, #6] add r0, sp, #0 - bl FUN_0230AF0C + bl ov11_0230AF0C add r0, r4, #0x4600 strh r5, [r0, #0xd0] _0230BAD8: @@ -53339,8 +53339,8 @@ _0230BC00: add r0, r0, #0x1400 ldrsb r0, [r0, #0xe4] bl sub_0202C7BC - bl FUN_0230CAA4 - bl FUN_0230C9F8 + bl ov11_0230CAA4 + bl ov11_0230C9F8 ldr r0, _0230BCD8 ; =0x02324DA4 ldr r4, [r0, #4] ldr r0, [r4] @@ -53797,8 +53797,8 @@ _0230C3C4: .word 0x020AF6B8 _0230C3C8: .word 0x00000547 arm_func_end ov00_0230C1D0 - arm_func_start FUN_0230C3CC -FUN_0230C3CC: ; 0x0230C3CC + arm_func_start ov11_0230C3CC +ov11_0230C3CC: ; 0x0230C3CC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bl GetCurrentBagCapacity mov r7, r0 @@ -53829,7 +53829,7 @@ _0230C3FC: bgt _0230C44C ldrh r1, [r1, #2] mov r2, sb - bl FUN_0230C5A0 + bl ov11_0230C5A0 cmp r0, #0 addne sb, sb, #1 _0230C44C: @@ -53855,7 +53855,7 @@ _0230C468: add r1, r1, #0xb00 ldrh r1, [r1, #0x5a] mov r2, sb - bl FUN_0230C5A0 + bl ov11_0230C5A0 cmp r0, #0 addne sb, sb, #1 _0230C4A8: @@ -53873,10 +53873,10 @@ _0230C4B4: _0230C4C8: .word 0x020AF6B8 _0230C4CC: .word 0x000003F5 _0230C4D0: .word 0x02324DA4 - arm_func_end FUN_0230C3CC + arm_func_end ov11_0230C3CC - arm_func_start FUN_0230C4D4 -FUN_0230C4D4: ; 0x0230C4D4 + arm_func_start ov11_0230C4D4 +ov11_0230C4D4: ; 0x0230C4D4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bl GetCurrentBagCapacity mov r8, #0 @@ -53932,10 +53932,10 @@ _0230C578: _0230C594: .word 0x020AF6B8 _0230C598: .word 0x02324DA4 _0230C59C: .word 0x0000018F - arm_func_end FUN_0230C4D4 + arm_func_end ov11_0230C4D4 - arm_func_start FUN_0230C5A0 -FUN_0230C5A0: ; 0x0230C5A0 + arm_func_start ov11_0230C5A0 +ov11_0230C5A0: ; 0x0230C5A0 stmdb sp!, {r4, lr} cmp r2, #0 beq _0230C5EC @@ -53971,10 +53971,10 @@ _0230C5EC: ldmdb sp!, {r4, pc} .align 2, 0 _0230C618: .word 0x02324DA4 - arm_func_end FUN_0230C5A0 + arm_func_end ov11_0230C5A0 - arm_func_start FUN_0230C61C -FUN_0230C61C: ; 0x0230C61C + arm_func_start ov11_0230C61C +ov11_0230C61C: ; 0x0230C61C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r4, _0230C8DC ; =0x000001FA mov r5, #0 @@ -54177,7 +54177,7 @@ _0230C900: .word 0x000001C5 _0230C904: .word 0x000001C6 _0230C908: .word 0x000001C7 _0230C90C: .word 0x000003F6 - arm_func_end FUN_0230C61C + arm_func_end ov11_0230C61C arm_func_start ov11_0230C910 ov11_0230C910: ; 0x0230C910 @@ -54253,15 +54253,15 @@ _0230C9E0: _0230C9E8: .word 0x02324DA4 arm_func_end ov11_0230C970 - arm_func_start FUN_0230C9EC -FUN_0230C9EC: ; 0x0230C9EC + arm_func_start ov11_0230C9EC +ov11_0230C9EC: ; 0x0230C9EC cmp r0, #4 moveq r0, #4 bx lr - arm_func_end FUN_0230C9EC + arm_func_end ov11_0230C9EC - arm_func_start FUN_0230C9F8 -FUN_0230C9F8: ; 0x0230C9F8 + arm_func_start ov11_0230C9F8 +ov11_0230C9F8: ; 0x0230C9F8 stmdb sp!, {r3, lr} ldr r0, _0230CA2C ; =0x02324DA4 ldr r1, [r0, #4] @@ -54279,7 +54279,7 @@ FUN_0230C9F8: ; 0x0230C9F8 _0230CA2C: .word 0x02324DA4 _0230CA30: .word 0x02322FF4 _0230CA34: .word 0x0230CA7C - arm_func_end FUN_0230C9F8 + arm_func_end ov11_0230C9F8 arm_func_start ov11_0230CA38 ov11_0230CA38: ; 0x0230CA38 @@ -54308,8 +54308,8 @@ _0230CA7C: .byte 0xF4, 0x65, 0xF4, 0xEB, 0x04, 0x00, 0xA0, 0xE1, 0x14, 0x6C, 0xF4, 0xEB, 0x10, 0x80, 0xBD, 0xE8 .byte 0xA9, 0x03, 0x00, 0x00 - arm_func_start FUN_0230CAA4 -FUN_0230CAA4: ; 0x0230CAA4 + arm_func_start ov11_0230CAA4 +ov11_0230CAA4: ; 0x0230CAA4 stmdb sp!, {r3, lr} ldr r0, _0230CAD8 ; =0x02324DA4 ldr r1, [r0, #4] @@ -54327,10 +54327,10 @@ FUN_0230CAA4: ; 0x0230CAA4 _0230CAD8: .word 0x02324DA4 _0230CADC: .word 0x02322FD4 _0230CAE0: .word 0x0230CB28 - arm_func_end FUN_0230CAA4 + arm_func_end ov11_0230CAA4 - arm_func_start FUN_0230CAE4 -FUN_0230CAE4: ; 0x0230CAE4 + arm_func_start ov11_0230CAE4 +ov11_0230CAE4: ; 0x0230CAE4 stmdb sp!, {r3, lr} ldr r0, _0230CB24 ; =0x02324DA4 ldr r1, [r0, #4] @@ -54349,7 +54349,7 @@ FUN_0230CAE4: ; 0x0230CAE4 ldmdb sp!, {r3, pc} .align 2, 0 _0230CB24: .word 0x02324DA4 - arm_func_end FUN_0230CAE4 + arm_func_end ov11_0230CAE4 _0230CB28: .byte 0x18, 0x40, 0x2D, 0xE9, 0x54, 0xD0, 0x4D, 0xE2 .byte 0x00, 0x40, 0xA0, 0xE1, 0x04, 0x00, 0x8D, 0xE2, 0xD4, 0x5A, 0xF4, 0xEB, 0x4C, 0xFB, 0xFF, 0xEB @@ -54374,28 +54374,28 @@ ov11_0230CB88: ; 0x0230CB88 _0230CBAC: .word 0x0232306C arm_func_end ov11_0230CB88 - arm_func_start FUN_0230CBB0 -FUN_0230CBB0: ; 0x0230CBB0 + arm_func_start ov11_0230CBB0 +ov11_0230CBB0: ; 0x0230CBB0 ldr ip, _0230CBBC ; =sub_020348E4 ldr r0, _0230CBC0 ; =0x0232307C bx ip .align 2, 0 _0230CBBC: .word sub_020348E4 _0230CBC0: .word 0x0232307C - arm_func_end FUN_0230CBB0 + arm_func_end ov11_0230CBB0 - arm_func_start FUN_0230CBC4 -FUN_0230CBC4: ; 0x0230CBC4 + arm_func_start ov11_0230CBC4 +ov11_0230CBC4: ; 0x0230CBC4 ldr ip, _0230CBD0 ; =sub_020348E4 ldr r0, _0230CBD4 ; =0x0232308C bx ip .align 2, 0 _0230CBD0: .word sub_020348E4 _0230CBD4: .word 0x0232308C - arm_func_end FUN_0230CBC4 + arm_func_end ov11_0230CBC4 - arm_func_start FUN_0230CBD8 -FUN_0230CBD8: ; 0x0230CBD8 + arm_func_start ov11_0230CBD8 +ov11_0230CBD8: ; 0x0230CBD8 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _0230CBF8 ; =0x0232309C @@ -54407,10 +54407,10 @@ FUN_0230CBD8: ; 0x0230CBD8 .align 2, 0 _0230CBF8: .word 0x0232309C _0230CBFC: .word 0x0238A08C - arm_func_end FUN_0230CBD8 + arm_func_end ov11_0230CBD8 - arm_func_start FUN_0230CC00 -FUN_0230CC00: ; 0x0230CC00 + arm_func_start ov11_0230CC00 +ov11_0230CC00: ; 0x0230CC00 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _0230CC20 ; =0x023230AC @@ -54422,10 +54422,10 @@ FUN_0230CC00: ; 0x0230CC00 .align 2, 0 _0230CC20: .word 0x023230AC _0230CC24: .word 0x0238A090 - arm_func_end FUN_0230CC00 + arm_func_end ov11_0230CC00 - arm_func_start FUN_0230CC28 -FUN_0230CC28: ; 0x0230CC28 + arm_func_start ov11_0230CC28 +ov11_0230CC28: ; 0x0230CC28 stmdb sp!, {r3, lr} ldr r0, _0230CC44 ; =0x023230CC bl sub_020348E4 @@ -54436,10 +54436,10 @@ FUN_0230CC28: ; 0x0230CC28 .align 2, 0 _0230CC44: .word 0x023230CC _0230CC48: .word 0x02324DAC - arm_func_end FUN_0230CC28 + arm_func_end ov11_0230CC28 - arm_func_start FUN_0230CC4C -FUN_0230CC4C: ; 0x0230CC4C + arm_func_start ov11_0230CC4C +ov11_0230CC4C: ; 0x0230CC4C stmdb sp!, {r3, lr} ldr r0, _0230CC68 ; =0x023230BC bl sub_020348E4 @@ -54450,12 +54450,12 @@ FUN_0230CC4C: ; 0x0230CC4C .align 2, 0 _0230CC68: .word 0x023230BC _0230CC6C: .word 0x02324DAC - arm_func_end FUN_0230CC4C + arm_func_end ov11_0230CC4C _0230CC70: .byte 0x04, 0x00, 0x9F, 0xE5, 0x00, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0xAC, 0x4D, 0x32, 0x02 - arm_func_start FUN_0230CC80 -FUN_0230CC80: ; 0x0230CC80 + arm_func_start ov11_0230CC80 +ov11_0230CC80: ; 0x0230CC80 stmdb sp!, {r3, lr} bl sub_020017EC ldr r0, _0230CCA0 ; =0x023230EC @@ -54467,10 +54467,10 @@ FUN_0230CC80: ; 0x0230CC80 .align 2, 0 _0230CCA0: .word 0x023230EC _0230CCA4: .word 0x02324DB4 - arm_func_end FUN_0230CC80 + arm_func_end ov11_0230CC80 - arm_func_start FUN_0230CCA8 -FUN_0230CCA8: ; 0x0230CCA8 + arm_func_start ov11_0230CCA8 +ov11_0230CCA8: ; 0x0230CCA8 stmdb sp!, {r3, lr} ldr r0, _0230CCD4 ; =0x023230EC bl sub_02034840 @@ -54487,7 +54487,7 @@ _0230CCC4: _0230CCD4: .word 0x023230EC _0230CCD8: .word 0x023230DC _0230CCDC: .word 0x02324DB4 - arm_func_end FUN_0230CCA8 + arm_func_end ov11_0230CCA8 _0230CCE0: .byte 0x04, 0x00, 0x9F, 0xE5, 0x00, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0xB4, 0x4D, 0x32, 0x02 .byte 0x10, 0x40, 0x2D, 0xE9, 0x40, 0x10, 0x9F, 0xE5, 0x00, 0x40, 0xA0, 0xE1, 0x00, 0x00, 0xD1, 0xE5 @@ -54497,18 +54497,18 @@ _0230CCE0: .byte 0x10, 0x80, 0xBD, 0xE8, 0x00, 0x00, 0xA0, 0xE3, 0x10, 0x80, 0xBD, 0xE8, 0xB4, 0x4D, 0x32, 0x02 .byte 0x98, 0xA0, 0x38, 0x02, 0x94, 0xA0, 0x38, 0x02 - arm_func_start FUN_0230CD48 -FUN_0230CD48: ; 0x0230CD48 + arm_func_start ov11_0230CD48 +ov11_0230CD48: ; 0x0230CD48 ldr ip, _0230CD54 ; =sub_020348E4 ldr r0, _0230CD58 ; =0x023230FC bx ip .align 2, 0 _0230CD54: .word sub_020348E4 _0230CD58: .word 0x023230FC - arm_func_end FUN_0230CD48 + arm_func_end ov11_0230CD48 - arm_func_start FUN_0230CD5C -FUN_0230CD5C: ; 0x0230CD5C + arm_func_start ov11_0230CD5C +ov11_0230CD5C: ; 0x0230CD5C stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _0230CD7C ; =0x0232310C @@ -54520,10 +54520,10 @@ FUN_0230CD5C: ; 0x0230CD5C .align 2, 0 _0230CD7C: .word 0x0232310C _0230CD80: .word 0x0238A130 - arm_func_end FUN_0230CD5C + arm_func_end ov11_0230CD5C - arm_func_start FUN_0230CD84 -FUN_0230CD84: ; 0x0230CD84 + arm_func_start ov11_0230CD84 +ov11_0230CD84: ; 0x0230CD84 ldr r1, _0230CD98 ; =0x0238A134 ldr ip, _0230CD9C ; =sub_020348E4 str r0, [r1] @@ -54533,37 +54533,37 @@ FUN_0230CD84: ; 0x0230CD84 _0230CD98: .word 0x0238A134 _0230CD9C: .word sub_020348E4 _0230CDA0: .word 0x0232311C - arm_func_end FUN_0230CD84 + arm_func_end ov11_0230CD84 - arm_func_start FUN_0230CDA4 -FUN_0230CDA4: ; 0x0230CDA4 + arm_func_start ov11_0230CDA4 +ov11_0230CDA4: ; 0x0230CDA4 ldr ip, _0230CDB0 ; =sub_020348E4 ldr r0, _0230CDB4 ; =0x0232312C bx ip .align 2, 0 _0230CDB0: .word sub_020348E4 _0230CDB4: .word 0x0232312C - arm_func_end FUN_0230CDA4 + arm_func_end ov11_0230CDA4 - arm_func_start FUN_0230CDB8 -FUN_0230CDB8: ; 0x0230CDB8 + arm_func_start ov11_0230CDB8 +ov11_0230CDB8: ; 0x0230CDB8 ldr ip, _0230CDC4 ; =sub_020348E4 ldr r0, _0230CDC8 ; =0x0232313C bx ip .align 2, 0 _0230CDC4: .word sub_020348E4 _0230CDC8: .word 0x0232313C - arm_func_end FUN_0230CDB8 + arm_func_end ov11_0230CDB8 - arm_func_start FUN_0230CDCC -FUN_0230CDCC: ; 0x0230CDCC + arm_func_start ov11_0230CDCC +ov11_0230CDCC: ; 0x0230CDCC ldr ip, _0230CDD8 ; =sub_020348E4 ldr r0, _0230CDDC ; =0x0232314C bx ip .align 2, 0 _0230CDD8: .word sub_020348E4 _0230CDDC: .word 0x0232314C - arm_func_end FUN_0230CDCC + arm_func_end ov11_0230CDCC arm_func_start ov11_0230CDE0 ov11_0230CDE0: ; 0x0230CDE0 @@ -54575,55 +54575,55 @@ _0230CDEC: .word sub_020348E4 _0230CDF0: .word 0x0232315C arm_func_end ov11_0230CDE0 - arm_func_start FUN_0230CDF4 -FUN_0230CDF4: ; 0x0230CDF4 + arm_func_start ov11_0230CDF4 +ov11_0230CDF4: ; 0x0230CDF4 ldr ip, _0230CE00 ; =sub_020348E4 ldr r0, _0230CE04 ; =0x0232316C bx ip .align 2, 0 _0230CE00: .word sub_020348E4 _0230CE04: .word 0x0232316C - arm_func_end FUN_0230CDF4 + arm_func_end ov11_0230CDF4 - arm_func_start FUN_0230CE08 -FUN_0230CE08: ; 0x0230CE08 + arm_func_start ov11_0230CE08 +ov11_0230CE08: ; 0x0230CE08 ldr ip, _0230CE14 ; =sub_020348E4 ldr r0, _0230CE18 ; =0x0232317C bx ip .align 2, 0 _0230CE14: .word sub_020348E4 _0230CE18: .word 0x0232317C - arm_func_end FUN_0230CE08 + arm_func_end ov11_0230CE08 - arm_func_start FUN_0230CE1C -FUN_0230CE1C: ; 0x0230CE1C + arm_func_start ov11_0230CE1C +ov11_0230CE1C: ; 0x0230CE1C ldr ip, _0230CE28 ; =sub_020348E4 ldr r0, _0230CE2C ; =0x0232318C bx ip .align 2, 0 _0230CE28: .word sub_020348E4 _0230CE2C: .word 0x0232318C - arm_func_end FUN_0230CE1C + arm_func_end ov11_0230CE1C - arm_func_start FUN_0230CE30 -FUN_0230CE30: ; 0x0230CE30 + arm_func_start ov11_0230CE30 +ov11_0230CE30: ; 0x0230CE30 ldr ip, _0230CE3C ; =sub_020348E4 ldr r0, _0230CE40 ; =0x0232319C bx ip .align 2, 0 _0230CE3C: .word sub_020348E4 _0230CE40: .word 0x0232319C - arm_func_end FUN_0230CE30 + arm_func_end ov11_0230CE30 - arm_func_start FUN_0230CE44 -FUN_0230CE44: ; 0x0230CE44 + arm_func_start ov11_0230CE44 +ov11_0230CE44: ; 0x0230CE44 ldr ip, _0230CE50 ; =sub_020348E4 ldr r0, _0230CE54 ; =0x023231AC bx ip .align 2, 0 _0230CE50: .word sub_020348E4 _0230CE54: .word 0x023231AC - arm_func_end FUN_0230CE44 + arm_func_end ov11_0230CE44 _0230CE58: .byte 0x10, 0xC0, 0x9F, 0xE5, 0x00, 0x30, 0xA0, 0xE1 .byte 0x01, 0x20, 0xA0, 0xE1, 0x08, 0x00, 0x9F, 0xE5, 0x03, 0x10, 0xA0, 0xE1, 0x1C, 0xFF, 0x2F, 0xE1 diff --git a/asm/overlay_29.s b/asm/overlay_29.s index dc46868a..e8b1103e 100644 --- a/asm/overlay_29.s +++ b/asm/overlay_29.s @@ -75,7 +75,7 @@ ov29_022DC314: ; 0x022DC314 mov r5, r0 ldr r0, _022DC338 ; =0x0234FD14 mov r4, r1 - bl DebugPrint0 + bl DebugPrint0__0200C1FC mov r0, r5 mov r1, r4 bl sub_02008BF4 @@ -3438,7 +3438,7 @@ _022DEF94: bl ov29_022DDE00 ldr r0, _022DFF3C ; =0x023510C8 mov r1, #0x3e0 - bl DebugPrint0 + bl DebugPrint0__0200C1FC ldr r0, _022DFF40 ; =0x02353538 cmp r5, #0 str sb, [r0] @@ -32702,7 +32702,7 @@ ov29_022F740C: ; 0x022F740C mov r6, r1 add r1, r2, #0x114 add r5, r1, #0x19800 - bl GetSpriteIndex + bl GetSpriteIndex__020526EC mov r4, r0 mov r1, r7, lsl #1 mov r0, r7 @@ -32721,7 +32721,7 @@ ov29_022F740C: ; 0x022F740C ldmnedb sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 - bl GetSpriteIndex + bl GetSpriteIndex__020526EC cmp r4, r0 moveq r0, r7, lsl #1 ldreqsh r1, [r5, r0] @@ -32738,7 +32738,7 @@ _022F7490: ldmnedb sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 - bl GetSpriteIndex + bl GetSpriteIndex__020526EC cmp r4, r0 moveq r0, r7, lsl #1 ldreqsh r1, [r5, r0] @@ -32761,7 +32761,7 @@ ov29_022F74D4: ; 0x022F74D4 ldrsh r1, [r2, r1] cmp r1, #0 bne _022F75BC - bl GetSpriteIndex + bl GetSpriteIndex__020526EC mov r4, r0 mov r0, r6 bl IsShaymin @@ -32832,7 +32832,7 @@ ov29_022F75D4: ; 0x022F75D4 add r1, r1, #0x114 mov r0, r5 add r4, r1, #0x19800 - bl GetSpriteIndex + bl GetSpriteIndex__020526EC mov r1, #1 str r1, [sp] mov r1, r6, lsl #1 @@ -57586,17 +57586,17 @@ _0230C940: bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4A4 ; =0x02352984 - bl DebugPrint0 + bl DebugPrint0__0200C1FC add r0, sp, #0xa0 bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4A8 ; =0x02352990 - bl DebugPrint0 + bl DebugPrint0__0200C1FC add r0, sp, #0x98 bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4AC ; =0x0235299C - bl DebugPrint0 + bl DebugPrint0__0200C1FC ldr r1, _0230C4B0 ; =0x020A18F4 add r0, sp, #0x70 ldr r1, [r1] @@ -86043,7 +86043,7 @@ _023254C8: cmp fp, #0 beq _02325500 ldr r0, _0232561C ; =0x00000229 - bl GetSpriteIndex + bl GetSpriteIndex__02052708 mov r1, r0 mov r0, #1 bl ov29_022F6F68 @@ -86051,7 +86051,7 @@ _023254C8: b _02325530 _02325500: ldrsh r0, [r7, #4] - bl GetSpriteIndex + bl GetSpriteIndex__02052708 mov r1, r0 mov r0, #1 bl ov29_022F6F68 @@ -87568,13 +87568,13 @@ _023268B4: .word 0x00000ECE _023268B8: .word 0x00000ECF arm_func_end ov29_0232680C - arm_func_start FUN_023268BC -FUN_023268BC: ; 0x023268BC + arm_func_start ov29_023268BC +ov29_023268BC: ; 0x023268BC stmdb sp!, {r3, lr} bl ov29_02315D84 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_023268BC + arm_func_end ov29_023268BC arm_func_start ov29_023268CC ov29_023268CC: ; 0x023268CC @@ -88703,14 +88703,14 @@ ov29_023276E8: ; 0x023276E8 _02327740: .word 0x02352AE8 arm_func_end ov29_023276E8 - arm_func_start FUN_02327744 -FUN_02327744: ; 0x02327744 + arm_func_start ov29_02327744 +ov29_02327744: ; 0x02327744 stmdb sp!, {r3, lr} mov r2, #0 bl TryInflictShadowHoldStatus mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02327744 + arm_func_end ov29_02327744 arm_func_start ov29_02327758 ov29_02327758: ; 0x02327758 @@ -89067,13 +89067,13 @@ _02327BD8: .word 0x022C4604 _02327BDC: .word 0x02352AEC arm_func_end ov29_02327B5C - arm_func_start FUN_02327BE0 -FUN_02327BE0: ; 0x02327BE0 + arm_func_start ov29_02327BE0 +ov29_02327BE0: ; 0x02327BE0 stmdb sp!, {r3, lr} bl ov29_02319378 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02327BE0 + arm_func_end ov29_02327BE0 arm_func_start ov29_02327BF0 ov29_02327BF0: ; 0x02327BF0 @@ -89147,8 +89147,8 @@ ov29_02327C74: ; 0x02327C74 ldmdb sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_02327C74 - arm_func_start FUN_02327CD8 -FUN_02327CD8: ; 0x02327CD8 + arm_func_start ov29_02327CD8 +ov29_02327CD8: ; 0x02327CD8 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 @@ -89184,7 +89184,7 @@ _02327D4C: ldmdb sp!, {r4, r5, r6, lr} add sp, sp, #0x10 bx lr - arm_func_end FUN_02327CD8 + arm_func_end ov29_02327CD8 arm_func_start ov29_02327D60 ov29_02327D60: ; 0x02327D60 @@ -89220,13 +89220,13 @@ _02327DC0: _02327DCC: .word 0x02352AE8 arm_func_end ov29_02327D60 - arm_func_start FUN_02327DD0 -FUN_02327DD0: ; 0x02327DD0 + arm_func_start ov29_02327DD0 +ov29_02327DD0: ; 0x02327DD0 stmdb sp!, {r3, lr} bl TryInflictSleeplessStatus mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02327DD0 + arm_func_end ov29_02327DD0 arm_func_start ov29_02327DE0 ov29_02327DE0: ; 0x02327DE0 @@ -89666,13 +89666,13 @@ _02328384: _02328390: .word 0x022C465C arm_func_end ov29_02328328 - arm_func_start FUN_02328394 -FUN_02328394: ; 0x02328394 + arm_func_start ov29_02328394 +ov29_02328394: ; 0x02328394 stmdb sp!, {r3, lr} bl ov29_02318F10 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02328394 + arm_func_end ov29_02328394 arm_func_start ov29_023283A4 ov29_023283A4: ; 0x023283A4 @@ -89785,13 +89785,13 @@ _02328518: _02328524: .word 0x022C4448 arm_func_end ov29_023284BC - arm_func_start FUN_02328528 -FUN_02328528: ; 0x02328528 + arm_func_start ov29_02328528 +ov29_02328528: ; 0x02328528 stmdb sp!, {r3, lr} bl ov29_02318E70 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02328528 + arm_func_end ov29_02328528 arm_func_start ov29_02328538 ov29_02328538: ; 0x02328538 @@ -90172,8 +90172,8 @@ _02328A4C: .word 0x02353538 _02328A50: .word 0x00000EC6 arm_func_end ov29_023289F8 - arm_func_start FUN_02328A54 -FUN_02328A54: ; 0x02328A54 + arm_func_start ov29_02328A54 +ov29_02328A54: ; 0x02328A54 stmdb sp!, {r3, lr} ldr r2, _02328A70 ; =0x02352AEC mov r3, #1 @@ -90183,10 +90183,10 @@ FUN_02328A54: ; 0x02328A54 ldmdb sp!, {r3, pc} .align 2, 0 _02328A70: .word 0x02352AEC - arm_func_end FUN_02328A54 + arm_func_end ov29_02328A54 - arm_func_start FUN_02328A74 -FUN_02328A74: ; 0x02328A74 + arm_func_start ov29_02328A74 +ov29_02328A74: ; 0x02328A74 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -90216,10 +90216,10 @@ _02328AD0: ldmdb sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328ADC: .word 0x022C451C - arm_func_end FUN_02328A74 + arm_func_end ov29_02328A74 - arm_func_start FUN_02328AE0 -FUN_02328AE0: ; 0x02328AE0 + arm_func_start ov29_02328AE0 +ov29_02328AE0: ; 0x02328AE0 stmdb sp!, {r3, lr} ldr r2, _02328AFC ; =0x02352AE8 mov r3, #1 @@ -90229,10 +90229,10 @@ FUN_02328AE0: ; 0x02328AE0 ldmdb sp!, {r3, pc} .align 2, 0 _02328AFC: .word 0x02352AE8 - arm_func_end FUN_02328AE0 + arm_func_end ov29_02328AE0 - arm_func_start FUN_02328B00 -FUN_02328B00: ; 0x02328B00 + arm_func_start ov29_02328B00 +ov29_02328B00: ; 0x02328B00 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -90269,10 +90269,10 @@ _02328B78: ldmdb sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02328B84: .word 0x022C44A0 - arm_func_end FUN_02328B00 + arm_func_end ov29_02328B00 - arm_func_start FUN_02328B88 -FUN_02328B88: ; 0x02328B88 + arm_func_start ov29_02328B88 +ov29_02328B88: ; 0x02328B88 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r7, r2 @@ -90335,10 +90335,10 @@ _02328C64: .align 2, 0 _02328C6C: .word 0x00000ED7 _02328C70: .word 0x0000270F - arm_func_end FUN_02328B88 + arm_func_end ov29_02328B88 - arm_func_start FUN_02328C74 -FUN_02328C74: ; 0x02328C74 + arm_func_start ov29_02328C74 +ov29_02328C74: ; 0x02328C74 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r7, r0 @@ -90397,10 +90397,10 @@ _02328D30: .align 2, 0 _02328D3C: .word 0x022C48A4 _02328D40: .word 0x00000CD2 - arm_func_end FUN_02328C74 + arm_func_end ov29_02328C74 - arm_func_start FUN_02328D44 -FUN_02328D44: ; 0x02328D44 + arm_func_start ov29_02328D44 +ov29_02328D44: ; 0x02328D44 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x20 mov r5, #0 @@ -90442,10 +90442,10 @@ FUN_02328D44: ; 0x02328D44 ldmdb sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02328DE0: .word 0x022C4568 - arm_func_end FUN_02328D44 + arm_func_end ov29_02328D44 - arm_func_start FUN_02328DE4 -FUN_02328DE4: ; 0x02328DE4 + arm_func_start ov29_02328DE4 +ov29_02328DE4: ; 0x02328DE4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 @@ -90485,10 +90485,10 @@ _02328E64: .align 2, 0 _02328E6C: .word 0x022C48C0 _02328E70: .word 0x00000CD3 - arm_func_end FUN_02328DE4 + arm_func_end ov29_02328DE4 - arm_func_start FUN_02328E74 -FUN_02328E74: ; 0x02328E74 + arm_func_start ov29_02328E74 +ov29_02328E74: ; 0x02328E74 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r6, r2 @@ -90511,7 +90511,7 @@ FUN_02328E74: ; 0x02328E74 mov r0, #1 add sp, sp, #8 ldmdb sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end FUN_02328E74 + arm_func_end ov29_02328E74 arm_func_start ov29_02328ECC ov29_02328ECC: ; 0x02328ECC @@ -90776,8 +90776,8 @@ ov29_023291F4: ; 0x023291F4 _02329238: .word 0x000003E7 arm_func_end ov29_023291F4 - arm_func_start FUN_0232923C -FUN_0232923C: ; 0x0232923C + arm_func_start ov29_0232923C +ov29_0232923C: ; 0x0232923C stmdb sp!, {r3, lr} ldr r2, _02329254 ; =0x02352AE8 ldr r2, [r2] @@ -90786,10 +90786,10 @@ FUN_0232923C: ; 0x0232923C ldmdb sp!, {r3, pc} .align 2, 0 _02329254: .word 0x02352AE8 - arm_func_end FUN_0232923C + arm_func_end ov29_0232923C - arm_func_start FUN_02329258 -FUN_02329258: ; 0x02329258 + arm_func_start ov29_02329258 +ov29_02329258: ; 0x02329258 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x20 mov r4, #0 @@ -90885,7 +90885,7 @@ _02329350: ldmdb sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _023293C8: .word 0x00000221 - arm_func_end FUN_02329258 + arm_func_end ov29_02329258 arm_func_start ov29_023293CC ov29_023293CC: ; 0x023293CC @@ -90997,8 +90997,8 @@ _0232952C: .word 0x00000ED9 _02329530: .word 0x0000270F arm_func_end ov29_02329438 - arm_func_start FUN_02329534 -FUN_02329534: ; 0x02329534 + arm_func_start ov29_02329534 +ov29_02329534: ; 0x02329534 stmdb sp!, {r3, lr} ldr r2, _02329550 ; =0x02352AEC mov r3, #2 @@ -91008,10 +91008,10 @@ FUN_02329534: ; 0x02329534 ldmdb sp!, {r3, pc} .align 2, 0 _02329550: .word 0x02352AEC - arm_func_end FUN_02329534 + arm_func_end ov29_02329534 - arm_func_start FUN_02329554 -FUN_02329554: ; 0x02329554 + arm_func_start ov29_02329554 +ov29_02329554: ; 0x02329554 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov sb, r1 @@ -91086,15 +91086,15 @@ _02329650: _02329658: .word 0x00000DC3 _0232965C: .word 0x00000DB6 _02329660: .word 0x00000DB5 - arm_func_end FUN_02329554 + arm_func_end ov29_02329554 - arm_func_start FUN_02329664 -FUN_02329664: ; 0x02329664 + arm_func_start ov29_02329664 +ov29_02329664: ; 0x02329664 stmdb sp!, {r3, lr} bl ov29_023194B8 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_02329664 + arm_func_end ov29_02329664 arm_func_start ov29_02329674 ov29_02329674: ; 0x02329674 @@ -91848,16 +91848,16 @@ _0232A03C: _0232A048: .word 0x02352AEC arm_func_end ov29_02329FE0 - arm_func_start FUN_0232A04C -FUN_0232A04C: ; 0x0232A04C + arm_func_start ov29_0232A04C +ov29_0232A04C: ; 0x0232A04C ldr ip, _0232A054 ; =ov29_0232C310 bx ip .align 2, 0 _0232A054: .word ov29_0232C310 - arm_func_end FUN_0232A04C + arm_func_end ov29_0232A04C - arm_func_start FUN_0232A058 -FUN_0232A058: ; 0x0232A058 + arm_func_start ov29_0232A058 +ov29_0232A058: ; 0x0232A058 stmdb sp!, {r3, lr} ldr r2, _0232A074 ; =0x02352AE8 mov r3, #2 @@ -91867,7 +91867,7 @@ FUN_0232A058: ; 0x0232A058 ldmdb sp!, {r3, pc} .align 2, 0 _0232A074: .word 0x02352AE8 - arm_func_end FUN_0232A058 + arm_func_end ov29_0232A058 arm_func_start ov01_0232A078 ov01_0232A078: ; 0x0232A078 @@ -92040,13 +92040,13 @@ ov29_0232A27C: ; 0x0232A27C _0232A2A8: .word 0x02352AEC arm_func_end ov29_0232A27C - arm_func_start FUN_0232A2AC -FUN_0232A2AC: ; 0x0232A2AC + arm_func_start ov29_0232A2AC +ov29_0232A2AC: ; 0x0232A2AC stmdb sp!, {r3, lr} bl ov29_02318FAC mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232A2AC + arm_func_end ov29_0232A2AC arm_func_start ov29_0232A2BC ov29_0232A2BC: ; 0x0232A2BC @@ -92194,13 +92194,13 @@ _0232A474: _0232A47C: .word 0x022C4748 arm_func_end ov29_0232A414 - arm_func_start FUN_0232A480 -FUN_0232A480: ; 0x0232A480 + arm_func_start ov29_0232A480 +ov29_0232A480: ; 0x0232A480 stmdb sp!, {r3, lr} bl TryInflictIngrainStatus mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232A480 + arm_func_end ov29_0232A480 arm_func_start ov29_0232A490 ov29_0232A490: ; 0x0232A490 @@ -92231,15 +92231,15 @@ _0232A4E0: .word 0x022C49D4 _0232A4E4: .word 0x00000EE4 arm_func_end ov29_0232A490 - arm_func_start FUN_0232A4E8 -FUN_0232A4E8: ; 0x0232A4E8 + arm_func_start ov29_0232A4E8 +ov29_0232A4E8: ; 0x0232A4E8 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl ov29_023160DC mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232A4E8 + arm_func_end ov29_0232A4E8 arm_func_start ov29_0232A500 ov29_0232A500: ; 0x0232A500 @@ -92337,8 +92337,8 @@ _0232A628: _0232A63C: .word 0x022C44C4 arm_func_end ov02_0232A5AC - arm_func_start FUN_0232A640 -FUN_0232A640: ; 0x0232A640 + arm_func_start ov29_0232A640 +ov29_0232A640: ; 0x0232A640 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr r4, [r0, #0xb4] @@ -92360,10 +92360,10 @@ _0232A678: ldmdb sp!, {r3, r4, pc} .align 2, 0 _0232A684: .word 0x00000EE5 - arm_func_end FUN_0232A640 + arm_func_end ov29_0232A640 - arm_func_start FUN_0232A688 -FUN_0232A688: ; 0x0232A688 + arm_func_start ov29_0232A688 +ov29_0232A688: ; 0x0232A688 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -92390,7 +92390,7 @@ _0232A6E0: mov r0, r4 add sp, sp, #4 ldmdb sp!, {r3, r4, r5, r6, pc} - arm_func_end FUN_0232A688 + arm_func_end ov29_0232A688 arm_func_start ov29_0232A6EC ov29_0232A6EC: ; 0x0232A6EC @@ -92769,13 +92769,13 @@ _0232AC3C: .word 0x00000163 _0232AC40: .word 0x022C44B4 arm_func_end ov29_0232A8EC - arm_func_start FUN_0232AC44 -FUN_0232AC44: ; 0x0232AC44 + arm_func_start ov29_0232AC44 +ov29_0232AC44: ; 0x0232AC44 stmdb sp!, {r3, lr} bl ov29_02315CE8 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232AC44 + arm_func_end ov29_0232AC44 arm_func_start ov29_0232AC54 ov29_0232AC54: ; 0x0232AC54 @@ -93369,15 +93369,15 @@ _0232B42C: .word 0x000003E7 _0232B430: .word 0x022C49C4 arm_func_end ov29_0232B368 - arm_func_start FUN_0232B434 -FUN_0232B434: ; 0x0232B434 + arm_func_start ov29_0232B434 +ov29_0232B434: ; 0x0232B434 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictParalysisStatus mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232B434 + arm_func_end ov29_0232B434 arm_func_start ov29_0232B44C ov29_0232B44C: ; 0x0232B44C @@ -93436,15 +93436,15 @@ _0232B4F0: _0232B4FC: .word 0x022C448C arm_func_end ov29_0232B494 - arm_func_start FUN_0232B500 -FUN_0232B500: ; 0x0232B500 + arm_func_start ov29_0232B500 +ov29_0232B500: ; 0x0232B500 stmdb sp!, {r3, lr} ldr r2, [r0, #0xb4] ldrb r2, [r2, #0x4c] bl TryBlowAway mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232B500 + arm_func_end ov29_0232B500 arm_func_start ov29_0232B518 ov29_0232B518: ; 0x0232B518 @@ -93496,8 +93496,8 @@ _0232B5C0: .word 0x00000DC3 _0232B5C4: .word 0x00000EEE arm_func_end ov29_0232B518 - arm_func_start FUN_0232B5C8 -FUN_0232B5C8: ; 0x0232B5C8 + arm_func_start ov29_0232B5C8 +ov29_0232B5C8: ; 0x0232B5C8 stmdb sp!, {r3, lr} ldr r2, _0232B5E4 ; =0x02352AE8 mov r3, #2 @@ -93507,10 +93507,10 @@ FUN_0232B5C8: ; 0x0232B5C8 ldmdb sp!, {r3, pc} .align 2, 0 _0232B5E4: .word 0x02352AE8 - arm_func_end FUN_0232B5C8 + arm_func_end ov29_0232B5C8 - arm_func_start FUN_0232B5E8 -FUN_0232B5E8: ; 0x0232B5E8 + arm_func_start ov29_0232B5E8 +ov29_0232B5E8: ; 0x0232B5E8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r5, r2 ldrh ip, [r5, #4] @@ -93562,16 +93562,16 @@ _0232B694: .align 2, 0 _0232B69C: .word 0x00000123 _0232B6A0: .word 0x022C44A4 - arm_func_end FUN_0232B5E8 + arm_func_end ov29_0232B5E8 - arm_func_start FUN_0232B6A4 -FUN_0232B6A4: ; 0x0232B6A4 + arm_func_start ov29_0232B6A4 +ov29_0232B6A4: ; 0x0232B6A4 stmdb sp!, {r3, lr} mov r2, #0 bl ov29_0231662C mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232B6A4 + arm_func_end ov29_0232B6A4 arm_func_start ov29_0232B6B8 ov29_0232B6B8: ; 0x0232B6B8 @@ -93795,8 +93795,8 @@ ov29_0232B928: ; 0x0232B928 ldmdb sp!, {r3, pc} arm_func_end ov29_0232B928 - arm_func_start FUN_0232B940 -FUN_0232B940: ; 0x0232B940 + arm_func_start ov29_0232B940 +ov29_0232B940: ; 0x0232B940 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 @@ -93835,10 +93835,10 @@ _0232B9B8: bx lr .align 2, 0 _0232B9CC: .word 0x022C4554 - arm_func_end FUN_0232B940 + arm_func_end ov29_0232B940 - arm_func_start FUN_0232B9D0 -FUN_0232B9D0: ; 0x0232B9D0 + arm_func_start ov29_0232B9D0 +ov29_0232B9D0: ; 0x0232B9D0 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -93870,7 +93870,7 @@ _0232BA14: _0232BA3C: mov r0, r4 ldmdb sp!, {r4, r5, r6, pc} - arm_func_end FUN_0232B9D0 + arm_func_end ov29_0232B9D0 arm_func_start ov29_0232BA44 ov29_0232BA44: ; 0x0232BA44 @@ -94529,13 +94529,13 @@ _0232C2F8: .word 0x00000EF6 _0232C2FC: .word 0x00000EF7 arm_func_end ov29_0232C27C - arm_func_start FUN_0232C300 -FUN_0232C300: ; 0x0232C300 + arm_func_start ov29_0232C300 +ov29_0232C300: ; 0x0232C300 stmdb sp!, {r3, lr} bl ov29_022EF5D8 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232C300 + arm_func_end ov29_0232C300 arm_func_start ov29_0232C310 ov29_0232C310: ; 0x0232C310 @@ -95066,15 +95066,15 @@ _0232CA0C: .word 0x00000F02 _0232CA10: .word 0x00000F01 arm_func_end ov29_0232C84C - arm_func_start FUN_0232CA14 -FUN_0232CA14: ; 0x0232CA14 + arm_func_start ov29_0232CA14 +ov29_0232CA14: ; 0x0232CA14 stmdb sp!, {r3, lr} mov r2, #1 mov r3, r2 bl LowerSpeed mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232CA14 + arm_func_end ov29_0232CA14 arm_func_start ov29_0232CA2C ov29_0232CA2C: ; 0x0232CA2C @@ -95347,14 +95347,14 @@ _0232CD88: .word 0x02353538 _0232CD8C: .word 0x00000F08 arm_func_end ov29_0232CCC4 - arm_func_start FUN_0232CD90 -FUN_0232CD90: ; 0x0232CD90 + arm_func_start ov29_0232CD90 +ov29_0232CD90: ; 0x0232CD90 stmdb sp!, {r3, lr} mov r1, r0 bl ov29_0231657C mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232CD90 + arm_func_end ov29_0232CD90 arm_func_start ov29_0232CDA4 ov29_0232CDA4: ; 0x0232CDA4 @@ -95424,8 +95424,8 @@ ov29_0232CE50: ; 0x0232CE50 _0232CE78: .word 0x022C456C arm_func_end ov29_0232CE50 - arm_func_start FUN_0232CE7C -FUN_0232CE7C: ; 0x0232CE7C + arm_func_start ov29_0232CE7C +ov29_0232CE7C: ; 0x0232CE7C stmdb sp!, {r3, lr} ldr r2, _0232CE90 ; =0x00000F09 bl LogMessageByIdWithPopupCheckUserTarget @@ -95433,17 +95433,17 @@ FUN_0232CE7C: ; 0x0232CE7C ldmdb sp!, {r3, pc} .align 2, 0 _0232CE90: .word 0x00000F09 - arm_func_end FUN_0232CE7C + arm_func_end ov29_0232CE7C - arm_func_start FUN_0232CE94 -FUN_0232CE94: ; 0x0232CE94 + arm_func_start ov29_0232CE94 +ov29_0232CE94: ; 0x0232CE94 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictCoweringStatus mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232CE94 + arm_func_end ov29_0232CE94 arm_func_start ov29_0232CEAC ov29_0232CEAC: ; 0x0232CEAC @@ -95504,13 +95504,13 @@ ov29_0232CF54: ; 0x0232CF54 _0232CF70: .word 0x022C45BC arm_func_end ov29_0232CF54 - arm_func_start FUN_0232CF74 -FUN_0232CF74: ; 0x0232CF74 + arm_func_start ov29_0232CF74 +ov29_0232CF74: ; 0x0232CF74 stmdb sp!, {r3, lr} bl ov29_0231EA40 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232CF74 + arm_func_end ov29_0232CF74 arm_func_start ov29_0232CF84 ov29_0232CF84: ; 0x0232CF84 @@ -96522,13 +96522,13 @@ _0232DC4C: .word 0x02352AEC _0232DC50: .word 0x02352AE8 arm_func_end ov29_0232DAD0 - arm_func_start FUN_0232DC54 -FUN_0232DC54: ; 0x0232DC54 + arm_func_start ov29_0232DC54 +ov29_0232DC54: ; 0x0232DC54 stmdb sp!, {r3, lr} bl ov29_02318984 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232DC54 + arm_func_end ov29_0232DC54 arm_func_start ov29_0232DC64 ov29_0232DC64: ; 0x0232DC64 @@ -96614,13 +96614,13 @@ _0232DD70: .word 0x022C4944 _0232DD74: .word 0x00000EBC arm_func_end ov29_0232DCD4 - arm_func_start FUN_0232DD78 -FUN_0232DD78: ; 0x0232DD78 + arm_func_start ov29_0232DD78 +ov29_0232DD78: ; 0x0232DD78 stmdb sp!, {r3, lr} bl BoostOrLowerSpeed mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232DD78 + arm_func_end ov29_0232DD78 arm_func_start ov29_0232DD88 ov29_0232DD88: ; 0x0232DD88 @@ -96877,14 +96877,14 @@ ov29_0232E084: ; 0x0232E084 _0232E0E0: .word 0x00000F2B arm_func_end ov29_0232E084 - arm_func_start FUN_0232E0E4 -FUN_0232E0E4: ; 0x0232E0E4 + arm_func_start ov29_0232E0E4 +ov29_0232E0E4: ; 0x0232E0E4 stmdb sp!, {r3, lr} mov r2, #1 bl ov29_0230DAB8 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232E0E4 + arm_func_end ov29_0232E0E4 arm_func_start ov29_0232E0F8 ov29_0232E0F8: ; 0x0232E0F8 @@ -97369,24 +97369,24 @@ ov29_0232E714: ; 0x0232E714 _0232E730: .word 0x02352AE8 arm_func_end ov29_0232E714 - arm_func_start FUN_0232E734 -FUN_0232E734: ; 0x0232E734 + arm_func_start ov29_0232E734 +ov29_0232E734: ; 0x0232E734 stmdb sp!, {r3, lr} bl ov29_02314E60 mov r0, #1 ldmdb sp!, {r3, pc} - arm_func_end FUN_0232E734 + arm_func_end ov29_0232E734 - arm_func_start FUN_0232E744 -FUN_0232E744: ; 0x0232E744 + arm_func_start ov29_0232E744 +ov29_0232E744: ; 0x0232E744 ldr ip, _0232E74C ; =ov29_0232CA70 bx ip .align 2, 0 _0232E74C: .word ov29_0232CA70 - arm_func_end FUN_0232E744 + arm_func_end ov29_0232E744 - arm_func_start FUN_0232E750 -FUN_0232E750: ; 0x0232E750 + arm_func_start ov29_0232E750 +ov29_0232E750: ; 0x0232E750 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -97404,7 +97404,7 @@ FUN_0232E750: ; 0x0232E750 bl ov29_0234AFFC mov r0, r4 ldmdb sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end FUN_0232E750 + arm_func_end ov29_0232E750 arm_func_start ov29_0232E794 ov29_0232E794: ; 0x0232E794 @@ -99309,7 +99309,7 @@ ov29_02330360: ; 0x02330360 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_023268BC + bl ov29_023268BC mov sl, r0 b _023326CC _0233037C: @@ -99370,7 +99370,7 @@ ov29_02330430: ; 0x02330430 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328B88 + bl ov29_02328B88 mov sl, r0 b _023326CC arm_func_end ov29_02330430 @@ -99392,7 +99392,7 @@ ov29_02330468: ; 0x02330468 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B5E8 + bl ov29_0232B5E8 mov sl, r0 b _023326CC _02330484: @@ -99422,7 +99422,7 @@ ov29_023304BC: ; 0x023304BC mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02327744 + bl ov29_02327744 mov sl, r0 b _023326CC arm_func_end ov29_023304BC @@ -99448,7 +99448,7 @@ ov29_023304F4: ; 0x023304F4 mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_023304F4 @@ -99463,7 +99463,7 @@ ov29_02330520: ; 0x02330520 mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_02330520 @@ -99478,7 +99478,7 @@ ov29_0233054C: ; 0x0233054C mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_0233054C @@ -99493,7 +99493,7 @@ ov29_02330578: ; 0x02330578 mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_02330578 @@ -99508,7 +99508,7 @@ ov29_023305A4: ; 0x023305A4 mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_023305A4 @@ -99524,7 +99524,7 @@ ov29_023305D0: ; 0x023305D0 mov r0, sb mov r1, r4 mov r2, r8 - bl FUN_02327CD8 + bl ov29_02327CD8 mov sl, r0 b _023326CC arm_func_end ov29_023305D0 @@ -99537,7 +99537,7 @@ ov29_02330600: ; 0x02330600 mov r1, r4 mov r2, r8 str r7, [sp] - bl FUN_0232B940 + bl ov29_0232B940 mov sl, r0 b _023326CC arm_func_end ov29_02330600 @@ -99649,7 +99649,7 @@ ov29_02330728: ; 0x02330728 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328A74 + bl ov29_02328A74 mov sl, r0 b _023326CC arm_func_end ov29_02330728 @@ -99660,7 +99660,7 @@ ov29_02330744: ; 0x02330744 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328B00 + bl ov29_02328B00 mov sl, r0 b _023326CC arm_func_end ov29_02330744 @@ -99794,7 +99794,7 @@ ov29_023308B0: ; 0x023308B0 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B9D0 + bl ov29_0232B9D0 mov sl, r0 b _023326CC _023308CC: @@ -99824,7 +99824,7 @@ ov29_02330904: ; 0x02330904 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328D44 + bl ov29_02328D44 mov sl, r0 b _023326CC arm_func_end ov29_02330904 @@ -99944,7 +99944,7 @@ ov29_02330A54: ; 0x02330A54 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B434 + bl ov29_0232B434 mov sl, r0 b _023326CC arm_func_end ov29_02330A54 @@ -99988,7 +99988,7 @@ ov29_02330AC4: ; 0x02330AC4 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A688 + bl ov29_0232A688 mov sl, r0 b _023326CC _02330AE0: @@ -100007,7 +100007,7 @@ ov29_02330AFC: ; 0x02330AFC mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B500 + bl ov29_0232B500 mov sl, r0 b _023326CC _02330B18: @@ -100026,7 +100026,7 @@ ov29_02330B34: ; 0x02330B34 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B5C8 + bl ov29_0232B5C8 mov sl, r0 b _023326CC arm_func_end ov29_02330B34 @@ -100037,7 +100037,7 @@ ov29_02330B50: ; 0x02330B50 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232923C + bl ov29_0232923C mov sl, r0 b _023326CC arm_func_end ov29_02330B50 @@ -100086,7 +100086,7 @@ ov29_02330BDC: ; 0x02330BDC mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02329534 + bl ov29_02329534 mov sl, r0 b _023326CC arm_func_end ov29_02330BDC @@ -100108,7 +100108,7 @@ ov29_02330C14: ; 0x02330C14 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328AE0 + bl ov29_02328AE0 mov sl, r0 b _023326CC arm_func_end ov29_02330C14 @@ -100119,7 +100119,7 @@ ov29_02330C30: ; 0x02330C30 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A058 + bl ov29_0232A058 mov sl, r0 b _023326CC arm_func_end ov29_02330C30 @@ -100242,7 +100242,7 @@ ov29_02330D80: ; 0x02330D80 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02329258 + bl ov29_02329258 mov sl, r0 b _023326CC arm_func_end ov29_02330D80 @@ -100338,7 +100338,7 @@ ov29_02330E7C: ; 0x02330E7C mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328C74 + bl ov29_02328C74 mov sl, r0 b _023326CC arm_func_end ov29_02330E7C @@ -100360,7 +100360,7 @@ ov29_02330EB4: ; 0x02330EB4 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232CA14 + bl ov29_0232CA14 mov sl, r0 b _023326CC arm_func_end ov29_02330EB4 @@ -100393,7 +100393,7 @@ ov29_02330F08: ; 0x02330F08 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02327DD0 + bl ov29_02327DD0 mov sl, r0 b _023326CC arm_func_end ov29_02330F08 @@ -100448,7 +100448,7 @@ ov29_02330F94: ; 0x02330F94 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328528 + bl ov29_02328528 mov sl, r0 b _023326CC arm_func_end ov29_02330F94 @@ -100459,7 +100459,7 @@ ov29_02330FB0: ; 0x02330FB0 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328394 + bl ov29_02328394 mov sl, r0 b _023326CC arm_func_end ov29_02330FB0 @@ -100570,7 +100570,7 @@ ov29_02331100: ; 0x02331100 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A04C + bl ov29_0232A04C mov sl, r0 b _023326CC arm_func_end ov29_02331100 @@ -100641,7 +100641,7 @@ ov29_023311C4: ; 0x023311C4 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A4E8 + bl ov29_0232A4E8 mov sl, r0 b _023326CC arm_func_end ov29_023311C4 @@ -100782,7 +100782,7 @@ ov29_02331354: ; 0x02331354 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A480 + bl ov29_0232A480 mov sl, r0 b _023326CC arm_func_end ov29_02331354 @@ -100900,7 +100900,7 @@ ov29_02331488: ; 0x02331488 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A2AC + bl ov29_0232A2AC mov sl, r0 b _023326CC _023314A4: @@ -100930,7 +100930,7 @@ ov29_023314DC: ; 0x023314DC mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328A54 + bl ov29_02328A54 mov sl, r0 b _023326CC _023314F8: @@ -101124,7 +101124,7 @@ ov29_0233170C: ; 0x0233170C mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328DE4 + bl ov29_02328DE4 mov sl, r0 b _023326CC arm_func_end ov29_0233170C @@ -101255,7 +101255,7 @@ ov29_02331878: ; 0x02331878 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232AC44 + bl ov29_0232AC44 mov sl, r0 b _023326CC arm_func_end ov29_02331878 @@ -101266,7 +101266,7 @@ ov29_02331894: ; 0x02331894 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232CE94 + bl ov29_0232CE94 mov sl, r0 b _023326CC arm_func_end ov29_02331894 @@ -101356,7 +101356,7 @@ ov29_0233197C: ; 0x0233197C mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02328E74 + bl ov29_02328E74 mov sl, r0 b _023326CC arm_func_end ov29_0233197C @@ -101430,7 +101430,7 @@ ov29_02331A40: ; 0x02331A40 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232C300 + bl ov29_0232C300 mov sl, r0 b _023326CC arm_func_end ov29_02331A40 @@ -101452,7 +101452,7 @@ ov29_02331A78: ; 0x02331A78 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232A640 + bl ov29_0232A640 mov sl, r0 b _023326CC arm_func_end ov29_02331A78 @@ -101490,7 +101490,7 @@ ov29_02331AE8: ; 0x02331AE8 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232CD90 + bl ov29_0232CD90 mov sl, r0 b _023326CC arm_func_end ov29_02331AE8 @@ -101512,7 +101512,7 @@ ov29_02331B20: ; 0x02331B20 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232B6A4 + bl ov29_0232B6A4 mov sl, r0 b _023326CC arm_func_end ov29_02331B20 @@ -101583,7 +101583,7 @@ ov29_02331BE4: ; 0x02331BE4 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232CF74 + bl ov29_0232CF74 mov sl, r0 b _023326CC arm_func_end ov29_02331BE4 @@ -101594,7 +101594,7 @@ ov29_02331C00: ; 0x02331C00 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02327BE0 + bl ov29_02327BE0 mov sl, r0 b _023326CC arm_func_end ov29_02331C00 @@ -101785,7 +101785,7 @@ ov29_02331E14: ; 0x02331E14 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232CE7C + bl ov29_0232CE7C mov sl, r0 b _023326CC arm_func_end ov29_02331E14 @@ -101883,7 +101883,7 @@ ov29_02331F18: ; 0x02331F18 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02329554 + bl ov29_02329554 mov sl, r0 b _023326CC arm_func_end ov29_02331F18 @@ -102009,7 +102009,7 @@ ov29_02332068: ; 0x02332068 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_02329664 + bl ov29_02329664 mov sl, r0 b _023326CC arm_func_end ov29_02332068 @@ -102347,7 +102347,7 @@ ov29_023323CC: ; 0x023323CC mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232DC54 + bl ov29_0232DC54 mov sl, r0 b _023326CC arm_func_end ov29_023323CC @@ -102369,7 +102369,7 @@ ov29_02332404: ; 0x02332404 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232DD78 + bl ov29_0232DD78 mov sl, r0 b _023326CC arm_func_end ov29_02332404 @@ -102446,7 +102446,7 @@ ov29_023324C8: ; 0x023324C8 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232E0E4 + bl ov29_0232E0E4 mov sl, r0 b _023326CC arm_func_end ov29_023324C8 @@ -102602,7 +102602,7 @@ ov29_02332658: ; 0x02332658 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232E734 + bl ov29_0232E734 mov sl, r0 b _023326CC arm_func_end ov29_02332658 @@ -102613,7 +102613,7 @@ ov29_02332674: ; 0x02332674 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232E744 + bl ov29_0232E744 mov sl, r0 b _023326CC arm_func_end ov29_02332674 @@ -102624,7 +102624,7 @@ ov29_02332690: ; 0x02332690 mov r1, r4 mov r2, r8 mov r3, r7 - bl FUN_0232E750 + bl ov29_0232E750 mov sl, r0 b _023326CC arm_func_end ov29_02332690 @@ -107850,7 +107850,7 @@ ov29_02336DB0: ; 0x02336DB0 tst r0, #0x200 beq _02336DE0 ldr r0, _02336F48 ; =0x02352F14 - bl DebugPrint0 + bl DebugPrint0__0200C1FC _02336DE0: ldrh r1, [r4] tst r1, #0x1000 @@ -134362,14 +134362,14 @@ _0234D38C: sub r1, r1, #0xb orr r1, r1, #0x90000 str r1, [sp, #8] - bl DebugPrint0 + bl DebugPrint0__0200C1FC b _0234D3D0 _0234D3BC: bl ov29_02337EE8 mov r1, r0 ldr r0, _0234D45C ; =0x02353380 str r1, [sp, #8] - bl DebugPrint0 + bl DebugPrint0__0200C1FC _0234D3D0: ldrsh r0, [r4, #4] str r0, [sp, #0xc] diff --git a/main.lsf b/main.lsf index a9859a8e..84a8f8b9 100644 --- a/main.lsf +++ b/main.lsf @@ -9,7 +9,6 @@ Static main { Address 0x02000000 StackSize 0 2048 - Object src/main.o Object asm/main.o ### Vendor libraries ###