diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-22 11:03:33 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-22 11:03:33 -0400 |
commit | 08c3453ffb413262818b4960c68ee94f4b6a5eea (patch) | |
tree | 67cdf5986d2a259900965e116b9266b929ce4e68 | |
parent | 716572be08ec797a4d23d6c3b86f41ba66678651 (diff) |
Split bss up to poke_overlay
-rw-r--r-- | arm9/arm9.lcf | 11 | ||||
-rw-r--r-- | arm9/asm/unk_020023C0.s | 7 | ||||
-rw-r--r-- | arm9/asm/unk_02002C14.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_02003B98.s | 17 | ||||
-rw-r--r-- | arm9/asm/unk_020040F4.s | 11 | ||||
-rw-r--r-- | arm9/asm/unk_0208AC14.s | 33 | ||||
-rw-r--r-- | arm9/asm/unk_020910EC.s | 512 | ||||
-rw-r--r-- | arm9/asm/unk_020AF030.s | 354 | ||||
-rw-r--r-- | arm9/data/bss.s | 376 | ||||
-rw-r--r-- | arm9/data/rom2.s | 347 | ||||
-rw-r--r-- | arm9/data/rom2_2.s | 6 | ||||
-rw-r--r-- | arm9/data/rom2_3.s | 5 | ||||
-rw-r--r-- | arm9/global.inc | 54 | ||||
-rw-r--r-- | arm9/src/GFLIB_sysctl.c | 2 | ||||
-rw-r--r-- | arm9/src/main.c | 3 | ||||
-rw-r--r-- | arm9/src/poke_overlay.c | 2 |
16 files changed, 368 insertions, 1384 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index f1e7fdd1..09e9fbc4 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -564,6 +564,7 @@ SECTIONS { SDK_STATIC_TEXT_END = .; SDK_STATIC_DATA_START = .; + unk_02003B98.o (.data) rom2_3.o (.data) FS_command.o (.data) FS_command_default.o (.data) @@ -579,8 +580,14 @@ SECTIONS { .arm9.bss : { - /* ALIGNALL(4); . = ALIGN(32); */ + ALIGNALL(4); . = ALIGN(32); SDK_STATIC_BSS_START = .; + GFLIB_sysctl.o (.bss) + unk_020023C0.o (.bss) + unk_02002C14.o (.bss) + unk_02003B98.o (.bss) + unk_020040F4.o (.bss) + poke_overlay.o (.bss) bss.o (.bss) custom_allocator.o (.bss) bss_2.o (.bss) @@ -590,7 +597,7 @@ SECTIONS { FS_file.o (.bss) FS_rom.o (.bss) bss_4.o (.bss) - /* . = ALIGN(32); */ + . = ALIGN(32); SDK_STATIC_BSS_END = .; SDK_STATIC_BSS_SIZE = SDK_STATIC_BSS_END - SDK_STATIC_BSS_START; } >> arm9 diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 115aa793..aaa448a5 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -1,7 +1,12 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_02106FC4 + .section .bss + + .global UNK_02106FC4 +UNK_02106FC4: ; 0x02106FC4 + .space 0x4 + .extern UNK_021C48F8 .extern UNK_020ECB50 .extern gUnknown21C48B8 diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index 873db795..989b86f4 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -1,6 +1,16 @@ .include "asm/macros.inc" .include "global.inc" + .section .bss + + .global UNK_02106FC8 +UNK_02106FC8: ; 0x02106FC8 + .space 0x4 + + .global UNK_02106FCC +UNK_02106FCC: ; 0x02106FCC + .space 0xa4 + .extern UNK_020ECB6A .extern UNK_020ECB65 .extern UNK_020ECB69 @@ -8,8 +18,6 @@ .extern UNK_020ECB56 .extern UNK_020ECB64 .extern UNK_020ECB54 - .extern UNK_02106FCC - .extern UNK_02106FC8 .extern UNK_020ECB6B .extern UNK_020ECB68 .extern UNK_020ECB66 diff --git a/arm9/asm/unk_02003B98.s b/arm9/asm/unk_02003B98.s index 7d8ef1c2..4085011c 100644 --- a/arm9/asm/unk_02003B98.s +++ b/arm9/asm/unk_02003B98.s @@ -1,9 +1,20 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_02107078 - .extern UNK_02104780 - .extern UNK_02107070 + .section .data + ; 0x02104780 + .global UNK_02104780 +UNK_02104780: ; 0x02104780 + .asciz "data/sound/sound_data.sdat" + + .section .bss + .global UNK_02107070 +UNK_02107070: ; 0x02107070 + .space 0x8 + + .global UNK_02107078 +UNK_02107078: ; 0x02107078 + .space 0xbcd60 .text diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s index 36f86011..689c5801 100644 --- a/arm9/asm/unk_020040F4.s +++ b/arm9/asm/unk_020040F4.s @@ -1,9 +1,16 @@ .include "asm/macros.inc" .include "global.inc" - .extern UNK_021C3DE0 .extern UNK_020ECB8C - .extern UNK_021C3DD8 + + .section .bss + .global UNK_021C3DD8 +UNK_021C3DD8: ; 0x021C3DD8 + .space 0x8 + + .global UNK_021C3DE0 +UNK_021C3DE0: ; 0x021C3DE0 + .space 0x7d0 .text diff --git a/arm9/asm/unk_0208AC14.s b/arm9/asm/unk_0208AC14.s index 14d31001..fd6dc462 100644 --- a/arm9/asm/unk_0208AC14.s +++ b/arm9/asm/unk_0208AC14.s @@ -102,7 +102,6 @@ FUN_0208ACEC: ; 0x0208ACEC add r1, r1, r6, lsl #0x5 mov r4, r0 bl FUN_0208C138 -_0208AD3C: ; 0x0208AD3C cmp r5, #0x0 beq _0208AD4C mov r0, r4 @@ -697,7 +696,6 @@ FUN_0208B4A0: ; 0x0208B4A0 mov r9, r0 mov r1, #0x0 bl MI_CpuFill8 -_0208B594: ; 0x0208B594 cmp r7, #0x0 mov r10, #0x0 ble _0208B5C0 @@ -719,7 +717,6 @@ _0208B5C0: mov r1, #0x0 mov r8, r0 bl MI_CpuFill8 -_0208B5E0: ; 0x0208B5E0 cmp r6, #0x0 mov r7, #0x0 ble _0208B60C @@ -792,7 +789,6 @@ FUN_0208B6A0: ; 0x0208B6A0 movs r2, r2, lsr #0x1f beq _0208B6F8 bl FUN_0208B71C -_0208B6CC: ; 0x0208B6CC ldr r0, [r5, #0x0] mov r0, r0, lsl #0x9 movs r0, r0, lsr #0x1f @@ -903,7 +899,6 @@ FUN_0208B804: ; 0x0208B804 ldrb r1, [r5, #0x47] mla r0, r1, r0, r2 bl FUN_0208C408 -_0208B830: ; 0x0208B830 ldr r0, [r5, #0x0] mov r0, r0, lsl #0x1a mov r0, r0, lsr #0x1e @@ -1000,7 +995,6 @@ _0208B95C: ldrh r0, [r9, #0x4c] ldrb r1, [r9, #0x80] bl _s32_div_f -_0208B968: ; 0x0208B968 cmp r1, #0x0 bne _0208B9A4 ldr r1, [r9, #0x24] @@ -1225,7 +1219,6 @@ _0208BBA0: mov r0, r0, asr #0xc ldrb r1, [r1, #0xe] bl _s32_div_f -_0208BCC0: ; 0x0208BCC0 cmp r1, #0x0 bne _0208BCD8 mov r0, r4 @@ -1988,7 +1981,6 @@ _0208C79C: str r0, [sp, #0x2c] ldr r0, [r5, #0x44] bl G3_LoadMtx43 -_0208C80C: ; 0x0208C80C add r0, sp, #0x0 bl G3_MultMtx43 b _0208C8BC @@ -2032,7 +2024,6 @@ _0208C818: str r3, [r0, #0x0] ldr r0, [r5, #0x44] bl G3_MultMtx43 -_0208C8B4: ; 0x0208C8B4 add r0, sp, #0x0 bl G3_MultMtx43 _0208C8BC: @@ -2291,7 +2282,6 @@ _0208CC18: str r0, [sp, #0x2c] ldr r0, [r5, #0x44] bl G3_LoadMtx43 -_0208CC88: ; 0x0208CC88 add r0, sp, #0x0 bl G3_MultMtx43 b _0208CD38 @@ -2335,7 +2325,6 @@ _0208CC94: str r3, [r0, #0x0] ldr r0, [r5, #0x44] bl G3_MultMtx43 -_0208CD30: ; 0x0208CD30 add r0, sp, #0x0 bl G3_MultMtx43 _0208CD38: @@ -2517,7 +2506,6 @@ _0208CF70: str r0, [sp, #0x2c] ldr r0, [r5, #0x44] bl G3_LoadMtx43 -_0208CFE0: ; 0x0208CFE0 add r0, sp, #0x0 bl G3_MultMtx43 b _0208D090 @@ -2561,7 +2549,6 @@ _0208CFEC: str r3, [r0, #0x0] ldr r0, [r5, #0x44] bl G3_MultMtx43 -_0208D088: ; 0x0208D088 add r0, sp, #0x0 bl G3_MultMtx43 _0208D090: @@ -2741,7 +2728,6 @@ _0208D2C0: str r0, [sp, #0x2c] ldr r0, [r5, #0x44] bl G3_LoadMtx43 -_0208D330: ; 0x0208D330 add r0, sp, #0x0 bl G3_MultMtx43 b _0208D3E0 @@ -2785,7 +2771,6 @@ _0208D33C: str r3, [r0, #0x0] ldr r0, [r5, #0x44] bl G3_MultMtx43 -_0208D3D8: ; 0x0208D3D8 add r0, sp, #0x0 bl G3_MultMtx43 _0208D3E0: @@ -4750,7 +4735,6 @@ _0208F13C: add r0, r9, #0x8 mov r1, r7 bl FUN_02090AA4 -_0208F160: ; 0x0208F160 ldr r0, [r8, #0x0] mov r0, r0, lsl #0x1c mov r0, r0, lsr #0x1c @@ -4947,7 +4931,6 @@ _0208F328: _0208F428: add r0, sp, #0x70 bl FUN_02090AF4 -_0208F430: ; 0x0208F430 ldr r0, [r6, #0x0] ldr r3, [sp, #0x70] mla r1, r0, r4, r5 @@ -5009,7 +4992,6 @@ _0208F4E4: add r1, r7, #0x8 str r2, [sp, #0x7c] bl VEC_DotProduct -_0208F520: ; 0x0208F520 cmp r0, #0x0 bgt _0208F54C ldr r0, [r7, #0x8] @@ -5064,7 +5046,6 @@ _0208F5B4: add r1, r7, #0x8 str r2, [sp, #0x88] bl VEC_DotProduct -_0208F5F0: ; 0x0208F5F0 cmp r0, #0x0 bge _0208F61C ldr r0, [r7, #0x8] @@ -5179,7 +5160,6 @@ _0208F720: _0208F7A4: add r0, r7, #0x14 bl FUN_02090AF4 -_0208F7AC: ; 0x0208F7AC ldr r0, [r6, #0x0] mov r3, #0x800 mla r2, r0, r4, r5 @@ -5586,7 +5566,6 @@ FUN_0208FDA8: ; 0x0208FDA8 add r0, r4, #0x84 add r1, r4, #0x8a bl VEC_Fx16CrossProduct -_0208FDCC: ; 0x0208FDCC add r0, sp, #0x0 mov r1, r0 bl VEC_Fx16Normalize @@ -6116,7 +6095,6 @@ FUN_02090540: ; 0x02090540 sub r0, r0, r5 mul r0, r2, r0 bl _s32_div_f -_02090574: ; 0x02090574 add r0, r5, r0 add sp, sp, #0x4 strh r0, [r4, #0x34] @@ -6136,7 +6114,6 @@ _02090588: sub r0, r5, r0 mul r0, r2, r0 bl _s32_div_f -_020905BC: ; 0x020905BC add r0, r5, r0 strh r0, [r4, #0x34] add sp, sp, #0x4 @@ -6368,7 +6345,6 @@ FUN_020908DC: ; 0x020908DC ldrh r1, [r5, #0x6] mov r4, r2 bl _s32_div_f -_020908F8: ; 0x020908F8 cmp r1, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,lr} @@ -6660,7 +6636,6 @@ FUN_02090CC8: ; 0x02090CC8 mov r0, #0xf mov r1, #0x1 bl PXI_IsCallbackReady -_02090CE4: ; 0x02090CE4 cmp r0, #0x0 moveq r0, #0x2 ldmeqia sp!, {r4-r6,lr} @@ -6679,7 +6654,6 @@ _02090D1C: mov r0, #0xf mov r1, #0x0 bl PXI_IsCallbackReady -_02090D28: ; 0x02090D28 cmp r0, #0x0 bne _02090D3C ldr r1, _02090DAC ; =FUN_02090BBC @@ -6698,7 +6672,6 @@ _02090D3C: mov r2, #0x0 str r5, [r3, #0x0] bl PXI_SendWordByFifo -_02090D6C: ; 0x02090D6C cmp r0, #0x0 bge _02090D94 ldr r1, _02090DA8 ; =UNK_021C8C6C @@ -6731,7 +6704,6 @@ FUN_02090DB8: ; 0x02090DB8 mov r0, #0xf mov r1, #0x1 bl PXI_IsCallbackReady -_02090DD8: ; 0x02090DD8 cmp r0, #0x0 moveq r0, #0x2 ldmeqia sp!, {r4-r8,lr} @@ -6784,7 +6756,6 @@ _02090E84: mov r0, #0x4 ldrh r1, [r1, #0x0] bl OSi_TryLockVram -_02090E94: ; 0x02090E94 cmp r0, #0x0 bne _02090EB0 mov r0, r4 @@ -6805,7 +6776,6 @@ _02090ECC: mov r0, #0x8 ldrh r1, [r1, #0x0] bl OSi_TryLockVram -_02090EDC: ; 0x02090EDC cmp r0, #0x0 bne _02090EF8 mov r0, r4 @@ -6826,7 +6796,6 @@ _02090F14: mov r0, #0xc ldrh r1, [r1, #0x0] bl OSi_TryLockVram -_02090F24: ; 0x02090F24 cmp r0, #0x0 bne _02090F40 mov r0, r4 @@ -6854,7 +6823,6 @@ _02090F78: mov r0, #0xf mov r1, #0x0 bl PXI_IsCallbackReady -_02090F84: ; 0x02090F84 cmp r0, #0x0 bne _02090F98 ldr r1, _02091034 ; =FUN_02090BBC @@ -6873,7 +6841,6 @@ _02090F98: mov r2, #0x0 str r5, [r3, #0x0] bl PXI_SendWordByFifo -_02090FC8: ; 0x02090FC8 cmp r0, #0x0 bge _0209100C ldr r0, _02091028 ; =UNK_021C8C64 diff --git a/arm9/asm/unk_020910EC.s b/arm9/asm/unk_020910EC.s index e04a7294..5442a4a7 100644 --- a/arm9/asm/unk_020910EC.s +++ b/arm9/asm/unk_020910EC.s @@ -216,7 +216,6 @@ FUN_020910EC: ; 0x020910EC mov r1, r12 mov r4, r3 bl MATH_CalcSHA1 -_02091114: ; 0x02091114 add r0, sp, #0x0 mov r1, r5 mov r2, r4 @@ -247,7 +246,6 @@ FUN_02091130: ; 0x02091130 add r2, sp, #0xc add r3, sp, #0x10 bl FUN_020913D4 -_02091180: ; 0x02091180 cmp r0, #0x0 addeq sp, sp, #0x120 moveq r0, #0x0 @@ -262,7 +260,6 @@ _02091180: ; 0x02091180 ldr r1, [sp, #0x10] mov r3, r2 bl FUN_02091230 -_020911B8: ; 0x020911B8 cmp r0, #0x0 addeq sp, sp, #0x120 moveq r0, #0x0 @@ -308,7 +305,6 @@ FUN_02091230: mov r2, #0x30 mov r3, #0x0 bl FUN_02091498 -_02091258: ; 0x02091258 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -320,7 +316,6 @@ _02091258: ; 0x02091258 mov r2, #0x30 mov r3, #0x0 bl FUN_02091498 -_02091284: ; 0x02091284 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -332,7 +327,6 @@ _02091284: ; 0x02091284 add r3, sp, #0x0 mov r2, #0x6 bl FUN_02091498 -_020912B0: ; 0x020912B0 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -363,7 +357,6 @@ _020912B0: ; 0x020912B0 mov r2, #0x5 str r12, [sp, #0x14] bl FUN_02091498 -_02091328: ; 0x02091328 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -388,7 +381,6 @@ _02091328: ; 0x02091328 mov r2, #0x4 str r12, [sp, #0x14] bl FUN_02091498 -_02091388: ; 0x02091388 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -554,7 +546,6 @@ _020915AC: bl FUN_0209502C add r0, sp, #0x40 bl FUN_0209502C -_020915D4: ; 0x020915D4 cmp r4, #0x0 mvneq r5, #0x1 beq _02091688 @@ -562,14 +553,12 @@ _020915D4: ; 0x020915D4 mov r0, r8 mov r1, r7 bl FUN_02094C68 -_020915F0: ; 0x020915F0 cmp r0, #0x0 mvneq r5, #0x1 beq _02091688 ldr r1, [sp, #0x78] add r0, sp, #0x2c bl FUN_02094D7C -_02091608: ; 0x02091608 cmp r0, #0x0 mvneq r5, #0x1 beq _02091688 @@ -577,7 +566,6 @@ _02091608: ; 0x02091608 ldr r1, [sp, #0x74] add r2, sp, #0x40 bl FUN_02094C68 -_02091624: ; 0x02091624 cmp r0, #0x0 mvneq r5, #0x1 beq _02091688 @@ -587,7 +575,6 @@ _02091624: ; 0x02091624 add r3, sp, #0x40 str r4, [sp, #0x0] bl FUN_020931B8 -_02091648: ; 0x02091648 cmp r0, #0x0 mvneq r5, #0x1 beq _02091688 @@ -613,7 +600,6 @@ _02091688: bl FUN_0209510C add r0, sp, #0x40 bl FUN_0209510C -_020916A8: ; 0x020916A8 cmp r4, #0x0 beq _020916B8 mov r0, r4 @@ -711,7 +697,6 @@ _020917DC: ldr r2, [sp, #0xa0] mov r1, r5 bl FUN_02092894 -_02091808: ; 0x02091808 cmp r0, #0x0 beq _02091E6C _02091810: @@ -723,7 +708,6 @@ _02091810: mov r2, #0x0 str r4, [sp, #0x1c] bl FUN_02092C28 -_02091830: ; 0x02091830 cmp r0, #0x0 beq _02091E6C ldr r0, [sp, #0xa0] @@ -798,7 +782,6 @@ _0209191C: ldr r3, [sp, #0xa0] str r0, [sp, #0x14] bl FUN_02093214 -_0209194C: ; 0x0209194C cmp r0, #0x0 beq _02091E6C ldr r0, [sp, #0x14] @@ -1000,7 +983,6 @@ _02091C28: mov r1, r8 mov r2, r10, lsl #0x2 bl MI_CpuCopy8 -_02091C40: ; 0x02091C40 cmp r9, #0x0 beq _02091E00 mov r0, #0xff @@ -1258,7 +1240,6 @@ _02091FC0: mov r1, r4 mov r2, r9 bl FUN_02092744 -_02091FD8: ; 0x02091FD8 cmp r0, #0x0 ble _0209220C add r0, sp, #0x4c @@ -1276,7 +1257,6 @@ _02091FD8: ; 0x02091FD8 mov r3, r9 str r4, [sp, #0xc] bl FUN_02093214 -_0209201C: ; 0x0209201C cmp r0, #0x0 beq _0209220C add r1, sp, #0x4c @@ -1285,7 +1265,6 @@ _0209201C: ; 0x0209201C mov r2, r1 str r9, [sp, #0x0] bl FUN_02092698 -_0209203C: ; 0x0209203C cmp r0, #0x0 beq _0209220C cmp r8, #0x11 @@ -1316,7 +1295,6 @@ _02092080: add r3, sp, #0x18 str r9, [sp, #0x0] bl FUN_02092698 -_020920AC: ; 0x020920AC cmp r0, #0x0 beq _0209220C add r4, r4, #0x1 @@ -1330,7 +1308,6 @@ _020920C4: str r4, [sp, #0xc] sub r8, r8, #0x1 bl FUN_02094D7C -_020920DC: ; 0x020920DC cmp r0, #0x0 beq _0209220C mov r0, r5 @@ -1341,7 +1318,6 @@ _020920F4: ldr r0, [sp, #0x4] mov r1, r8 bl FUN_02094A8C -_02092100: ; 0x02092100 cmp r0, #0x0 bne _02092140 cmp r5, #0x0 @@ -1352,7 +1328,6 @@ _02092100: ; 0x02092100 add r3, sp, #0x18 str r9, [sp, #0x0] bl FUN_02092698 -_02092128: ; 0x02092128 cmp r0, #0x0 beq _0209220C _02092130: @@ -1371,7 +1346,6 @@ _02092154: bmi _02092184 ldr r0, [sp, #0x4] bl FUN_02094A8C -_02092164: ; 0x02092164 cmp r0, #0x0 subne r0, r4, r7 movne r0, r6, lsl r0 @@ -1394,7 +1368,6 @@ _0209219C: add r3, sp, #0x18 str r9, [sp, #0x0] bl FUN_02092698 -_020921B4: ; 0x020921B4 cmp r0, #0x0 beq _0209220C add r4, r4, #0x1 @@ -1410,7 +1383,6 @@ _020921C8: add r3, sp, #0x18 str r9, [sp, #0x0] bl FUN_02092698 -_020921EC: ; 0x020921EC cmp r0, #0x0 beq _0209220C add r0, r7, #0x1 @@ -1552,7 +1524,6 @@ FUN_020923A0: ; 0x020923A0 add r0, sp, #0x4 mov r1, r6 bl FUN_02094AFC -_020923DC: ; 0x020923DC cmp r0, #0x0 beq _02092404 add r2, sp, #0x4 @@ -1561,7 +1532,6 @@ _020923DC: ; 0x020923DC mov r1, #0x0 str r5, [sp, #0x0] bl FUN_02093248 -_020923FC: ; 0x020923FC cmp r0, #0x0 movne r4, r6 _02092404: @@ -1610,7 +1580,6 @@ _0209249C: mov r0, r8 mov r1, r7 bl FUN_02094B98 -_020924A8: ; 0x020924A8 cmp r0, #0x0 bge _020924DC mov r0, r10 @@ -1653,7 +1622,6 @@ _02092534: mov r1, r8 sub r2, r2, r4 bl FUN_02094134 -_02092548: ; 0x02092548 cmp r0, #0x0 beq _02092684 ldr r1, [sp, #0x4] @@ -1661,7 +1629,6 @@ _02092548: ; 0x02092548 mov r3, r6 add r2, r7, #0x14 bl FUN_0209390C -_02092564: ; 0x02092564 cmp r0, #0x0 beq _02092684 ldr r2, [sp, #0x8] @@ -1669,7 +1636,6 @@ _02092564: ; 0x02092564 mov r1, r5 add r2, r2, r4 bl FUN_02094134 -_02092580: ; 0x02092580 cmp r0, #0x0 beq _02092684 mov r4, #0x0 @@ -1679,14 +1645,12 @@ _02092580: ; 0x02092580 mov r3, r6 str r4, [r10, #0xc] bl FUN_0209390C -_020925A4: ; 0x020925A4 cmp r0, #0x0 beq _02092684 mov r0, r9 mov r1, r8 mov r2, r5 bl FUN_02093B50 -_020925BC: ; 0x020925BC cmp r0, #0x0 beq _02092684 mov r5, r4 @@ -1694,7 +1658,6 @@ _020925BC: ; 0x020925BC mov r1, r7 str r5, [r9, #0xc] bl FUN_02094B98 -_020925D8: ; 0x020925D8 cmp r0, #0x0 blt _02092630 mov r4, #0x1 @@ -1706,19 +1669,16 @@ _020925E4: mov r1, r9 mov r2, r7 bl FUN_02093B50 -_02092600: ; 0x02092600 cmp r0, #0x0 beq _02092684 mov r0, r10 mov r1, r4 bl FUN_0209400C -_02092614: ; 0x02092614 cmp r0, #0x0 beq _02092684 mov r0, r9 mov r1, r7 bl FUN_02094B98 -_02092628: ; 0x02092628 cmp r0, #0x0 bge _020925E4 _02092630: @@ -1773,7 +1733,6 @@ FUN_02092698: mov r0, r6 mov r2, r4 bl FUN_0209305C -_020926E4: ; 0x020926E4 cmp r0, #0x0 bne _0209270C b _02092728 @@ -1781,7 +1740,6 @@ _020926F0: mov r0, r6 mov r3, r4 bl FUN_0209390C -_020926FC: ; 0x020926FC cmp r0, #0x0 bne _0209270C b _02092728 @@ -1847,7 +1805,6 @@ FUN_020927BC: ; 0x020927BC bl FUN_0209502C add r0, r4, #0x14 bl FUN_0209502C -_020927D0: ; 0x020927D0 mov r0, #0x0 str r0, [r4, #0x28] str r0, [r4, #0x30] @@ -1886,7 +1843,6 @@ FUN_02092824: ; 0x02092824 bl FUN_0209502C add r0, r4, #0x34 bl FUN_0209502C -_02092850: ; 0x02092850 mov r0, #0x0 str r0, [r4, #0x4c] ldmia sp!, {r4,lr} @@ -1924,7 +1880,6 @@ FUN_02092894: add r0, r7, #0x20 add r4, r7, #0xc bl FUN_02094E24 -_020928CC: ; 0x020928CC cmp r0, #0x0 addeq sp, sp, #0x14 moveq r0, #0x0 @@ -1944,7 +1899,6 @@ _020928CC: ; 0x020928CC mov r1, #0x0 str r2, [r7, #0x8] bl FUN_02094D7C -_02092918: ; 0x02092918 cmp r0, #0x0 addeq sp, sp, #0x14 moveq r0, #0x0 @@ -1953,7 +1907,6 @@ _02092918: ; 0x02092918 mov r0, r4 mov r1, #0x20 bl FUN_02094AFC -_02092938: ; 0x02092938 cmp r0, #0x0 beq _02092A38 ldr r0, [r6, #0x0] @@ -1963,14 +1916,12 @@ _02092938: ; 0x02092938 mov r1, r0 add r0, sp, #0x0 bl FUN_02094D7C -_0209295C: ; 0x0209295C cmp r0, #0x0 beq _02092A38 add r0, sp, #0x0 mov r2, #0x20 mov r1, r0 bl FUN_02094250 -_02092974: ; 0x02092974 cmp r0, #0x0 beq _02092A38 ldr r0, [sp, #0x4] @@ -1991,7 +1942,6 @@ _020929B0: add r0, sp, #0x0 mvn r1, #0x0 bl FUN_02094D7C -_020929BC: ; 0x020929BC cmp r0, #0x0 beq _02092A38 _020929C4: @@ -2014,7 +1964,6 @@ _020929C4: add r0, r7, #0xc mov r1, r1, lsl #0x6 bl FUN_02094AFC -_02092A10: ; 0x02092A10 cmp r0, #0x0 beq _02092A38 add r0, r7, #0xc @@ -2454,7 +2403,6 @@ _02093018: mov r2, r10 mov r3, r6 bl FUN_02094468 -_0209302C: ; 0x0209302C ldr r0, [sp, #0x0] mov r1, r9 mov r2, r11 @@ -2635,7 +2583,6 @@ _02093298: ldr r0, [sp, #0x4] mov r1, r6 bl FUN_02094B98 -_020932A4: ; 0x020932A4 cmp r0, #0x0 bge _020932F8 ldr r0, [sp, #0x0] @@ -2643,7 +2590,6 @@ _020932A4: ; 0x020932A4 beq _020932D4 ldr r1, [sp, #0x4] bl FUN_02094E24 -_020932C0: ; 0x020932C0 cmp r0, #0x0 addeq sp, sp, #0x4c moveq r0, #0x0 @@ -2689,7 +2635,6 @@ _020932F8: ldr r2, [sp, #0x8] mov r1, r6 bl FUN_02094250 -_02093368: ; 0x02093368 cmp r0, #0x0 addeq sp, sp, #0x4c moveq r0, #0x0 @@ -2703,7 +2648,6 @@ _02093368: ; 0x02093368 add r2, r2, #0x20 str r4, [r3, #0xc] bl FUN_02094250 -_0209339C: ; 0x0209339C cmp r0, #0x0 addeq sp, sp, #0x4c moveq r0, r4 @@ -2787,14 +2731,12 @@ _020934CC: ldr r1, [sp, #0x1c] add r0, sp, #0x38 bl FUN_02094B98 -_020934E0: ; 0x020934E0 cmp r0, #0x0 blt _02093520 add r0, sp, #0x38 ldr r2, [sp, #0x1c] mov r1, r0 bl FUN_02093B50 -_020934F8: ; 0x020934F8 cmp r0, #0x0 beq _020937D4 ldr r0, [sp, #0x20] @@ -2968,7 +2910,6 @@ _0209374C: _0209377C: ldr r0, [sp, #0x18] bl FUN_02095040 -_02093784: ; 0x02093784 ldr r0, [sp, #0x0] cmp r0, #0x0 beq _020937C4 @@ -2978,7 +2919,6 @@ _02093784: ; 0x02093784 add r2, r2, #0x20 ldr r4, [r3, #0xc] bl FUN_02094134 -_020937A8: ; 0x020937A8 cmp r0, #0x0 addeq sp, sp, #0x4c moveq r0, #0x0 @@ -3073,7 +3013,6 @@ _02093840: add r9, r9, #0x10 add r6, r6, #0x10 b _02093840 -_02093900: ; 0x02093900 add sp, sp, #0x4 ldmia sp!, {r4-r9,lr} bx lr @@ -3183,7 +3122,6 @@ _02093A60: mov r1, r6 mov r2, r5 bl FUN_02093CB4 -_02093A78: ; 0x02093A78 cmp r0, #0x0 moveq r0, #0x0 add sp, sp, #0x4 @@ -3211,14 +3149,12 @@ _02093ABC: mov r0, r6 mov r1, r5 bl FUN_02094B98 -_02093ADC: ; 0x02093ADC cmp r0, #0x0 bge _02093B14 mov r0, r7 mov r1, r5 mov r2, r6 bl FUN_02093B50 -_02093AF4: ; 0x02093AF4 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -3232,7 +3168,6 @@ _02093B14: mov r1, r6 mov r2, r5 bl FUN_02093B50 -_02093B24: ; 0x02093B24 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -3383,7 +3318,6 @@ _02093D04: mov r1, r5 mov r3, r7 bl FUN_02094468 -_02093D38: ; 0x02093D38 cmp r0, #0x0 add r4, r4, r7, lsl #0x2 add r5, r5, r7, lsl #0x2 @@ -3445,14 +3379,12 @@ FUN_02093DD0: ; 0x02093DD0 mov r0, r5 mov r1, r4 bl FUN_02094B98 -_02093E0C: ; 0x02093E0C cmp r0, #0x0 bge _02093E40 mov r0, r6 mov r1, r4 mov r2, r5 bl FUN_02093B50 -_02093E24: ; 0x02093E24 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,lr} @@ -3465,7 +3397,6 @@ _02093E40: mov r1, r5 mov r2, r4 bl FUN_02093B50 -_02093E50: ; 0x02093E50 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,lr} @@ -3486,7 +3417,6 @@ _02093E74: mov r1, r5 mov r2, r4 bl FUN_02093CB4 -_02093E98: ; 0x02093E98 cmp r0, #0x0 moveq r0, #0x0 movne r0, #0x1 @@ -4657,7 +4587,6 @@ FUN_02094EBC: mov r1, r6 mov r2, r2, lsl #0x2 bl MI_CpuCopy8 -_02094F20: ; 0x02094F20 ldr r0, [r5, #0x0] bl CallCustomDestructor _02094F28: @@ -4697,7 +4626,6 @@ FUN_02094F84: ; 0x02094F84 mov r2, #0x110 mov r4, r0 bl MI_CpuFill8 -_02094F98: ; 0x02094F98 mov r0, #0x0 str r0, [r4, #0x0] str r0, [r4, #0x108] @@ -4726,7 +4654,6 @@ FUN_02094FE0: ; 0x02094FE0 sub sp, sp, #0x4 mov r0, #0x14 bl CallCustomAllocator -_02094FF0: ; 0x02094FF0 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -5058,7 +4985,6 @@ _02095434: mov r0, r5 mov r1, r4 bl PXI_IsCallbackReady -_02095440: ; 0x02095440 cmp r0, #0x0 beq _02095434 ldr r1, _02095490 ; =FUN_020953F0 @@ -5094,16 +5020,13 @@ FUN_02095494: mov r1, r5 mov r2, r4 bl FUN_0209555C -_020954B4: ; 0x020954B4 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020954C0: ; 0x020954C0 mov r0, r6 mov r1, r4 mov r2, r5 bl memcmp -_020954D0: ; 0x020954D0 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -5121,7 +5044,6 @@ _020954F8: mov r0, r5 mov r1, r4 bl PXI_IsCallbackReady -_02095504: ; 0x02095504 cmp r0, #0x0 beq _020954F8 ldr r1, _02095558 ; =FUN_020953F0 @@ -5140,11 +5062,9 @@ _0209552C: bl FUN_020955F4 cmp r0, #0x1 ldmeqia sp!, {r4-r8,pc} -_02095548: ; 0x02095548 mov r0, r4 bl SVC_WaitByLoop b _0209552C -_02095554: ; 0x02095554 ldmia sp!, {r4-r8,pc} .balign 4 _02095558: .word FUN_020953F0 @@ -5164,7 +5084,6 @@ _02095580: mov r0, r8 mov r1, r7 bl PXI_IsCallbackReady -_0209558C: ; 0x0209558C cmp r0, #0x0 beq _02095580 ldr r1, _020955F0 ; =FUN_020953F0 @@ -5312,7 +5231,6 @@ _02095788: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095798: ; 0x02095798 cmp r0, #0x0 ldrlt r8, [sp, #0x34] blt _0209574C @@ -5320,7 +5238,6 @@ _02095798: ; 0x02095798 mov r0, r5 mov r1, r7 bl PXI_SendWordByFifo -_020957B4: ; 0x020957B4 cmp r0, #0x0 ldrlt r8, [sp, #0x3c] blt _0209574C @@ -5328,7 +5245,6 @@ _020957B4: ; 0x020957B4 ldr r2, [sp, #0x44] mov r0, r5 bl PXI_SendWordByFifo -_020957D0: ; 0x020957D0 cmp r0, #0x0 ldrlt r8, [sp, #0x48] blt _0209574C @@ -5336,7 +5252,6 @@ _020957D0: ; 0x020957D0 ldr r2, [sp, #0x4c] mov r0, r5 bl PXI_SendWordByFifo -_020957EC: ; 0x020957EC cmp r0, #0x0 ldrlt r8, [sp, #0x50] blt _0209574C @@ -5344,7 +5259,6 @@ _020957EC: ; 0x020957EC ldr r2, [sp, #0x54] mov r0, r5 bl PXI_SendWordByFifo -_02095808: ; 0x02095808 cmp r0, #0x0 ldrlt r8, [sp, #0x58] blt _0209574C @@ -5352,7 +5266,6 @@ _02095808: ; 0x02095808 ldr r2, [sp, #0x5c] mov r0, r5 bl PXI_SendWordByFifo -_02095824: ; 0x02095824 cmp r0, #0x0 ldrlt r8, [sp, #0x60] movge r8, r4 @@ -5362,7 +5275,6 @@ _02095834: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095844: ; 0x02095844 cmp r0, #0x0 movge r8, r4 ldrlt r8, [sp, #0x64] @@ -5372,7 +5284,6 @@ _02095854: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095864: ; 0x02095864 cmp r0, #0x0 ldrlt r8, [sp, #0x68] blt _020958E0 @@ -5380,7 +5291,6 @@ _02095864: ; 0x02095864 mov r0, r5 mov r1, r7 bl PXI_SendWordByFifo -_02095880: ; 0x02095880 cmp r0, #0x0 ldrlt r8, [sp, #0x70] blt _020958E0 @@ -5388,7 +5298,6 @@ _02095880: ; 0x02095880 ldr r2, [sp, #0x74] mov r0, r5 bl PXI_SendWordByFifo -_0209589C: ; 0x0209589C cmp r0, #0x0 ldrlt r8, [sp, #0x78] blt _020958E0 @@ -5396,7 +5305,6 @@ _0209589C: ; 0x0209589C ldr r2, [sp, #0x7c] mov r0, r5 bl PXI_SendWordByFifo -_020958B8: ; 0x020958B8 cmp r0, #0x0 ldrlt r8, [sp, #0x80] blt _020958E0 @@ -5404,13 +5312,11 @@ _020958B8: ; 0x020958B8 ldr r2, [sp, #0x84] mov r0, r5 bl PXI_SendWordByFifo -_020958D4: ; 0x020958D4 cmp r0, #0x0 ldrlt r8, [sp, #0x88] movge r8, r4 _020958E0: bl OS_GetTick -_020958E4: ; 0x020958E4 str r0, [sp, #0x0] mov r11, r1 b _0209574C @@ -5419,7 +5325,6 @@ _020958F0: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095900: ; 0x02095900 cmp r0, #0x0 ldrlt r8, [sp, #0x8c] blt _0209574C @@ -5427,7 +5332,6 @@ _02095900: ; 0x02095900 ldr r2, [sp, #0x90] mov r0, r5 bl PXI_SendWordByFifo -_0209591C: ; 0x0209591C cmp r0, #0x0 ldrlt r8, [sp, #0x94] blt _0209574C @@ -5435,7 +5339,6 @@ _0209591C: ; 0x0209591C ldr r2, [sp, #0x98] mov r0, r5 bl PXI_SendWordByFifo -_02095938: ; 0x02095938 cmp r0, #0x0 ldrlt r8, [sp, #0x9c] movge r8, r4 @@ -5445,7 +5348,6 @@ _02095948: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095958: ; 0x02095958 cmp r0, #0x0 movge r8, r4 ldrlt r8, [sp, #0xa0] @@ -5455,7 +5357,6 @@ _02095968: mov r0, r5 mov r2, r6 bl PXI_SendWordByFifo -_02095978: ; 0x02095978 cmp r0, #0x0 movge r8, r4 ldrlt r8, [sp, #0xa4] @@ -5473,21 +5374,13 @@ _02095988: cmp r9, #0x7 addls pc, pc, r9, lsl #0x2 b _0209574C -_020959B8: ; 0x020959B8 b _0209574C -_020959BC: ; 0x020959BC b _020959D8 -_020959C0: ; 0x020959C0 b _020959E4 -_020959C4: ; 0x020959C4 b _020959EC -_020959C8: ; 0x020959C8 b _020959F4 -_020959CC: ; 0x020959CC b _020959F4 -_020959D0: ; 0x020959D0 b _02095A88 -_020959D4: ; 0x020959D4 b _02095A94 _020959D8: add sp, sp, #0xc4 @@ -5518,7 +5411,6 @@ _02095A24: addeq sp, sp, #0xc4 moveq r0, #0x1 ldmeqia sp!, {r4-r11,pc} -_02095A38: ; 0x02095A38 ands r0, r1, #0x20 bne _02095A74 bl OS_GetTick @@ -5531,7 +5423,6 @@ _02095A38: ; 0x02095A38 mov r0, r2, lsl #0x6 ldr r2, _02095ADC ; =0x000082EA bl _ll_udiv -_02095A68: ; 0x02095A68 cmp r1, #0x0 cmpeq r0, #0xfa0 bls _02095A7C @@ -5590,12 +5481,10 @@ FUN_02095B0C: mov r5, r0 mov r4, r1 bl FUN_02095AE0 -_02095B20: ; 0x02095B20 cmp r0, #0x0 addeq sp, sp, #0xc moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_02095B30: ; 0x02095B30 add r1, sp, #0x0 mov r0, r5 mov r2, #0x4 @@ -5612,7 +5501,6 @@ _02095B30: ; 0x02095B30 addeq sp, sp, #0xc moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_02095B70: ; 0x02095B70 mvn r0, r3 ands r0, r2, r0 movne r0, #0x1 @@ -5712,7 +5600,6 @@ _02095C80: mov r2, r5 mov r3, r4 bl FUN_02095494 -_02095CA4: ; 0x02095CA4 cmp r0, #0x0 beq _02095C80 add r9, r9, #0x1 @@ -5721,7 +5608,6 @@ _02095CA4: ; 0x02095CA4 add r8, r8, #0x100 blt _02095C68 bl FUN_02095428 -_02095CC4: ; 0x02095CC4 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -5755,7 +5641,6 @@ _02095D0C: mov r2, r5 mov r3, r8 bl FUN_02095494 -_02095D30: ; 0x02095D30 cmp r0, #0x0 beq _02095D0C _02095D38: @@ -5765,7 +5650,6 @@ _02095D38: add r6, r6, #0x100 blt _02095D00 bl FUN_02095428 -_02095D50: ; 0x02095D50 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -5783,7 +5667,6 @@ FUN_02095D68: ldr r0, [r1, #0x0] mov r1, #0x400 bl FUN_0209555C -_02095D84: ; 0x02095D84 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -5800,11 +5683,9 @@ FUN_02095D9C: mov r1, r0 mov r2, r4 bl FUN_0209555C -_02095DB4: ; 0x02095DB4 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_02095DC0: ; 0x02095DC0 ldrh r2, [r4, #0x0] ldr r1, _02095DDC ; =UNK_021C8C80 mov r0, #0x1 @@ -5837,7 +5718,6 @@ _02095E1C: mov r1, r7 mov r2, r10 bl FUN_0209555C -_02095E2C: ; 0x02095E2C cmp r0, #0x0 bne _02095E44 bl OS_Terminate @@ -5864,7 +5744,6 @@ _02095E68: mov r2, r7 mov r3, r4 bl FUN_02095494 -_02095E8C: ; 0x02095E8C cmp r0, #0x0 beq _02095E68 add r9, r9, #0x1 @@ -5872,7 +5751,6 @@ _02095E8C: ; 0x02095E8C add r8, r8, #0x100 blt _02095E1C bl FUN_02095428 -_02095EA8: ; 0x02095EA8 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -5952,7 +5830,6 @@ FUN_02095FA8: ; 0x02095FA8 ldr r0, [r1, #0x0] mov r1, #0x300 bl FUN_0209555C -_02095FC4: ; 0x02095FC4 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -5996,7 +5873,6 @@ _02096034: blt _02096034 add r0, sp, #0x0 bl FUN_020967A4 -_02096050: ; 0x02096050 add r0, sp, #0x0 bl FUN_02095330 mov r6, r0 @@ -6025,47 +5901,38 @@ FUN_02096090: addeq sp, sp, #0x8 moveq r0, #0x1 ldmeqia sp!, {r4,pc} -_020960B0: ; 0x020960B0 cmp r0, #0x2 addhi sp, sp, #0x8 movhi r0, #0x0 ldmhiia sp!, {r4,pc} -_020960C0: ; 0x020960C0 add r0, r4, #0x40 bl FUN_02095B88 -_020960C8: ; 0x020960C8 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020960D8: ; 0x020960D8 ldr r1, _0209618C ; =UNK_020FF574 add r0, r4, #0xc0 mov r2, #0x4 bl memcmp -_020960E8: ; 0x020960E8 cmp r0, #0x0 beq _02096140 add r0, r4, #0xc4 bl FUN_02095AE0 -_020960F8: ; 0x020960F8 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_02096108: ; 0x02096108 ldrb r0, [r4, #0xd0] cmp r0, #0x20 addhi sp, sp, #0x8 movhi r0, #0x0 ldmhiia sp!, {r4,pc} -_0209611C: ; 0x0209611C add r1, sp, #0x0 bl FUN_02095BB0 add r1, sp, #0x0 add r0, r4, #0xc0 bl FUN_02095B0C -_02096130: ; 0x02096130 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 @@ -6075,17 +5942,14 @@ _02096140: add r0, r4, #0xc8 mov r2, #0x4 bl memcmp -_02096150: ; 0x02096150 cmp r0, #0x0 beq _02096180 add r0, r4, #0xc8 bl FUN_02095AE0 -_02096160: ; 0x02096160 cmp r0, #0x0 bne _02096180 add r0, r4, #0xcc bl FUN_02095AE0 -_02096170: ; 0x02096170 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 @@ -6107,23 +5971,19 @@ FUN_02096190: ; 0x02096190 bl MI_CpuFill8 mov r0, r10 bl FUN_02095D9C -_020961B0: ; 0x020961B0 cmp r0, #0x0 addeq sp, sp, #0x14 ldreq r0, _020964B4 ; =0xFFFFD8EF ldmeqia sp!, {r4-r11,pc} -_020961C0: ; 0x020961C0 ldr r1, _020964B8 ; =0x0000A001 add r0, r10, #0x500 bl MATHi_CRC16InitTableRev mov r0, r10 bl FUN_02095D68 -_020961D4: ; 0x020961D4 cmp r0, #0x0 addeq sp, sp, #0x14 ldreq r0, _020964B4 ; =0xFFFFD8EF ldmeqia sp!, {r4-r11,pc} -_020961E4: ; 0x020961E4 add r0, sp, #0x0 mov r1, #0x0 mov r2, #0x10 @@ -6146,7 +6006,6 @@ _02096210: bne _02096240 mov r0, r7 bl FUN_02096090 -_02096238: ; 0x02096238 cmp r0, #0x0 strne r4, [r11, r9, lsl #0x2] _02096240: @@ -6197,7 +6056,6 @@ _020962BC: bl FUN_02096010 mov r0, r10 bl FUN_02095C3C -_020962F8: ; 0x020962F8 cmp r0, #0x0 movne r0, #0x0 add sp, sp, #0x14 @@ -6221,7 +6079,6 @@ _02096338: bl FUN_02096010 mov r0, r10 bl FUN_02095C3C -_02096348: ; 0x02096348 cmp r0, #0x0 movne r0, #0x0 add sp, sp, #0x14 @@ -6237,7 +6094,6 @@ _0209635C: bl FUN_02096010 mov r0, r10 bl FUN_02095C3C -_02096380: ; 0x02096380 cmp r0, #0x0 ldrne r0, _020964C0 ; =0xFFFFD8ED add sp, sp, #0x14 @@ -6313,12 +6169,10 @@ _0209647C: blt _02096444 mov r0, r10 bl FUN_02095C3C -_02096490: ; 0x02096490 cmp r0, #0x0 addeq sp, sp, #0x14 ldreq r0, _020964BC ; =0xFFFFD8F0 ldmeqia sp!, {r4-r11,pc} -_020964A0: ; 0x020964A0 cmp r4, #0x0 ldrne r0, _020964C4 ; =0xFFFFD8EE moveq r0, #0x0 @@ -6362,7 +6216,6 @@ FUN_02096518: ; 0x02096518 mov r4, r0 add r0, sp, #0x0 bl FUN_02095EC8 -_0209652C: ; 0x0209652C add r0, sp, #0x0 ldmia r0, {r2-r3} stmia r4, {r2-r3} @@ -6398,20 +6251,16 @@ FUN_02096570: ; 0x02096570 bl RTC_Init add r0, sp, #0x8 bl RTC_GetDate -_020965AC: ; 0x020965AC cmp r0, #0x0 addne sp, sp, #0x28 movne r0, #0x0 ldmneia sp!, {r4-r10,pc} -_020965BC: ; 0x020965BC add r0, sp, #0x18 bl RTC_GetTime -_020965C4: ; 0x020965C4 cmp r0, #0x0 addne sp, sp, #0x28 movne r0, #0x0 ldmneia sp!, {r4-r10,pc} -_020965D4: ; 0x020965D4 add r0, sp, #0x8 add r1, sp, #0x18 bl RTC_ConvertDateTimeToSecond @@ -6421,9 +6270,7 @@ _020965D4: ; 0x020965D4 sbcs r2, r1, r0 addlt sp, sp, #0x28 ldmltia sp!, {r4-r10,pc} -_020965F8: ; 0x020965F8 bl OS_IsTickAvailable -_020965FC: ; 0x020965FC cmp r0, #0x0 beq _0209660C ldr r0, _02096700 ; =OS_GetTick @@ -6517,7 +6364,6 @@ FUN_02096710: ; 0x02096710 mov r1, r4 stmia r12, {r2-r3} bl FUN_02095DE0 -_0209674C: ; 0x0209674C cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -6531,16 +6377,13 @@ FUN_02096760: ; 0x02096760 mov r4, r0 add r0, sp, #0x0 bl FUN_020967A4 -_02096774: ; 0x02096774 cmp r0, #0x0 addeq sp, sp, #0x18 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_02096784: ; 0x02096784 add r0, sp, #0x0 mov r1, r4 bl FUN_02095DE0 -_02096790: ; 0x02096790 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -6556,20 +6399,16 @@ FUN_020967A4: bl RTC_Init add r0, sp, #0x8 bl RTC_GetDate -_020967C0: ; 0x020967C0 cmp r0, #0x0 addne sp, sp, #0x28 movne r0, #0x0 ldmneia sp!, {r4-r10,pc} -_020967D0: ; 0x020967D0 add r0, sp, #0x18 bl RTC_GetTime -_020967D8: ; 0x020967D8 cmp r0, #0x0 addne sp, sp, #0x28 movne r0, #0x0 ldmneia sp!, {r4-r10,pc} -_020967E8: ; 0x020967E8 add r0, sp, #0x8 add r1, sp, #0x18 bl RTC_ConvertDateTimeToSecond @@ -6579,9 +6418,7 @@ _020967E8: ; 0x020967E8 sbcs r2, r1, r0 addlt sp, sp, #0x28 ldmltia sp!, {r4-r10,pc} -_0209680C: ; 0x0209680C bl OS_IsTickAvailable -_02096810: ; 0x02096810 cmp r0, #0x0 beq _02096820 ldr r0, _02096978 ; =OS_GetTick @@ -6805,7 +6642,6 @@ FUN_02096B14: ; 0x02096B14 bl FUN_02096190 mov r5, r0 bl FUN_020964C8 -_02096B38: ; 0x02096B38 cmp r0, #0x0 beq _02096B4C mov r0, r6 @@ -6838,12 +6674,10 @@ FUN_02096B78: ; 0x02096B78 mov r5, r0 mov r0, r4 bl FUN_020974C8 -_02096B98: ; 0x02096B98 cmp r5, r0 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r7,pc} -_02096BA8: ; 0x02096BA8 cmp r5, #0x3 bne _02096BD8 mov r0, r7 @@ -6851,7 +6685,6 @@ _02096BA8: ; 0x02096BA8 mov r5, r0 mov r0, r4 bl FUN_02097544 -_02096BC4: ; 0x02096BC4 cmp r5, r0 moveq r0, #0x1 add sp, sp, #0x4 @@ -6874,7 +6707,6 @@ _02096BD8: mov r5, r0 mov r0, r4 bl FUN_02097560 -_02096C18: ; 0x02096C18 cmp r5, r0 addeq sp, sp, #0x4 moveq r0, #0x1 @@ -6943,14 +6775,12 @@ FUN_02096CCC: ; 0x02096CCC bl MI_CpuFill8 mov r0, r5 bl FUN_0209702C -_02096CF4: ; 0x02096CF4 cmp r0, #0x0 addeq r0, r5, #0x4 ldmeqia r0, {r0-r2} addeq sp, sp, #0x4 stmeqia r4, {r0-r2} ldmeqia sp!, {r4-r5,pc} -_02096D0C: ; 0x02096D0C ldr r1, [r5, #0x1c] mov r0, r4 bl FUN_020974F4 @@ -7017,11 +6847,9 @@ _02096DD0: mov r4, r0 mov r5, r1 bl FUN_02097344 -_02096DE8: ; 0x02096DE8 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_02096DF4: ; 0x02096DF4 ldr r2, [r6, #0x24] mov r0, r4 mov r1, r5 @@ -7047,7 +6875,6 @@ FUN_02096E24: ; 0x02096E24 movne r0, #0x0 movne r1, r0 ldmneia sp!, {r4,pc} -_02096E40: ; 0x02096E40 mov r0, r4 bl FUN_0209754C ldmia sp!, {r4,pc} @@ -7063,7 +6890,6 @@ FUN_02096E4C: ; 0x02096E4C ldr r1, _02096E8C ; =0xEDB88320 str r2, [r4, #0x20] bl MATHi_CRC32InitTableRev -_02096E70: ; 0x02096E70 add r0, sp, #0x0 mov r1, r4 mov r2, #0x3c @@ -7110,7 +6936,6 @@ FUN_02096EC0: ; 0x02096EC0 add r0, sp, #0x0 str r12, [r4, #0x1c] bl MATHi_CRC32InitTableRev -_02096EEC: ; 0x02096EEC add r0, sp, #0x0 mov r1, r4 mov r2, #0x3c @@ -7131,12 +6956,10 @@ FUN_02096F18: ; 0x02096F18 mov r4, r0 add r0, r4, #0x10 bl FUN_020974C8 -_02096F2C: ; 0x02096F2C cmp r0, #0x0 addeq sp, sp, #0x18 moveq r0, #0x1 ldmeqia sp!, {r4,pc} -_02096F3C: ; 0x02096F3C add r0, sp, #0x0 bl FUN_02096518 ldr r0, [sp, #0x10] @@ -7144,7 +6967,6 @@ _02096F3C: ; 0x02096F3C addeq sp, sp, #0x18 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_02096F58: ; 0x02096F58 add r0, r4, #0x10 bl FUN_02097568 ldr r2, [sp, #0x4] @@ -7162,7 +6984,6 @@ FUN_02096F80: ; 0x02096F80 mov r4, r0 add r0, r4, #0x10 bl FUN_0209703C -_02096F90: ; 0x02096F90 cmp r0, #0x0 beq _02096FA8 ldr r0, [r4, #0x1c] @@ -7181,7 +7002,6 @@ FUN_02096FB0: ; 0x02096FB0 mov r4, r0 add r0, sp, #0x0 bl MATHi_CRC32InitTableRev -_02096FC8: ; 0x02096FC8 add r0, sp, #0x0 mov r1, r4 mov r2, #0x3c @@ -7214,7 +7034,6 @@ FUN_0209700C: ; 0x0209700C stmdb sp!, {lr} sub sp, sp, #0x4 bl FUN_020974C8 -_02097018: ; 0x02097018 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -7351,7 +7170,6 @@ FUN_02097190: ; 0x02097190 ldr r1, _02097214 ; =0xEDB88320 add r0, sp, #0x0 bl MATHi_CRC32InitTableRev -_020971E4: ; 0x020971E4 add r0, sp, #0x0 mov r1, r5 mov r2, #0x3c @@ -7449,7 +7267,6 @@ FUN_02097324: ; 0x02097324 stmdb sp!, {r4,lr} mov r4, r0 bl FUN_02097344 -_02097330: ; 0x02097330 cmp r0, #0x0 mvnne r0, #0x0 andne r0, r4, r0 @@ -7469,7 +7286,6 @@ FUN_02097344: addne sp, sp, #0x108 movne r0, r1 ldmneia sp!, {r4,pc} -_02097370: ; 0x02097370 str r0, [sp, #0x0] add r0, sp, #0x8 mov r1, #0x7 @@ -7526,7 +7342,6 @@ FUN_02097414: ; 0x02097414 bl FUN_020974C8 cmp r0, #0x3 ldmneia sp!, {r4,pc} -_02097428: ; 0x02097428 mov r0, r4 bl FUN_020974E0 orr r1, r0, #0x4 @@ -7683,7 +7498,6 @@ FUN_020975B4: ; 0x020975B4 stmdb sp!, {lr} sub sp, sp, #0x4 bl FUN_020A8850 -_020975C0: ; 0x020975C0 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -7900,7 +7714,6 @@ _02097890: mov r1, r6 mov r2, r5 bl OS_ReadMessage -_020978A0: ; 0x020978A0 ldr r0, [sp, #0x0] cmp r0, #0x0 addeq sp, sp, #0x4 @@ -7916,7 +7729,6 @@ _020978A0: ; 0x020978A0 mov r1, r4 mov r2, r4 bl OS_ReceiveMessage -_020978DC: ; 0x020978DC ldr r0, [sp, #0x0] ldr r0, [r0, #0x4] cmp r0, #0x0 @@ -7935,7 +7747,6 @@ _02097908: mov r0, r8 bl OS_RestoreInterrupts b _02097890 -_02097920: ; 0x02097920 add sp, sp, #0x4 ldmia sp!, {r4-r9,lr} bx lr @@ -7993,7 +7804,6 @@ _020979BC: mov r2, #0x0 str r2, [r4, #0x8] bl FUN_020979F8 -_020979C8: ; 0x020979C8 str r0, [sp, #0x0] _020979CC: ldr r0, [sp, #0x0] @@ -8073,7 +7883,6 @@ FUN_02097A98: ; 0x02097A98 mov r0, r4 mov r5, r1 bl FUN_02097AE0 -_02097AB0: ; 0x02097AB0 cmp r0, #0x0 ldmeqia sp!, {r4-r6,lr} bxeq lr @@ -8095,7 +7904,6 @@ FUN_02097AE0: ldr r0, _02097B10 ; =UNK_021C8D08 add r1, sp, #0x0 bl OS_ReceiveMessage -_02097AF8: ; 0x02097AF8 cmp r0, #0x0 ldrne r0, [sp, #0x0] moveq r0, #0x0 @@ -8158,7 +7966,6 @@ FUN_02097B78: ; 0x02097B78 mov r1, r6 mov r2, r4 bl OS_InitMessageQueue -_02097BD0: ; 0x02097BD0 cmp r4, #0x0 add r5, r6, r5 ble _02097BF4 @@ -8224,7 +8031,6 @@ FUN_02097C8C: ; 0x02097C8C mov r0, r2 str r2, [r1, #0x0] bl FUN_02099F6C -_02097CAC: ; 0x02097CAC add r0, r4, r0 ldmia sp!, {r4,lr} bx lr @@ -8313,7 +8119,6 @@ FUN_02097DC4: ; 0x02097DC4 mov r4, r0 ldrh r0, [r5, #0x0] bl FUN_02099F6C -_02097DE8: ; 0x02097DE8 add r0, r4, r0 add sp, sp, #0x4 ldmia sp!, {r4-r5,lr} @@ -8424,7 +8229,6 @@ _02097F40: bl FUN_0209CBE8 ldr r0, _02097F6C ; =FUN_02098550 bl FUN_0209CAA8 -_02097F50: ; 0x02097F50 b _02097F58 _02097F54: bl FUN_0209CBE8 @@ -8487,7 +8291,6 @@ FUN_02097FB4: ; 0x02097FB4 orr r1, r1, #0x4 strh r1, [r4, #0x70] bl OS_UnlockMutex -_02098020: ; 0x02098020 mov r0, #0x0 add sp, sp, #0x8 ldmia sp!, {r4-r6,lr} @@ -8500,7 +8303,6 @@ FUN_02098030: mov r5, r1 mov r4, r2 bl FUN_02099FA8 -_02098044: ; 0x02098044 cmp r0, #0x0 mvnne r0, #0x1b ldmneia sp!, {r4-r6,lr} @@ -8568,7 +8370,6 @@ FUN_02098120: mov r5, r1 mov r4, r2 bl FUN_02099FA8 -_02098138: ; 0x02098138 cmp r0, #0x0 addne sp, sp, #0x4 mvnne r0, #0x1b @@ -8618,7 +8419,6 @@ _020981A8: bxmi lr ldrh r1, [r6, #0x74] bl FUN_020984B4 -_020981F4: ; 0x020981F4 cmp r0, #0x0 addlt sp, sp, #0x4 ldmltia sp!, {r4-r7,lr} @@ -8627,7 +8427,6 @@ _020981F4: ; 0x020981F4 mov r1, r5 mov r2, r4 bl FUN_02098030 -_02098214: ; 0x02098214 cmp r0, #0x0 movge r0, r7 add sp, sp, #0x4 @@ -8641,7 +8440,6 @@ FUN_0209822C: ; 0x0209822C stmdb sp!, {r4,lr} mov r4, r0 bl FUN_02099FA8 -_02098238: ; 0x02098238 cmp r0, #0x0 mvnne r0, #0x1b ldmneia sp!, {r4,lr} @@ -8707,7 +8505,6 @@ _02098310: _02098318: add r0, r6, #0xe0 bl OS_UnlockMutex -_02098320: ; 0x02098320 cmp r5, #0x0 ldrnesh r1, [r4, #0x70] mvnne r0, #0x4b @@ -8756,7 +8553,6 @@ FUN_020983B0: ; 0x020983B0 mov r5, r1 mov r4, r2 bl FUN_02099FA8 -_020983C4: ; 0x020983C4 cmp r0, #0x0 bne _020983D8 ldrsh r0, [r6, #0x70] @@ -8833,7 +8629,6 @@ FUN_020984B4: mov r4, r0 mov r5, r1 bl FUN_02099FA8 -_020984C8: ; 0x020984C8 cmp r0, #0x0 addne sp, sp, #0x4 mvnne r0, #0x1b @@ -8977,7 +8772,6 @@ _020986B8: bl OS_SleepThread mov r0, r10 bl FUN_02099FA8 -_020986D4: ; 0x020986D4 cmp r0, #0x0 bne _020986FC mov r1, r5 @@ -9119,7 +8913,6 @@ FUN_02098868: ; 0x02098868 _020988A8: mov r0, r11 bl FUN_0209C638 -_020988B0: ; 0x020988B0 cmp r0, #0x0 beq _02098904 ldr r1, [sp, #0x10] @@ -9278,7 +9071,6 @@ FUN_02098AA4: ; 0x02098AA4 add r2, sp, #0x4 add r3, sp, #0x6 bl FUN_02098A14 -_02098AE0: ; 0x02098AE0 cmp r0, #0x0 beq _02098B48 ldr r4, [sp, #0x8] @@ -9438,7 +9230,6 @@ FUN_02098CF4: mov r7, r2 mov r6, r3 bl FUN_02099FA8 -_02098D10: ; 0x02098D10 cmp r0, #0x0 addne sp, sp, #0xc mvnne r0, #0x1b @@ -9506,7 +9297,6 @@ _02098DEC: bne _02098E18 add r0, r5, #0xe0 bl OS_TryLockMutex -_02098E00: ; 0x02098E00 cmp r0, #0x0 bne _02098E20 add sp, sp, #0xc @@ -9591,7 +9381,6 @@ FUN_02098F08: ; 0x02098F08 ldr r0, [r1, #0x4] ldr r5, [r0, #0xa4] bl OS_DisableInterrupts -_02098F24: ; 0x02098F24 cmp r5, #0x0 beq _02098F74 ldrh r3, [r5, #0x2e] @@ -9619,13 +9408,11 @@ _02098F74: mov r5, r1, lsl #0x1 _02098F80: bl OS_RestoreInterrupts -_02098F84: ; 0x02098F84 cmp r5, #0x0 ble _02098FAC mov r0, r4 mov r1, r5 bl _s32_div_f -_02098F98: ; 0x02098F98 cmp r0, #0x0 mulgt r0, r5, r0 addgt sp, sp, #0x4 @@ -9703,7 +9490,6 @@ _02099078: ble _020990E0 mov r0, r5 bl FUN_0209C030 -_0209909C: ; 0x0209909C cmp r0, #0x0 bgt _020990D4 ldrsb r0, [r7, #0x73] @@ -9840,7 +9626,6 @@ _02099270: ldr r0, [r6, #0x10c] mov r1, r5 bl FUN_02097948 -_0209927C: ; 0x0209927C cmp r0, #0x0 addne r0, r6, #0x100 movne r8, #0x0 @@ -9960,7 +9745,6 @@ _020993D0: mov r0, r10 mov r2, r5 bl FUN_02099104 -_02099418: ; 0x02099418 cmp r0, #0x0 addle sp, sp, #0x1c mvnle r0, #0x5 @@ -9996,7 +9780,6 @@ FUN_02099470: ; 0x02099470 mov r6, r2 mov r5, r3 bl FUN_02099FA8 -_0209948C: ; 0x0209948C cmp r0, #0x0 addne sp, sp, #0x8 mvnne r0, #0x1b @@ -10045,7 +9828,6 @@ _02099514: _02099530: add r0, r4, #0xe0 bl OS_TryLockMutex -_02099538: ; 0x02099538 cmp r0, #0x0 addeq sp, sp, #0x8 mvneq r0, #0x5 @@ -10101,7 +9883,6 @@ FUN_020995DC: ; 0x020995DC sub sp, sp, #0x4 mov r4, r0 bl FUN_02099FA8 -_020995EC: ; 0x020995EC cmp r0, #0x0 addne sp, sp, #0x4 mvnne r0, #0x1b @@ -10173,7 +9954,6 @@ FUN_020996C0: ; 0x020996C0 beq _020996F0 _020996E0: bl FUN_020997B8 -_020996E4: ; 0x020996E4 ldr r0, [r4, #0x0] cmp r0, #0x0 bne _020996E0 @@ -10203,7 +9983,6 @@ FUN_02099708: ; 0x02099708 mov r0, r8 mov r2, #0x0 bl OS_ReceiveMessage -_02099744: ; 0x02099744 cmp r0, #0x0 beq _0209979C add r4, sp, #0x0 @@ -10227,7 +10006,6 @@ _02099784: mov r1, r4 mov r2, r5 bl OS_ReceiveMessage -_02099794: ; 0x02099794 cmp r0, #0x0 bne _02099758 _0209979C: @@ -10372,14 +10150,12 @@ FUN_0209996C: ; 0x0209996C ldmleia sp!, {r4,lr} bxle lr bl FUN_02099F78 -_02099988: ; 0x02099988 cmp r0, #0x0 mvnne r0, #0x19 ldmneia sp!, {r4,lr} bxne lr mov r0, r4 bl FUN_02099FA8 -_020999A0: ; 0x020999A0 cmp r0, #0x0 movne r0, #0x0 ldmneia sp!, {r4,lr} @@ -10425,7 +10201,6 @@ _02099A24: mov r0, r4 str r2, [r1, #0x8] bl FUN_020979DC -_02099A48: ; 0x02099A48 mov r0, #0x0 ldmia sp!, {r4,lr} bx lr @@ -10438,12 +10213,10 @@ FUN_02099A58: movs r4, r0 bmi _02099A88 bl FUN_02099FA8 -_02099A68: ; 0x02099A68 cmp r0, #0x0 beq _02099A88 mov r0, r4 bl FUN_02099F78 -_02099A78: ; 0x02099A78 cmp r0, #0x0 moveq r0, #0x1 ldmeqia sp!, {r4,lr} @@ -10469,7 +10242,6 @@ FUN_02099A94: ; 0x02099A94 ldr r0, _02099B10 ; =UNK_021C8CD0 ldr r0, [r0, #0x0] bl FUN_02099A58 -_02099ACC: ; 0x02099ACC cmp r0, #0x0 ldrne r0, _02099B10 ; =UNK_021C8CD0 movne r1, #0x0 @@ -10480,7 +10252,6 @@ _02099AE0: b _02099B04 _02099AE8: bl FUN_0209FD34 -_02099AEC: ; 0x02099AEC cmp r0, #0x0 mvneq r4, #0x19 beq _02099B04 @@ -10517,7 +10288,6 @@ _02099B48: bne _02099B34 _02099B54: bl OS_RestoreInterrupts -_02099B58: ; 0x02099B58 cmp r6, #0x0 beq _02099B6C mov r0, r6 @@ -10577,7 +10347,6 @@ _02099C10: movs r4, r0 bmi _02099C58 bl FUN_0209FCC4 -_02099C20: ; 0x02099C20 mov r0, #0x0 bl FUN_0209FD24 ldr r0, _02099C70 ; =UNK_021C8CC0 @@ -10646,7 +10415,6 @@ FUN_02099CEC: ; 0x02099CEC mov r5, r0 mov r4, r1 bl FUN_02099C78 -_02099D00: ; 0x02099D00 cmp r0, #0x0 ldrne r1, _02099D24 ; =UNK_021C8F1C mvneq r0, #0x26 @@ -10769,7 +10537,6 @@ FUN_02099E90: mov r4, #0x0 mov r5, r0 bl FUN_02099FA8 -_02099EA0: ; 0x02099EA0 cmp r0, #0x0 orrne r4, r4, #0x80 bne _02099F60 @@ -10787,12 +10554,10 @@ _02099ED0: mov r6, r0 mov r0, r5 bl FUN_02099E40 -_02099EE0: ; 0x02099EE0 cmp r0, #0x0 mov r0, r5 orrgt r4, r4, #0x1 bl FUN_020992A0 -_02099EF0: ; 0x02099EF0 cmp r0, #0x0 mov r0, r6 orrgt r4, r4, #0x8 @@ -10842,7 +10607,6 @@ FUN_02099F78: mov r1, r0 ldr r0, _02099FA4 ; =UNK_021C8D34 bl FUN_0209A008 -_02099F8C: ; 0x02099F8C cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -10861,7 +10625,6 @@ FUN_02099FA8: ble _02099FCC ldr r0, _02099FEC ; =UNK_021C8D30 bl FUN_0209A008 -_02099FC4: ; 0x02099FC4 cmp r0, #0x0 bne _02099FDC _02099FCC: @@ -10908,7 +10671,6 @@ FUN_0209A034: ; 0x0209A034 stmdb sp!, {r4,lr} mov r4, r1 bl FUN_0209A008 -_0209A040: ; 0x0209A040 cmp r0, #0x0 ldrne r1, [r4, #0x7c] strne r1, [r0, #0x0] @@ -10980,7 +10742,6 @@ _0209A0FC: ldr r0, [r7, #0x0] orr r4, r1, #0xe0 bl FUN_02099E90 -_0209A10C: ; 0x0209A10C ands r0, r4, r0 strh r0, [r7, #0x6] add r6, r6, #0x1 @@ -11068,7 +10829,6 @@ FUN_0209A224: ; 0x0209A224 stmdb sp!, {r4,lr} mov r4, r1 bl FUN_02099D28 -_0209A230: ; 0x0209A230 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,lr} @@ -11288,7 +11048,6 @@ FUN_0209A504: ; 0x0209A504 add r1, sp, #0x0 add r2, sp, #0x4 bl FUN_02098120 -_0209A51C: ; 0x0209A51C cmp r0, #0x0 addlt sp, sp, #0x8 ldmltia sp!, {r4,lr} @@ -11386,7 +11145,6 @@ FUN_0209A650: ; 0x0209A650 ldmeqia sp!, {r4-r6,lr} bxeq lr bl FUN_02099C78 -_0209A66C: ; 0x0209A66C cmp r5, #0x0 ldrneh r1, [r5, #0x74] mov r2, r0, lsr #0x18 @@ -11549,7 +11307,6 @@ FUN_0209A880: ; 0x0209A880 str r3, [sp, #0x4] add r3, sp, #0x8 bl FUN_02098CF4 -_0209A89C: ; 0x0209A89C cmp r0, #0x0 addlt sp, sp, #0x14 ldmltia sp!, {lr} @@ -11682,13 +11439,11 @@ _0209AA54: mov r0, #0x0 strb r0, [r6, #0x73] bl FUN_020A02EC -_0209AA60: ; 0x0209AA60 mov r0, #0x0 str r0, [r4, #0xc] _0209AA68: add r0, r5, #0xe0 bl OS_UnlockMutex -_0209AA70: ; 0x0209AA70 mov r0, #0x0 add sp, sp, #0x4 ldmia sp!, {r4-r7,lr} @@ -11725,7 +11480,6 @@ FUN_0209AAD0: ; 0x0209AAD0 mov r5, r0 mov r4, r1 bl FUN_02099FA8 -_0209AAE4: ; 0x0209AAE4 cmp r0, #0x0 addne sp, sp, #0x4 mvnne r0, #0x1b @@ -11803,7 +11557,6 @@ FUN_0209AB80: ; 0x0209AB80 str r5, [r6, #0x4] strh r3, [sp, #0xa] bl FUN_0209AD34 -_0209AC04: ; 0x0209AC04 cmp r0, #0x0 ldrne r0, [sp, #0x4] addne sp, sp, #0xc @@ -12038,7 +11791,6 @@ _0209AED8: b _0209B084 _0209AF38: bl FUN_0209BF9C -_0209AF3C: ; 0x0209AF3C cmp r0, #0x0 bne _0209AF4C bl FUN_020A005C @@ -12073,7 +11825,6 @@ _0209AF4C: beq _0209AFCC _0209AFB8: bl FUN_0209B0D0 -_0209AFBC: ; 0x0209AFBC cmp r7, #0x0 add r0, r0, #0x4 sub r7, r7, #0x1 @@ -12342,7 +12093,6 @@ FUN_0209B2FC: ; 0x0209B2FC b _0209B64C _0209B354: bl FUN_0209BF9C -_0209B358: ; 0x0209B358 cmp r0, #0x0 bne _0209B368 bl FUN_020A005C @@ -12374,7 +12124,6 @@ _0209B368: ldr r1, _0209B6A4 ; =UNK_021C8F14 add r0, r10, #0x1c bl FUN_0209F9A0 -_0209B3D0: ; 0x0209B3D0 cmp r0, #0x0 bne _0209B644 ldrb r3, [r10, #0x10] @@ -12647,7 +12396,6 @@ _0209B790: mov r0, r4 sub r1, r1, r4 bl FUN_0209C030 -_0209B7BC: ; 0x0209B7BC ldr r0, [sp, #0x0] add sp, sp, #0x4 ldmia sp!, {r4-r5,lr} @@ -12704,7 +12452,6 @@ _0209B85C: mov r0, r4 sub r1, r1, r4 bl FUN_0209C030 -_0209B888: ; 0x0209B888 ldr r0, [sp, #0x0] add sp, sp, #0x8 ldmia sp!, {r4,lr} @@ -12944,13 +12691,11 @@ _0209BBD8: ldrne r0, [sp, #0x14] strne r0, [sp, #0x4] bl FUN_0209B298 -_0209BBF8: ; 0x0209BBF8 cmp r0, #0x0 beq _0209BC14 ldr r1, [sp, #0x18] add r0, sp, #0x4c bl FUN_0209B170 -_0209BC0C: ; 0x0209BC0C cmp r0, #0x0 bne _0209BC20 _0209BC14: @@ -12964,7 +12709,6 @@ _0209BC28: ldr r1, [sp, #0x24] add r0, sp, #0x4c bl FUN_0209B170 -_0209BC34: ; 0x0209BC34 cmp r0, #0x0 bne _0209BCA4 ldr r0, [sp, #0x4c] @@ -12975,7 +12719,6 @@ _0209BC4C: ldr r1, [sp, #0x10] add r0, sp, #0x4c bl FUN_0209B170 -_0209BC58: ; 0x0209BC58 cmp r0, #0x0 ldrne r11, [sp, #0x28] bne _0209BCA4 @@ -13204,7 +12947,6 @@ FUN_0209BF4C: ; 0x0209BF4C ldr r0, [r4, #0x5c] mov r3, r2 bl FUN_0209C0E8 -_0209BF88: ; 0x0209BF88 mov r0, #0x0 str r0, [r4, #0x60] ldmia sp!, {r4,lr} @@ -13420,7 +13162,6 @@ _0209C230: orr r5, r5, r1, lsl #0x10 _0209C25C: bl FUN_020A005C -_0209C260: ; 0x0209C260 ldr r0, [r4, #0x0] blx r0 cmp r0, #0x0 @@ -13541,7 +13282,6 @@ FUN_0209C3F0: ; 0x0209C3F0 ldr r2, [sp, #0x10] ldr r3, [sp, #0x14] bl FUN_0209C44C -_0209C40C: ; 0x0209C40C cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,lr} @@ -13771,7 +13511,6 @@ _0209C704: _0209C71C: mov r0, r8 bl OS_RestoreInterrupts -_0209C724: ; 0x0209C724 b _0209C72C _0209C728: bl OS_YieldThread @@ -14328,7 +14067,6 @@ FUN_0209CDB0: ; 0x0209CDB0 cmp r0, r2 beq _0209CEF0 bl FUN_0209F9CC -_0209CE24: ; 0x0209CE24 cmp r0, #0x0 addeq sp, sp, #0x8 ldmeqia sp!, {r4-r6,lr} @@ -14660,7 +14398,6 @@ FUN_0209D2BC: ; 0x0209D2BC mov r2, r7 mov r3, #0x11 bl FUN_0209FB28 -_0209D2EC: ; 0x0209D2EC cmp r0, #0x0 ldmneia sp!, {r4-r8,lr} bxne lr @@ -14805,7 +14542,6 @@ FUN_0209D4D8: mov r2, r6 mov r3, #0x6 bl FUN_0209FB28 -_0209D4FC: ; 0x0209D4FC cmp r0, #0x0 ldmneia sp!, {r4-r6,lr} bxne lr @@ -15138,7 +14874,6 @@ _0209D968: mov r1, #0x0 str r2, [r5, #0x24] bl FUN_0209DF70 -_0209D998: ; 0x0209D998 cmp r6, #0x0 bne _0209DA8C ldr r0, [r5, #0x4] @@ -15316,7 +15051,6 @@ FUN_0209DBB0: ; 0x0209DBB0 orr r0, r6, r0, lsr #0x10 mov r5, r2 bl FUN_0209E3DC -_0209DC20: ; 0x0209DC20 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,lr} @@ -15325,7 +15059,6 @@ _0209DC20: ; 0x0209DC20 mov r1, r7 mov r2, r5 bl FUN_0209DCB4 -_0209DC40: ; 0x0209DC40 cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r7,lr} @@ -15574,7 +15307,6 @@ FUN_0209DF98: ; 0x0209DF98 mov r5, r1 mov r4, r2 bl FUN_0209E014 -_0209DFB4: ; 0x0209DFB4 cmp r0, #0x0 bne _0209DFD0 ldr r0, _0209E00C ; =OSi_ThreadInfo @@ -15608,7 +15340,6 @@ FUN_0209E014: stmdb sp!, {lr} sub sp, sp, #0x4 bl FUN_0209FAB0 -_0209E020: ; 0x0209E020 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x1 @@ -15679,7 +15410,6 @@ _0209E0E8: mov r1, r6 mov r2, r5 bl FUN_0209E144 -_0209E110: ; 0x0209E110 cmp r0, #0x0 addne sp, sp, #0x4 movne r0, r5 @@ -15854,7 +15584,6 @@ FUN_0209E2E0: ; 0x0209E2E0 orr r0, r3, r0, lsr #0x10 orr r1, r2, r1, lsr #0x10 bl FUN_0209E3DC -_0209E370: ; 0x0209E370 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,lr} @@ -16003,7 +15732,6 @@ FUN_0209E524: ; 0x0209E524 ldmeqia sp!, {r4-r7,lr} bxeq lr bl FUN_0209F438 -_0209E57C: ; 0x0209E57C cmp r0, #0x0 bne _0209E598 mov r0, r7 @@ -16056,7 +15784,6 @@ FUN_0209E614: ; 0x0209E614 ldr r1, _0209E7BC ; =UNK_021C8F14 add r0, r6, #0x8 bl FUN_0209F9A0 -_0209E63C: ; 0x0209E63C cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,lr} @@ -16712,7 +16439,6 @@ _0209EFC4: beq _0209EFF8 mov r0, r4 bl FUN_0209FA54 -_0209EFE8: ; 0x0209EFE8 cmp r0, #0x0 addeq sp, sp, #0x8 ldmeqia sp!, {r4-r8,lr} @@ -16756,7 +16482,6 @@ FUN_0209F050: ; 0x0209F050 mov r5, r3 strh r12, [r8, #-0x2] bl FUN_0209FA54 -_0209F080: ; 0x0209F080 cmp r0, #0x0 bne _0209F0CC mov r0, r4 @@ -16765,7 +16490,6 @@ _0209F080: ; 0x0209F080 ldmeqia sp!, {r4-r8,lr} bxeq lr bl FUN_0209F438 -_0209F0A0: ; 0x0209F0A0 cmp r0, #0x0 bne _0209F0B0 mov r0, r4 @@ -16826,14 +16550,12 @@ FUN_0209F12C: ; 0x0209F12C bxeq lr mov r0, r6 bl FUN_0209FAD8 -_0209F174: ; 0x0209F174 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,lr} bxeq lr mov r0, r6 bl FUN_0209FA54 -_0209F18C: ; 0x0209F18C cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r7,lr} @@ -16936,7 +16658,6 @@ _0209F2D4: bl OS_Sleep mov r0, r9 bl FUN_0209F438 -_0209F2FC: ; 0x0209F2FC cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r9,lr} @@ -16963,7 +16684,6 @@ FUN_0209F338: ; 0x0209F338 mov r1, #0x0 mov r2, #0x2a bl MI_CpuFill8 -_0209F354: ; 0x0209F354 add r0, sp, #0x0 mov r1, #0xff mov r2, #0x6 @@ -17044,12 +16764,10 @@ _0209F46C: _0209F474: mov r0, r7 bl FUN_0209FA68 -_0209F47C: ; 0x0209F47C cmp r0, #0x0 bne _0209F494 mov r0, r7 bl FUN_0209FA54 -_0209F48C: ; 0x0209F48C cmp r0, #0x0 beq _0209F49C _0209F494: @@ -17200,7 +16918,6 @@ FUN_0209F65C: ; 0x0209F65C bxeq lr ldr r0, [r0, #0x0] bl OS_IsThreadTerminated -_0209F694: ; 0x0209F694 cmp r0, #0x0 addne sp, sp, #0xc ldmneia sp!, {lr} @@ -17402,7 +17119,6 @@ _0209F958: add r1, r6, #0x6 sub r2, r2, #0x6 bl FUN_020A8644 -_0209F97C: ; 0x0209F97C cmp r0, #0x0 movlt r1, #0x1 ldr r0, _0209F99C ; =UNK_021C8EA8 @@ -17454,7 +17170,6 @@ _0209FA10: bne _0209FA28 mov r0, r6 bl FUN_0209FA68 -_0209FA20: ; 0x0209FA20 cmp r0, #0x0 moveq r4, #0x0 _0209FA28: @@ -17462,7 +17177,6 @@ _0209FA28: bne _0209FA40 mov r0, r6 bl FUN_0209FA54 -_0209FA38: ; 0x0209FA38 cmp r0, #0x0 moveq r5, #0x0 _0209FA40: @@ -17488,7 +17202,6 @@ FUN_0209FA68: mov r5, r0 mov r4, #0x0 bl FUN_0209FAD8 -_0209FA7C: ; 0x0209FA7C cmp r0, #0x0 beq _0209FA9C ldr r0, _0209FAAC ; =UNK_021C8ED0 @@ -17510,7 +17223,6 @@ FUN_0209FAB0: stmdb sp!, {r4,lr} mov r4, r0 bl FUN_0209FAD8 -_0209FABC: ; 0x0209FABC cmp r0, #0x0 ldreq r0, _0209FAD4 ; =UNK_021C8EE0 ldreq r4, [r0, #0x0] @@ -18410,11 +18122,9 @@ _020A0698: add r1, r3, r1 movcc r6, #0x0 bl MI_CpuCopy8 -_020A06D8: ; 0x020A06D8 ldr r0, [sp, #0x0] mov r1, r5 bl FUN_0209C580 -_020A06E4: ; 0x020A06E4 cmp r6, #0x0 beq _020A0714 ldr r1, [r4, #0x824] @@ -18485,7 +18195,6 @@ FUN_020A0790: ; 0x020A0790 add r0, r12, r3 sub r1, r1, r3 bl FUN_020A1974 -_020A07D0: ; 0x020A07D0 cmp r0, #0x0 beq _020A07FC ldr r1, _020A0870 ; =UNK_021C8EF4 @@ -18543,7 +18252,6 @@ FUN_020A0874: ; 0x020A0874 cmp r1, #0x4 beq _020A08A8 bl FUN_0209C990 -_020A0894: ; 0x020A0894 cmp r0, #0x0 addne sp, sp, #0x4 movne r0, #0x1 @@ -18592,7 +18300,6 @@ _020A0920: bl FUN_020A215C mov r0, r5 bl FUN_020A0AF4 -_020A093C: ; 0x020A093C cmp r0, #0x0 addne sp, sp, #0x4 movne r0, #0x1 @@ -18620,7 +18327,6 @@ _020A0988: bl FUN_020A0F94 mov r0, r5 bl FUN_020A0AF4 -_020A09A0: ; 0x020A09A0 cmp r0, #0x0 addne sp, sp, #0x4 movne r0, #0x1 @@ -18656,7 +18362,6 @@ _020A09EC: bl FUN_020A3B8C mov r0, r9 bl FUN_020A0A58 -_020A0A18: ; 0x020A0A18 cmp r0, #0x0 moveq r0, #0x8 addeq sp, sp, #0x4 @@ -18670,7 +18375,6 @@ _020A0A18: ; 0x020A0A18 ldr r0, [r9, #0x20] str r0, [r9, #0x1c] b _020A09EC -_020A0A4C: ; 0x020A0A4C add sp, sp, #0x4 ldmia sp!, {r4-r9,lr} bx lr @@ -18686,7 +18390,6 @@ FUN_020A0A58: bxne lr mov r0, r4 bl FUN_020A10F4 -_020A0A7C: ; 0x020A0A7C cmp r0, #0x0 beq _020A0AB0 ldr r0, [r4, #0xc] @@ -18695,7 +18398,6 @@ _020A0A7C: ; 0x020A0A7C bl FUN_020A0F94 mov r0, r4 bl FUN_020A0AF4 -_020A0A9C: ; 0x020A0A9C cmp r0, #0x0 beq _020A0AE8 mov r0, #0x1 @@ -18710,7 +18412,6 @@ _020A0AB0: bxne lr mov r0, r4 bl FUN_020A0AF4 -_020A0AD0: ; 0x020A0AD0 cmp r0, #0x0 movne r0, #0x1 ldmneia sp!, {r4,lr} @@ -19464,7 +19165,6 @@ _020A153C: ldr r1, [sp, #0x0] mov r2, r5 bl FUN_020A1974 -_020A15D8: ; 0x020A15D8 cmp r0, #0x0 bne _020A15FC ldrb r0, [r6, #0x0] @@ -19516,7 +19216,6 @@ _020A1634: ldr r1, [sp, #0x0] mov r2, r5 bl FUN_020A1974 -_020A1694: ; 0x020A1694 cmp r0, #0x0 beq _020A16C0 ldr r1, _020A16E0 ; =UNK_021C8EF4 @@ -19585,13 +19284,9 @@ _020A1764: sub r5, r5, #0x5 addls pc, pc, r0, lsl #0x2 b _020A1920 -_020A177C: ; 0x020A177C b _020A178C -_020A1780: ; 0x020A1780 b _020A17BC -_020A1784: ; 0x020A1784 b _020A17D0 -_020A1788: ; 0x020A1788 b _020A18FC _020A178C: ldr r0, [r8, #0x1d4] @@ -19758,11 +19453,9 @@ _020A198C: ldr r2, [sp, #0x0] mov r1, r7 bl MI_CpuCopy8 -_020A19C4: ; 0x020A19C4 ldr r0, [sp, #0x0] mov r1, r5 bl FUN_0209C580 -_020A19D0: ; 0x020A19D0 ldr r0, [sp, #0x0] sub r6, r6, r0 cmp r6, #0x0 @@ -19798,7 +19491,6 @@ _020A1A30: mov r0, r7 mov r2, #0x10 bl FUN_020A3ACC -_020A1A4C: ; 0x020A1A4C add r0, sp, #0x0 mov r1, #0x36 mov r2, #0x30 @@ -19828,7 +19520,6 @@ _020A1A4C: ; 0x020A1A4C mov r0, r7 mov r2, #0x10 bl FUN_020A3ACC -_020A1AC0: ; 0x020A1AC0 add r0, sp, #0x0 mov r1, #0x5c mov r2, #0x30 @@ -19854,7 +19545,6 @@ _020A1B04: mov r0, r7 mov r2, #0x14 bl FUN_020A410C -_020A1B20: ; 0x020A1B20 add r0, sp, #0x0 mov r1, #0x36 mov r2, #0x28 @@ -19884,7 +19574,6 @@ _020A1B20: ; 0x020A1B20 mov r0, r7 mov r2, #0x14 bl FUN_020A410C -_020A1B94: ; 0x020A1B94 add r0, sp, #0x0 mov r1, #0x5c mov r2, #0x28 @@ -20055,7 +19744,6 @@ _020A1E0C: mov r2, r4 add r0, r0, r5 bl memcmp -_020A1E20: ; 0x020A1E20 cmp r0, #0x0 movne r0, #0x9 strneb r0, [r7, #0x455] @@ -20111,7 +19799,6 @@ FUN_020A1E84: ; 0x020A1E84 mov r0, r4 mov r2, #0x10 bl memcmp -_020A1ED4: ; 0x020A1ED4 cmp r0, #0x0 movne r0, #0x9 addne sp, sp, #0x14 @@ -20134,7 +19821,6 @@ _020A1ED4: ; 0x020A1ED4 add r0, r4, #0x10 mov r2, #0x14 bl memcmp -_020A1F2C: ; 0x020A1F2C cmp r0, #0x0 movne r0, #0x9 strneb r0, [r5, #0x455] @@ -20169,7 +19855,6 @@ _020A1F90: mov r1, r6 mov r2, #0x30 bl FUN_020A410C -_020A1FA0: ; 0x020A1FA0 add r0, sp, #0x0 mov r1, #0x36 mov r2, #0x28 @@ -20187,7 +19872,6 @@ _020A1FA0: ; 0x020A1FA0 mov r0, r4 mov r2, #0x30 bl FUN_020A410C -_020A1FE4: ; 0x020A1FE4 add r0, sp, #0x0 mov r1, #0x5c mov r2, #0x28 @@ -20235,7 +19919,6 @@ _020A2078: mov r1, r6 mov r2, #0x30 bl FUN_020A3ACC -_020A2088: ; 0x020A2088 add r0, sp, #0x0 mov r1, #0x36 mov r2, #0x30 @@ -20253,7 +19936,6 @@ _020A2088: ; 0x020A2088 mov r0, r4 mov r2, #0x30 bl FUN_020A3ACC -_020A20CC: ; 0x020A20CC add r0, sp, #0x0 mov r1, #0x5c mov r2, #0x30 @@ -20453,7 +20135,6 @@ FUN_020A2364: ; 0x020A2364 add r0, sp, #0x20 mov r2, r4 bl FUN_020A23C8 -_020A23A0: ; 0x020A23A0 add r0, sp, #0x0 mov r1, r4 mov r2, #0x30 @@ -20626,7 +20307,6 @@ FUN_020A2470: ; 0x020A2470 mov r0, r6 mov r1, r9 bl FUN_020A59DC -_020A2634: ; 0x020A2634 cmp r0, #0x0 bge _020A267C mov r0, r6 @@ -20678,7 +20358,6 @@ FUN_020A26D0: ; 0x020A26D0 ldrb r0, [r6, #0x0] ldrb r1, [r6, #0x1] bl FUN_020A284C -_020A26E8: ; 0x020A26E8 cmp r0, #0x0 ldmeqia sp!, {r4-r6,lr} bxeq lr @@ -20724,7 +20403,6 @@ FUN_020A2774: ; 0x020A2774 ldrb r0, [r5, #0x0] ldrb r1, [r5, #0x1] bl FUN_020A284C -_020A278C: ; 0x020A278C cmp r0, #0x0 ldmeqia sp!, {r4-r6,lr} bxeq lr @@ -20799,7 +20477,6 @@ _020A2874: mov r1, r7 mov r2, r6 bl FUN_020A28C0 -_020A288C: ; 0x020A288C cmp r0, #0x0 ldrne r0, _020A28BC ; =UNK_0210623C movne r1, r5, lsl #0x1 @@ -20863,7 +20540,6 @@ FUN_020A2914: ; 0x020A2914 add r0, r6, #0x74 mov r2, #0x20 bl memcmp -_020A2964: ; 0x020A2964 cmp r0, #0x0 moveq r0, #0x1 streqb r0, [r6, #0x31] @@ -20966,7 +20642,6 @@ _020A2A74: mov r3, r4 str r8, [sp, #0x0] bl FUN_020A2F98 -_020A2ADC: ; 0x020A2ADC cmp r0, #0x0 bne _020A2AFC ldr r0, [r10, #0x594] @@ -20993,7 +20668,6 @@ _020A2B14: beq _020A2B44 ldr r1, [sp, #0x4] bl FUN_020A2C18 -_020A2B3C: ; 0x020A2B3C cmp r0, #0x0 orrne r8, r8, #0x4000 _020A2B44: @@ -21013,7 +20687,6 @@ _020A2B44: mov r3, r2 str r11, [sp, #0x0] bl FUN_020A2F98 -_020A2B84: ; 0x020A2B84 cmp r0, #0x0 movne r0, #0x9 addne sp, sp, #0x24 @@ -21088,7 +20761,6 @@ _020A2C38: sub r0, r4, r0 add r6, r6, r0 b _020A2C38 -_020A2C8C: ; 0x020A2C8C ldmia sp!, {r4-r6,lr} bx lr @@ -21174,7 +20846,6 @@ _020A2D88: bxeq lr mov r0, r5 bl FUN_020A2DBC -_020A2DAC: ; 0x020A2DAC orr r0, r4, r0 ldmia sp!, {r4-r6,lr} bx lr @@ -21294,7 +20965,6 @@ _020A2F24: add r0, r8, r0 sub r1, r1, r2 bl memcmp -_020A2F60: ; 0x020A2F60 cmp r0, #0x0 beq _020A2F6C _020A2F68: @@ -21486,7 +21156,6 @@ _020A317C: mov r3, #0x0 str r8, [sp, #0x0] bl FUN_020A2F98 -_020A31AC: ; 0x020A31AC cmp r0, #0x0 addne sp, sp, #0xc movne r0, #0x1 @@ -21512,23 +21181,16 @@ _020A31E8: mov r0, r5 mov r1, r4 bl memcmp -_020A3204: ; 0x020A3204 cmp r0, #0x0 bne _020A3258 cmp r6, #0x5 addls pc, pc, r6, lsl #0x2 b _020A3264 -_020A3218: ; 0x020A3218 b _020A3264 -_020A321C: ; 0x020A321C b _020A3230 -_020A3220: ; 0x020A3220 b _020A3230 -_020A3224: ; 0x020A3224 b _020A3240 -_020A3228: ; 0x020A3228 b _020A3240 -_020A322C: ; 0x020A322C b _020A324C _020A3230: cmp r8, #0x0 @@ -21592,7 +21254,6 @@ _020A32F4: beq _020A3330 ldr r0, [sp, #0x8] bl FUN_020A34C4 -_020A3304: ; 0x020A3304 cmp r4, #0x0 bne _020A3320 ldr r1, [r9, #0x80c] @@ -21635,7 +21296,6 @@ _020A3380: mov r3, r10 str r8, [sp, #0x0] bl FUN_020A2F98 -_020A3398: ; 0x020A3398 cmp r0, #0x0 add r10, r10, #0x1 addne sp, sp, #0xc @@ -21668,7 +21328,6 @@ _020A33F4: mov r3, r5 str r8, [sp, #0x0] bl FUN_020A2F98 -_020A340C: ; 0x020A340C cmp r0, #0x0 addne sp, sp, #0xc movne r0, #0x1 @@ -21695,7 +21354,6 @@ _020A3454: mov r3, r5 str r8, [sp, #0x0] bl FUN_020A2F98 -_020A346C: ; 0x020A346C cmp r0, #0x0 addne sp, sp, #0xc movne r0, #0x1 @@ -21844,7 +21502,6 @@ _020A3648: mov r1, r7 ldr r0, [r0, #0x0] bl strcmp -_020A3658: ; 0x020A3658 cmp r0, #0x0 addeq sp, sp, #0x4 ldreq r0, [r5, r6, lsl #0x2] @@ -21936,7 +21593,6 @@ FUN_020A375C: ; 0x020A375C bl RTC_GetDate add r0, sp, #0x10 bl RTC_GetTime -_020A3774: ; 0x020A3774 add r0, sp, #0x0 add r1, sp, #0x10 bl RTC_ConvertDateTimeToSecond @@ -21966,7 +21622,6 @@ _020A37B8: mov r1, r5 mov r2, r4 bl memcmp -_020A37D4: ; 0x020A37D4 cmp r0, #0x0 moveq r0, #0x0 streqb r0, [r6, #0x5a] @@ -22131,7 +21786,6 @@ _020A39D8: mov r1, r9 mov r2, r8 bl memcmp -_020A3A0C: ; 0x020A3A0C cmp r0, #0x0 bne _020A3A30 mov r1, r7 @@ -23576,7 +23230,6 @@ _020A4E48: ldr r1, [sp, #0x24] mov r2, r5 bl FUN_020A570C -_020A4ED4: ; 0x020A4ED4 cmp r0, #0x0 beq _020A4EF0 cmp r0, #0x1 @@ -23631,7 +23284,6 @@ FUN_020A4F2C: ; 0x020A4F2C mov r0, r9 mov r1, r10 bl FUN_020A59DC -_020A4F98: ; 0x020A4F98 cmp r0, #0x0 ble _020A503C _020A4FA0: @@ -23672,7 +23324,6 @@ _020A4FA0: mov r0, r9 mov r1, r10 bl FUN_020A59DC -_020A5034: ; 0x020A5034 cmp r0, #0x0 bgt _020A4FA0 _020A503C: @@ -23721,7 +23372,6 @@ FUN_020A507C: ; 0x020A507C mov r1, r8 strh r2, [r10, #0x0] bl thunk_FUN_020a5a28 -_020A50E4: ; 0x020A50E4 sub r0, r8, r0 mov r5, r0, lsl #0x4 mov r4, r8, lsl #0x4 @@ -23765,7 +23415,6 @@ _020A5160: mov r0, r6 mov r1, r10 bl MI_CpuCopy8 -_020A5180: ; 0x020A5180 cmp r7, #0x0 beq _020A51A4 ldr r0, [sp, #0x10] @@ -23794,7 +23443,6 @@ _020A51A4: mov r0, r6 mov r1, r10 bl MI_CpuCopy8 -_020A51EC: ; 0x020A51EC cmp r7, #0x0 beq _020A5210 ldr r0, [sp, #0x10] @@ -23922,7 +23570,6 @@ _020A5390: mov r1, r6 mov r2, r9 bl FUN_020A570C -_020A53B8: ; 0x020A53B8 cmp r0, #0x0 sublt r7, r7, #0x1 blt _020A5390 @@ -24111,7 +23758,6 @@ FUN_020A5608: ; 0x020A5608 mov r0, r9 mov r1, r8 bl thunk_FUN_020a5a28 -_020A5648: ; 0x020A5648 str r0, [sp, #0x0] cmp r0, #0x0 mov r7, #0x0 @@ -24240,7 +23886,6 @@ FUN_020A57BC: ; 0x020A57BC mov r0, r6 mov r1, r5 bl thunk_FUN_020a5a28 -_020A57EC: ; 0x020A57EC cmp r4, r0 movlt r4, r0 mov r3, #0x0 @@ -24351,7 +23996,6 @@ FUN_020A5930: ; 0x020A5930 mov r0, r6 mov r1, r5 bl thunk_FUN_020a5a28 -_020A5960: ; 0x020A5960 cmp r4, r0 movlt r4, r0 cmp r4, r5 @@ -24399,7 +24043,6 @@ FUN_020A59DC: ldmneia sp!, {lr} bxne lr bl thunk_FUN_020a5a28 -_020A5A08: ; 0x020A5A08 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -24505,7 +24148,6 @@ _020A5AFC: _020A5B24: mov r0, #0x3 bl FUN_020A6C38 -_020A5B2C: ; 0x020A5B2C mov r0, #0x0 ldr r3, _020A5DB0 ; =0x000008FB mov r1, r0 @@ -24986,25 +24628,15 @@ _020A6190: cmp r0, #0x0 addge pc, pc, r0, lsl #0x2 b _020A6338 -_020A61A8: ; 0x020A61A8 b _020A6338 -_020A61AC: ; 0x020A61AC b _020A6338 -_020A61B0: ; 0x020A61B0 b _020A6338 -_020A61B4: ; 0x020A61B4 b _020A6338 -_020A61B8: ; 0x020A61B8 b _020A6338 -_020A61BC: ; 0x020A61BC b _020A6338 -_020A61C0: ; 0x020A61C0 b _020A63B0 -_020A61C4: ; 0x020A61C4 b _020A6258 -_020A61C8: ; 0x020A61C8 b _020A61E0 -_020A61CC: ; 0x020A61CC b _020A61E0 _020A61D0: cmp r0, #0x1a @@ -25178,7 +24810,6 @@ _020A63FC: _020A6400: mov r0, #0x3 bl FUN_020A6C38 -_020A6408: ; 0x020A6408 mov r0, #0x0 ldr r3, _020A6460 ; =0x00000783 mov r1, r0 @@ -25236,7 +24867,6 @@ _020A649C: bne _020A64D0 mov r0, #0x6 bl FUN_020A6C38 -_020A64BC: ; 0x020A64BC mov r0, #0x0 ldr r3, _020A6740 ; =0x00000704 mov r1, r0 @@ -25310,7 +24940,6 @@ _020A6588: ldr r6, [r0, #0x284] mov r0, r6 bl _u32_div_f -_020A65D0: ; 0x020A65D0 cmp r1, #0x0 bne _020A65F4 ldr r4, _020A674C ; =0x00000728 @@ -25481,7 +25110,6 @@ _020A67F4: b _020A692C _020A6804: bl WM_Finish -_020A6808: ; 0x020A6808 cmp r0, #0x0 beq _020A6818 cmp r0, #0x4 @@ -25489,7 +25117,6 @@ _020A6808: ; 0x020A6808 _020A6818: mov r0, #0x1 bl FUN_020A6C38 -_020A6820: ; 0x020A6820 mov r0, #0x0 ldr r3, _020A6A50 ; =0x00000663 mov r1, r0 @@ -25512,7 +25139,6 @@ _020A6840: _020A6868: mov r0, #0x3 bl FUN_020A6C38 -_020A6870: ; 0x020A6870 mov r0, #0x0 ldr r3, _020A6A58 ; =0x00000673 mov r1, r0 @@ -26338,7 +25964,6 @@ _020A734C: b _020A73D4 _020A737C: bl WM_Finish -_020A7380: ; 0x020A7380 cmp r0, #0x0 bne _020A73F0 mov r0, #0x1 @@ -26443,7 +26068,6 @@ _020A74B4: bx lr _020A74E4: bl OS_RestoreInterrupts -_020A74E8: ; 0x020A74E8 mov r0, #0x0 ldmia sp!, {r4,lr} bx lr @@ -26719,7 +26343,6 @@ _020A7890: bx lr _020A78A0: bl OS_RestoreInterrupts -_020A78A4: ; 0x020A78A4 mov r0, #0x0 ldmia sp!, {r4,lr} bx lr @@ -26907,7 +26530,6 @@ _020A7AF4: bx lr _020A7B24: bl OS_RestoreInterrupts -_020A7B28: ; 0x020A7B28 mov r0, #0x0 ldmia sp!, {r4,lr} bx lr @@ -26996,7 +26618,6 @@ _020A7C3C: bx lr _020A7C4C: bl OS_RestoreInterrupts -_020A7C50: ; 0x020A7C50 mov r0, #0x0 ldmia sp!, {r4-r6,lr} bx lr @@ -27054,11 +26675,9 @@ _020A7CE0: bx lr _020A7CFC: bl WM_GetAllowedChannel -_020A7D00: ; 0x020A7D00 cmp r0, #0x0 bne _020A7D44 bl WM_Finish -_020A7D0C: ; 0x020A7D0C cmp r0, #0x0 beq _020A7D30 mov r0, #0xb @@ -27077,7 +26696,6 @@ _020A7D30: _020A7D44: ldr r0, _020A7E04 ; =FUN_020A6A74 bl WM_SetIndCallback -_020A7D4C: ; 0x020A7D4C cmp r0, #0x0 beq _020A7D70 mov r0, #0xb @@ -27161,7 +26779,6 @@ _020A7E60: mov r1, #0x0 str r1, [r2, #0x0] bl OS_RestoreInterrupts -_020A7E6C: ; 0x020A7E6C mov r0, #0x0 add sp, sp, #0x4 ldmia sp!, {lr} @@ -27232,13 +26849,11 @@ _020A7EFC: bl FUN_020A6E30 bl FUN_020A897C bl OS_IsTickAvailable -_020A7F64: ; 0x020A7F64 cmp r0, #0x0 bne _020A7F70 bl OS_InitTick _020A7F70: bl OS_IsAlarmAvailable -_020A7F74: ; 0x020A7F74 cmp r0, #0x0 bne _020A7F80 bl OS_InitAlarm @@ -27250,7 +26865,6 @@ _020A7F80: bl OS_CreateAlarm mov r0, r4 bl OS_RestoreInterrupts -_020A7F9C: ; 0x020A7F9C mov r0, #0x0 ldmia sp!, {r4-r6,lr} bx lr @@ -27374,7 +26988,6 @@ _020A813C: mov r1, r5 add r0, r0, #0x4 bl FUN_020A8B78 -_020A814C: ; 0x020A814C cmp r0, #0x0 bne _020A8160 ldr r4, [r4, #0xc] @@ -27531,7 +27144,6 @@ FUN_020A8358: ; 0x020A8358 bl OS_DisableInterrupts mov r5, r0 bl FUN_020A7138 -_020A8370: ; 0x020A8370 cmp r0, #0x0 bne _020A8390 mov r0, r5 @@ -27567,7 +27179,6 @@ FUN_020A83D0: ; 0x020A83D0 bl OS_DisableInterrupts mov r4, r0 bl FUN_020A7138 -_020A83E8: ; 0x020A83E8 cmp r0, #0x0 bne _020A8408 mov r0, r4 @@ -27612,7 +27223,6 @@ FUN_020A846C: ; 0x020A846C bl OS_DisableInterrupts mov r5, r0 bl FUN_020A7138 -_020A8480: ; 0x020A8480 cmp r0, #0x0 mov r4, #0x0 bne _020A84A4 @@ -27644,7 +27254,6 @@ FUN_020A84D8: ; 0x020A84D8 bl OS_DisableInterrupts mov r4, r0 bl FUN_020A7138 -_020A84E8: ; 0x020A84E8 cmp r0, #0x0 bne _020A8500 mov r0, r4 @@ -27762,12 +27371,10 @@ FUN_020A8644: bl OS_DisableInterrupts mov r5, r0 bl FUN_020A7138 -_020A8660: ; 0x020A8660 cmp r0, #0x0 bne _020A867C mov r0, r5 bl OS_RestoreInterrupts -_020A8670: ; 0x020A8670 mvn r0, #0x0 ldmia sp!, {r4-r8,lr} bx lr @@ -27781,7 +27388,6 @@ _020A867C: bl OS_UnlockMutex mov r0, r5 bl OS_RestoreInterrupts -_020A86A0: ; 0x020A86A0 mvn r0, #0x0 ldmia sp!, {r4-r8,lr} bx lr @@ -27893,7 +27499,6 @@ FUN_020A87E0: ; 0x020A87E0 bl FUN_020A7138 mov r5, r0 bl OS_DisableInterrupts -_020A8800: ; 0x020A8800 cmp r5, #0x0 beq _020A8830 add r1, r5, #0x2000 @@ -27908,7 +27513,6 @@ _020A8800: ; 0x020A8800 addeq r7, r5, r1 _020A8830: bl OS_RestoreInterrupts -_020A8834: ; 0x020A8834 cmp r4, #0x0 strneh r6, [r4, #0x0] mov r0, r7 @@ -27926,7 +27530,6 @@ FUN_020A8850: bl FUN_020A7138 mov r4, r0 bl OS_DisableInterrupts -_020A8868: ; 0x020A8868 cmp r4, #0x0 beq _020A8890 add r1, r4, #0x2000 @@ -27964,7 +27567,6 @@ FUN_020A88A8: ; 0x020A88A8 bxeq lr ldr r0, _020A8928 ; =UNK_021CA87C bl FUN_020A8590 -_020A88E8: ; 0x020A88E8 cmp r0, #0x0 ldmeqia sp!, {r4,lr} bxeq lr @@ -28143,7 +27745,6 @@ FUN_020A8B28: ; 0x020A8B28 bl OS_DisableInterrupts mov r5, r0 bl FUN_020A7138 -_020A8B3C: ; 0x020A8B3C cmp r0, #0x0 mov r4, #0x0 beq _020A8B60 @@ -28275,7 +27876,6 @@ FUN_020A8CA8: ; 0x020A8CA8 str r2, [sp, #0x0] addeq sp, sp, #0x3c ldmeqia sp!, {r4-r11,pc} -_020A8CC8: ; 0x020A8CC8 mov r5, #0x8000 ldr fp, _020A8F4C ; =UNK_020FF5D4 ldr r4, _020A8F50 ; =0x00007FFF @@ -28455,7 +28055,6 @@ FUN_020A8F58: ; 0x020A8F58 addls sp, sp, #0x34 mov r12, #0x0 ldmlsia sp!, {r4-r11,pc} -_020A8F70: ; 0x020A8F70 mov r4, #0x8000 rsb r6, r4, #0x0 ldr r5, _020A91CC ; =0x00007FFF @@ -28635,7 +28234,6 @@ FUN_020A91D8: ; 0x020A91D8 str r2, [sp, #0x0] addeq sp, sp, #0x54 ldmeqia sp!, {r4-r11,pc} -_020A91F8: ; 0x020A91F8 ldr r5, [sp, #0x0] mov r4, #0x8000 rsb lr, r4, #0x0 @@ -29037,7 +28635,6 @@ FUN_020A97DC: ; 0x020A97DC str r2, [sp, #0xc] addeq sp, sp, #0x4c ldmeqia sp!, {r4-r11,pc} -_020A9808: ; 0x020A9808 ldr r2, [sp, #0x0] mov r4, #0x8000 ldr lr, _020A9D0C ; =0x00007FFF @@ -29399,7 +28996,6 @@ FUN_020A9D18: ; 0x020A9D18 str r2, [sp, #0x0] addeq sp, sp, #0x1c ldmeqia sp!, {r4-r11,pc} -_020A9D38: ; 0x020A9D38 mov r4, #0x8000 rsb r5, r4, #0x0 ldr fp, _020A9F04 ; =0x00007FFF @@ -29531,7 +29127,6 @@ FUN_020A9F10: ; 0x020A9F10 addls sp, sp, #0x1c mov r12, #0x0 ldmlsia sp!, {r4-r11,pc} -_020A9F28: ; 0x020A9F28 mov r4, #0x8000 ldr fp, _020AA098 ; =0x00007FFF str r12, [sp, #0x8] @@ -29644,7 +29239,6 @@ FUN_020AA0A4: cmp r0, #0x0 moveq r0, #0x1 ldmeqia sp!, {r4-r8,pc} -_020AA0BC: ; 0x020AA0BC ldr r1, _020AA1B8 ; =UNK_021CAF00 ldr r0, [r1, #0x8c8] cmp r0, #0x0 @@ -29727,12 +29321,10 @@ FUN_020AA1CC: ; 0x020AA1CC stmdb sp!, {r4-r7,lr} sub sp, sp, #0x4 bl FUN_020AB154 -_020AA1D8: ; 0x020AA1D8 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020AA1E8: ; 0x020AA1E8 ldrb r5, [r0, #0x11] mov r0, r5 bl FUN_020AB144 @@ -29773,7 +29365,6 @@ _020AA25C: ldrb r1, [r4, #0x11] mov r0, r4 bl FUN_020AB500 -_020AA278: ; 0x020AA278 cmp r0, #0x0 bge _020AA288 mov r0, r4 @@ -29803,7 +29394,6 @@ FUN_020AA2A0: ; 0x020AA2A0 addeq sp, sp, #0x4 moveq r0, r5 ldmeqia sp!, {r4-r11,pc} -_020AA2D8: ; 0x020AA2D8 ldr r1, _020AA4AC ; =UNK_021CA8E8 mov r2, r5 _020AA2E0: @@ -29822,7 +29412,6 @@ _020AA308: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r11,pc} -_020AA318: ; 0x020AA318 ldrb r0, [r9, #0x4] cmp r0, #0x41 bne _020AA344 @@ -29839,7 +29428,6 @@ _020AA344: addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r11,pc} -_020AA354: ; 0x020AA354 ldrb r0, [r9, #0x5] and r4, r0, #0x7f cmp r4, #0x5 @@ -29847,7 +29435,6 @@ _020AA354: ; 0x020AA354 str r4, [r5, #0x24] movge r0, #0x0 ldmgeia sp!, {r4-r11,pc} -_020AA370: ; 0x020AA370 ldr r1, _020AA4B0 ; =UNK_020FF689 ldr r0, _020AA4B4 ; =UNK_020FF688 ldrb r2, [r1, r4, lsl #0x1] @@ -29859,7 +29446,6 @@ _020AA370: ; 0x020AA370 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r11,pc} -_020AA39C: ; 0x020AA39C cmp r10, #0x0 movne r0, #0x1 movne r1, r0, lsl r10 @@ -29870,7 +29456,6 @@ _020AA39C: ; 0x020AA39C addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r11,pc} -_020AA3C4: ; 0x020AA3C4 bl FUN_020ACDC8 movs r6, r0 bne _020AA40C @@ -29918,7 +29503,6 @@ _020AA40C: ldrh r2, [r9, #0x6] str r2, [r6, #0x18] bl FUN_020AB760 -_020AA478: ; 0x020AA478 cmp r0, #0x0 bne _020AA494 mov r0, r6 @@ -29958,7 +29542,6 @@ FUN_020AA4C0: ; 0x020AA4C0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020AA500: ; 0x020AA500 ldr r0, _020AA728 ; =UNK_021CAF00 ldr r0, [r0, #0x8c0] ands r0, r0, #0x1 @@ -30137,7 +29720,6 @@ FUN_020AA770: ; 0x020AA770 mov r4, r0 str r4, [r1, #0x0] bl FUN_020AD170 -_020AA784: ; 0x020AA784 cmp r4, #0x0 ldreq r0, _020AA79C ; =UNK_021CA8B8 moveq r1, #0x1 @@ -30328,7 +29910,6 @@ _020AA9A4: bl MIi_CpuCopyFast ldr r0, [r6, #0x3c] bl FUN_020ACD90 -_020AAA24: ; 0x020AAA24 mov r0, #0x0 str r0, [r6, #0x3c] ldr r0, [sp, #0x8] @@ -30442,7 +30023,6 @@ _020AABB0: cmp r0, #0x0 beq _020AABC8 bl FUN_020ACD90 -_020AABC0: ; 0x020AABC0 mov r0, #0x0 str r0, [r6, #0x3c] _020AABC8: @@ -30463,13 +30043,11 @@ FUN_020AABDC: ; 0x020AABDC cmp r2, r1 movne r0, r12 ldmneia sp!, {r4,pc} -_020AABFC: ; 0x020AABFC ldr r1, _020AACE4 ; =UNK_021CA8D0 ldr r4, [r1, #0x0] cmp r4, #0x0 moveq r0, r12 ldmeqia sp!, {r4,pc} -_020AAC10: ; 0x020AAC10 mov lr, r12 cmp r4, #0x0 bls _020AAC48 @@ -30490,7 +30068,6 @@ _020AAC48: cmp r12, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AAC54: ; 0x020AAC54 ldr r1, _020AACEC ; =UNK_021CAF00 ldr r4, _020AACEC ; =UNK_021CAF00 ldr r1, [r1, #0x8c4] @@ -30580,7 +30157,6 @@ _020AAD80: cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020AAD94: ; 0x020AAD94 ldr r0, _020AADC8 ; =UNK_021CA8C4 mov r1, #0x1 str r1, [r0, #0x0] @@ -30605,14 +30181,12 @@ FUN_020AADCC: ; 0x020AADCC addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020AADE4: ; 0x020AADE4 ldr r0, _020AAF24 ; =UNK_021CA8D0 ldr r0, [r0, #0x0] cmp r0, #0x3 addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020AADFC: ; 0x020AADFC ldr r0, [r5, #0xc] cmp r0, #0x2 beq _020AAE18 @@ -30629,7 +30203,6 @@ _020AAE20: addeq sp, sp, #0x4 moveq r0, #0x1 ldmeqia sp!, {r4-r5,pc} -_020AAE34: ; 0x020AAE34 add r2, r2, #0x1 cmp r2, #0x3 blo _020AAE20 @@ -30667,7 +30240,6 @@ _020AAE68: addne sp, sp, #0x4 movne r0, #0x1 ldmneia sp!, {r4-r5,pc} -_020AAEC0: ; 0x020AAEC0 ldr r0, _020AAF24 ; =UNK_021CA8D0 ldr r0, [r0, #0x0] cmp r0, #0x1 @@ -30918,7 +30490,6 @@ _020AB1F8: mov r0, r4 ldr r4, [r4, #0x8] bl FUN_020ACD90 -_020AB204: ; 0x020AB204 cmp r4, #0x0 bne _020AB1F8 _020AB20C: @@ -31048,7 +30619,6 @@ FUN_020AB37C: ; 0x020AB37C mov r8, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r11,pc} -_020AB394: ; 0x020AB394 mov r12, r8 mov lr, #0xff mov r4, #0x7f @@ -31154,7 +30724,6 @@ FUN_020AB4B8: ; 0x020AB4B8 ldmia sp!, {r4,pc} _020AB4EC: bl OS_RestoreInterrupts -_020AB4F0: ; 0x020AB4F0 mov r0, #0x0 ldmia sp!, {r4,pc} .balign 4 @@ -31170,12 +30739,10 @@ FUN_020AB500: addeq sp, sp, #0x4 mvneq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020AB51C: ; 0x020AB51C cmp r4, #0x3 addcs sp, sp, #0x4 mvncs r0, #0x0 ldmcsia sp!, {r4-r5,pc} -_020AB52C: ; 0x020AB52C bl OS_DisableInterrupts ldr r3, _020AB620 ; =UNK_021CB7F0 ldr r1, _020AB624 ; =UNK_021CB7EC @@ -31361,14 +30928,12 @@ _020AB790: mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 bl FUN_020ABB1C -_020AB7A0: ; 0x020AB7A0 cmp r0, #0x0 ldreq r1, [r7, #0x14] moveq r0, r4 addeq r1, r1, #0x1 streq r1, [r7, #0x14] ldmeqia sp!, {r4-r8,pc} -_020AB7B8: ; 0x020AB7B8 ldr r0, [r6, #0x18] str r0, [r7, #0x10] ldr r2, [r6, #0x18] @@ -31379,7 +30944,6 @@ _020AB7B8: ; 0x020AB7B8 addeq r1, r1, #0x1 streq r1, [r7, #0x14] ldmeqia sp!, {r4-r8,pc} -_020AB7E0: ; 0x020AB7E0 add r0, r1, #0x1 cmp r0, r2 beq _020AB820 @@ -31392,7 +30956,6 @@ _020AB7E0: ; 0x020AB7E0 strgt r2, [r7, #0x54] movgt r0, #0x0 ldmgtia sp!, {r4-r8,pc} -_020AB810: ; 0x020AB810 cmp r1, r2 ldrhi r0, [r7, #0x1c] addhi r0, r0, #0x1 @@ -31485,7 +31048,6 @@ _020AB918: cmpeq r6, r0 movcc r0, r3 ldmccia sp!, {r4-r8,pc} -_020AB968: ; 0x020AB968 ldr r6, _020ABB04 ; =0x0007FD88 adds r6, r0, r6 adc r0, r1, r3 @@ -31493,7 +31055,6 @@ _020AB968: ; 0x020AB968 cmpeq r12, r6 movhi r0, r3 ldmhiia sp!, {r4-r8,pc} -_020AB984: ; 0x020AB984 ldr r0, [r7, #0x84] cmp r0, #0x0 bgt _020ABAE0 @@ -31699,7 +31260,6 @@ FUN_020ABC40: ; 0x020ABC40 cmp r0, #0x0 beq _020ABC60 bl FUN_020ACD90 -_020ABC58: ; 0x020ABC58 mov r0, #0x0 str r0, [r4, #0x3c] _020ABC60: @@ -31858,7 +31418,6 @@ FUN_020ABE40: ; 0x020ABE40 _020ABE70: ldrb r0, [r5, #0x8] bl FUN_020AC1E8 -_020ABE78: ; 0x020ABE78 cmp r0, #0x0 beq _020ABEA4 mov r1, #0x2 @@ -31877,7 +31436,6 @@ _020ABEA4: ldr r0, _020ABEC8 ; =UNK_021CB838 mov r1, #0x2 bl FUN_020AC708 -_020ABEBC: ; 0x020ABEBC mov r0, #0x0 add sp, sp, #0x4 ldmia sp!, {r4-r5,pc} @@ -31934,7 +31492,6 @@ _020ABF50: _020ABF74: mov r0, #0x1 bl FUN_020AC5E8 -_020ABF7C: ; 0x020ABF7C mov r0, #0x0 ldmia sp!, {r4-r6,pc} _020ABF84: @@ -31948,7 +31505,6 @@ _020ABF84: ands r0, r0, r1 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020ABFAC: ; 0x020ABFAC ldr r2, _020AC070 ; =UNK_021CB824 mov r4, #0x2 mov r3, #0x0 @@ -32059,7 +31615,6 @@ _020AC124: mov r0, r6 mov r1, r4 bl FUN_020AC4A0 -_020AC130: ; 0x020AC130 str r0, [r5, #0x0] str r4, [r5, #0x4] str r7, [r4, #0xc] @@ -32099,7 +31654,6 @@ _020AC1B4: mov r0, r6 mov r1, r7 bl FUN_020AC4A0 -_020AC1C0: ; 0x020AC1C0 str r0, [r5, #0x0] str r7, [r5, #0x4] str r4, [r7, #0xc] @@ -32245,7 +31799,6 @@ _020AC380: addlt sp, sp, #0x4 mvnlt r0, #0x0 ldmltia sp!, {r4-r5,pc} -_020AC390: ; 0x020AC390 ldr r0, _020AC44C ; =UNK_021CCD20 ldr r0, [r0, #0x10] cmp r0, #0x1 @@ -32394,7 +31947,6 @@ _020AC57C: ldrb r0, [r0, #0x4] mov r2, #0x10 bl MOD04_021EB044 -_020AC588: ; 0x020AC588 cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 @@ -32474,7 +32026,6 @@ _020AC654: mov r2, r6 strb r8, [r10, #0x9] bl MOD04_021EB044 -_020AC68C: ; 0x020AC68C cmp r0, #0x0 addne r9, r9, #0x1 _020AC694: @@ -32522,15 +32073,12 @@ FUN_020AC708: mov r3, #0x10 mov r4, r0 bl FUN_020ACAE0 -_020AC720: ; 0x020AC720 cmp r0, #0x0 addne sp, sp, #0x10 ldmneia sp!, {r4,pc} -_020AC72C: ; 0x020AC72C add r1, sp, #0x0 mov r0, r4 bl FUN_020AC554 -_020AC738: ; 0x020AC738 cmp r0, #0x0 movne r0, #0x0 mvneq r0, #0x3 @@ -32545,15 +32093,12 @@ FUN_020AC74C: ; 0x020AC74C mov r3, #0x10 mov r4, r0 bl FUN_020ACBD0 -_020AC764: ; 0x020AC764 cmp r0, #0x0 addne sp, sp, #0x10 ldmneia sp!, {r4,pc} -_020AC770: ; 0x020AC770 add r1, sp, #0x0 mov r0, r4 bl FUN_020AC554 -_020AC77C: ; 0x020AC77C cmp r0, #0x0 movne r0, #0x0 mvneq r0, #0x3 @@ -32567,19 +32112,16 @@ FUN_020AC790: ; 0x020AC790 cmp r1, #0x20 movcs r0, #0x0 ldmcsia sp!, {r4,pc} -_020AC7A4: ; 0x020AC7A4 ldr r0, _020AC7F4 ; =UNK_021CCD20 ldrb r0, [r0, #0x0] cmp r1, r0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AC7B8: ; 0x020AC7B8 ldr r2, _020AC7F8 ; =UNK_021CB824 ldr r4, [r2, #0x0] cmp r4, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AC7CC: ; 0x020AC7CC ldr r3, [r4, #0x14] mov r0, r4 str r3, [r2, #0x0] @@ -32651,12 +32193,10 @@ FUN_020AC898: ; 0x020AC898 cmp r3, #0x2 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020AC8B8: ; 0x020AC8B8 ldr r2, [r2, #0xc] cmp r2, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020AC8C8: ; 0x020AC8C8 ldr r3, _020AC954 ; =UNK_021CB81C mov r12, #0x0 ldr r5, [r3, #0x4] @@ -32665,7 +32205,6 @@ _020AC8C8: ; 0x020AC8C8 cmpeq r4, r12 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020AC8E8: ; 0x020AC8E8 ldr r2, _020AC958 ; =UNK_02106490 subs r4, r0, r4 ldr lr, [r2, #0x0] @@ -32675,7 +32214,6 @@ _020AC8E8: ; 0x020AC8E8 cmpeq r4, lr addls sp, sp, #0x4 ldmlsia sp!, {r4-r5,pc} -_020AC90C: ; 0x020AC90C ldr r1, _020AC95C ; =UNK_021CB824 mov r0, r12 str r12, [r3, #0x0] @@ -32819,11 +32357,9 @@ FUN_020ACAE0: mov r4, r2 mvneq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020ACAF8: ; 0x020ACAF8 cmp r3, #0x10 mvncc r0, #0x0 ldmccia sp!, {r4-r6,pc} -_020ACB04: ; 0x020ACB04 cmp r6, #0x0 blt _020ACB14 cmp r6, #0x6 @@ -32837,7 +32373,6 @@ _020ACB1C: and r2, r6, #0xff strb r3, [r4, #0x4] bl FUN_020AC458 -_020ACB30: ; 0x020ACB30 cmp r6, #0x0 bne _020ACB80 ldr r0, _020ACB9C ; =UNK_021CCD20 @@ -32849,7 +32384,6 @@ _020ACB30: ; 0x020ACB30 bne _020ACB68 mov r0, r5 bl FUN_020AC304 -_020ACB5C: ; 0x020ACB5C cmp r0, #0x0 mvneq r0, #0x2 ldmeqia sp!, {r4-r6,pc} @@ -32864,7 +32398,6 @@ _020ACB80: mov r0, r5 mov r1, r4 bl FUN_020AC268 -_020ACB8C: ; 0x020ACB8C cmp r0, #0x0 mvneq r0, #0x2 movne r0, #0x0 @@ -32896,17 +32429,14 @@ FUN_020ACBD0: mov r6, r2 mvneq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020ACBE8: ; 0x020ACBE8 cmp r3, #0x10 mvncc r0, #0x0 ldmccia sp!, {r4-r6,pc} -_020ACBF4: ; 0x020ACBF4 ldr r1, _020ACC80 ; =UNK_021CCD20 ldr r1, [r1, #0xc] cmp r1, #0x1 mvneq r0, #0x2 ldmeqia sp!, {r4-r6,pc} -_020ACC08: ; 0x020ACC08 cmp r4, #0x0 blt _020ACC18 cmp r4, #0x5 @@ -32923,11 +32453,9 @@ _020ACC20: mov r0, r5 mov r1, r6 bl FUN_020AC268 -_020ACC40: ; 0x020ACC40 cmp r0, #0x0 mvneq r0, #0x2 ldmeqia sp!, {r4-r6,pc} -_020ACC4C: ; 0x020ACC4C ldr r0, _020ACC80 ; =UNK_021CCD20 ldr r0, [r0, #0x10] cmp r0, #0x1 @@ -32936,7 +32464,6 @@ _020ACC4C: ; 0x020ACC4C bne _020ACC78 mov r0, r5 bl FUN_020AC304 -_020ACC6C: ; 0x020ACC6C cmp r0, #0x0 mvneq r0, #0x2 ldmeqia sp!, {r4-r6,pc} @@ -33103,13 +32630,11 @@ _020ACE6C: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020ACE7C: ; 0x020ACE7C ands r3, r0, #0x1f movne r0, #0x0 strne r0, [r1, #0x0] addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020ACE90: ; 0x020ACE90 mov r1, r0 mov r0, #0x0 bl MIi_CpuClearFast @@ -33486,7 +33011,6 @@ _020AD388: strhih r1, [r0, #0x0] addhi sp, sp, #0x14 ldmhiia sp!, {r4-r11,pc} -_020AD3C0: ; 0x020AD3C0 cmp r3, r4 ldrlo r1, _020AD458 ; =UNK_021CB890 movcc r2, #0x4 @@ -33500,7 +33024,6 @@ _020AD3C0: ; 0x020AD3C0 cmp r8, #0x0 addls sp, sp, #0x14 ldmlsia sp!, {r4-r11,pc} -_020AD3F4: ; 0x020AD3F4 ldr r1, _020AD458 ; =UNK_021CB890 ldrsh r4, [r1, #0x0] _020AD3FC: @@ -33667,7 +33190,6 @@ FUN_020AD61C: mov r4, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020AD634: ; 0x020AD634 mov r3, #0x8000 ldr ip, _020AD720 ; =0x00007FFF rsb r3, r3, #0x0 @@ -33746,14 +33268,12 @@ FUN_020AD724: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020AD748: ; 0x020AD748 ldr r1, [r6, #0x0] ldr r0, _020AD824 ; =0x5F564354 cmp r1, r0 addne sp, sp, #0x4 movne r0, #0x2 ldmneia sp!, {r4-r7,pc} -_020AD760: ; 0x020AD760 ldr r0, _020AD828 ; =UNK_021CCD20 ldr r0, [r0, #0x10] cmp r0, #0x0 @@ -33799,7 +33319,6 @@ _020AD7F0: mov r2, r5 mov r3, r4 bl FUN_020AC7FC -_020AD804: ; 0x020AD804 cmp r0, #0x0 movne r0, #0x1 add sp, sp, #0x4 @@ -33822,7 +33341,6 @@ FUN_020AD834: ; 0x020AD834 add r3, sp, #0x0 mov r4, r0 bl FUN_020AD724 -_020AD848: ; 0x020AD848 cmp r0, #0x0 beq _020AD898 cmp r0, #0x1 @@ -33870,7 +33388,6 @@ FUN_020AD8A8: ; 0x020AD8A8 bl FUN_020AC898 _020AD8E0: bl FUN_020AA0A4 -_020AD8E4: ; 0x020AD8E4 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {pc} @@ -34208,7 +33725,6 @@ FUN_020ADD30: ; 0x020ADD30 mov r1, r0 mov r0, r4 bl FUN_020ADD58 -_020ADD44: ; 0x020ADD44 cmp r0, #0x0 addne r4, r0, #0xc mov r0, r4 @@ -34235,7 +33751,6 @@ _020ADD74: mov r1, r5 add r0, r4, #0xc bl FUN_020ADD58 -_020ADD98: ; 0x020ADD98 cmp r0, #0x0 moveq r0, r4 ldmia sp!, {r4-r6,pc} @@ -34302,7 +33817,6 @@ FUN_020ADE2C: ; 0x020ADE2C addeq sp, sp, #0x10 moveq r0, r10 ldmeqia sp!, {r4-r10,pc} -_020ADE64: ; 0x020ADE64 cmp r10, r8 bls _020ADF60 ldr r9, [r7, #0x0] @@ -34382,7 +33896,6 @@ _020ADF60: mov r0, r7 str r10, [r6, #0x4] bl FUN_020AE02C -_020ADF88: ; 0x020ADF88 cmp r0, #0x0 streq r8, [r6, #0x4] _020ADF90: @@ -34495,7 +34008,6 @@ _020AE0D4: addcc sp, sp, #0x8 movcc r0, #0x0 ldmccia sp!, {r4-r6,pc} -_020AE0F0: ; 0x020AE0F0 ldr r1, _020AE118 ; =0x00004652 add r0, sp, #0x0 bl FUN_020AE4A0 @@ -34555,7 +34067,6 @@ _020AE1B0: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020AE1C0: ; 0x020AE1C0 mov r4, #0x1 mov r2, r12 str r4, [sp, #0x0] @@ -34610,7 +34121,6 @@ _020AE270: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020AE280: ; 0x020AE280 mov r4, #0x0 mov r2, lr str r4, [sp, #0x0] @@ -34734,7 +34244,6 @@ FUN_020AE420: ; 0x020AE420 ldr r1, _020AE498 ; =0x45585048 add r2, r4, #0x14 bl FUN_020ADCA4 -_020AE444: ; 0x020AE444 mov r0, #0x0 strh r0, [r4, #0x10] strh r0, [r4, #0x12] @@ -34855,11 +34364,9 @@ FUN_020AE5B0: ; 0x020AE5B0 mov r1, #0x10 mov r2, #0x4 bl FUN_020AE77C -_020AE5D0: ; 0x020AE5D0 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020AE5DC: ; 0x020AE5DC str r6, [r0, #0x0] str r5, [r0, #0x4] ldr r1, [r4, #0x4] @@ -34883,7 +34390,6 @@ _020AE61C: ands r0, r4, #0x2 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020AE628: ; 0x020AE628 mov r0, r5 bl FUN_020AE6C8 add sp, sp, #0x4 @@ -34979,7 +34485,6 @@ FUN_020AE710: ; 0x020AE710 addcc sp, sp, #0x4 movcc r0, #0x0 ldmccia sp!, {r4-r5,pc} -_020AE744: ; 0x020AE744 ldr r0, [r5, #-0x4] sub r2, r3, r4 and r0, r0, #0xff @@ -35010,7 +34515,6 @@ FUN_020AE77C: cmp r4, r2 movhi r0, #0x0 ldmhiia sp!, {r4-r6,pc} -_020AE7AC: ; 0x020AE7AC ldr r1, [r6, #-0x4] sub r2, r4, r0 and r1, r1, #0xff @@ -35183,7 +34687,6 @@ FUN_020AE96C: ; 0x020AE96C cmp r7, r0 movcs r0, #0x0 ldmcsia sp!, {r4-r10,pc} -_020AE990: ; 0x020AE990 cmp r1, #0x0 beq _020AEA5C mov lr, r7, lsr #0x1 @@ -35271,7 +34774,6 @@ _020AEAB8: cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r10,pc} -_020AEAC4: ; 0x020AEAC4 ldr r0, _020AEAF0 ; =0x0000FFFF mov r2, r7, lsr #0x4 and r0, r0, r8, lsr #0x3 @@ -35350,11 +34852,9 @@ _020AEBC4: ldr r0, _020AEBFC ; =UNK_021CCD48 strh r5, [r0, #0x0] bl FUN_020AEAF4 -_020AEBD0: ; 0x020AEBD0 cmp r4, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020AEBDC: ; 0x020AEBDC ldr r3, _020AEC00 ; =FUN_020AE96C ldr r1, _020AEC04 ; =UNK_021064B8 ldr r2, _020AEC08 ; =FUN_020AE964 @@ -35444,7 +34944,6 @@ FUN_020AECBC: ; 0x020AECBC mov r3, #0x0 movcs r0, #0x0 ldmcsia sp!, {r4,pc} -_020AECE4: ; 0x020AECE4 cmp r2, #0x1 bne _020AED64 ldr r2, _020AEDEC ; =UNK_021CCD4C @@ -35528,10 +35027,8 @@ FUN_020AEDF4: ; 0x020AEDF4 mov r4, r1 str r0, [r2, #0x8] bl FUN_020AEC60 -_020AEE08: ; 0x020AEE08 cmp r4, #0x0 ldmeqia sp!, {r4,pc} -_020AEE10: ; 0x020AEE10 ldr r3, _020AEE30 ; =FUN_020AECBC ldr r1, _020AEE34 ; =UNK_021064C0 ldr r2, _020AEE38 ; =FUN_020AECB4 @@ -35557,12 +35054,10 @@ FUN_020AEE40: ; 0x020AEE40 mov r7, r2 mov r6, r3 bl FUN_020AF2F4 -_020AEE64: ; 0x020AEE64 cmp r0, #0x0 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r9,pc} -_020AEE74: ; 0x020AEE74 mov r0, r5 bl FUN_020AEF78 mov r4, r0 @@ -35591,10 +35086,8 @@ FUN_020AEEB8: ; 0x020AEEB8 mov r5, r0 mov r0, r6 bl FUN_020AEF3C -_020AEED4: ; 0x020AEED4 cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020AEEDC: ; 0x020AEEDC add r4, r6, #0x10 _020AEEE0: mov r0, r5 @@ -35608,7 +35101,6 @@ _020AEEE0: mov r5, r0 mov r0, r6 bl FUN_020AEF3C -_020AEF0C: ; 0x020AEF0C cmp r0, #0x0 bne _020AEEE0 ldmia sp!, {r4-r6,pc} @@ -35632,11 +35124,9 @@ FUN_020AEF3C: stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020AF2E0 -_020AEF48: ; 0x020AEF48 cmp r0, #0x0 movne r0, #0x0 ldmneia sp!, {r4,pc} -_020AEF54: ; 0x020AEF54 ldrh r1, [r4, #0x8] mov r0, r4 bl FUN_020AF30C @@ -35666,11 +35156,9 @@ FUN_020AEF98: ; 0x020AEF98 stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020AF2F4 -_020AEFA4: ; 0x020AEFA4 cmp r0, #0x0 movne r0, #0x0 ldmneia sp!, {r4,pc} -_020AEFB0: ; 0x020AEFB0 ldrh r1, [r4, #0xa] mov r0, r4 bl FUN_020AF30C diff --git a/arm9/asm/unk_020AF030.s b/arm9/asm/unk_020AF030.s index f78f7f62..7e02cdc4 100644 --- a/arm9/asm/unk_020AF030.s +++ b/arm9/asm/unk_020AF030.s @@ -574,7 +574,6 @@ _020AF418: addeq sp, sp, #0x10 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020AF438: ; 0x020AF438 ldr r2, [sp, #0x8] mov r1, #0x0 str r2, [r4, #0x0] @@ -881,7 +880,6 @@ _020AF85C: cmp r3, #0x0 addeq sp, sp, #0x30 ldmeqia sp!, {r4-r6,pc} -_020AF86C: ; 0x020AF86C ldr r0, _020AF888 ; =UNK_021CCD6C ldr r1, _020AF890 ; =UNK_021CCD74 add r2, r4, #0x20000 @@ -949,7 +947,6 @@ FUN_020AF91C: ; 0x020AF91C addcs sp, sp, #0x4 movcs r0, #0x0 ldmcsia sp!, {r4-r5,pc} -_020AF94C: ; 0x020AF94C cmp r4, #0x0 beq _020AF96C ldr r0, _020AF9B4 ; =UNK_021CCD70 @@ -969,7 +966,6 @@ _020AF980: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020AF990: ; 0x020AF990 ldr r1, [sp, #0x0] ldr r0, _020AF9C0 ; =0x0000FFFF mov r2, r5, lsr #0x4 @@ -1058,7 +1054,6 @@ FUN_020AFA80: ; 0x020AFA80 mov r2, r12, lsl #0x3 mov r3, r3, lsl #0x3 bl FUN_020AF334 -_020AFAB4: ; 0x020AFAB4 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -1082,7 +1077,6 @@ FUN_020AFAD4: ; 0x020AFAD4 addcs sp, sp, #0x8 movcs r0, #0x0 ldmcsia sp!, {r4,pc} -_020AFB00: ; 0x020AFB00 cmp r1, #0x0 beq _020AFB50 mov r12, #0x8 @@ -1116,7 +1110,6 @@ _020AFB6C: addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AFB7C: ; 0x020AFB7C ldr r1, [sp, #0x4] ldr r0, _020AFBA4 ; =0x0000FFFF mov r2, r4, lsr #0x3 @@ -1139,10 +1132,8 @@ FUN_020AFBA8: ; 0x020AFBA8 str r1, [r12, #0xc] str r2, [r12, #0x10] bl FUN_020AFA30 -_020AFBC4: ; 0x020AFBC4 cmp r4, #0x0 ldmeqia sp!, {r4,pc} -_020AFBCC: ; 0x020AFBCC ldr r3, _020AFBEC ; =FUN_020AFAD4 ldr r1, _020AFBF0 ; =UNK_021064C0 ldr r2, _020AFBF4 ; =FUN_020AFA80 @@ -1225,7 +1216,6 @@ _020AFCCC: cmp r1, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r9,pc} -_020AFCDC: ; 0x020AFCDC add r1, r1, r0 str r1, [r0, #0x14] ldr r1, [r0, #0x14] @@ -1238,7 +1228,6 @@ _020AFCDC: ; 0x020AFCDC cmp r0, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r9,pc} -_020AFD0C: ; 0x020AFD0C mov r0, r12 mov r6, r12 _020AFD14: @@ -1300,7 +1289,6 @@ FUN_020AFDA0: ; 0x020AFDA0 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020AFDC8: ; 0x020AFDC8 add r0, r4, #0x8 bl FUN_020AFC1C add r0, r4, #0x8 @@ -1352,7 +1340,6 @@ _020AFE6C: ldr r0, [r5, #0x14] cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020AFE78: ; 0x020AFE78 add r0, r0, r5 str r0, [r5, #0x14] ldr r0, [r5, #0x14] @@ -1385,7 +1372,6 @@ FUN_020AFEB8: ; 0x020AFEB8 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020AFEE0: ; 0x020AFEE0 add r0, r4, #0x8 bl FUN_020AFDE8 add r0, r4, #0x8 @@ -1455,7 +1441,6 @@ _020AFFA8: ldr r1, [r0, #0x10] cmp r1, #0x0 ldmeqia sp!, {r4,pc} -_020AFFB4: ; 0x020AFFB4 add r1, r1, r0 str r1, [r0, #0x10] ldr r0, [r0, #0x10] @@ -1482,7 +1467,6 @@ FUN_020AFFD8: ; 0x020AFFD8 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020B0000: ; 0x020B0000 add r0, r4, #0x8 bl FUN_020AFF4C add r0, r4, #0x8 @@ -1512,7 +1496,6 @@ FUN_020B0030: ; 0x020B0030 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020B0058: ; 0x020B0058 add r0, r4, #0x8 bl FUN_020B0020 add r0, r4, #0x8 @@ -1542,7 +1525,6 @@ FUN_020B0088: ; 0x020B0088 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020B00B0: ; 0x020B00B0 add r0, r4, #0x8 bl FUN_020B0078 add r0, r4, #0x8 @@ -1579,7 +1561,6 @@ FUN_020B00F0: ; 0x020B00F0 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020B0118: ; 0x020B0118 add r0, r4, #0x8 bl FUN_020B00E0 add r0, r4, #0x8 @@ -1602,7 +1583,6 @@ FUN_020B0138: ; 0x020B0138 addeq sp, sp, #0x4 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r5,pc} -_020B0160: ; 0x020B0160 add r0, r4, #0x8 bl FUN_020B00D0 add r0, r4, #0x8 @@ -1619,7 +1599,6 @@ FUN_020B0180: ; 0x020B0180 mov r4, r1 ldr r1, _020B01AC ; =0x5343524E bl FUN_020B01F8 -_020B0190: ; 0x020B0190 cmp r0, #0x0 addne r0, r0, #0x8 strne r0, [r4, #0x0] @@ -1882,7 +1861,6 @@ FUN_020B04C0: str r1, [r4, #0x14] str r1, [r4, #0x18] ldmia sp!, {r4,pc} -_020B04FC: ; 0x020B04FC ldr r1, [r0, #0x18] ldr r2, [r0, #0x0] ldr r0, [r1, #0xc] @@ -1896,7 +1874,6 @@ FUN_020B0518: stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020B06EC -_020B0524: ; 0x020B0524 cmp r0, #0x0 movne r1, #0x0 strne r1, [r4, #0xc] @@ -1911,7 +1888,6 @@ FUN_020B0534: cmp r0, #0x1 movne r0, r7 ldmneia sp!, {r4-r8,pc} -_020B0550: ; 0x020B0550 ldr r2, [r8, #0x10] mov r0, #0x800 smull r3, r1, r2, r1 @@ -2118,7 +2094,6 @@ _020B0800: cmp r2, r0 strhi r0, [r4, #0x0] ldmhiia sp!, {r4,pc} -_020B0824: ; 0x020B0824 cmp r2, r1 strcc r1, [r4, #0x0] ldmia sp!, {r4,pc} @@ -2261,7 +2236,6 @@ FUN_020B09B4: ; 0x020B09B4 mov r1, r6 mov r7, r2, lsr #0x10 bl DC_FlushRange -_020B0A0C: ; 0x020B0A0C cmp r5, #0x0 beq _020B0A20 cmp r5, #0x1 @@ -2326,7 +2300,6 @@ _020B0AC8: _020B0AEC: cmp r3, #0x0 ldmeqia sp!, {r4-r10,pc} -_020B0AF4: ; 0x020B0AF4 ldr r0, [r7, #0x0] ldr r2, _020B0BA8 ; =UNK_021CCDA0 mov r1, #0x540 @@ -2345,7 +2318,6 @@ _020B0AF4: ; 0x020B0AF4 mov r7, r2, lsr #0x10 mov r6, #0x0 ldmeqia sp!, {r4-r10,pc} -_020B0B3C: ; 0x020B0B3C mov r4, #0x2 _020B0B40: mov r2, r4 @@ -2800,7 +2772,6 @@ _020B112C: mla r5, r7, r2, r11 mla r4, r7, r6, r0 bl DC_FlushRange -_020B114C: ; 0x020B114C cmp r8, #0x0 beq _020B11E0 cmp r8, #0x1 @@ -2883,7 +2854,6 @@ FUN_020B1240: ; 0x020B1240 mov r1, r4 mov r6, r3 bl DC_FlushRange -_020B126C: ; 0x020B126C cmp r7, #0x0 beq _020B1300 cmp r7, #0x1 @@ -2955,7 +2925,6 @@ FUN_020B1340: ; 0x020B1340 mov r5, r2 mov r4, r3 bl DC_FlushRange -_020B1364: ; 0x020B1364 cmp r5, #0x0 ldr r0, [r7, #0x8] beq _020B13B8 @@ -3146,7 +3115,6 @@ _020B1590: ldr r0, [r7, #0x14] ldr r1, [r7, #0x10] bl DC_FlushRange -_020B159C: ; 0x020B159C cmp r5, #0x0 beq _020B15B8 cmp r5, #0x1 @@ -3340,7 +3308,6 @@ _020B17D0: ldr r0, [r7, #0x14] ldr r1, [r7, #0x10] bl DC_FlushRange -_020B17DC: ; 0x020B17DC cmp r5, #0x0 beq _020B17F8 cmp r5, #0x1 @@ -3884,10 +3851,8 @@ FUN_020B1EA4: ; 0x020B1EA4 stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020B0518 -_020B1EB0: ; 0x020B1EB0 cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020B1EB8: ; 0x020B1EB8 mov r0, r4 bl FUN_020B1FC4 ldmia sp!, {r4,pc} @@ -3897,10 +3862,8 @@ FUN_020B1EC4: ; 0x020B1EC4 stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020B0534 -_020B1ED0: ; 0x020B1ED0 cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020B1ED8: ; 0x020B1ED8 mov r0, r4 bl FUN_020B1FC4 ldmia sp!, {r4,pc} @@ -3980,7 +3943,6 @@ FUN_020B1FC4: ; 0x020B1FC4 cmp r1, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020B1FE4: ; 0x020B1FE4 bl FUN_020B06E0 mov r4, r0 ldr r7, [r5, #0x30] @@ -3994,7 +3956,6 @@ _020B1FE4: ; 0x020B1FE4 mov r1, #0x1 and r6, r2, #0xff bl FUN_020B1A68 -_020B2018: ; 0x020B2018 cmp r6, #0x0 beq _020B2068 cmp r6, #0x2 @@ -4024,7 +3985,6 @@ _020B2068: cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020B2084: ; 0x020B2084 ldr r1, [r5, #0x34] mvn r0, #0x0 cmp r1, r0 @@ -4033,7 +3993,6 @@ _020B2084: ; 0x020B2084 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020B20A4: ; 0x020B20A4 ldrh r1, [r4, #0x0] ldr r2, [r2, #0x4] ldr r0, [r5, #0x34] @@ -4087,7 +4046,6 @@ _020B210C: _020B215C: ldr r0, [sp, #0x0] bl FUN_020B04C0 -_020B2164: ; 0x020B2164 ldr r0, [sp, #0x0] ldr r3, [sp, #0x38] ldr r2, [sp, #0x0] @@ -4095,7 +4053,6 @@ _020B2164: ; 0x020B2164 mov r1, #0x1 str r3, [r2, #0x40] bl FUN_020B1A68 -_020B2180: ; 0x020B2180 ldr r0, [sp, #0x0] mov r1, #0x0 strh r1, [r0, #0x2c] @@ -4108,11 +4065,9 @@ FUN_020B2194: ; 0x020B2194 sub sp, sp, #0x4 mov r7, r0 bl FUN_020B0518 -_020B21A4: ; 0x020B21A4 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020B21B0: ; 0x020B21B0 mov r0, r7 bl FUN_020B06E0 mov r4, r0 @@ -4126,7 +4081,6 @@ _020B21B0: ; 0x020B21B0 and r5, r1, #0xff mov r1, #0x1 bl FUN_020B1A68 -_020B21E4: ; 0x020B21E4 cmp r5, #0x0 beq _020B2234 cmp r5, #0x2 @@ -4165,7 +4119,6 @@ FUN_020B224C: ; 0x020B224C mov r6, r1 ldrh r5, [r2, #0x4] bl FUN_020B0534 -_020B2268: ; 0x020B2268 cmp r0, #0x0 beq _020B2318 ldrh r1, [r4, #0x2c] @@ -4184,7 +4137,6 @@ _020B2268: ; 0x020B2268 and r6, r1, #0xff mov r1, #0x1 bl FUN_020B1A68 -_020B22B0: ; 0x020B22B0 cmp r6, #0x0 beq _020B2300 cmp r6, #0x2 @@ -4234,7 +4186,6 @@ FUN_020B232C: ; 0x020B232C mov r5, #0x0 cmp r0, #0x0 ldmlsia sp!, {r4-r8,pc} -_020B235C: ; 0x020B235C mov r8, #0x58 _020B2360: mla r0, r5, r8, r4 @@ -4255,7 +4206,6 @@ _020B238C: mov r5, #0x0 cmp r0, #0x0 ldmlsia sp!, {r4-r8,pc} -_020B23A4: ; 0x020B23A4 mov r8, #0x28 _020B23A8: mul r0, r5, r8 @@ -4318,7 +4268,6 @@ FUN_020B242C: ; 0x020B242C and r5, r1, #0xff mov r1, #0x1 bl FUN_020B1A68 -_020B2478: ; 0x020B2478 cmp r5, #0x0 beq _020B24C8 cmp r5, #0x2 @@ -4382,7 +4331,6 @@ _020B2544: cmp r0, #0x0 addls sp, sp, #0x14 ldmlsia sp!, {r4-r11,pc} -_020B2558: ; 0x020B2558 str r5, [sp, #0x4] mov r11, #0x1 _020B2560: @@ -4426,7 +4374,6 @@ _020B25D8: _020B25F0: mov r0, r6 bl FUN_020B0408 -_020B25F8: ; 0x020B25F8 cmp r0, #0x0 beq _020B261C mov r0, r9 @@ -4461,7 +4408,6 @@ _020B2654: ldr r11, [r0, #0xc] addls sp, sp, #0x14 ldmlsia sp!, {r4-r11,pc} -_020B2670: ; 0x020B2670 mov r0, #0x1 str r4, [sp, #0xc] str r0, [sp, #0x8] @@ -4503,7 +4449,6 @@ _020B26E4: _020B2700: mov r0, r6 bl FUN_020B0408 -_020B2708: ; 0x020B2708 cmp r0, #0x0 beq _020B272C mov r0, r9 @@ -4920,7 +4865,6 @@ _020B2CA4: movge r0, #0x0 cmp r0, #0x0 ldmeqia sp!, {r4-r10,pc} -_020B2CC4: ; 0x020B2CC4 ldr r0, _020B2D7C ; =UNK_021CDD68 ldr r0, [r0, #0x0] cmp r0, #0x0 @@ -4999,13 +4943,11 @@ _020B2DBC: ldr r0, [r0, #0x0] ldrsh r5, [r4, #0x50] bl FUN_020B4F88 -_020B2DE0: ; 0x020B2DE0 cmp r0, #0x0 ldr r0, _020B2E70 ; =UNK_021CDD6C rsbne r5, r5, #0x0 ldr r0, [r0, #0x0] bl FUN_020B4F74 -_020B2DF4: ; 0x020B2DF4 cmp r0, #0x0 rsbne r6, r6, #0x0 mov r0, r5, lsl #0xc @@ -5079,7 +5021,6 @@ _020B2ED0: cmp r0, #0x0 beq _020B2FD8 bl FUN_020B4948 -_020B2EF4: ; 0x020B2EF4 str r0, [sp, #0x0] mov r0, r6 bl FUN_020B497C @@ -5109,13 +5050,11 @@ _020B2F28: ldr r0, [r0, #0x0] ldrsh r10, [r10, #0x2] bl FUN_020B4F88 -_020B2F64: ; 0x020B2F64 cmp r0, #0x0 ldr r0, _020B3178 ; =UNK_021CDD6C rsbne r10, r10, #0x0 ldr r0, [r0, #0x0] bl FUN_020B4F74 -_020B2F78: ; 0x020B2F78 cmp r0, #0x0 rsbne r4, r4, #0x0 mov r2, r11 @@ -5137,7 +5076,6 @@ _020B2F78: ; 0x020B2F78 _020B2FC0: mov r0, #0x0 bl FUN_020B497C -_020B2FC8: ; 0x020B2FC8 ldr r0, [sp, #0x0] bl FUN_020B4958 bl FUN_020B4968 @@ -5166,13 +5104,11 @@ _020B2FF4: ldr r0, [r0, #0x0] ldrsh r10, [r10, #0x2] bl FUN_020B4F88 -_020B3030: ; 0x020B3030 cmp r0, #0x0 ldr r0, _020B3178 ; =UNK_021CDD6C rsbne r10, r10, #0x0 ldr r0, [r0, #0x0] bl FUN_020B4F74 -_020B3044: ; 0x020B3044 cmp r0, #0x0 rsbne r4, r4, #0x0 ldr r2, [sp, #0x4] @@ -5211,7 +5147,6 @@ _020B309C: ldr r0, [r0, #0x0] ldr r0, [r0, #0x80] bl FUN_020B4958 -_020B30D4: ; 0x020B30D4 ldr r0, [r5, #0x0] mov r4, #0x0 ldrh r0, [r0, #0x0] @@ -5243,7 +5178,6 @@ _020B312C: cmp r0, #0x0 addls sp, sp, #0xc ldmlsia sp!, {r4-r11,pc} -_020B3144: ; 0x020B3144 mov r6, #0x28 _020B3148: mla r0, r4, r6, r7 @@ -5281,7 +5215,6 @@ FUN_020B317C: ; 0x020B317C bl FUN_020B4958 mov r0, r5 bl FUN_020B3554 -_020B31C4: ; 0x020B31C4 mov r0, #0x0 bl FUN_020B497C mov r0, r4 @@ -5490,7 +5423,6 @@ FUN_020B3474: ; 0x020B3474 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020B3490: ; 0x020B3490 ldr r4, [r5, #0x0] bl FUN_020B2B58 ldrh r0, [r5, #0x1e] @@ -5501,13 +5433,11 @@ _020B3490: ; 0x020B3490 ldr r0, [r0, #0x0] ldrsh r6, [r5, #0x18] bl FUN_020B4F88 -_020B34B8: ; 0x020B34B8 cmp r0, #0x0 ldr r0, _020B354C ; =UNK_021CDD6C rsbne r6, r6, #0x0 ldr r0, [r0, #0x0] bl FUN_020B4F74 -_020B34CC: ; 0x020B34CC cmp r0, #0x0 rsbne r7, r7, #0x0 mov r0, r6, lsl #0xc @@ -5587,13 +5517,11 @@ _020B35C0: ldr r0, [r0, #0x0] ldrsh r6, [r5, #0x44] bl FUN_020B4F88 -_020B35E4: ; 0x020B35E4 cmp r0, #0x0 ldr r0, _020B36B8 ; =UNK_021CDD6C rsbne r6, r6, #0x0 ldr r0, [r0, #0x0] bl FUN_020B4F74 -_020B35F8: ; 0x020B35F8 cmp r0, #0x0 rsbne r7, r7, #0x0 mov r0, r6, lsl #0xc @@ -5805,7 +5733,6 @@ _020B38EC: cmp r9, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r11,pc} -_020B38F8: ; 0x020B38F8 ldr r4, _020B3B6C ; =UNK_021CDD70 ldr fp, _020B3B78 ; =UNK_021CDEF4 mov r7, #0x0 @@ -5870,7 +5797,6 @@ _020B397C: b _020B3A04 _020B39E4: bl FUN_020B4010 -_020B39E8: ; 0x020B39E8 ldr r0, [r4, #0x0] mov r0, r0, lsl #0x10 mov r1, r0, lsr #0xd @@ -6001,7 +5927,6 @@ FUN_020B3B90: ; 0x020B3B90 cmp r2, #0x0 addeq sp, sp, #0x8 ldmeqia sp!, {r4-r6,pc} -_020B3BBC: ; 0x020B3BBC ldr r2, _020B3C28 ; =UNK_021CDD68 ldr r2, [r2, #0x0] cmp r2, #0x0 @@ -6048,7 +5973,6 @@ FUN_020B3C40: ; 0x020B3C40 mov r6, r1 mov r5, r2 bl FUN_020B278C -_020B3C60: ; 0x020B3C60 cmp r0, #0x0 beq _020B3C90 ldrh r1, [r4, #0x4] @@ -6143,7 +6067,6 @@ _020B3DA4: cmp r2, #0x0 addeq sp, sp, #0x8 ldmeqia sp!, {r4-r6,pc} -_020B3DC0: ; 0x020B3DC0 ldr r2, _020B3E30 ; =UNK_021CDD68 ldr r2, [r2, #0x0] cmp r2, #0x0 @@ -6191,7 +6114,6 @@ FUN_020B3E48: ; 0x020B3E48 ldr r3, [r1, #0x3c] cmp r3, #0x0 ldmeqia sp!, {r4,pc} -_020B3E68: ; 0x020B3E68 ldr r3, _020B3EC8 ; =UNK_021CDD68 ldr r3, [r3, #0x0] cmp r3, #0x0 @@ -6265,14 +6187,12 @@ _020B3F54: moveq r0, #0x0 streq r0, [r6, #0x30] ldmeqia sp!, {r4-r6,pc} -_020B3F74: ; 0x020B3F74 mov r0, #0x1 str r0, [r6, #0x30] _020B3F7C: ldr r0, [r4, #0x38] cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020B3F88: ; 0x020B3F88 ldr r0, _020B3FF8 ; =UNK_021CDD68 ldr r0, [r0, #0x0] cmp r0, #0x0 @@ -6329,7 +6249,6 @@ _020B4044: cmp r2, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020B4050: ; 0x020B4050 ldr r0, _020B415C ; =UNK_021CDD60 mov r2, #0x10 ldrh r4, [r0, #0x0] @@ -6382,7 +6301,6 @@ _020B40E4: movs lr, r0, lsr #0x10 addmi sp, sp, #0x4 ldmmiia sp!, {r4-r5,pc} -_020B411C: ; 0x020B411C ldr r3, _020B4158 ; =UNK_021CDDF4 mov r0, #0x3 _020B4124: @@ -6392,7 +6310,6 @@ _020B4124: cmp r5, r1 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020B413C: ; 0x020B413C strh r0, [r2, #0x4] strh r4, [r3, r12] subs lr, lr, #0x1 @@ -6548,7 +6465,6 @@ FUN_020B4358: ; 0x020B4358 mla r4, r0, r1, r2 mov r0, r4 bl FUN_020B10CC -_020B4374: ; 0x020B4374 mov r0, #0x0 str r0, [r4, #0xc] str r0, [r4, #0x10] @@ -6617,7 +6533,6 @@ FUN_020B442C: ; 0x020B442C cmp r0, #0x0 addls sp, sp, #0x14 ldmlsia sp!, {r4-r11,pc} -_020B4450: ; 0x020B4450 ldr r0, [sp, #0x0] mov r5, #0x1 str r0, [sp, #0x4] @@ -6711,7 +6626,6 @@ FUN_020B4568: ; 0x020B4568 str r7, [r3, #0x0] str r6, [r1, #0x0] ldmeqia sp!, {r4-r7,pc} -_020B459C: ; 0x020B459C mov r4, r5 _020B45A0: mov r0, r7 @@ -6749,7 +6663,6 @@ FUN_020B45F0: ; 0x020B45F0 mov r6, r2 mov r5, r3 bl FUN_020B10CC -_020B461C: ; 0x020B461C mvn r0, #0x0 cmp r7, r0 beq _020B4638 @@ -6946,7 +6859,6 @@ _020B47C0: cmp r0, #0x0 addeq sp, sp, #0x1c ldmeqia sp!, {r4-r7,pc} -_020B48F4: ; 0x020B48F4 ldr r1, _020B4924 ; =UNK_021CED10 ldr r0, _020B4944 ; =UNK_02106590 ldr r2, [r1, #0x0] @@ -7176,7 +7088,6 @@ FUN_020B4BF4: ; 0x020B4BF4 ldr r0, [r5, #0x10] cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020B4C18: ; 0x020B4C18 mov r0, #0x1 str r0, [r3, #0x30] ldr r3, [r5, #0x18] @@ -7229,7 +7140,6 @@ _020B4CB8: ldr r2, [r5, #0x1c] cmp r2, #0x0 ldmeqia sp!, {r4-r6,pc} -_020B4CC4: ; 0x020B4CC4 ldr r0, _020B4CD8 ; =UNK_021CED14 mov r1, r6 ldr r0, [r0, #0x0] @@ -7250,7 +7160,6 @@ FUN_020B4CDC: cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020B4D04: ; 0x020B4D04 mov r0, #0x1 str r0, [r2, #0x30] ldr r2, [r4, #0x18] @@ -7291,7 +7200,6 @@ _020B4D74: cmp r2, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020B4D84: ; 0x020B4D84 ldr r0, _020B4D9C ; =UNK_021CED14 mov r1, r5 ldr r0, [r0, #0x0] @@ -7365,7 +7273,6 @@ FUN_020B4E0C: ; 0x020B4E0C ldr r5, [r0, #0x8] mov r0, r5 bl FUN_020B19FC -_020B4E80: ; 0x020B4E80 cmp r0, #0x0 moveq r0, #0x0 beq _020B4E98 @@ -7380,7 +7287,6 @@ _020B4E98: ldr r5, [r0, #0xc] mov r0, r5 bl FUN_020B19A8 -_020B4EB4: ; 0x020B4EB4 cmp r0, #0x0 moveq r0, #0x0 beq _020B4ECC @@ -7396,7 +7302,6 @@ _020B4ED8: mov r1, r5 mov r0, r4 bl FUN_020B19FC -_020B4EE8: ; 0x020B4EE8 cmp r0, #0x0 moveq r1, #0x0 beq _020B4F14 @@ -7553,7 +7458,6 @@ FUN_020B5090: ; 0x020B5090 mov r8, #0x0 cmp r1, #0x0 ldmlsia sp!, {r4-r10,pc} -_020B50B8: ; 0x020B50B8 mov r6, #0x1 mov r4, #0x6 _020B50C0: @@ -7619,7 +7523,6 @@ FUN_020B515C: ; 0x020B515C ldr r1, _020B53A8 ; =0xC000C000 and r4, r2, r1 bl FUN_020B4F88 -_020B519C: ; 0x020B519C cmp r0, #0x0 beq _020B51F4 ldr r0, [r7, #0x0] @@ -7658,7 +7561,6 @@ _020B5218: ldr r0, [r0, #0x0] mov r6, r1, asr #0x10 bl FUN_020B4F74 -_020B522C: ; 0x020B522C cmp r0, #0x0 beq _020B527C and r1, r4, #0xc000 @@ -7805,7 +7707,6 @@ _020B5438: cmp r1, #0x0 addls sp, sp, #0x44 ldmlsia sp!, {r4-r11,pc} -_020B5450: ; 0x020B5450 mov r0, #0x1 ldr r4, _020B57B0 ; =UNK_021CED14 str r8, [sp, #0x14] @@ -7955,7 +7856,6 @@ _020B5600: str r0, [r7, #0x0] ldr r0, [r4, #0x0] bl FUN_020B4F88 -_020B5684: ; 0x020B5684 cmp r0, #0x0 beq _020B56D4 and r1, r5, #0xc000 @@ -7979,7 +7879,6 @@ _020B5684: ; 0x020B5684 _020B56D4: ldr r0, [r4, #0x0] bl FUN_020B4F74 -_020B56DC: ; 0x020B56DC cmp r0, #0x0 beq _020B5714 and r1, r5, #0xc000 @@ -8020,7 +7919,6 @@ _020B5750: cmp r0, #0x1 addne sp, sp, #0x44 ldmneia sp!, {r4-r11,pc} -_020B5774: ; 0x020B5774 ldr r3, [r10, #0x24] cmp r3, #0x0 beq _020B5790 @@ -8767,7 +8665,6 @@ FUN_020B61DC: ; 0x020B61DC mov r6, #0x0 cmp r2, #0x0 ldmleia sp!, {r4-r8,pc} -_020B61FC: ; 0x020B61FC mov lr, r3, lsl #0x1 mov r12, r6 _020B6204: @@ -9045,7 +8942,6 @@ _020B6528: str r0, [sp, #0x34] addge sp, sp, #0x54 ldmgeia sp!, {r4-r11,pc} -_020B65DC: ; 0x020B65DC mov r4, #0x0 mov r11, #0x8 _020B65E4: @@ -9180,7 +9076,6 @@ _020B673C: cmp r1, r0 addge sp, sp, #0x3c ldmgeia sp!, {r4-r11,pc} -_020B67D8: ; 0x020B67D8 mov r5, #0x0 mov r4, #0x8 _020B67E0: @@ -9286,16 +9181,13 @@ FUN_020B6908: ; 0x020B6908 mov r5, r5, asr #0x3 addeq sp, sp, #0x4c ldmeqia sp!, {r4-r11,pc} -_020B6958: ; 0x020B6958 adds r3, r2, r4 addmi sp, sp, #0x4c ldmmiia sp!, {r4-r11,pc} -_020B6964: ; 0x020B6964 ldr r2, [sp, #0xc] adds r2, r2, r9 addmi sp, sp, #0x4c ldmmiia sp!, {r4-r11,pc} -_020B6974: ; 0x020B6974 ldr r10, [sp, #0x8] add r3, r3, #0x7 cmp r10, #0x0 @@ -9319,11 +9211,9 @@ _020B6974: ; 0x020B6974 addmi sp, sp, #0x4c sub r3, r11, r10 ldmmiia sp!, {r4-r11,pc} -_020B69D0: ; 0x020B69D0 cmp r3, #0x0 addlt sp, sp, #0x4c ldmltia sp!, {r4-r11,pc} -_020B69DC: ; 0x020B69DC ldr r2, [sp, #0x8] ldr r6, [r0, #0x0] cmp r2, #0x0 @@ -9429,15 +9319,12 @@ FUN_020B6B10: ; 0x020B6B10 ldr lr, [r0, #0x0] ldrb r3, [r6, #0x1] ldmeqia sp!, {r4-r11,pc} -_020B6B68: ; 0x020B6B68 adds r6, r10, r4 addmi sp, sp, #0x2c ldmmiia sp!, {r4-r11,pc} -_020B6B74: ; 0x020B6B74 adds r2, r9, r3 addmi sp, sp, #0x2c ldmmiia sp!, {r4-r11,pc} -_020B6B80: ; 0x020B6B80 cmp r10, #0x0 movle r11, #0x0 add r6, r6, #0x7 @@ -9456,11 +9343,9 @@ _020B6B80: ; 0x020B6B80 addmi sp, sp, #0x2c sub r2, r2, r12 ldmmiia sp!, {r4-r11,pc} -_020B6BC8: ; 0x020B6BC8 cmp r2, #0x0 addlt sp, sp, #0x2c ldmltia sp!, {r4-r11,pc} -_020B6BD4: ; 0x020B6BD4 ldr r6, [r0, #0x10] cmp r10, #0x0 sub r8, r6, r7 @@ -9495,7 +9380,6 @@ _020B6BD4: ; 0x020B6BD4 str r0, [sp, #0x1c] addle sp, sp, #0x2c ldmleia sp!, {r4-r11,pc} -_020B6C5C: ; 0x020B6C5C add r4, sp, #0x4 _020B6C60: mov r8, r10 @@ -9573,7 +9457,6 @@ FUN_020B6CAC: ; 0x020B6CAC cmp r1, r0 addcs sp, sp, #0x34 ldmcsia sp!, {r4-r11,pc} -_020B6D78: ; 0x020B6D78 mov r0, #0x0 add r9, sp, #0x24 mov r4, #0xf @@ -9600,7 +9483,6 @@ _020B6DCC: mov r0, r9 mov r1, r6 bl FUN_020B76B0 -_020B6DD8: ; 0x020B6DD8 cmp r0, #0x0 mvnne r1, r4, lsl r8 addne r0, r7, r0 @@ -9632,7 +9514,6 @@ _020B6E24: cmp r1, r0 addcs sp, sp, #0x34 ldmcsia sp!, {r4-r11,pc} -_020B6E4C: ; 0x020B6E4C mov r0, #0x0 mov r4, #0xff str r0, [sp, #0x20] @@ -9651,7 +9532,6 @@ _020B6E58: strb r0, [sp, #0x31] add r0, sp, #0x2c bl FUN_020B76B0 -_020B6E90: ; 0x020B6E90 ldr r0, [sp, #0x0] cmp r0, r10 mov r5, r0 @@ -9660,7 +9540,6 @@ _020B6EA0: add r0, sp, #0x2c mov r1, r6 bl FUN_020B76B0 -_020B6EAC: ; 0x020B6EAC cmp r0, #0x0 beq _020B6EDC cmp r5, #0x20 @@ -9852,7 +9731,6 @@ _020B7118: str r5, [sp, #0x28] str r4, [sp, #0x2c] b _020B7080 -_020B715C: ; 0x020B715C add sp, sp, #0x4 ldmia sp!, {r4-r11,pc} .balign 4 @@ -9975,7 +9853,6 @@ FUN_020B72C4: ; 0x020B72C4 add r6, r5, r4 addeq sp, sp, #0x14 ldmeqia sp!, {r4-r11,pc} -_020B730C: ; 0x020B730C add r0, r7, #0x1 ldr r1, [sp, #0x3c] add r0, r0, r0, lsr #0x1f @@ -9993,7 +9870,6 @@ _020B732C: ldr r2, [sp, #0xc] mov r3, r4 bl FUN_020B5BC8 -_020B734C: ; 0x020B734C sub r0, r7, r0 add r1, r9, r0 b _020B7388 @@ -10065,7 +9941,6 @@ _020B743C: cmp r1, #0x0 addeq sp, sp, #0xc ldmeqia sp!, {r4-r11,pc} -_020B744C: ; 0x020B744C cmp r0, #0xa ldreq r1, [sp, #0x8] ldr r0, [sp, #0x34] @@ -10083,7 +9958,6 @@ FUN_020B7468: ; 0x020B7468 add r2, r0, r2 cmp r3, #0x0 ldmleia sp!, {r4-r6,pc} -_020B7484: ; 0x020B7484 ldr r3, _020B7548 ; =0x46494E46 ldr ip, _020B754C ; =0x43574448 ldr r4, _020B7550 ; =0x434D4150 @@ -10228,12 +10102,10 @@ _020B7654: ldr r1, _020B76AC ; =0x46494E46 mov r0, r6 bl FUN_020B01F8 -_020B7668: ; 0x020B7668 cmp r0, #0x0 moveq r0, #0x0 streq r0, [r5, #0x0] ldmeqia sp!, {r4-r6,pc} -_020B7678: ; 0x020B7678 add r0, r0, #0x8 str r0, [r5, #0x0] cmp r4, #0x0 @@ -10299,7 +10171,6 @@ FUN_020B772C: ; 0x020B772C cmp r0, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r7,pc} -_020B774C: ; 0x020B774C add r4, r6, #0x8 _020B7750: ldrh r0, [r6, #0xe] @@ -10418,7 +10289,6 @@ _020B7898: mov r0, r9 mov r2, r10 bl FUN_020B7910 -_020B78EC: ; 0x020B78EC b _020B78F4 _020B78F0: mov r6, r4 @@ -10541,7 +10411,6 @@ _020B7A40: mov r0, r9 mov r2, r10 bl FUN_020B7B40 -_020B7A90: ; 0x020B7A90 b _020B7A98 _020B7A94: mov r11, r4 @@ -10709,7 +10578,6 @@ _020B7C90: orr r0, r0, #0x1 strh r0, [r5, #0x32] ldmeqia sp!, {r4-r5,pc} -_020B7CCC: ; 0x020B7CCC bl GX_EndLoadTexPltt add sp, sp, #0x4 ldmia sp!, {r4-r5,pc} @@ -10797,7 +10665,6 @@ _020B7DDC: cmp r8, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r9,pc} -_020B7DE8: ; 0x020B7DE8 bl GX_EndLoadTex add sp, sp, #0x4 ldmia sp!, {r4-r9,pc} @@ -10833,19 +10700,16 @@ FUN_020B7E28: ; 0x020B7E28 add r0, r5, #0x8 mov r4, r1 bl FUN_020B7E88 -_020B7E40: ; 0x020B7E40 cmp r0, #0x0 bne _020B7E74 mov r1, r4 add r0, r5, #0x10 bl FUN_020B7E88 -_020B7E54: ; 0x020B7E54 cmp r0, #0x0 bne _020B7E74 mov r1, r4 add r0, r5, #0x18 bl FUN_020B7E88 -_020B7E68: ; 0x020B7E68 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} @@ -10940,7 +10804,6 @@ FUN_020B7F88: ; 0x020B7F88 cmp r1, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020B7F9C: ; 0x020B7F9C mov r3, #0x1 mov r4, #0x0 _020B7FA4: @@ -11072,7 +10935,6 @@ FUN_020B8110: ; 0x020B8110 cmp r6, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r7,pc} -_020B8150: ; 0x020B8150 ldrb r7, [r1, #0x0] ldr r4, _020B81A8 ; =UNK_021065B8 _020B8158: @@ -11511,7 +11373,6 @@ FUN_020B86B0: ; 0x020B86B0 addne sp, sp, #0x5c movne r0, #0x0 ldmneia sp!, {r4-r11,pc} -_020B86EC: ; 0x020B86EC ldr r3, [r9, #0xc] and r2, r4, #0xff blx r3 @@ -11539,7 +11400,6 @@ _020B8714: addeq sp, sp, #0x5c moveq r0, #0x0 ldmeqia sp!, {r4-r11,pc} -_020B8750: ; 0x020B8750 cmp r3, #0x1 bne _020B877C add r0, r1, r8, lsl #0x1 @@ -11556,7 +11416,6 @@ _020B877C: mov r0, #0x0 mov r2, #0x58 bl MIi_CpuClearFast -_020B878C: ; 0x020B878C mvn r0, #0x0 str r0, [r10, #0x0] add r5, sp, #0x0 @@ -11602,7 +11461,6 @@ _020B87F0: mov r2, r6 and r3, r3, #0x10 bl FUN_020B8998 -_020B8838: ; 0x020B8838 ldr r0, [sp, #0x0] ands r0, r0, #0x4 bne _020B8898 @@ -11940,7 +11798,6 @@ _020B8CE0: _020B8D04: mov r0, r4 bl G3X_GetClipMtx -_020B8D0C: ; 0x020B8D0C cmp r0, #0x0 bne _020B8D04 ldr r1, _020B8DEC ; =0x04000448 @@ -12491,7 +12348,6 @@ _020B9500: _020B9508: mov r0, r6 bl G3X_GetClipMtx -_020B9510: ; 0x020B9510 cmp r0, #0x0 bne _020B9508 ldr r1, [sp, #0x14] @@ -12599,7 +12455,6 @@ _020B9538: _020B96AC: mov r0, r5 bl G3X_GetVectorMtx -_020B96B4: ; 0x020B96B4 cmp r0, #0x0 bne _020B96AC _020B96BC: @@ -12827,7 +12682,6 @@ _020B99C4: _020B99F8: mov r0, r4 bl G3X_GetClipMtx -_020B9A00: ; 0x020B9A00 cmp r0, #0x0 bne _020B99F8 ldr r0, _020B9C3C ; =UNK_021CED18 @@ -12861,7 +12715,6 @@ _020B9A5C: ldr r1, [sp, #0x40] str r1, [r6, #0x8] bl VEC_Mag -_020B9A7C: ; 0x020B9A7C str r0, [r11, #0x0] add r0, sp, #0x18 bl VEC_Mag @@ -13081,7 +12934,6 @@ _020B9D50: _020B9D84: mov r0, r10 bl G3X_GetClipMtx -_020B9D8C: ; 0x020B9D8C cmp r0, #0x0 bne _020B9D84 ldr r0, _020B9F68 ; =UNK_021CED18 @@ -13115,7 +12967,6 @@ _020B9DE8: ldr r1, [sp, #0x40] str r1, [r5, #0x8] bl VEC_Mag -_020B9E08: ; 0x020B9E08 str r0, [r4, #0x0] add r0, sp, #0x18 bl VEC_Mag @@ -13604,7 +13455,6 @@ _020BA4B8: _020BA4E8: cmp r4, #0x3 ldmneia sp!, {r4-r6,pc} -_020BA4F0: ; 0x020BA4F0 ldr r1, [r6, #0x8] mov r0, r6 bic r1, r1, #0x40 @@ -13922,7 +13772,6 @@ _020BA900: ldr r3, [r4, #0x14] str r3, [sp, #0x18] bl FUN_020BB1C0 -_020BA984: ; 0x020BA984 ldr r0, [r4, #0x0] ands r0, r0, #0x18 beq _020BA9AC @@ -13938,7 +13787,6 @@ _020BA9AC: cmp r5, #0x3 addne sp, sp, #0x20 ldmneia sp!, {r4-r8,pc} -_020BA9B8: ; 0x020BA9B8 ldr r1, [r8, #0x8] mov r0, r8 bic r1, r1, #0x40 @@ -14222,7 +14070,6 @@ FUN_020BAD74: cmp r1, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020BAD88: ; 0x020BAD88 mov r3, #0x1 mov r4, #0x0 _020BAD90: @@ -14344,7 +14191,6 @@ _020BAEE0: _020BAF44: mov r0, r5 bl FUN_020BAF6C -_020BAF4C: ; 0x020BAF4C ldr r0, [r4, #0x0] bic r0, r0, #0x1 str r0, [r4, #0x0] @@ -14413,7 +14259,6 @@ _020BAFF8: ands r0, r0, #0x1f0000 addeq sp, sp, #0x6c ldmeqia sp!, {r4-r7,pc} -_020BB034: ; 0x020BB034 ldr r0, _020BB1B4 ; =0x00293130 str r0, [sp, #0x0] ldr r0, [r4, #0x4] @@ -14504,7 +14349,6 @@ _020BB150: cmp r3, #0x1000 addeq sp, sp, #0x6c ldmeqia sp!, {r4-r7,pc} -_020BB190: ; 0x020BB190 add r1, sp, #0x60 mov r0, #0x1b mov r2, #0x3 @@ -14544,7 +14388,6 @@ FUN_020BB1C0: add r0, r0, r2, lsl #0x2 str r6, [r0, #0x4] ldmeqia sp!, {r4-r6,pc} -_020BB21C: ; 0x020BB21C ldr r2, [r3, #0x0] mov r0, r5 ldr r1, [r2], #0x4 @@ -14942,7 +14785,6 @@ _020BB77C: bne _020BB7A4 mov r0, r5 bl FUN_020BC13C -_020BB794: ; 0x020BB794 cmp r4, #0x0 beq _020BB7A4 mov r1, r4 @@ -15008,7 +14850,6 @@ FUN_020BB824: ; 0x020BB824 _020BB860: mov r0, r4 bl G3X_GetClipMtx -_020BB868: ; 0x020BB868 cmp r0, #0x0 bne _020BB860 add r0, sp, #0x0 @@ -15020,7 +14861,6 @@ _020BB87C: _020BB884: mov r0, r5 bl G3X_GetVectorMtx -_020BB88C: ; 0x020BB88C cmp r0, #0x0 bne _020BB884 _020BB894: @@ -15628,7 +15468,6 @@ FUN_020BC02C: ; 0x020BC02C cmp r4, #0x0 add r12, r0, r3 ldmlsia sp!, {r4-r6,pc} -_020BC048: ; 0x020BC048 mvn r3, r2 add r0, r12, #0x4 _020BC050: @@ -15659,7 +15498,6 @@ FUN_020BC094: ; 0x020BC094 cmp r4, #0x0 add r12, r0, r3 ldmlsia sp!, {r4-r6,pc} -_020BC0B0: ; 0x020BC0B0 mvn r3, r2 add r0, r12, #0x4 _020BC0B8: @@ -16127,11 +15965,9 @@ _020BC6F0: mov r1, r5 mov r2, r4 bl FUN_020BC500 -_020BC718: ; 0x020BC718 cmp r0, #0x0 addeq sp, sp, #0x48 ldmeqia sp!, {r4-r10,pc} -_020BC724: ; 0x020BC724 ldr r9, [r6, #0x14] ldr r5, [r6, #0x4] ldr r4, [r6, #0x10] @@ -16254,7 +16090,6 @@ _020BC800: add r0, r6, #0xc mov r1, r0 bl VEC_Normalize -_020BC8F8: ; 0x020BC8F8 cmp r7, #0x0 bne _020BC968 ldr r3, [sp, #0x18] @@ -16403,7 +16238,6 @@ _020BCA44: add r0, r6, #0xc mov r1, r0 bl VEC_Normalize -_020BCB2C: ; 0x020BCB2C cmp r7, #0x0 bne _020BCB7C ldr r1, [sp, #0x18] @@ -16499,7 +16333,6 @@ _020BCBE8: add r0, r6, #0xc mov r1, r0 bl VEC_Normalize -_020BCC98: ; 0x020BCC98 cmp r7, #0x0 bne _020BCCE4 ldr r2, [r6, #0x18] @@ -16550,11 +16383,9 @@ _020BCD40: mov r1, r5 mov r2, r4 bl FUN_020BC500 -_020BCD58: ; 0x020BCD58 cmp r0, #0x0 addeq sp, sp, #0x4c ldmeqia sp!, {r4-r9,pc} -_020BCD64: ; 0x020BCD64 ldr r12, [r6, #0x14] ldr r5, [r6, #0x4] ldr r8, [r6, #0x0] @@ -16613,7 +16444,6 @@ _020BCE08: addeq sp, sp, #0x4 streq r1, [r0, #0x4] ldmeqia sp!, {r4-r7,pc} -_020BCE38: ; 0x020BCE38 mov r1, r5, lsl #0x2 ldrsh r2, [r6, r1] add r1, r6, r5, lsl #0x2 @@ -16805,7 +16635,6 @@ _020BD0D0: addeq sp, sp, #0x4 streq r1, [r0, #0x4] ldmeqia sp!, {r4-r5,pc} -_020BD0F0: ; 0x020BD0F0 mov r2, r1, lsl #0x2 ldrsh r2, [r3, r2] add r1, r3, r1, lsl #0x2 @@ -17193,7 +17022,6 @@ _020BD628: add r1, r9, r1 add r2, r9, r2 bl FUN_020BC500 -_020BD644: ; 0x020BD644 cmp r0, #0x0 beq _020BD6A0 ldr r12, [r7, #0x3c] @@ -17632,7 +17460,6 @@ FUN_020BDC0C: ; 0x020BDC0C cmp r0, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r9,pc} -_020BDC60: ; 0x020BDC60 mov r6, r7 add r5, r8, #0x8 add r4, r4, #0x4 @@ -17644,7 +17471,6 @@ _020BDC6C: add r1, r2, r1 add r1, r1, r6 bl FUN_020BC14C -_020BDC88: ; 0x020BDC88 cmp r0, #0x0 orrge r1, r7, #0x100 addge r0, r9, r0, lsl #0x1 @@ -17881,7 +17707,6 @@ FUN_020BDF84: ; 0x020BDF84 cmp r0, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r9,pc} -_020BDFD8: ; 0x020BDFD8 mov r6, r7 add r5, r8, #0x8 add r4, r4, #0x4 @@ -17893,7 +17718,6 @@ _020BDFE4: add r1, r2, r1 add r1, r1, r6 bl FUN_020BC14C -_020BE000: ; 0x020BE000 cmp r0, #0x0 orrge r1, r7, #0x100 addge r0, r9, r0, lsl #0x1 @@ -17932,7 +17756,6 @@ FUN_020BE030: ; 0x020BE030 ldr r2, [r5, #0x24] mov r3, r7 bl FUN_020BE238 -_020BE088: ; 0x020BE088 cmp r9, #0x0 bne _020BE09C cmp r0, #0x0 @@ -18155,7 +17978,6 @@ FUN_020BE334: ; 0x020BE334 cmp r1, #0xff addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020BE394: ; 0x020BE394 mov r0, r5 bl FUN_020BC4A8 mov r1, r0 @@ -18277,7 +18099,6 @@ FUN_020BE4F0: ; 0x020BE4F0 cmp r0, #0x0 addls sp, sp, #0x4 ldmlsia sp!, {r4-r9,pc} -_020BE548: ; 0x020BE548 mov r6, r7 add r5, r8, #0xc add r4, r4, #0x4 @@ -18289,7 +18110,6 @@ _020BE554: add r1, r2, r1 add r1, r1, r6 bl FUN_020BC14C -_020BE570: ; 0x020BE570 cmp r0, #0x0 orrge r1, r7, #0x100 addge r0, r9, r0, lsl #0x1 @@ -18400,7 +18220,6 @@ _020BE6C4: ldr r0, [r4, #0x0] ands r0, r0, #0x1 ldmneia sp!, {r4,pc} -_020BE6D0: ; 0x020BE6D0 add r1, r4, #0x4 mov r0, #0x1b mov r2, #0x3 @@ -18968,7 +18787,6 @@ _020BEEE8: ands r0, r0, #0x1 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020BEEF8: ; 0x020BEEF8 add r1, r5, #0x4 mov r0, #0x1b mov r2, #0x3 @@ -19321,7 +19139,6 @@ _020BF404: ands r0, r0, #0x1 addne sp, sp, #0x10 ldmneia sp!, {r4-r6,pc} -_020BF414: ; 0x020BF414 add r1, r6, #0x4 mov r0, #0x1b mov r2, #0x3 @@ -20233,7 +20050,6 @@ _020C0138: .word FUN_020C187C FUN_020C013C: ; 0x020C013C stmdb sp!, {r4,lr} bl FUN_020C18F8 -_020C0144: ; 0x020C0144 mov r0, #0x0 mov r1, r0 mov r2, r0 @@ -20269,13 +20085,11 @@ FUN_020C01A0: ; 0x020C01A0 _020C01A8: mov r0, r4 bl SND_RecvCommandReply -_020C01B0: ; 0x020C01B0 cmp r0, #0x0 bne _020C01A8 bl FUN_020C0BA0 bl FUN_020C1D9C bl FUN_020C3C88 -_020C01C4: ; 0x020C01C4 mov r0, #0x0 bl SND_FlushCommand ldmia sp!, {r4,pc} @@ -20402,7 +20216,6 @@ FUN_020C0340: stmdb sp!, {r4,lr} movs r4, r0 ldmeqia sp!, {r4,pc} -_020C034C: ; 0x020C034C mov r1, #0x0 bl SND_UnlockChannel ldr r0, _020C036C ; =UNK_021D1CB8 @@ -20420,13 +20233,11 @@ FUN_020C0370: movs r4, r0 moveq r0, #0x1 ldmeqia sp!, {r4,pc} -_020C0380: ; 0x020C0380 ldr r1, _020C03B4 ; =UNK_021D1CB8 ldr r1, [r1, #0x0] ands r1, r4, r1 movne r0, #0x0 ldmneia sp!, {r4,pc} -_020C0394: ; 0x020C0394 mov r1, #0x0 bl SND_LockChannel ldr r1, _020C03B4 ; =UNK_021D1CB8 @@ -20446,17 +20257,14 @@ FUN_020C03B8: ; 0x020C03B8 cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020C03D0: ; 0x020C03D0 ldr r0, [r4, #0xc] cmp r0, #0x0 bne _020C03F8 ldr r0, [r4, #0x10] bl SND_IsFinishedCommandTag -_020C03E4: ; 0x020C03E4 cmp r0, #0x0 moveq r0, #0x1 ldmeqia sp!, {r4,pc} -_020C03F0: ; 0x020C03F0 mov r0, #0x1 str r0, [r4, #0xc] _020C03F8: @@ -20495,7 +20303,6 @@ FUN_020C044C: ; 0x020C044C cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020C046C: ; 0x020C046C ldr r2, [r5, #0x4] ldr r0, _020C04D4 ; =0xD87F8000 mov r3, r2, asr #0x1f @@ -20550,7 +20357,6 @@ FUN_020C0510: ; 0x020C0510 ldr r0, [r4, #0x8] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C0524: ; 0x020C0524 ldr r0, [r4, #0x0] mov r2, #0x1 mov r1, #0x0 @@ -20558,7 +20364,6 @@ _020C0524: ; 0x020C0524 mov r2, r1 mov r3, r1 bl SND_StopTimer -_020C0540: ; 0x020C0540 mov r0, #0x0 str r0, [r4, #0x8] ldmia sp!, {r4,pc} @@ -20660,11 +20465,9 @@ FUN_020C0688: ; 0x020C0688 mov r0, #0x1 mov r0, r0, lsl r4 bl FUN_020C0370 -_020C069C: ; 0x020C069C cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020C06A8: ; 0x020C06A8 mov r0, #0x14 mul r0, r4, r0 ldr r2, _020C06C8 ; =UNK_021D1CBC @@ -20687,7 +20490,6 @@ FUN_020C06CC: ; 0x020C06CC mov r0, r4 mov r1, r6 bl FUN_020ADAB0 -_020C06F0: ; 0x020C06F0 mov r0, #0x0 str r0, [r6, #0x4] _020C06F8: @@ -20714,14 +20516,12 @@ FUN_020C072C: ; 0x020C072C ldr r0, [r4, #0x8] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C0740: ; 0x020C0740 bl FUN_020C2A7C ldr r1, [r4, #0xc] cmp r1, #0x0 movne r0, #0x0 strne r0, [r1, #0x8] ldmneia sp!, {r4,pc} -_020C0758: ; 0x020C0758 ldr r1, [r4, #0x10] ldr r2, _020C0778 ; =UNK_021D2254 mov r0, #0x24 @@ -20747,7 +20547,6 @@ FUN_020C077C: ; 0x020C077C mov r1, r4 mov r0, r5 bl FUN_020ADAB0 -_020C07AC: ; 0x020C07AC mov r0, #0x0 str r0, [r4, #0x4] ldr r1, [r4, #0x8] @@ -20766,7 +20565,6 @@ _020C07D8: ldr r0, _020C0804 ; =UNK_021D1DFC mov r1, r4 bl FUN_020ADBE8 -_020C07F0: ; 0x020C07F0 mov r0, #0x0 strb r0, [r4, #0x2c] add sp, sp, #0x4 @@ -20794,7 +20592,6 @@ FUN_020C0808: ; 0x020C0808 addlt sp, sp, #0x4 movlt r0, #0x0 ldmltia sp!, {r4-r5,pc} -_020C084C: ; 0x020C084C bl FUN_020C087C _020C0850: ldr r0, _020C0874 ; =UNK_021D1DFC @@ -20919,7 +20716,6 @@ FUN_020C09B0: ; 0x020C09B0 movs r4, r0 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C09DC: ; 0x020C09DC mov r1, r4 add r0, r5, #0xc bl FUN_020ADAB0 @@ -20940,12 +20736,10 @@ FUN_020C0A04: ; 0x020C0A04 mov r4, r1 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020C0A1C: ; 0x020C0A1C ldrb r0, [r5, #0x2e] cmp r4, r0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020C0A2C: ; 0x020C0A2C ldrb r0, [r5, #0x3c] bl SND_PauseSeq strb r4, [r5, #0x2e] @@ -20958,11 +20752,9 @@ FUN_020C0A40: ; 0x020C0A40 movs r4, r0 mov r2, r1 ldmeqia sp!, {r4,pc} -_020C0A50: ; 0x020C0A50 ldrb r1, [r4, #0x2c] cmp r1, #0x0 ldmeqia sp!, {r4,pc} -_020C0A5C: ; 0x020C0A5C cmp r2, #0x0 bne _020C0A6C bl FUN_020C087C @@ -21033,18 +20825,15 @@ _020C0B20: mov r0, r6 mov r1, #0x0 bl FUN_020ADA98 -_020C0B3C: ; 0x020C0B3C cmp r0, #0x0 addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C0B4C: ; 0x020C0B4C ldrb r1, [r0, #0x3d] cmp r7, r1 addlt sp, sp, #0x4 movlt r0, #0x0 ldmltia sp!, {r4-r7,pc} -_020C0B60: ; 0x020C0B60 bl FUN_020C087C _020C0B64: mov r0, r7 @@ -21053,7 +20842,6 @@ _020C0B64: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C0B7C: ; 0x020C0B7C mov r0, r6 mov r1, r5 bl FUN_020C0910 @@ -21070,7 +20858,6 @@ FUN_020C0BA0: ; 0x020C0BA0 stmdb sp!, {r4-r11,lr} sub sp, sp, #0xc bl SND_GetPlayerStatus -_020C0BAC: ; 0x020C0BAC str r0, [sp, #0x0] ldr r0, _020C0D14 ; =UNK_021D1E08 mov r1, #0x0 @@ -21078,7 +20865,6 @@ _020C0BAC: ; 0x020C0BAC movs r10, r0 addeq sp, sp, #0xc ldmeqia sp!, {r4-r11,pc} -_020C0BC8: ; 0x020C0BC8 mov r0, #0x8000 rsb r0, r0, #0x0 ldr r4, _020C0D18 ; =UNK_02103BAC @@ -21095,7 +20881,6 @@ _020C0BE0: bne _020C0C0C ldr r0, [r10, #0x30] bl SND_IsFinishedCommandTag -_020C0C04: ; 0x020C0C04 cmp r0, #0x0 strneb r5, [r10, #0x2d] _020C0C0C: @@ -21153,7 +20938,6 @@ _020C0CC4: bne _020C0CE8 add r0, r10, #0x1c bl FUN_020C3DDC -_020C0CD8: ; 0x020C0CD8 cmp r0, #0x0 beq _020C0CE8 mov r0, r10 @@ -21493,7 +21277,6 @@ FUN_020C10B4: addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C10EC: ; 0x020C10EC mov r2, #0x0 str r2, [r4, #0xc] str r6, [r4, #0x10] @@ -21501,12 +21284,10 @@ _020C10EC: ; 0x020C10EC add r0, r4, #0x14 str r2, [r4, #0x8] bl FUN_020C2A94 -_020C1108: ; 0x020C1108 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C1118: ; 0x020C1118 ldr r2, _020C1144 ; =UNK_021D2254 mov r1, #0x24 mla r2, r6, r1, r2 @@ -21561,7 +21342,6 @@ FUN_020C1198: ; 0x020C1198 mov r0, r0, lsl #0x1e movs r0, r0, asr #0x1f ldmeqia sp!, {r4-r6,pc} -_020C11B0: ; 0x020C11B0 ldr r0, [r4, #0x38] cmp r0, #0x0 beq _020C11E8 @@ -21594,7 +21374,6 @@ FUN_020C1208: ; 0x020C1208 mov r1, r1, lsl #0x1e movs r1, r1, asr #0x1f ldmeqia sp!, {r4,pc} -_020C121C: ; 0x020C121C ldr r2, [r0, #0x40] mov r3, #0x1 mov r1, #0x0 @@ -21729,7 +21508,6 @@ FUN_020C13C4: ; 0x020C13C4 mov r5, #0x0 cmp r0, #0x0 ldmleia sp!, {r4-r8,pc} -_020C13E0: ; 0x020C13E0 ldr r4, _020C142C ; =UNK_021D2724 mov r8, #0x1 _020C13E8: @@ -21781,7 +21559,6 @@ FUN_020C1458: ; 0x020C1458 mov r0, r0, lsl #0x1e movs r0, r0, asr #0x1f ldmneia sp!, {r4,pc} -_020C148C: ; 0x020C148C add r0, r4, #0x8 bl PM_PrependPreSleepCallback add r0, r4, #0x14 @@ -21832,7 +21609,6 @@ _020C14E0: addlt sp, sp, #0x24 movlt r0, #0x0 ldmltia sp!, {r4-r11,pc} -_020C1544: ; 0x020C1544 ldr r0, [r10, #0x48] mov r8, #0x0 cmp r0, #0x0 @@ -21920,9 +21696,7 @@ FUN_020C1674: ; 0x020C1674 ldr r0, [r4, #0x44] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C1688: ; 0x020C1688 bl FUN_020C0340 -_020C168C: ; 0x020C168C mov r0, #0x0 str r0, [r4, #0x44] str r0, [r4, #0x48] @@ -21950,7 +21724,6 @@ _020C16BC: _020C16DC: mov r0, r4 bl FUN_020C0370 -_020C16E4: ; 0x020C16E4 cmp r0, #0x0 moveq r0, #0x0 strne r5, [r6, #0x48] @@ -22072,7 +21845,6 @@ FUN_020C187C: ; 0x020C187C ldr r0, [r4, #0x0] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C1890: ; 0x020C1890 mov r0, #0x0 str r0, [r4, #0x1c] ldr r1, [r4, #0xc] @@ -22108,7 +21880,6 @@ FUN_020C18F8: ldr r0, [r3, #0x0] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C190C: ; 0x020C190C ldr r1, [r3, #0x2c] cmp r1, #0x0 movge r0, #0x1 @@ -22137,7 +21908,6 @@ FUN_020C1950: ; 0x020C1950 cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020C196C: ; 0x020C196C ldr r1, [r4, #0x2c] mov r3, #0x0 cmp r1, #0x0 @@ -22150,7 +21920,6 @@ _020C196C: ; 0x020C196C ldr r1, [r4, #0x28] moveq r2, #0x0 bl SND_StopTimer -_020C199C: ; 0x020C199C cmp r7, #0x0 beq _020C19DC bl SND_GetCurrentCommandTag @@ -22166,7 +21935,6 @@ _020C19C4: mov r1, r5 mov r2, r5 bl OS_ReceiveMessage -_020C19D4: ; 0x020C19D4 cmp r0, #0x0 bne _020C19C4 _020C19DC: @@ -22277,7 +22045,6 @@ _020C1B00: _020C1B58: mov r0, #0x3 bl FUN_020C031C -_020C1B60: ; 0x020C1B60 cmp r0, #0x0 bne _020C1B84 cmp r6, #0x0 @@ -22291,7 +22058,6 @@ _020C1B78: _020C1B84: mov r0, #0xa bl FUN_020C0370 -_020C1B8C: ; 0x020C1B8C cmp r0, #0x0 bne _020C1BB8 cmp r6, #0x0 @@ -22331,7 +22097,6 @@ _020C1BB8: mov r0, #0x0 mov r3, r7 bl SND_SetupCapture -_020C1C20: ; 0x020C1C20 mov r0, #0x0 str r0, [sp, #0x0] str r7, [sp, #0x4] @@ -22357,7 +22122,6 @@ _020C1C20: ; 0x020C1C20 mov r3, r7 mov r0, #0x1 bl SND_SetupCapture -_020C1C84: ; 0x020C1C84 cmp r6, #0x0 blt _020C1CA8 ldr r2, [sp, #0x30] @@ -22422,7 +22186,6 @@ _020C1CC8: mov r1, r8, lsl #0x8 mov r2, #0x1 bl FUN_020C3E40 -_020C1D7C: ; 0x020C1D7C mov r0, #0x0 str r0, [r4, #0x4c] mov r0, #0x1 @@ -22442,12 +22205,10 @@ FUN_020C1D9C: ; 0x020C1D9C cmp r0, #0x0 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020C1DB8: ; 0x020C1DB8 ldr r0, [r5, #0x4] cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r5,pc} -_020C1DC8: ; 0x020C1DC8 add r4, r5, #0x3c mov r0, r4 bl FUN_020C3DF4 @@ -22456,7 +22217,6 @@ _020C1DC8: ; 0x020C1DC8 beq _020C1DFC mov r0, r4 bl FUN_020C3DDC -_020C1DE8: ; 0x020C1DE8 cmp r0, #0x0 beq _020C1DFC bl FUN_020C1950 @@ -22470,7 +22230,6 @@ _020C1DFC: cmp r4, r1 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r5,pc} -_020C1E18: ; 0x020C1E18 ldr r0, [r5, #0x24] mov r1, r4 mov r2, #0x0 @@ -22535,7 +22294,6 @@ FUN_020C1EA4: ; 0x020C1EA4 addne sp, sp, #0x2c movne r0, #0x0 ldmneia sp!, {r4-r7,pc} -_020C1ED8: ; 0x020C1ED8 mov r1, r5 mov r2, r4 mov r0, #0x0 @@ -22577,11 +22335,9 @@ FUN_020C1F54: ; 0x020C1F54 ldr r0, [r4, #0x0] cmp r0, #0x0 ldmeqia sp!, {r4,pc} -_020C1F6C: ; 0x020C1F6C ldr r0, [r4, #0x4] cmp r0, #0x0 ldmneia sp!, {r4,pc} -_020C1F78: ; 0x020C1F78 cmp r2, #0x0 bne _020C1F88 bl FUN_020C1950 @@ -22635,7 +22391,6 @@ FUN_020C1FF0: ; 0x020C1FF0 addne sp, sp, #0x2c movne r0, #0x0 ldmneia sp!, {r4-r7,pc} -_020C2028: ; 0x020C2028 mov r1, r5 mov r2, r4 mov r0, #0x0 @@ -22722,7 +22477,6 @@ FUN_020C2104: cmp r0, r1 mvncs r0, #0x0 ldmcsia sp!, {r4-r6,pc} -_020C212C: ; 0x020C212C add r1, r2, #0xc add r1, r1, r0, lsl #0x4 ldr r0, [r1, #0x4] @@ -22734,11 +22488,9 @@ _020C212C: ; 0x020C212C add r1, r1, r3 mov r2, #0x0 bl FS_SeekFile -_020C2158: ; 0x020C2158 cmp r0, #0x0 mvneq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2164: ; 0x020C2164 mov r1, r6 mov r2, r5 add r0, r4, #0x34 @@ -22940,7 +22692,6 @@ FUN_020C23FC: ; 0x020C23FC stmdb sp!, {lr} sub sp, sp, #0x4 bl FUN_020C2398 -_020C2408: ; 0x020C2408 cmp r0, #0x0 moveq r0, #0x0 addne r0, r0, #0x4 @@ -23032,12 +22783,10 @@ FUN_020C250C: mov r2, r1 add r0, r6, #0x34 bl FS_SeekFile -_020C2530: ; 0x020C2530 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2540: ; 0x020C2540 mov r1, r6 add r0, r6, #0x34 mov r2, #0x30 @@ -23046,7 +22795,6 @@ _020C2540: ; 0x020C2540 addne sp, sp, #0x8 movne r0, #0x0 ldmneia sp!, {r4-r6,pc} -_020C2560: ; 0x020C2560 cmp r5, #0x0 beq _020C26E0 mov r0, #0x0 @@ -23062,17 +22810,14 @@ _020C2560: ; 0x020C2560 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C259C: ; 0x020C259C ldr r1, [r6, #0x18] add r0, r6, #0x34 mov r2, #0x0 bl FS_SeekFile -_020C25AC: ; 0x020C25AC cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C25BC: ; 0x020C25BC ldr r1, [r6, #0x8c] ldr r2, [r6, #0x1c] add r0, r6, #0x34 @@ -23082,7 +22827,6 @@ _020C25BC: ; 0x020C25BC addne sp, sp, #0x8 movne r0, #0x0 ldmneia sp!, {r4-r6,pc} -_020C25E0: ; 0x020C25E0 mov r0, #0x0 str r0, [sp, #0x0] ldr r1, [r6, #0x24] @@ -23096,17 +22840,14 @@ _020C25E0: ; 0x020C25E0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2614: ; 0x020C2614 ldr r1, [r6, #0x20] add r0, r6, #0x34 mov r2, #0x0 bl FS_SeekFile -_020C2624: ; 0x020C2624 cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2634: ; 0x020C2634 ldr r1, [r6, #0x84] ldr r2, [r6, #0x24] add r0, r6, #0x34 @@ -23116,7 +22857,6 @@ _020C2634: ; 0x020C2634 addne sp, sp, #0x8 movne r0, #0x0 ldmneia sp!, {r4-r6,pc} -_020C2658: ; 0x020C2658 cmp r4, #0x0 beq _020C26E0 ldr r1, [r6, #0x14] @@ -23134,17 +22874,14 @@ _020C2658: ; 0x020C2658 addeq sp, sp, #0x8 moveq r0, r4 ldmeqia sp!, {r4-r6,pc} -_020C269C: ; 0x020C269C ldr r1, [r6, #0x10] add r0, r6, #0x34 mov r2, r4 bl FS_SeekFile -_020C26AC: ; 0x020C26AC cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, r4 ldmeqia sp!, {r4-r6,pc} -_020C26BC: ; 0x020C26BC ldr r1, [r6, #0x88] ldr r2, [r6, #0x14] add r0, r6, #0x34 @@ -23175,27 +22912,22 @@ FUN_020C26F8: ; 0x020C26F8 mov r4, r3 str r12, [r6, #0x88] bl FS_ConvertPathToFileID -_020C2720: ; 0x020C2720 cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2728: ; 0x020C2728 add r0, r6, #0x34 bl FS_InitFile add r1, r6, #0x7c add r0, r6, #0x34 ldmia r1, {r1-r2} bl FS_OpenFileFast -_020C2740: ; 0x020C2740 cmp r0, #0x0 ldmeqia sp!, {r4-r6,pc} -_020C2748: ; 0x020C2748 mov r3, #0x1 mov r0, r6 mov r1, r5 mov r2, r4 str r3, [r6, #0x30] bl FUN_020C250C -_020C2760: ; 0x020C2760 cmp r0, #0x0 ldrne r0, _020C2770 ; =UNK_021D28C0 strne r6, [r0, #0x0] @@ -23227,7 +22959,6 @@ FUN_020C2794: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020C27C0: ; 0x020C27C0 bl FUN_020C2818 mov r1, r4 add r0, r5, #0x4 @@ -23248,7 +22979,6 @@ FUN_020C27DC: mov r0, r5 str r4, [r5, #0x0] bl FUN_020C2794 -_020C2804: ; 0x020C2804 cmp r0, #0x0 movne r0, #0x1 moveq r0, #0x0 @@ -23318,7 +23048,6 @@ _020C28D8: ldr r0, [r10, #0x0] mov r1, r9 bl FUN_020AE554 -_020C28E4: ; 0x020C28E4 cmp r6, #0x0 beq _020C28F0 bl FUN_020C2774 @@ -23338,23 +23067,18 @@ FUN_020C290C: ; 0x020C290C ldrh r1, [r4, #0xc] ldr r0, [r4, #0x0] bl FUN_020AE5B0 -_020C2920: ; 0x020C2920 cmp r0, #0x0 mvneq r0, #0x0 ldmeqia sp!, {r4,pc} -_020C292C: ; 0x020C292C mov r0, r4 bl FUN_020C2794 -_020C2934: ; 0x020C2934 cmp r0, #0x0 ldrneh r0, [r4, #0xc] subne r0, r0, #0x1 ldmneia sp!, {r4,pc} -_020C2944: ; 0x020C2944 ldr r0, [r4, #0x0] mov r1, #0x0 bl FUN_020AE554 -_020C2950: ; 0x020C2950 mvn r0, #0x0 ldmia sp!, {r4,pc} @@ -23374,7 +23098,6 @@ FUN_020C2958: ; 0x020C2958 movs r4, r0 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C2990: ; 0x020C2990 add r0, r8, #0x4 mov r1, #0x0 bl FUN_020ADA84 @@ -23436,7 +23159,6 @@ _020C2A58: ldr r0, [r8, #0x0] mov r1, #0x3 bl FUN_020AE600 -_020C2A64: ; 0x020C2A64 cmp r5, #0x0 beq _020C2A70 bl FUN_020C2774 @@ -23450,7 +23172,6 @@ FUN_020C2A7C: ; 0x020C2A7C stmdb sp!, {r4,lr} mov r4, r0 bl FUN_020C29C0 -_020C2A88: ; 0x020C2A88 ldr r0, [r4, #0x0] bl thunk_FUN_020adc8c_2 ldmia sp!, {r4,pc} @@ -23466,13 +23187,11 @@ FUN_020C2A94: addhi sp, sp, #0x4 movhi r0, #0x0 ldmhiia sp!, {r4-r5,pc} -_020C2AB8: ; 0x020C2AB8 sub r1, r0, r5 cmp r1, #0x10 addcc sp, sp, #0x4 movcc r0, #0x0 ldmccia sp!, {r4-r5,pc} -_020C2ACC: ; 0x020C2ACC add r0, r5, #0x10 sub r1, r1, #0x10 mov r2, #0x0 @@ -23481,19 +23200,15 @@ _020C2ACC: ; 0x020C2ACC addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020C2AEC: ; 0x020C2AEC mov r0, r5 mov r1, r4 bl FUN_020C27DC -_020C2AF8: ; 0x020C2AF8 cmp r0, #0x0 addne sp, sp, #0x4 movne r0, r5 ldmneia sp!, {r4-r5,pc} -_020C2B08: ; 0x020C2B08 mov r0, r4 bl thunk_FUN_020adc8c_2 -_020C2B10: ; 0x020C2B10 mov r0, #0x0 add sp, sp, #0x4 ldmia sp!, {r4-r5,pc} @@ -23518,11 +23233,9 @@ FUN_020C2B1C: addeq sp, sp, #0x20 moveq r0, #0x0 ldmeqia sp!, {r4-r10,pc} -_020C2B64: ; 0x020C2B64 add r1, sp, #0x10 mov r0, r7 bl SND_GetNextInstData -_020C2B70: ; 0x020C2B70 cmp r0, #0x0 beq _020C2BD4 add r10, sp, #0x10 @@ -23539,7 +23252,6 @@ _020C2B80: mov r2, r5 mov r3, r4 bl FUN_020C2BE0 -_020C2BAC: ; 0x020C2BAC cmp r0, #0x0 addeq sp, sp, #0x20 moveq r0, #0x0 @@ -23549,7 +23261,6 @@ _020C2BBC: mov r1, r10 mov r2, r9 bl SND_GetNextInstData -_020C2BCC: ; 0x020C2BCC cmp r0, #0x0 bne _020C2B80 _020C2BD4: @@ -23566,12 +23277,10 @@ FUN_020C2BE0: mov r5, r2 mov r4, r3 bl SND_GetWaveDataAddress -_020C2BFC: ; 0x020C2BFC cmp r0, #0x0 addne sp, sp, #0x4 movne r0, #0x1 ldmneia sp!, {r4-r9,pc} -_020C2C0C: ; 0x020C2C0C mov r0, r7 bl SND_GetWaveDataCount ldr r1, [r7, #0x38] @@ -23587,7 +23296,6 @@ _020C2C0C: ; 0x020C2C0C addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020C2C48: ; 0x020C2C48 ldr r2, _020C2CBC ; =FUN_020C2CC0 mov r0, r4 mov r3, r7 @@ -23598,18 +23306,15 @@ _020C2C48: ; 0x020C2C48 addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020C2C70: ; 0x020C2C70 mov r0, r5 mov r1, r4 mov r2, r9 mov r3, r8 bl FUN_020C2104 -_020C2C84: ; 0x020C2C84 cmp r9, r0 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r9,pc} -_020C2C94: ; 0x020C2C94 mov r0, r4 mov r1, r9 bl DC_StoreRange @@ -23634,7 +23339,6 @@ FUN_020C2CC0: ; 0x020C2CC0 mov r0, r5 mov r1, r4 bl SND_GetWaveDataAddress -_020C2CE4: ; 0x020C2CE4 cmp r7, r0 bne _020C2CFC mov r0, r5 @@ -23717,7 +23421,6 @@ FUN_020C2DD0: ; 0x020C2DD0 mov r6, r2 addeq sp, sp, #0x4 ldmeqia sp!, {r4-r7,pc} -_020C2DEC: ; 0x020C2DEC bl OS_DisableInterrupts mov r4, r0 mov r0, r5 @@ -23725,7 +23428,6 @@ _020C2DEC: ; 0x020C2DEC mov r5, r0 mov r0, r6 bl FUN_020C20DC -_020C2E08: ; 0x020C2E08 cmp r7, r0 bne _020C2E1C mov r0, r6 @@ -23758,7 +23460,6 @@ FUN_020C2E34: ; 0x020C2E34 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r9,pc} -_020C2E78: ; 0x020C2E78 ldr r0, _020C2F4C ; =UNK_021D28C4 cmp r8, #0x0 ldr r0, [r0, #0x38] @@ -23768,7 +23469,6 @@ _020C2E78: ; 0x020C2E78 add r5, r0, #0x3c moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020C2E9C: ; 0x020C2E9C cmp r7, #0x0 moveq r3, #0x0 beq _020C2EB0 @@ -23784,7 +23484,6 @@ _020C2EB0: addeq sp, sp, #0x4 moveq r0, #0x0 ldmeqia sp!, {r4-r9,pc} -_020C2ED4: ; 0x020C2ED4 mov r0, r9 mov r1, r6 add r2, r4, #0x3c @@ -23795,7 +23494,6 @@ _020C2ED4: ; 0x020C2ED4 addne sp, sp, #0x4 movne r0, #0x0 ldmneia sp!, {r4-r9,pc} -_020C2EFC: ; 0x020C2EFC ldr r1, [r6, #0x38] add r0, r6, #0x3c mov r2, r4 @@ -23808,7 +23506,6 @@ _020C2EFC: ; 0x020C2EFC mov r0, r6 mov r1, r5 bl DC_StoreRange -_020C2F2C: ; 0x020C2F2C cmp r7, #0x0 beq _020C2F40 mov r0, r9 @@ -23979,13 +23676,11 @@ FUN_020C3134: ; 0x020C3134 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C3160: ; 0x020C3160 ldr r0, [sp, #0x20] cmp r0, #0x0 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C3174: ; 0x020C3174 mov r2, r7 mov r3, r6 add r1, r5, #0x20 @@ -23995,18 +23690,15 @@ _020C3174: ; 0x020C3174 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C3198: ; 0x020C3198 mov r0, r8 mov r1, r4 mov r2, r5 mov r3, #0x0 bl FUN_020C2104 -_020C31AC: ; 0x020C31AC cmp r5, r0 addne sp, sp, #0x8 movne r0, #0x0 ldmneia sp!, {r4-r8,pc} -_020C31BC: ; 0x020C31BC mov r0, r4 mov r1, r5 bl DC_StoreRange @@ -24021,11 +23713,9 @@ FUN_020C31D4: mov r5, r2 mov r4, r3 bl FUN_020C226C -_020C31E8: ; 0x020C31E8 cmp r0, #0x0 moveq r0, #0x5 ldmeqia sp!, {r4-r6,pc} -_020C31F4: ; 0x020C31F4 ands r1, r6, #0x4 beq _020C324C ldrb r1, [r0, #0x3] @@ -24074,7 +23764,6 @@ FUN_020C3270: addeq sp, sp, #0xc moveq r0, #0x4 ldmeqia sp!, {r4-r11,pc} -_020C3298: ; 0x020C3298 ands r0, r10, #0x2 beq _020C32C4 ldr r0, [r8, #0x0] @@ -24104,7 +23793,6 @@ _020C32D8: addeq sp, sp, #0xc moveq r0, #0x5 ldmeqia sp!, {r4-r11,pc} -_020C3300: ; 0x020C3300 add r0, sp, #0x4 str r0, [sp, #0x0] add r0, r8, r6, lsl #0x1 @@ -24113,11 +23801,9 @@ _020C3300: ; 0x020C3300 mov r2, r9 mov r3, r11 bl FUN_020C31D4 -_020C3320: ; 0x020C3320 cmp r0, #0x0 addne sp, sp, #0xc ldmneia sp!, {r4-r11,pc} -_020C332C: ; 0x020C332C ldrb r0, [r4, #0x3] ands r0, r0, #0x1 beq _020C3370 @@ -24131,7 +23817,6 @@ _020C332C: ; 0x020C332C mov r2, r6 mov r3, r3, lsr #0x8 bl FUN_020C2B1C -_020C3360: ; 0x020C3360 cmp r0, #0x0 addeq sp, sp, #0xc moveq r0, #0x9 @@ -24165,18 +23850,15 @@ FUN_020C33B8: mov r5, r2 mov r4, r3 bl FUN_020C2334 -_020C33CC: ; 0x020C33CC cmp r0, #0x0 moveq r0, #0x3 ldmeqia sp!, {r4-r6,pc} -_020C33D8: ; 0x020C33D8 ands r1, r6, #0x8 beq _020C3400 ldr r0, [r0, #0x0] mov r1, r5 mov r2, r4 bl FUN_020C3044 -_020C33F0: ; 0x020C33F0 cmp r0, #0x0 bne _020C3408 mov r0, #0x7 @@ -24203,7 +23885,6 @@ FUN_020C341C: addeq sp, sp, #0x4 moveq r0, #0x2 ldmeqia sp!, {r4-r7,pc} -_020C3444: ; 0x020C3444 mov r0, #0x0 str r0, [sp, #0x0] ldrh r0, [r4, #0x4] @@ -24211,18 +23892,15 @@ _020C3444: ; 0x020C3444 mov r2, r6 mov r3, r5 bl FUN_020C3270 -_020C3460: ; 0x020C3460 cmp r0, #0x0 addne sp, sp, #0x4 ldmneia sp!, {r4-r7,pc} -_020C346C: ; 0x020C346C ands r0, r7, #0x1 beq _020C3498 ldr r0, [r4, #0x0] mov r1, r6 mov r2, r5 bl FUN_020C30BC -_020C3484: ; 0x020C3484 cmp r0, #0x0 bne _020C34A0 add sp, sp, #0x4 @@ -24249,7 +23927,6 @@ FUN_020C34B8: addeq sp, sp, #0xc moveq r0, #0x1 ldmeqia sp!, {r4-r11,pc} -_020C34D8: ; 0x020C34D8 ldr r0, [r8, #0x0] mov r7, #0x0 cmp r0, #0x0 @@ -24280,7 +23957,6 @@ _020C3520: mov r2, r9 mov r3, r4 bl FUN_020C341C -_020C3538: ; 0x020C3538 cmp r0, #0x0 beq _020C35C0 add sp, sp, #0xc @@ -24292,7 +23968,6 @@ _020C3548: mov r2, r9 mov r3, r4 bl FUN_020C33B8 -_020C3560: ; 0x020C3560 cmp r0, #0x0 beq _020C35C0 add sp, sp, #0xc @@ -24304,7 +23979,6 @@ _020C3570: mov r2, r9 mov r3, r4 bl FUN_020C3270 -_020C3588: ; 0x020C3588 cmp r0, #0x0 beq _020C35C0 add sp, sp, #0xc @@ -24317,7 +23991,6 @@ _020C3598: ldr r0, [r6, #0x4] mov r3, r4 bl FUN_020C31D4 -_020C35B4: ; 0x020C35B4 cmp r0, #0x0 addne sp, sp, #0xc ldmneia sp!, {r4-r11,pc} @@ -24340,7 +24013,6 @@ FUN_020C35E0: ; 0x020C35E0 mov r3, #0x1 str r12, [sp, #0x0] bl FUN_020C341C -_020C35F8: ; 0x020C35F8 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -24357,7 +24029,6 @@ FUN_020C360C: ; 0x020C360C mov r3, #0x1 str r12, [sp, #0x0] bl FUN_020C31D4 -_020C362C: ; 0x020C362C cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -24374,7 +24045,6 @@ FUN_020C3640: ; 0x020C3640 mov r3, #0x1 str r12, [sp, #0x0] bl FUN_020C3270 -_020C3660: ; 0x020C3660 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -24391,7 +24061,6 @@ FUN_020C3674: ; 0x020C3674 mov r3, #0x1 str r12, [sp, #0x0] bl FUN_020C341C -_020C3694: ; 0x020C3694 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -24403,7 +24072,6 @@ FUN_020C36A8: ; 0x020C36A8 stmdb sp!, {lr} sub sp, sp, #0x4 bl FUN_020C34B8 -_020C36B4: ; 0x020C36B4 cmp r0, #0x0 moveq r0, #0x1 movne r0, #0x0 @@ -24424,7 +24092,6 @@ FUN_020C36C8: ; 0x020C36C8 addeq sp, sp, #0x8 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C36F8: ; 0x020C36F8 mov r0, r8 mov r1, r5 bl FUN_020C09B0 @@ -24435,7 +24102,6 @@ _020C36F8: ; 0x020C36F8 mov r3, #0x0 str r12, [sp, #0x0] bl FUN_020C3270 -_020C3720: ; 0x020C3720 cmp r0, #0x0 beq _020C373C mov r0, r5 @@ -24479,7 +24145,6 @@ FUN_020C378C: ; 0x020C378C addeq sp, sp, #0x10 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C37BC: ; 0x020C37BC mov r0, r7 mov r1, r4 bl FUN_020C09B0 @@ -24491,7 +24156,6 @@ _020C37BC: ; 0x020C37BC mov r3, #0x0 str r12, [sp, #0x0] bl FUN_020C3270 -_020C37E8: ; 0x020C37E8 cmp r0, #0x0 beq _020C3804 mov r0, r4 @@ -24507,7 +24171,6 @@ _020C3804: mov r3, #0x0 str r12, [sp, #0x0] bl FUN_020C341C -_020C3820: ; 0x020C3820 cmp r0, #0x0 beq _020C383C mov r0, r4 @@ -24545,27 +24208,22 @@ FUN_020C3888: ; 0x020C3888 mov r0, r6 mov r5, r2 bl FUN_020C2334 -_020C38A4: ; 0x020C38A4 cmp r0, #0x0 addeq sp, sp, #0x14 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C38B4: ; 0x020C38B4 ldr r0, [r0, #0x0] bl FUN_020C20DC movs r4, r0 addeq sp, sp, #0x14 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C38CC: ; 0x020C38CC mov r1, r5 bl FUN_020C3D9C -_020C38D4: ; 0x020C38D4 cmp r0, #0x0 addeq sp, sp, #0x14 moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C38E4: ; 0x020C38E4 str r0, [sp, #0x0] str r4, [sp, #0x4] str r6, [sp, #0x8] @@ -24588,12 +24246,10 @@ FUN_020C3910: ; 0x020C3910 mov r5, r2 mov r4, r3 bl FUN_020C2398 -_020C3930: ; 0x020C3930 cmp r0, #0x0 addeq sp, sp, #0xc moveq r0, #0x0 ldmeqia sp!, {r4-r7,pc} -_020C3940: ; 0x020C3940 cmp r4, #0x0 ldrltb r4, [r0, #0x8] cmp r5, #0x0 @@ -24619,12 +24275,10 @@ FUN_020C3980: ; 0x020C3980 mov r5, r0 mov r0, r4 bl FUN_020C2398 -_020C3998: ; 0x020C3998 cmp r0, #0x0 addeq sp, sp, #0xc moveq r0, #0x0 ldmeqia sp!, {r4-r5,pc} -_020C39A8: ; 0x020C39A8 str r0, [sp, #0x0] str r4, [sp, #0x4] ldrb r1, [r0, #0x9] @@ -24667,11 +24321,9 @@ _020C3A2C: mov r0, r5 mov r1, r6 bl FUN_020C10B4 -_020C3A3C: ; 0x020C3A3C cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4-r8,pc} -_020C3A48: ; 0x020C3A48 ldrb r0, [r4, #0x0] add r8, r8, #0x1 cmp r8, r0 @@ -24760,7 +24412,6 @@ FUN_020C3B4C: ; 0x020C3B4C mov r1, r1, lsl #0x1f movs r1, r1, asr #0x1f ldmeqia sp!, {r4,pc} -_020C3B64: ; 0x020C3B64 bl FUN_020C3B10 ldr r1, [r4, #0x164] mov r0, r4 @@ -24820,7 +24471,6 @@ _020C3C10: ldr r1, [r0, #0x0] cmp r1, #0x0 ldmeqia sp!, {r4,pc} -_020C3C30: ; 0x020C3C30 ldr r0, _020C3C48 ; =0x000004C8 add r0, r1, r0 bl OS_UnlockMutex @@ -24911,7 +24561,6 @@ _020C3D54: beq _020C3D7C add r0, r5, #0xe8 bl FUN_020C3DDC -_020C3D6C: ; 0x020C3D6C cmp r0, #0x0 beq _020C3D7C mov r0, r5 @@ -24972,13 +24621,11 @@ FUN_020C3E0C: cmp r2, r1 ldrge r0, [r0, #0x4] ldmgeia sp!, {r4,pc} -_020C3E24: ; 0x020C3E24 ldr r4, [r0, #0x0] ldr r0, [r0, #0x4] sub r0, r0, r4 mul r0, r2, r0 bl _s32_div_f -_020C3E38: ; 0x020C3E38 add r0, r4, r0 ldmia sp!, {r4,pc} @@ -24989,7 +24636,6 @@ FUN_020C3E40: mov r5, r1 mov r4, r2 bl FUN_020C3E0C -_020C3E54: ; 0x020C3E54 str r0, [r6, #0x0] str r5, [r6, #0x4] str r4, [r6, #0xc] diff --git a/arm9/data/bss.s b/arm9/data/bss.s index c1a5e414..f46267e6 100644 --- a/arm9/data/bss.s +++ b/arm9/data/bss.s @@ -1,381 +1,5 @@ .section .bss - .global UNK_02106FA0 - .global gBacklightTop - .global gBacklightTop_2 -UNK_02106FA0: ; 0x02106FA0 -gBacklightTop: ; 0x02106FA0 -gBacklightTop_2: ; 0x02106FA0 - .space 0x24 - - .global UNK_02106FC4 -UNK_02106FC4: ; 0x02106FC4 - .space 0x4 - - .global UNK_02106FC8 -UNK_02106FC8: ; 0x02106FC8 - .space 0x4 - - .global UNK_02106FCC -UNK_02106FCC: ; 0x02106FCC - .space 0xa4 - - .global UNK_02107070 -UNK_02107070: ; 0x02107070 - .space 0x8 - - .global UNK_02107078 -UNK_02107078: ; 0x02107078 - .space 0x688 - - .global UNK_02107700 -UNK_02107700: ; 0x02107700 - .space 0x24 - - .global UNK_02107724 -UNK_02107724: ; 0x02107724 - .space 0x891e - - .global UNK_02110042 -UNK_02110042: ; 0x02110042 - .space 0xc0 - - .global UNK_02110102 -UNK_02110102: ; 0x02110102 - .space 0x1d9 - - .global UNK_021102DB -UNK_021102DB: ; 0x021102DB - .space 0xc27 - - .global UNK_02110F02 -UNK_02110F02: ; 0x02110F02 - .space 0x6906 - - .global UNK_02117808 -UNK_02117808: ; 0x02117808 - .space 0x883b - - .global UNK_02120043 -UNK_02120043: ; 0x02120043 - .space 0xe4 - - .global UNK_02120127 -UNK_02120127: ; 0x02120127 - .space 0x47 - - .global UNK_0212016E -UNK_0212016E: ; 0x0212016E - .space 0xa0 - - .global UNK_0212020E -UNK_0212020E: ; 0x0212020E - .space 0x3 - - .global UNK_02120211 -UNK_02120211: ; 0x02120211 - .space 0x1632 - - .global UNK_02121843 -UNK_02121843: ; 0x02121843 - .space 0x26 - - .global UNK_02121869 -UNK_02121869: ; 0x02121869 - .space 0xc2 - - .global UNK_0212192B -UNK_0212192B: ; 0x0212192B - .space 0x2d6 - - .global UNK_02121C01 -UNK_02121C01: ; 0x02121C01 - .space 0x1d - - .global UNK_02121C1E -UNK_02121C1E: ; 0x02121C1E - .space 0x1b - - .global UNK_02121C39 -UNK_02121C39: ; 0x02121C39 - .space 0x4c7 - - .global UNK_02122100 -UNK_02122100: ; 0x02122100 - .space 0x3 - - .global UNK_02122103 -UNK_02122103: ; 0x02122103 - .space 0xff - - .global UNK_02122202 -UNK_02122202: ; 0x02122202 - .space 0x1 - - .global UNK_02122203 -UNK_02122203: ; 0x02122203 - .space 0xc - - .global UNK_0212220F -UNK_0212220F: ; 0x0212220F - .space 0x30 - - .global UNK_0212223F -UNK_0212223F: ; 0x0212223F - .space 0xf21 - - .global UNK_02123160 -UNK_02123160: ; 0x02123160 - .space 0x26c8 - - .global UNK_02125828 -UNK_02125828: ; 0x02125828 - .space 0x39 - - .global UNK_02125861 -UNK_02125861: ; 0x02125861 - .space 0x10df - - .global UNK_02126940 -UNK_02126940: ; 0x02126940 - .space 0xec9 - - .global UNK_02127809 -UNK_02127809: ; 0x02127809 - .space 0xd7 - - .global UNK_021278E0 -UNK_021278E0: ; 0x021278E0 - .space 0x1821 - - .global UNK_02129101 -UNK_02129101: ; 0x02129101 - .space 0x2 - - .global UNK_02129103 -UNK_02129103: ; 0x02129103 - .space 0x6f41 - - .global UNK_02130044 -UNK_02130044: ; 0x02130044 - .space 0xed - - .global UNK_02130131 -UNK_02130131: ; 0x02130131 - .space 0x243 - - .global UNK_02130374 -UNK_02130374: ; 0x02130374 - .space 0xfcd1 - - .global UNK_02140045 -UNK_02140045: ; 0x02140045 - .space 0xe3 - - .global UNK_02140128 -UNK_02140128: ; 0x02140128 - .space 0xeb - - .global UNK_02140213 -UNK_02140213: ; 0x02140213 - .space 0x14b - - .global UNK_0214035E -UNK_0214035E: ; 0x0214035E - .space 0xfce8 - - .global UNK_02150046 -UNK_02150046: ; 0x02150046 - .space 0x252 - - .global UNK_02150298 -UNK_02150298: ; 0x02150298 - .space 0xd45 - - .global UNK_02150FDD -UNK_02150FDD: ; 0x02150FDD - .space 0xe046 - - .global UNK_0215F023 -UNK_0215F023: ; 0x0215F023 - .space 0x1024 - - .global UNK_02160047 -UNK_02160047: ; 0x02160047 - .space 0xe2 - - .global UNK_02160129 -UNK_02160129: ; 0x02160129 - .space 0x1d - - .global UNK_02160146 -UNK_02160146: ; 0x02160146 - .space 0xd0 - - .global UNK_02160216 -UNK_02160216: ; 0x02160216 - .space 0x42 - - .global UNK_02160258 -UNK_02160258: ; 0x02160258 - .space 0x4237 - - .global UNK_0216448F -UNK_0216448F: ; 0x0216448F - .space 0xbbb9 - - .global UNK_02170048 -UNK_02170048: ; 0x02170048 - .space 0x2ce - - .global UNK_02170316 -UNK_02170316: ; 0x02170316 - .space 0xfd33 - - .global UNK_02180049 -UNK_02180049: ; 0x02180049 - .space 0xe2 - - .global UNK_0218012B -UNK_0218012B: ; 0x0218012B - .space 0x2d1 - - .global UNK_021803FC -UNK_021803FC: ; 0x021803FC - .space 0x3c05 - - .global UNK_02184001 -UNK_02184001: ; 0x02184001 - .space 0xc049 - - .global UNK_0219004A -UNK_0219004A: ; 0x0219004A - .space 0x31e - - .global UNK_02190368 -UNK_02190368: ; 0x02190368 - .space 0x173 - - .global UNK_021904DB -UNK_021904DB: ; 0x021904DB - .space 0xfb70 - - .global UNK_021A004B -UNK_021A004B: ; 0x021A004B - .space 0xe1 - - .global UNK_021A012C -UNK_021A012C: ; 0x021A012C - .space 0xcc - - .global UNK_021A01F8 -UNK_021A01F8: ; 0x021A01F8 - .space 0x1a - - .global UNK_021A0212 -UNK_021A0212: ; 0x021A0212 - .space 0x2 - - .global UNK_021A0214 -UNK_021A0214: ; 0x021A0214 - .space 0x2 - - .global UNK_021A0216 -UNK_021A0216: ; 0x021A0216 - .space 0x2a - - .global UNK_021A0240 -UNK_021A0240: ; 0x021A0240 - .space 0xfe0c - - .global UNK_021B004C -UNK_021B004C: ; 0x021B004C - .space 0x18c - - .global UNK_021B01D8 -UNK_021B01D8: ; 0x021B01D8 - .space 0x61 - - .global UNK_021B0239 -UNK_021B0239: ; 0x021B0239 - .space 0xda3 - - .global UNK_021B0FDC -UNK_021B0FDC: ; 0x021B0FDC - .space 0xc29 - - .global UNK_021B1C05 -UNK_021B1C05: ; 0x021B1C05 - .space 0x6fe - - .global UNK_021B2303 -UNK_021B2303: ; 0x021B2303 - .space 0xfc - - .global UNK_021B23FF -UNK_021B23FF: ; 0x021B23FF - .space 0x2516 - - .global UNK_021B4915 -UNK_021B4915: ; 0x021B4915 - .space 0x1ef0 - - .global UNK_021B6805 -UNK_021B6805: ; 0x021B6805 - .space 0x29fc - - .global UNK_021B9201 -UNK_021B9201: ; 0x021B9201 - .space 0x5ff - - .global UNK_021B9800 -UNK_021B9800: ; 0x021B9800 - .space 0x5824 - - .global UNK_021BF024 -UNK_021BF024: ; 0x021BF024 - .space 0x1029 - - .global UNK_021C004D -UNK_021C004D: ; 0x021C004D - .space 0xe0 - - .global UNK_021C012D -UNK_021C012D: ; 0x021C012D - .space 0xd7 - - .global UNK_021C0204 -UNK_021C0204: ; 0x021C0204 - .space 0x2 - - .global UNK_021C0206 -UNK_021C0206: ; 0x021C0206 - .space 0x33a - - .global UNK_021C0540 -UNK_021C0540: ; 0x021C0540 - .space 0x3898 - - .global UNK_021C3DD8 -UNK_021C3DD8: ; 0x021C3DD8 - .space 0x8 - - .global UNK_021C3DE0 -UNK_021C3DE0: ; 0x021C3DE0 - .space 0x7d0 - - .global gLoadedOverlays -gLoadedOverlays: ; 0x021C45B0 - .space 0x40 - - .global UNK_021C45F0 -UNK_021C45F0: ; 0x021C45F0 - .space 0x40 - - .global UNK_021C4630 -UNK_021C4630: ; 0x021C4630 - .space 0x40 - .global UNK_021C4670 UNK_021C4670: ; 0x021C4670 .space 0x4 diff --git a/arm9/data/rom2.s b/arm9/data/rom2.s index 44f7e256..4a93ec17 100644 --- a/arm9/data/rom2.s +++ b/arm9/data/rom2.s @@ -1,114 +1,269 @@ - .include "asm/macros.inc" - .include "global.inc" + .include "asm/macros.inc" + .include "global.inc" .section .rodata ; 0x020EC710 .global UNK_020EC710 UNK_020EC710: ; 0x020EC710 - .byte 0x20, 0xFF, 0x09, 0x60, 0x00, 0x00, 0x00, 0x00 + .byte 0x20, 0xFF, 0x09, 0x60 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC718 UNK_020EC718: ; 0x020EC718 - .byte 0x00, 0xFF, 0x01, 0xB0, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0xFF, 0x01, 0xB0 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC720 UNK_020EC720: ; 0x020EC720 - .byte 0x00, 0xFF, 0x01, 0xD0, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0xFF, 0x01, 0xD0 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC728 UNK_020EC728: ; 0x020EC728 - .byte 0x20, 0xFF, 0x09, 0x60, 0x00, 0x00, 0x00, 0x00 + .byte 0x20, 0xFF, 0x09, 0x60 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC730 UNK_020EC730: ; 0x020EC730 - .byte 0x20, 0xFF, 0x11, 0x68, 0x00, 0x00, 0x00, 0x00 + .byte 0x20, 0xFF, 0x11, 0x68 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC738 UNK_020EC738: ; 0x020EC738 - .byte 0x20, 0xFF, 0x01, 0xB8, 0x00, 0x00, 0x00, 0x00 + .byte 0x20, 0xFF, 0x01, 0xB8 + .byte 0x00, 0x00, 0x00, 0x00 .global UNK_020EC740 UNK_020EC740: ; 0x020EC740 - .byte 0x00, 0xFF, 0x05, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xE1, 0x0D, 0x02, 0x25, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x10, 0x00, 0x70, 0xE1, 0x0D, 0x02, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00 - .word 0x020DE1BC - .byte 0x29, 0x01, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00, 0xE4, 0xE2, 0x0D, 0x02 - .byte 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xE2, 0x0D, 0x02, 0x8D, 0x00, 0x00, 0x00 - .byte 0x00, 0x3F, 0x40, 0x00, 0x88, 0xE3, 0x0D, 0x02, 0x69, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x40, 0x00 - .word 0x020DE3FC - .byte 0x3D, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x70, 0xE4, 0x0D, 0x02 - .byte 0x8D, 0x00, 0x00, 0x00, 0x00, 0x07, 0x20, 0x00, 0xFC, 0xE4, 0x0D, 0x02, 0x89, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x20, 0x00, 0x84, 0xE5, 0x0D, 0x02, 0x0D, 0x01, 0x00, 0x00, 0x00, 0x7F, 0x40, 0x00 - .word 0x020DE690 - .byte 0x49, 0x03, 0x00, 0x00, 0x00, 0x7F, 0x50, 0x00, 0xD8, 0xE9, 0x0D, 0x02 - .byte 0xB1, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x60, 0x00, 0x88, 0xEC, 0x0D, 0x02, 0x75, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x20, 0x00, 0xFC, 0xEC, 0x0D, 0x02, 0xE9, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00 - .word 0x020DEE60 - .byte 0x1D, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x30, 0x00, 0x7C, 0xEF, 0x0D, 0x02 - .byte 0xE9, 0x01, 0x00, 0x00, 0x20, 0x03, 0x40, 0x00, 0x64, 0xF1, 0x0D, 0x02, 0x2D, 0x01, 0x00, 0x00 - .byte 0x00, 0x3F, 0x40, 0x00, 0x90, 0xF2, 0x0D, 0x02, 0x25, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00 - .word 0x020DF2B4 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x1C, 0xF3, 0x0D, 0x02 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x38, 0xF3, 0x0D, 0x02, 0x89, 0x00, 0x00, 0x00 - .byte 0x00, 0x1F, 0x30, 0x00, 0xC0, 0xF3, 0x0D, 0x02, 0x79, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x40, 0x00 - .word 0x020DF4A4 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x90, 0xFB, 0x0D, 0x02 - .byte 0x4D, 0x02, 0x00, 0x00, 0x20, 0xFF, 0x90, 0x00, 0xDC, 0xFD, 0x0D, 0x02, 0xE1, 0x02, 0x00, 0x00 - .byte 0x20, 0xFF, 0xA0, 0x00, 0xBC, 0x00, 0x0E, 0x02, 0xDD, 0x04, 0x00, 0x00, 0x20, 0x7F, 0xF0, 0x00 - .word 0x020E06BC - .byte 0x65, 0x07, 0x00, 0x00, 0x20, 0xFF, 0xC0, 0x00, 0x20, 0x0E, 0x0E, 0x02 - .byte 0x24, 0x08, 0x00, 0x00, 0x10, 0xC7, 0x0E, 0x02, 0x44, 0x16, 0x0E, 0x02, 0x2D, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x20, 0x00, 0x70, 0x16, 0x0E, 0x02, 0x45, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00 - .word 0x020E16B4 - .byte 0x19, 0x01, 0x00, 0x00, 0x20, 0x01, 0x30, 0x00, 0xCC, 0x17, 0x0E, 0x02 - .byte 0x69, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x00, 0x34, 0x18, 0x0E, 0x02, 0x29, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x30, 0x00, 0x5C, 0x18, 0x0E, 0x02, 0x2D, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00 - .word 0x020E1888 - .byte 0x65, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x70, 0x00, 0x28, 0x1F, 0x0E, 0x02 - .byte 0x54, 0x0D, 0x00, 0x00, 0x18, 0xC7, 0x0E, 0x02, 0x00, 0x2D, 0x0E, 0x02, 0x55, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x20, 0x00, 0x54, 0x2D, 0x0E, 0x02, 0x29, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00 - .word 0x020E2D7C - .byte 0x31, 0x01, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00, 0x10, 0x33, 0x0E, 0x02 - .byte 0x4C, 0x12, 0x00, 0x00, 0x20, 0xC7, 0x0E, 0x02, 0x5C, 0x45, 0x0E, 0x02, 0xE1, 0x00, 0x00, 0x00 - .byte 0x00, 0x0F, 0x50, 0x00, 0x3C, 0x46, 0x0E, 0x02, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .word 0x020E464C - .byte 0xE9, 0x03, 0x00, 0x00, 0x00, 0xFF, 0x60, 0x00, 0x34, 0x4A, 0x0E, 0x02 - .byte 0x4D, 0x04, 0x00, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x80, 0x4E, 0x0E, 0x02, 0x99, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x60, 0x00, 0x18, 0x4F, 0x0E, 0x02, 0xC9, 0x00, 0x00, 0x00, 0x00, 0x03, 0x60, 0x00 - .word 0x020E4FE0 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x50, 0x0E, 0x02 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x56, 0x0E, 0x02, 0x51, 0x02, 0x00, 0x00 - .byte 0x20, 0xFF, 0x90, 0x00, 0x68, 0x58, 0x0E, 0x02, 0xE5, 0x02, 0x00, 0x00, 0x20, 0xFF, 0xA0, 0x00 - .word 0x020E5B4C - .byte 0x99, 0x03, 0x00, 0x00, 0x20, 0x7F, 0xF0, 0x00, 0x08, 0x60, 0x0E, 0x02 - .byte 0x4C, 0x06, 0x00, 0x00, 0x28, 0xC7, 0x0E, 0x02, 0x54, 0x66, 0x0E, 0x02, 0xF0, 0x08, 0x00, 0x00 - .word 0x020EC730 - .word 0x020E6F44 - .byte 0x41, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00 - .word 0x020E6F84 - .byte 0x29, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0xAC, 0x6F, 0x0E, 0x02 - .byte 0x71, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x00, 0x8C, 0x70, 0x0E, 0x02, 0x88, 0x11, 0x00, 0x00 - .word 0x020EC738 - .word 0x020E825C - .byte 0xBD, 0x00, 0x00, 0x00, 0x20, 0x01, 0x30, 0x00 - .word 0x020E8318 - .byte 0x4D, 0x02, 0x00, 0x00, 0x20, 0x01, 0x30, 0x00, 0x64, 0x85, 0x0E, 0x02 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x86, 0x0E, 0x02, 0x41, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x20, 0x00, 0x6C, 0x86, 0x0E, 0x02, 0xCD, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x50, 0x00 - .word 0x020E8738 - .byte 0x85, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xD0, 0x00, 0xBC, 0x88, 0x0E, 0x02 - .byte 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x58, 0x89, 0x0E, 0x02, 0x85, 0x03, 0x00, 0x00 - .byte 0x00, 0x03, 0xB0, 0x00, 0x40, 0x91, 0x0E, 0x02, 0x81, 0x01, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00 - .word 0x020E92C0 - .byte 0xA9, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x00, 0x68, 0x93, 0x0E, 0x02 - .byte 0x24, 0x06, 0x00, 0x00, 0x40, 0xC7, 0x0E, 0x02, 0xA4, 0x9A, 0x0E, 0x02, 0x2D, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x20, 0x00, 0x08, 0xC6, 0x0E, 0x02, 0x51, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x30, 0x00 - .word 0x020EC658 - .byte 0x35, 0x00, 0x00, 0x00, 0x00, 0x07, 0x20, 0x00, 0x94, 0xC6, 0x0E, 0x02 - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0xC0, 0xC6, 0x0E, 0x02, 0x45, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x20, 0x00, 0x04, 0xC7, 0x0E, 0x02, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0xFF, 0x05, 0x20 + .byte 0x00, 0x00, 0x00, 0x00 + + .global UNK_020EC748 +UNK_020EC748: ; 0x020EC748 + .word abort + .short 37 + .word 0x00100000 + .word exit + .short 77 + .word 0x00100100 + .word __exit + .short 297 + .word 0x00200300 + .word nan + .short 25 + .word 0x00000000 + .word __flush_line_buffered_output_files + .short 141 + .word 0x00403F00 + .word __flush_all + .short 105 + .word 0x00403F00 + .word __msl_assertion_failed + .short 61 + .word 0x00200100 + .word __load_buffer + .short 141 + .word 0x00200700 + .word __flush_buffer + .short 137 + .word 0x00200300 + .word fread + .short 269 + .word 0x00407F00 + .word __fread + .short 841 + .word 0x00507F00 + .word __fwrite + .short 689 + .word 0x0060FF00 + .word fclose + .short 117 + .word 0x00200300 + .word fflush + .short 233 + .word 0x00100100 + .word ftell + .short 285 + .word 0x00300F00 + .word _fseek + .short 489 + .word 0x00400320 + .word fseek + .short 301 + .word 0x00403F00 + .word rewind + .short 37 + .word 0x00100100 + .word mbtowc + .short 29 + .word 0x00100000 + .word wctomb + .short 29 + .word 0x00100000 + .word mbstowcs + .short 137 + .word 0x00301F00 + .word wcstombs + .short 121 + .word 0x00403F00 + .word memset + .short 21 + .word 0x00100100 + .word long2str + .short 589 + .word 0x0090FF20 + .word longlong2str + .short 737 + .word 0x00A0FF20 + .word double2hex + .short 1245 + .word 0x00F07F20 + .word float2str + .short 1893 + .word 0x00C0FF20 + .word __pformatter + .short 2084 + .word UNK_020EC710 + .word __FileWrite + .short 45 + .word 0x00200300 + .word __StringWrite + .short 69 + .word 0x00200300 + .word printf + .short 281 + .word 0x00300120 + .word vsnprintf + .short 105 + .word 0x00300300 + .word snprintf + .short 41 + .word 0x00300020 + .word sprintf + .short 45 + .word 0x00300020 + .word qsort + .short 357 + .word 0x0070FF00 + .word __sformatter + .short 3412 + .word UNK_020EC718 + .word vsscanf + .short 85 + .word 0x00200000 + .word sscanf + .short 41 + .word 0x00300020 + .word raise + .short 305 + .word 0x00200300 + .word __strtold + .short 4684 + .word UNK_020EC720 + .word strtold + .short 225 + .word 0x00500F00 + .word atod + .short 17 + .word 0x00000000 + .word __strtoul + .short 1001 + .word 0x0060FF00 + .word __strtoull + .short 1101 + .word 0x0080FF00 + .word strtoul + .short 153 + .word 0x00600300 + .word strtold2 + .short 201 + .word 0x00600300 + .word atol + .short 21 + .word 0x00000000 + .word wmemcpy + .short 17 + .word 0x00000000 + .word long2str_wide + .short 593 + .word 0x0090FF20 + .word longlong2str_wide + .short 741 + .word 0x00A0FF20 + .word double2hex_wide + .short 921 + .word 0x00F07F20 + .word float2str_wide + .short 1612 + .word UNK_020EC728 + .word __wpformatter + .short 2288 + .word UNK_020EC730 + .word __wStringWrite + .short 65 + .word 0x00200300 + .word swprintf + .short 41 + .word 0x00300020 + .word vswprintf + .short 113 + .word 0x00300300 + .word __ieee754_pow + .short 4488 + .word UNK_020EC738 + .word frexp + .short 189 + .word 0x00300120 + .word ldexp + .short 589 + .word 0x00300120 + .word pow + .short 13 + .word 0x00000000 + .word __rounddec + .short 65 + .word 0x00200300 + .word __ull2dec + .short 205 + .word 0x0050FF00 + .word __timesdec + .short 389 + .word 0x00D0FF00 + .word __str2dec + .short 157 + .word 0x00100000 + .word __two_exp + .short 901 + .word 0x00B00300 + .word __num2dec_internal + .short 385 + .word 0x00E01F00 + .word __num2dec_internal2 + .short 169 + .word 0x00200300 + .word __dec2num + .short 1572 + .word UNK_020EC740 + .word scalbn + .short 45 + .word 0x00200100 + .word __read_console + .short 81 + .word 0x00300F00 + .word __write_console + .short 53 + .word 0x00200700 + .word __call_static_initializers + .short 45 + .word 0x00100100 + .word __destroy_global_chain + .short 69 + .word 0x00200300 + .word _ExitProcess + .short 13 + .word 0x00000000 .global UNK_020ECAC0 UNK_020ECAC0: ; 0x020ECAC0 @@ -120,8 +275,20 @@ UNK_020ECAC4: ; 0x020ECAC4 .global UNK_020ECAC8 UNK_020ECAC8: ; 0x020ECAC8 - .byte 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x21, 0xFF, 0xFF, 0x00, 0x11, 0xF2, 0xFF, 0x00 - .byte 0x11, 0x21, 0xFF, 0x00, 0x11, 0x11, 0xF2, 0x00, 0x11, 0x11, 0x21, 0x00, 0x11, 0x11, 0x22, 0x00 - .byte 0x11, 0x21, 0xF2, 0x00, 0x11, 0x22, 0xFF, 0x00, 0x21, 0xF2, 0xFF, 0x00, 0x22, 0xFF, 0xFF, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xFF, 0xFF, 0xFF, 0x00 + .byte 0xFF, 0xFF, 0xFF, 0x00 + .byte 0x21, 0xFF, 0xFF, 0x00 + .byte 0x11, 0xF2, 0xFF, 0x00 + .byte 0x11, 0x21, 0xFF, 0x00 + .byte 0x11, 0x11, 0xF2, 0x00 + .byte 0x11, 0x11, 0x21, 0x00 + .byte 0x11, 0x11, 0x22, 0x00 + .byte 0x11, 0x21, 0xF2, 0x00 + .byte 0x11, 0x22, 0xFF, 0x00 + .byte 0x21, 0xF2, 0xFF, 0x00 + .byte 0x22, 0xFF, 0xFF, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 diff --git a/arm9/data/rom2_2.s b/arm9/data/rom2_2.s index 1f7d9b04..ef152416 100644 --- a/arm9/data/rom2_2.s +++ b/arm9/data/rom2_2.s @@ -53,11 +53,13 @@ UNK_020ECB6B: ; 0x020ECB6B .global UNK_020ECB8C UNK_020ECB8C: ; 0x020ECB8C - .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00, 0x00 + .byte 2, 3, 4, 5, 6, 7, 8, 9, 10 + .balign 4, 0 .global UNK_020ECB98 UNK_020ECB98: ; 0x020ECB98 - .byte 0x68, 0x17, 0x0B, 0x02, 0x28, 0x15, 0x0B, 0x02 + .word 0x020B1768 + .word 0x020B1528 .global UNK_020ECBA0 UNK_020ECBA0: ; 0x020ECBA0 diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s index 3a317b36..3ae85c71 100644 --- a/arm9/data/rom2_3.s +++ b/arm9/data/rom2_3.s @@ -268,11 +268,6 @@ UNK_02104764: ; 0x02104764 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xD0, 0xCF, 0x43, 0xEB, 0xFD, 0x4C, 0x3E .section .data - ; 0x02104780 - .global UNK_02104780 -UNK_02104780: ; 0x02104780 - .asciz "data/sound/sound_data.sdat" - .balign 4 .global UNK_0210479C UNK_0210479C: ; 0x0210479C diff --git a/arm9/global.inc b/arm9/global.inc index cbe300c3..00b02515 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -6912,3 +6912,57 @@ .extern thunk_FUN_020afda0_2
.extern thunk_FUN_020b5040
.extern wcslen
+.extern abort +.extern __dec2num +.extern double2hex +.extern double2hex_wide +.extern __exit +.extern exit +.extern fflush +.extern __FileWrite +.extern float2str +.extern float2str_wide +.extern __flush_all +.extern __flush_buffer +.extern __flush_line_buffered_output_files +.extern __fread +.extern frexp +.extern _fseek +.extern __fwrite +.extern __ieee754_pow +.extern ldexp +.extern __load_buffer +.extern long2str +.extern long2str_wide +.extern longlong2str +.extern longlong2str_wide +.extern mbstowcs +.extern mbtowc +.extern nan +.extern __num2dec_internal +.extern __num2dec_internal2 +.extern __pformatter +.extern pow +.extern printf +.extern qsort +.extern raise +.extern __rounddec +.extern scalbn +.extern __sformatter +.extern __str2dec +.extern __StringWrite +.extern __strtold +.extern strtold +.extern __strtoul +.extern __strtoull +.extern __timesdec +.extern __two_exp +.extern __ull2dec +.extern vsnprintf +.extern vsscanf +.extern vswprintf +.extern wcstombs +.extern wctomb +.extern wmemcpy +.extern __wpformatter +.extern __wStringWrite diff --git a/arm9/src/GFLIB_sysctl.c b/arm9/src/GFLIB_sysctl.c index 9a7d8566..bc856768 100644 --- a/arm9/src/GFLIB_sysctl.c +++ b/arm9/src/GFLIB_sysctl.c @@ -11,6 +11,8 @@ extern struct Unk21C48B8 gUnknown21C48B8; +struct Unk2106FA0 gBacklightTop; + extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int); extern BOOL FUN_02006290(int); extern void FUN_02006260(int); diff --git a/arm9/src/main.c b/arm9/src/main.c index c097bfca..93858cc2 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -50,6 +50,7 @@ extern void FUN_02016464(void); extern struct Unk21DBE18 MOD63_UNK_021DBE18; extern struct Unk21DBE18 MOD52_UNK_021D76C8; +extern u8 SDK_STATIC_BSS_START[]; THUMB_FUNC void NitroMain(void) { @@ -58,7 +59,7 @@ THUMB_FUNC void NitroMain(void) FUN_020163BC(); FUN_02016438(0); - PM_GetBackLight(&gBacklightTop_2.unk0, NULL); + PM_GetBackLight((PMBackLightSwitch *)SDK_STATIC_BSS_START, NULL); FUN_02022294(); FUN_0201259C(); diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index 2b6fe790..787cd65a 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -8,7 +8,7 @@ struct LoadedOverlay { BOOL active; }; -extern struct LoadedOverlay gLoadedOverlays[3][8]; +static struct LoadedOverlay gLoadedOverlays[3][8]; struct LoadedOverlay* GetLoadedOverlaysInRegion(int); BOOL GetOverlayRamBounds(FSOverlayID, void**, void**); |