diff options
Diffstat (limited to 'arm9/asm')
68 files changed, 585 insertions, 1595 deletions
diff --git a/arm9/asm/error_handling.s b/arm9/asm/error_handling.s index 04589e6c..d6330897 100644 --- a/arm9/asm/error_handling.s +++ b/arm9/asm/error_handling.s @@ -12,6 +12,6 @@ ErrorHandling: ; 0x02020C2C bl OS_GetProcMode cmp r0, #0x12 beq _02020C42 - bl FUN_0208A9B8 + bl PrintErrorMessageAndReset _02020C42: pop {r3, pc} diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 68c87867..e979c01d 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -5,7 +5,7 @@ .extern UNK_020F34E8 .extern UNK_020F34FC .extern UNK_020F3538 - .extern gUnknown21C48B8 + .extern gMain .extern gUnk021C4918 .section .bss @@ -1417,7 +1417,7 @@ _0203A468: .word FUN_0203A46C thumb_func_start FUN_0203A46C FUN_0203A46C: ; 0x0203A46C - ldr r0, _0203A480 ; =gUnknown21C48B8 + ldr r0, _0203A480 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -1428,7 +1428,7 @@ _0203A47A: mov r0, #0x0 bx lr nop -_0203A480: .word gUnknown21C48B8 +_0203A480: .word gMain thumb_func_start FUN_0203A484 FUN_0203A484: ; 0x0203A484 @@ -1451,7 +1451,7 @@ _0203A4A8: .word FUN_0203A4AC thumb_func_start FUN_0203A4AC FUN_0203A4AC: ; 0x0203A4AC - ldr r1, _0203A4CC ; =gUnknown21C48B8 + ldr r1, _0203A4CC ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 tst r1, r2 @@ -1469,7 +1469,7 @@ _0203A4C6: mov r0, #0x0 bx lr nop -_0203A4CC: .word gUnknown21C48B8 +_0203A4CC: .word gMain thumb_func_start FUN_0203A4D0 FUN_0203A4D0: ; 0x0203A4D0 @@ -1484,7 +1484,7 @@ _0203A4DC: .word FUN_0203A4E0 thumb_func_start FUN_0203A4E0 FUN_0203A4E0: ; 0x0203A4E0 push {r4, lr} - ldr r1, _0203A55C ; =gUnknown21C48B8 + ldr r1, _0203A55C ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 add r3, r2, #0x0 @@ -1547,7 +1547,7 @@ _0203A556: mov r0, #0x1 pop {r4, pc} nop -_0203A55C: .word gUnknown21C48B8 +_0203A55C: .word gMain thumb_func_start FUN_0203A560 FUN_0203A560: ; 0x0203A560 @@ -1561,7 +1561,7 @@ _0203A56C: .word FUN_0203A570 thumb_func_start FUN_0203A570 FUN_0203A570: ; 0x0203A570 - ldr r0, _0203A58C ; =gUnknown21C48B8 + ldr r0, _0203A58C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -1578,7 +1578,7 @@ _0203A588: mov r0, #0x0 bx lr .balign 4 -_0203A58C: .word gUnknown21C48B8 +_0203A58C: .word gMain thumb_func_start FUN_0203A590 FUN_0203A590: ; 0x0203A590 @@ -1883,7 +1883,7 @@ _0203A7E0: ldr r0, [r0, #0x0] ldr r1, [r7, #0x0] ldr r2, [r2, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [r4, #0x60] bl MOD05_021E8140 mov r3, #0x0 @@ -1892,7 +1892,7 @@ _0203A7E0: str r3, [sp, #0x8] ldr r2, [r7, #0x0] mov r1, #0x1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r0, #0x1 add sp, #0x1c pop {r4-r7, pc} @@ -2011,7 +2011,7 @@ FUN_0203A8B8: ; 0x0203A8B8 ldr r1, [r7, #0x0] ldr r0, [r0, #0x0] ldr r2, [r6, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [r4, #0x60] bl MOD05_021E8140 add r4, r0, #0x0 @@ -2066,7 +2066,7 @@ FUN_0203A94C: ; 0x0203A94C mov r0, #0x1 pop {r3-r7, pc} _0203A986: - ldr r0, _0203A9EC ; =gUnknown21C48B8 + ldr r0, _0203A9EC ; =gMain mov r1, #0x40 ldr r0, [r0, #0x48] tst r1, r0 @@ -2120,7 +2120,7 @@ _0203A9E4: pop {r3-r7, pc} .balign 4 _0203A9E8: .word 0x0000FFFF -_0203A9EC: .word gUnknown21C48B8 +_0203A9EC: .word gMain thumb_func_start FUN_0203A9F0 FUN_0203A9F0: ; 0x0203A9F0 @@ -2147,7 +2147,7 @@ FUN_0203AA0C: ; 0x0203AA0C lsr r1, r1, #0x10 bl FUN_020394B8 add r4, r0, #0x0 - ldr r0, _0203AA88 ; =gUnknown21C48B8 + ldr r0, _0203AA88 ; =gMain ldr r1, _0203AA8C ; =0x0000FFFF ldr r2, [r0, #0x48] mov r0, #0x3 @@ -2205,7 +2205,7 @@ _0203AA82: mov r0, #0x0 pop {r3-r5, pc} nop -_0203AA88: .word gUnknown21C48B8 +_0203AA88: .word gMain _0203AA8C: .word 0x0000FFFF thumb_func_start FUN_0203AA90 @@ -7715,7 +7715,7 @@ FUN_0203D6E0: ; 0x0203D6E0 ldr r0, [r0, #0x0] ldr r0, [r0, #0x78] bl FUN_02052648 - ldr r1, _0203D724 ; =gUnknown21C48B8 + ldr r1, _0203D724 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x2 tst r1, r2 @@ -7735,7 +7735,7 @@ _0203D720: mov r0, #0x0 pop {r3-r5, pc} .balign 4 -_0203D724: .word gUnknown21C48B8 +_0203D724: .word gMain thumb_func_start FUN_0203D728 FUN_0203D728: ; 0x0203D728 @@ -12209,7 +12209,7 @@ FUN_0203FA58: ; 0x0203FA58 str r0, [sp, #0x0] ldr r1, [sp, #0x0] add r0, r7, #0x0 - bl FUN_02021CE0 + bl StringCompare cmp r0, #0x0 bne _0203FB24 mov r0, #0x1 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index cb148e1a..16052c26 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -893,7 +893,7 @@ FUN_02040DEC: ; 0x02040DEC bl FUN_02024F0C add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, _02040E48 ; =gGameLanguage mov r3, #0x0 ldrb r0, [r0, #0x0] diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index c4315fb0..ab9a501c 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -527,7 +527,7 @@ FUN_0204224C: ; 0x0204224C bl String_ctor add r1, r7, #0x0 add r4, r0, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, [sp, #0x24] ldr r3, [sp, #0x8] str r0, [sp, #0x0] diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s index 74a4e970..f3c838d8 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -180,7 +180,7 @@ FUN_02001204: ; 0x02001204 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 - ldr r6, _020012FC ; =gUnknown21C48B8 + ldr r6, _020012FC ; =gMain mov r3, #0x0 add r1, #0x33 strb r3, [r1, #0x0] @@ -311,7 +311,7 @@ _020012F4: mvn r0, r0 pop {r4-r6, pc} nop -_020012FC: .word gUnknown21C48B8 +_020012FC: .word gMain thumb_func_start FUN_02001300 FUN_02001300: ; 0x02001300 @@ -871,7 +871,7 @@ FUN_0200165C: ; 0x0200165C ldrb r1, [r6, #0x0] lsl r1, r1, #0x19 lsr r1, r1, #0x19 - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 add sp, #0x18 pop {r4-r6, pc} _020016CC: @@ -907,7 +907,7 @@ _020016CC: ldr r0, [r6, #0xc] lsl r1, r1, #0x11 lsr r1, r1, #0x1a - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 _02001710: add sp, #0x18 pop {r4-r6, pc} diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index d2319bbb..52c55775 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -141,7 +141,7 @@ FUN_02001C78: ; 0x02001C78 push {r3-r5, lr} add r4, r0, #0x0 mov r1, #0x0 - ldr r2, _02001D24 ; =gUnknown21C48B8 + ldr r2, _02001D24 ; =gMain strb r1, [r4, #0x1b] ldr r2, [r2, #0x48] mov r5, #0x1 @@ -228,7 +228,7 @@ _02001D1C: add r0, r1, #0x0 pop {r3-r5, pc} nop -_02001D24: .word gUnknown21C48B8 +_02001D24: .word gMain _02001D28: .word 0x000005DC thumb_func_start FUN_02001D2C @@ -237,7 +237,7 @@ FUN_02001D2C: ; 0x02001D2C add r2, r1, #0x0 add r4, r0, #0x0 mov r1, #0x0 - ldr r3, _02001DD4 ; =gUnknown21C48B8 + ldr r3, _02001DD4 ; =gMain strb r1, [r4, #0x1b] ldr r5, [r3, #0x48] mov r3, #0x1 @@ -322,7 +322,7 @@ _02001DCE: add r0, r1, #0x0 pop {r4-r6, pc} .balign 4 -_02001DD4: .word gUnknown21C48B8 +_02001DD4: .word gMain _02001DD8: .word 0x000005DC thumb_func_start FUN_02001DDC @@ -676,7 +676,7 @@ _0200202A: ldrb r1, [r5, #0x8] ldr r0, [r5, #0x4] add r3, r7, #0x0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x1 lsl r0, r0, #0x18 ldrb r2, [r5, #0xa] diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index eaba9e8d..110db7ea 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -4,10 +4,10 @@ .section .bss .extern UNK_021C48F8 - .extern gUnknown21C48B8 + .extern gMain - .global UNK_02106FC4 -UNK_02106FC4: ; 0x02106FC4 + .global gTextFlags +gTextFlags: ; 0x02106FC4 .space 0x4 .section .rodata @@ -18,8 +18,8 @@ UNK_020ECB50: ; 0x020ECB50 .text - thumb_func_start FUN_020023C0 -FUN_020023C0: ; 0x020023C0 + thumb_func_start RenderText +RenderText: ; 0x020023C0 push {r3-r6, lr} sub sp, #0xc add r4, r0, #0x0 @@ -47,7 +47,7 @@ _020023E2: ; jump table (using 16-bit offset) .short _0200280C - _020023E2 - 2; case 5 .short _02002818 - _020023E2 - 2; case 6 _020023F0: - ldr r0, _02002658 ; =gUnknown21C48B8 + ldr r0, _02002658 ; =gMain ldr r1, [r0, #0x44] mov r0, #0x3 tst r0, r1 @@ -61,7 +61,7 @@ _02002402: ldrh r0, [r0, #0x22] cmp r0, #0x0 beq _02002432 - ldr r0, _02002660 ; =UNK_02106FC4 + ldr r0, _02002660 ; =gTextFlags ldrb r0, [r0, #0x0] lsl r0, r0, #0x1b lsr r0, r0, #0x1f @@ -77,7 +77,7 @@ _02002414: lsl r0, r0, #0x19 lsr r0, r0, #0x19 beq _02002432 - ldr r1, _02002660 ; =UNK_02106FC4 + ldr r1, _02002660 ; =gTextFlags mov r0, #0x40 ldrb r2, [r1, #0x0] orr r0, r2 @@ -101,12 +101,12 @@ _02002432: add r0, r4, #0x0 add r0, #0x26 strb r1, [r0, #0x0] - ldr r0, _02002660 ; =UNK_02106FC4 + ldr r0, _02002660 ; =gTextFlags ldrb r0, [r0, #0x0] lsl r1, r0, #0x1f lsr r1, r1, #0x1f beq _02002486 - ldr r1, _02002658 ; =gUnknown21C48B8 + ldr r1, _02002658 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 tst r1, r2 @@ -153,10 +153,10 @@ _020024B0: cmp r5, r0 bgt _020024DA bge _0200250E - ldr r1, _02002668 ; =0x000025BD + ldr r1, _02002668 ; =0x000025BD \f cmp r5, r1 bgt _020024D0 - sub r0, r1, #0x1 + sub r0, r1, #0x1 ; \r cmp r5, r0 blt _020024CE bne _020024C8 @@ -174,7 +174,7 @@ _020024D0: beq _020024F2 b _02002700 _020024DA: - ldr r0, _0200266C ; =0x0000FFFE + ldr r0, _0200266C ; =0x0000FFFE EXT_CTRL_CODE_BEGIN cmp r5, r0 bgt _020024E4 beq _0200251A @@ -213,7 +213,7 @@ _0200251A: ldr r0, [r4, #0x0] sub r0, r0, #0x2 str r0, [r4, #0x0] - bl FUN_0201B8E0 + bl MsgArray_GetControlCode lsl r0, r0, #0x10 ldr r1, _02002670 ; =0x0000FE06 lsr r0, r0, #0x10 @@ -234,11 +234,11 @@ _02002532: asr r1, r1, #0x10 add pc, r1 _02002548: ; jump table (using 16-bit offset) - .short _020025B4 - _02002548 - 2; case 0 - .short _020025DE - _02002548 - 2; case 1 - .short _02002600 - _02002548 - 2; case 2 - .short _02002618 - _02002548 - 2; case 3 - .short _02002624 - _02002548 - 2; case 4 + .short _020025B4 - _02002548 - 2; case 0x200 + .short _020025DE - _02002548 - 2; case 0x201 + .short _02002600 - _02002548 - 2; case 0x202 + .short _02002618 - _02002548 - 2; case 0x203 + .short _02002624 - _02002548 - 2; case 0x204 _02002552: mov r1, #0xff lsl r1, r1, #0x8 @@ -255,7 +255,7 @@ _0200255E: _02002566: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r0, #0xff @@ -295,7 +295,7 @@ _0200259E: _020025B4: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField lsl r0, r0, #0x10 lsr r3, r0, #0x10 ldrb r1, [r4, #0xc] @@ -314,12 +314,12 @@ _020025B4: _020025DE: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField add r1, r4, #0x0 add r1, #0x26 strb r0, [r1, #0x0] ldr r0, [r4, #0x0] - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode str r0, [r4, #0x0] mov r0, #0x6 add r4, #0x24 @@ -330,10 +330,10 @@ _020025DE: _02002600: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField strh r0, [r4, #0x2a] ldr r0, [r4, #0x0] - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode str r0, [r4, #0x0] add sp, #0xc mov r0, #0x3 @@ -341,19 +341,19 @@ _02002600: _02002618: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField strb r0, [r4, #0xc] b _020026CA _02002624: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField strb r0, [r4, #0xd] b _020026CA _02002630: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r0, #0x64 @@ -374,9 +374,9 @@ _0200264E: strb r0, [r4, #0x16] b _020026CA .balign 4 -_02002658: .word gUnknown21C48B8 +_02002658: .word gMain _0200265C: .word UNK_021C48F8 -_02002660: .word UNK_02106FC4 +_02002660: .word gTextFlags _02002664: .word 0x0000F0FD _02002668: .word 0x000025BD _0200266C: .word 0x0000FFFE @@ -385,7 +385,7 @@ _02002674: .word 0x0000FFFC _02002678: ldr r0, [r4, #0x0] mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField lsl r0, r0, #0x10 lsr r1, r0, #0x10 mov r0, #0xfe @@ -402,7 +402,7 @@ _02002678: add r0, r4, #0x0 bl FUN_0200284C ldr r0, [r4, #0x0] - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode str r0, [r4, #0x0] add sp, #0xc mov r0, #0x3 @@ -415,14 +415,14 @@ _020026AE: add r0, r4, #0x0 bl FUN_0200284C ldr r0, [r4, #0x0] - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode str r0, [r4, #0x0] add sp, #0xc mov r0, #0x3 pop {r3-r6, pc} _020026CA: ldr r0, [r4, #0x0] - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode str r0, [r4, #0x0] add sp, #0xc mov r0, #0x2 @@ -614,15 +614,15 @@ _02002838: thumb_func_start FUN_02002840 FUN_02002840: ; 0x02002840 - ldr r1, _02002848 ; =UNK_02106FC4 + ldr r1, _02002848 ; =gTextFlags strh r0, [r1, #0x2] bx lr nop -_02002848: .word UNK_02106FC4 +_02002848: .word gTextFlags thumb_func_start FUN_0200284C FUN_0200284C: ; 0x0200284C - ldr r1, _02002874 ; =UNK_02106FC4 + ldr r1, _02002874 ; =gTextFlags add r0, #0x1c ldrb r1, [r1, #0x0] lsl r1, r1, #0x1d @@ -644,14 +644,14 @@ _02002862: strb r2, [r0, #0x1] bx lr .balign 4 -_02002874: .word UNK_02106FC4 +_02002874: .word gTextFlags thumb_func_start FUN_02002878 FUN_02002878: ; 0x02002878 push {r4-r7, lr} sub sp, #0x2c add r5, r0, #0x0 - ldr r0, _020029F8 ; =UNK_02106FC4 + ldr r0, _020029F8 ; =gTextFlags add r4, r5, #0x0 ldrb r0, [r0, #0x0] add r4, #0x1c @@ -687,7 +687,7 @@ _020028AC: str r0, [sp, #0x28] ldr r0, [r5, #0x4] bl FUN_0201AB0C - ldr r1, _020029F8 ; =UNK_02106FC4 + ldr r1, _020029F8 ; =gTextFlags ldrh r6, [r1, #0x2] ldr r1, [sp, #0x28] add r7, r1, #0x2 @@ -835,7 +835,7 @@ _020029F4: add sp, #0x2c pop {r4-r7, pc} .balign 4 -_020029F8: .word UNK_02106FC4 +_020029F8: .word gTextFlags _020029FC: .word UNK_020ECB50 thumb_func_start FUN_02002A00 @@ -854,7 +854,7 @@ FUN_02002A00: ; 0x02002A00 add r6, r0, #0x0 ldr r0, [r5, #0x4] bl FUN_0201AB0C - ldr r1, _02002A90 ; =UNK_02106FC4 + ldr r1, _02002A90 ; =gTextFlags add r7, r6, #0x2 ldrh r4, [r1, #0x2] ldr r1, [sp, #0x14] @@ -905,12 +905,12 @@ FUN_02002A00: ; 0x02002A00 add sp, #0x18 pop {r3-r7, pc} nop -_02002A90: .word UNK_02106FC4 +_02002A90: .word gTextFlags thumb_func_start FUN_02002A94 FUN_02002A94: ; 0x02002A94 push {r3, lr} - ldr r0, _02002ACC ; =gUnknown21C48B8 + ldr r0, _02002ACC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -919,7 +919,7 @@ FUN_02002A94: ; 0x02002A94 ldrh r0, [r0, #0x20] cmp r0, #0x0 beq _02002AC6 - ldr r0, _02002AD4 ; =UNK_02106FC4 + ldr r0, _02002AD4 ; =gTextFlags ldrb r0, [r0, #0x0] lsl r0, r0, #0x1b lsr r0, r0, #0x1f @@ -927,7 +927,7 @@ FUN_02002A94: ; 0x02002A94 _02002AB2: ldr r0, _02002AD8 ; =0x000005DC bl FUN_020054C8 - ldr r1, _02002AD4 ; =UNK_02106FC4 + ldr r1, _02002AD4 ; =gTextFlags mov r0, #0x80 ldrb r2, [r1, #0x0] orr r0, r2 @@ -938,9 +938,9 @@ _02002AC6: mov r0, #0x0 pop {r3, pc} nop -_02002ACC: .word gUnknown21C48B8 +_02002ACC: .word gMain _02002AD0: .word UNK_021C48F8 -_02002AD4: .word UNK_02106FC4 +_02002AD4: .word gTextFlags _02002AD8: .word 0x000005DC thumb_func_start FUN_02002ADC @@ -964,7 +964,7 @@ _02002AEE: lsr r3, r3, #0x18 orr r1, r3 strb r1, [r2, #0x2] - ldr r1, _02002B14 ; =UNK_02106FC4 + ldr r1, _02002B14 ; =gTextFlags ldrb r1, [r1, #0x0] lsl r1, r1, #0x1a lsr r1, r1, #0x1f @@ -975,12 +975,12 @@ _02002B10: mov r0, #0x0 pop {r4, pc} .balign 4 -_02002B14: .word UNK_02106FC4 +_02002B14: .word gTextFlags thumb_func_start FUN_02002B18 FUN_02002B18: ; 0x02002B18 push {r4, lr} - ldr r1, _02002B38 ; =UNK_02106FC4 + ldr r1, _02002B38 ; =gTextFlags add r4, r0, #0x0 ldrb r1, [r1, #0x0] lsl r1, r1, #0x1d @@ -994,12 +994,12 @@ _02002B2C: bl FUN_02002A94 pop {r4, pc} .balign 4 -_02002B38: .word UNK_02106FC4 +_02002B38: .word gTextFlags thumb_func_start FUN_02002B3C FUN_02002B3C: ; 0x02002B3C push {r3, lr} - ldr r1, _02002B5C ; =UNK_02106FC4 + ldr r1, _02002B5C ; =gTextFlags ldrb r1, [r1, #0x0] lsl r1, r1, #0x1d lsr r1, r1, #0x1f @@ -1014,11 +1014,11 @@ _02002B52: lsr r0, r0, #0x18 pop {r3, pc} .balign 4 -_02002B5C: .word UNK_02106FC4 +_02002B5C: .word gTextFlags thumb_func_start FUN_02002B60 FUN_02002B60: ; 0x02002B60 - ldr r2, _02002B78 ; =UNK_02106FC4 + ldr r2, _02002B78 ; =gTextFlags mov r1, #0x1 ldrb r3, [r2, #0x0] lsl r0, r0, #0x18 @@ -1030,12 +1030,12 @@ FUN_02002B60: ; 0x02002B60 strb r0, [r2, #0x0] bx lr nop -_02002B78: .word UNK_02106FC4 +_02002B78: .word gTextFlags thumb_func_start FUN_02002B7C FUN_02002B7C: ; 0x02002B7C push {r3-r4} - ldr r1, _02002BB4 ; =UNK_02106FC4 + ldr r1, _02002BB4 ; =gTextFlags mov r3, #0x4 ldrb r2, [r1, #0x0] mov r4, #0x1 @@ -1062,11 +1062,11 @@ FUN_02002B7C: ; 0x02002B7C pop {r3-r4} bx lr nop -_02002BB4: .word UNK_02106FC4 +_02002BB4: .word gTextFlags thumb_func_start FUN_02002BB8 FUN_02002BB8: ; 0x02002BB8 - ldr r2, _02002BD0 ; =UNK_02106FC4 + ldr r2, _02002BD0 ; =gTextFlags lsl r0, r0, #0x18 ldrb r3, [r2, #0x0] lsr r0, r0, #0x18 @@ -1078,46 +1078,46 @@ FUN_02002BB8: ; 0x02002BB8 strb r0, [r2, #0x0] bx lr nop -_02002BD0: .word UNK_02106FC4 +_02002BD0: .word gTextFlags thumb_func_start FUN_02002BD4 FUN_02002BD4: ; 0x02002BD4 - ldr r0, _02002BE0 ; =UNK_02106FC4 + ldr r0, _02002BE0 ; =gTextFlags ldrb r0, [r0, #0x0] lsl r0, r0, #0x19 lsr r0, r0, #0x1f bx lr nop -_02002BE0: .word UNK_02106FC4 +_02002BE0: .word gTextFlags thumb_func_start FUN_02002BE4 FUN_02002BE4: ; 0x02002BE4 - ldr r1, _02002BF0 ; =UNK_02106FC4 + ldr r1, _02002BF0 ; =gTextFlags mov r0, #0x40 ldrb r2, [r1, #0x0] bic r2, r0 strb r2, [r1, #0x0] bx lr .balign 4 -_02002BF0: .word UNK_02106FC4 +_02002BF0: .word gTextFlags thumb_func_start FUN_02002BF4 FUN_02002BF4: ; 0x02002BF4 - ldr r0, _02002C00 ; =UNK_02106FC4 + ldr r0, _02002C00 ; =gTextFlags ldrb r0, [r0, #0x0] lsl r0, r0, #0x18 lsr r0, r0, #0x1f bx lr nop -_02002C00: .word UNK_02106FC4 +_02002C00: .word gTextFlags thumb_func_start FUN_02002C04 FUN_02002C04: ; 0x02002C04 - ldr r1, _02002C10 ; =UNK_02106FC4 + ldr r1, _02002C10 ; =gTextFlags mov r0, #0x80 ldrb r2, [r1, #0x0] bic r2, r0 strb r2, [r1, #0x0] bx lr .balign 4 -_02002C10: .word UNK_02106FC4 +_02002C10: .word gTextFlags diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index ee2881da..c6fd3590 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -15,45 +15,18 @@ UNK_02106FCC: ; 0x02106FCC .global UNK_020ECB54 UNK_020ECB54: ; 0x020ECB54 - .byte 0x00, 0x00 - - .global UNK_020ECB56 -UNK_020ECB56: ; 0x020ECB56 - .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .short 0x0000, 0x0000 + .short 0x0001, 0x0000 + .short 0x0002, 0x0000 + .short 0x0003, 0x0000 .global UNK_020ECB64 UNK_020ECB64: ; 0x020ECB64 - .byte 0x0B - - .global UNK_020ECB65 -UNK_020ECB65: ; 0x020ECB65 - .byte 0x10 - - .global UNK_020ECB66 -UNK_020ECB66: ; 0x020ECB66 - .byte 0x00 - - .global UNK_020ECB67 -UNK_020ECB67: ; 0x020ECB67 - .byte 0x00 - - .global UNK_020ECB68 -UNK_020ECB68: ; 0x020ECB68 - .byte 0x00 - - .global UNK_020ECB69 -UNK_020ECB69: ; 0x020ECB69 - .byte 0x01 - - .global UNK_020ECB6A -UNK_020ECB6A: ; 0x020ECB6A - .byte 0x0F - - .global UNK_020ECB6B -UNK_020ECB6B: ; 0x020ECB6B - .byte 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F - .byte 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00 + .byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 + .byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 + .byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 + .byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .text @@ -94,7 +67,7 @@ FUN_02002C50: ; 0x02002C50 str r1, [sp, #0x0] lsl r4, r0, #0x2 ldr r1, _02002C78 ; =UNK_020ECB54 - ldr r3, _02002C7C ; =UNK_020ECB56 + ldr r3, _02002C7C ; =UNK_020ECB54 + 2 ldrh r1, [r1, r4] ldrh r3, [r3, r4] mov r0, #0xe @@ -109,7 +82,7 @@ FUN_02002C50: ; 0x02002C50 pop {r3-r4, pc} nop _02002C78: .word UNK_020ECB54 -_02002C7C: .word UNK_020ECB56 +_02002C7C: .word UNK_020ECB54 + 2 _02002C80: .word UNK_02106FC8 thumb_func_start FUN_02002C84 @@ -271,8 +244,8 @@ FUN_02002D94: ; 0x02002D94 .balign 4 _02002DAC: .word UNK_02106FC8 - thumb_func_start FUN_02002DB0 -FUN_02002DB0: ; 0x02002DB0 + thumb_func_start FontFunc +FontFunc: ; 0x02002DB0 push {r4, lr} add r3, r1, #0x0 add r3, #0x1c @@ -295,7 +268,7 @@ FUN_02002DB0: ; 0x02002DB0 strb r0, [r3, #0x1] _02002DD8: add r0, r1, #0x0 - bl FUN_020023C0 + bl RenderText pop {r4, pc} thumb_func_start FUN_02002DE0 @@ -381,50 +354,50 @@ _02002E6E: b _02002EAC _02002E76: lsl r1, r0, #0x3 - ldr r0, _02002EB4 ; =UNK_020ECB65 + ldr r0, _02002EB4 ; =UNK_020ECB64 + 1 ldrb r2, [r0, r1] b _02002EAC _02002E7E: lsl r1, r0, #0x3 - ldr r0, _02002EB8 ; =UNK_020ECB66 + ldr r0, _02002EB8 ; =UNK_020ECB64 + 2 ldrb r2, [r0, r1] b _02002EAC _02002E86: lsl r1, r0, #0x3 - ldr r0, _02002EBC ; =UNK_020ECB67 + ldr r0, _02002EBC ; =UNK_020ECB64 + 3 ldrb r2, [r0, r1] b _02002EAC _02002E8E: lsl r1, r0, #0x3 - ldr r0, _02002EC0 ; =UNK_020ECB68 + ldr r0, _02002EC0 ; =UNK_020ECB64 + 4 ldrb r2, [r0, r1] b _02002EAC _02002E96: lsl r1, r0, #0x3 - ldr r0, _02002EC4 ; =UNK_020ECB69 + ldr r0, _02002EC4 ; =UNK_020ECB64 + 5 ldrb r2, [r0, r1] b _02002EAC _02002E9E: lsl r1, r0, #0x3 - ldr r0, _02002EC8 ; =UNK_020ECB6A + ldr r0, _02002EC8 ; =UNK_020ECB64 + 6 ldrb r2, [r0, r1] b _02002EAC _02002EA6: lsl r1, r0, #0x3 - ldr r0, _02002ECC ; =UNK_020ECB6B + ldr r0, _02002ECC ; =UNK_020ECB64 + 7 ldrb r2, [r0, r1] _02002EAC: add r0, r2, #0x0 bx lr .balign 4 _02002EB0: .word UNK_020ECB64 -_02002EB4: .word UNK_020ECB65 -_02002EB8: .word UNK_020ECB66 -_02002EBC: .word UNK_020ECB67 -_02002EC0: .word UNK_020ECB68 -_02002EC4: .word UNK_020ECB69 -_02002EC8: .word UNK_020ECB6A -_02002ECC: .word UNK_020ECB6B +_02002EB4: .word UNK_020ECB64 + 1 +_02002EB8: .word UNK_020ECB64 + 2 +_02002EBC: .word UNK_020ECB64 + 3 +_02002EC0: .word UNK_020ECB64 + 4 +_02002EC4: .word UNK_020ECB64 + 5 +_02002EC8: .word UNK_020ECB64 + 6 +_02002ECC: .word UNK_020ECB64 + 7 thumb_func_start FUN_02002ED0 FUN_02002ED0: ; 0x02002ED0 diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s index a1fdc78f..b844da17 100644 --- a/arm9/asm/unk_02002F08.s +++ b/arm9/asm/unk_02002F08.s @@ -29,7 +29,7 @@ _02002F22: add r0, r0, r4 add r0, #0x94 ldr r0, [r0, #0x0] - bl FUN_02021934 + bl StringGetWidth pop {r4-r6, pc} .balign 4 _02002F3C: .word UNK_02106FC8 @@ -64,7 +64,7 @@ FUN_02002F58: ; 0x02002F58 _02002F6C: cmp r2, r4 bne _02002F76 - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode b _02002F82 _02002F76: cmp r2, r6 @@ -113,7 +113,7 @@ _02002FB4: add r0, r0, r4 add r0, #0x94 ldr r0, [r0, #0x0] - bl FUN_0202199C + bl StringGetWidth_SingleLine_HandleClearToControlCode pop {r3-r5, pc} .balign 4 _02002FCC: .word UNK_02106FC8 diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index 165a789e..a054a19f 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -206,7 +206,7 @@ FUN_0200ABC0: ; 0x0200ABC0 bl FUN_0202398C add r1, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 @@ -225,7 +225,7 @@ FUN_0200ABE4: ; 0x0200ABE4 bl FUN_02024EE8 add r1, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 @@ -906,7 +906,7 @@ FUN_0200B144: ; 0x0200B144 add r2, #0x14 add r4, r1, #0x0 add r1, r2, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r2, [r5, #0xc] add r0, r5, #0x0 add r1, r4, #0x0 @@ -1658,7 +1658,7 @@ FUN_0200B708: ; 0x0200B708 bl FUN_020287A8 add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString mov r0, #0x1 str r0, [sp, #0x0] ldr r0, [sp, #0x8] @@ -1713,14 +1713,14 @@ FUN_0200B7A8: ; 0x0200B7A8 ldr r2, [r0, #0x8] lsl r0, r1, #0x3 add r0, r2, r0 - ldr r3, _0200B7B4 ; =FUN_02021FF8 + ldr r3, _0200B7B4 ; =StrUpperFirstChar ldr r0, [r0, #0x4] bx r3 .balign 4 -_0200B7B4: .word FUN_02021FF8 +_0200B7B4: .word StrUpperFirstChar - thumb_func_start StringExpandPlaceholders -StringExpandPlaceholders: ; 0x0200B7B8 + thumb_func_start FUN_0200B7B8 +FUN_0200B7B8: ; 0x0200B7B8 push {r3-r7, lr} add r7, r0, #0x0 add r6, r1, #0x0 @@ -1738,12 +1738,12 @@ _0200B7D4: cmp r1, r0 bne _0200B82E add r0, r5, #0x0 - bl FUN_0201B8F8 + bl MsgArray_ControlCodeIsStrVar cmp r0, #0x0 beq _0200B810 add r0, r5, #0x0 mov r1, #0x0 - bl FUN_0201B914 + bl MsgArray_ControlCodeGetField add r4, r0, #0x0 ldr r0, [r7, #0x0] cmp r4, r0 @@ -1757,13 +1757,13 @@ _0200B7F8: add r0, r6, #0x0 bl FUN_02022048 add r0, r5, #0x0 - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode add r5, r0, #0x0 b _0200B838 _0200B810: add r0, r5, #0x0 add r4, r5, #0x0 - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode add r5, r0, #0x0 cmp r4, r5 bhs _0200B838 @@ -1771,7 +1771,7 @@ _0200B81E: ldrh r1, [r4, #0x0] add r0, r6, #0x0 add r4, r4, #0x2 - bl FUN_02021FB0 + bl StrAddChar cmp r4, r5 blo _0200B81E b _0200B838 @@ -1779,7 +1779,7 @@ _0200B82E: ldrh r1, [r5, #0x0] add r0, r6, #0x0 add r5, r5, #0x2 - bl FUN_02021FB0 + bl StrAddChar _0200B838: ldrh r1, [r5, #0x0] ldr r0, _0200B844 ; =0x0000FFFF diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index 0f39b4e8..b77e441c 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -1503,7 +1503,7 @@ FUN_02013690: ; 0x02013690 bl String_ctor ldr r1, _020136BC ; =UNK_020ED548 str r0, [r4, #0x4] - bl FUN_02021E28 + bl CopyU16ArrayToString _020136B2: add r0, r4, #0x0 pop {r3-r5, pc} @@ -1563,7 +1563,7 @@ FUN_020136F8: ; 0x020136F8 ldr r2, [r6, #0x4] add r0, r5, #0x0 add r3, r4, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0x0 bl FUN_02019548 add sp, #0x10 diff --git a/arm9/asm/unk_02013724.s b/arm9/asm/unk_02013724.s index b9edb722..1cbd1070 100644 --- a/arm9/asm/unk_02013724.s +++ b/arm9/asm/unk_02013724.s @@ -274,13 +274,13 @@ _020138E2: cmp r1, r6 bne _020138FC add r0, r4, #0x0 - bl FUN_0201B8F8 + bl MsgArray_ControlCodeIsStrVar cmp r0, #0x0 beq _020138F2 add r5, r5, #0x1 _020138F2: add r0, r4, #0x0 - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode add r4, r0, #0x0 b _020138FE _020138FC: diff --git a/arm9/asm/unk_02015EA0.s b/arm9/asm/unk_02015EA0.s index 3a876cb5..047d2a6b 100644 --- a/arm9/asm/unk_02015EA0.s +++ b/arm9/asm/unk_02015EA0.s @@ -10,8 +10,8 @@ UNK_020EDB10: ; 0x020EDB10 .section .bss - .global gUnknown21C48B8 -gUnknown21C48B8: ; 0x021C48B8 + .global gMain +gMain: ; 0x021C48B8 .space 0x40 .global UNK_021C48F8 @@ -47,10 +47,10 @@ FUN_02015EA0: ; 0x02015EA0 str r0, [r3, r1] mov r0, #0x3 bl MI_WaitDma - ldr r0, _02015ED0 ; =gUnknown21C48B8 + ldr r0, _02015ED0 ; =gMain ldr r0, [r0, #0x1c] bl FUN_0201B5CC - ldr r0, _02015ED0 ; =gUnknown21C48B8 + ldr r0, _02015ED0 ; =gMain ldr r1, [r0, #0x30] add r1, r1, #0x1 str r1, [r0, #0x30] @@ -58,7 +58,7 @@ FUN_02015EA0: ; 0x02015EA0 nop _02015EC8: .word 0x027E0000 _02015ECC: .word 0x00003FF8 -_02015ED0: .word gUnknown21C48B8 +_02015ED0: .word gMain thumb_func_start FUN_02015ED4 FUN_02015ED4: ; 0x02015ED4 @@ -92,25 +92,25 @@ _02015F0C: .word FUN_02015ED4 thumb_func_start FUN_02015F10 FUN_02015F10: ; 0x02015F10 - ldr r2, _02015F18 ; =gUnknown21C48B8 + ldr r2, _02015F18 ; =gMain str r0, [r2, #0x0] str r1, [r2, #0x4] bx lr .balign 4 -_02015F18: .word gUnknown21C48B8 +_02015F18: .word gMain thumb_func_start FUN_02015F1C FUN_02015F1C: ; 0x02015F1C push {r3, lr} mov r0, #0x0 bl FUN_02015F80 - ldr r0, _02015F30 ; =gUnknown21C48B8 + ldr r0, _02015F30 ; =gMain mov r1, #0x0 str r1, [r0, #0x8] str r1, [r0, #0xc] pop {r3, pc} nop -_02015F30: .word gUnknown21C48B8 +_02015F30: .word gMain thumb_func_start FUN_02015F34 FUN_02015F34: ; 0x02015F34 @@ -119,14 +119,14 @@ FUN_02015F34: ; 0x02015F34 bne _02015F4C mov r0, #0x0 bl FUN_02015F80 - ldr r0, _02015F68 ; =gUnknown21C48B8 + ldr r0, _02015F68 ; =gMain mov r1, #0x0 str r1, [r0, #0x8] str r1, [r0, #0xc] mov r0, #0x1 pop {r3, pc} _02015F4C: - ldr r2, _02015F68 ; =gUnknown21C48B8 + ldr r2, _02015F68 ; =gMain ldr r3, [r2, #0x8] cmp r3, #0x0 bne _02015F62 @@ -140,12 +140,12 @@ _02015F62: mov r0, #0x0 pop {r3, pc} nop -_02015F68: .word gUnknown21C48B8 +_02015F68: .word gMain thumb_func_start FUN_02015F6C FUN_02015F6C: ; 0x02015F6C push {r3, lr} - ldr r0, _02015F7C ; =gUnknown21C48B8 + ldr r0, _02015F7C ; =gMain ldr r1, [r0, #0x8] cmp r1, #0x0 beq _02015F7A @@ -154,7 +154,7 @@ FUN_02015F6C: ; 0x02015F6C _02015F7A: pop {r3, pc} .balign 4 -_02015F7C: .word gUnknown21C48B8 +_02015F7C: .word gMain thumb_func_start FUN_02015F80 FUN_02015F80: ; 0x02015F80 @@ -255,7 +255,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0 mov r0, #0xa0 bl FUN_0201B580 - ldr r1, _02016130 ; =gUnknown21C48B8 + ldr r1, _02016130 ; =gMain str r0, [r1, #0x18] mov r0, #0x10 bl FUN_0201B578 @@ -266,7 +266,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0 mov r0, #0x10 bl FUN_0201B580 - ldr r1, _02016130 ; =gUnknown21C48B8 + ldr r1, _02016130 ; =gMain str r0, [r1, #0x1c] mov r0, #0x20 bl FUN_0201B578 @@ -277,7 +277,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0 mov r0, #0x20 bl FUN_0201B580 - ldr r1, _02016130 ; =gUnknown21C48B8 + ldr r1, _02016130 ; =gMain str r0, [r1, #0x20] mov r0, #0x4 bl FUN_0201B578 @@ -288,7 +288,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0 mov r0, #0x4 bl FUN_0201B580 - ldr r1, _02016130 ; =gUnknown21C48B8 + ldr r1, _02016130 ; =gMain str r0, [r1, #0x24] bl GX_DispOff ldr r2, _02016134 ; =0x04001000 @@ -332,7 +332,7 @@ _02016108: add r0, r5, #0x0 add r1, r4, #0x0 bl FS_TryLoadTable - ldr r0, _02016130 ; =gUnknown21C48B8 + ldr r0, _02016130 ; =gMain mov r1, #0x0 str r1, [r0, #0x0] str r1, [r0, #0x8] @@ -346,7 +346,7 @@ _02016108: _02016124: .word 0x04000304 _02016128: .word 0xFFFFFDF1 _0201612C: .word 0x0000020E -_02016130: .word gUnknown21C48B8 +_02016130: .word gMain _02016134: .word 0x04001000 _02016138: .word 0xFFFEFFFF _0201613C: .word FUN_02015EA0 @@ -683,7 +683,7 @@ _020163B8: .word UNK_021C4928 FUN_020163BC: ; 0x020163BC push {r3, lr} sub sp, #0x8 - ldr r0, _0201641C ; =gUnknown21C48B8 + ldr r0, _0201641C ; =gMain mov r2, #0x0 str r2, [r0, #0x34] str r2, [r0, #0x38] @@ -727,7 +727,7 @@ _02016402: add sp, #0x8 pop {r3, pc} .balign 4 -_0201641C: .word gUnknown21C48B8 +_0201641C: .word gMain _02016420: .word UNK_021C48F8 _02016424: .word gUnk021C4918 _02016428: .word 0x000002AE @@ -775,7 +775,7 @@ FUN_02016464: ; 0x02016464 and r0, r1 asr r0, r0, #0xf beq _0201648A - ldr r0, _02016554 ; =gUnknown21C48B8 + ldr r0, _02016554 ; =gMain mov r1, #0x0 str r1, [r0, #0x48] str r1, [r0, #0x44] @@ -793,7 +793,7 @@ _0201648A: ldr r0, _02016560 ; =0x00002FFF eor r1, r0 and r0, r1 - ldr r1, _02016554 ; =gUnknown21C48B8 + ldr r1, _02016554 ; =gMain lsl r0, r0, #0x10 lsr r0, r0, #0x10 ldr r2, [r1, #0x38] @@ -815,11 +815,11 @@ _0201648A: str r2, [r1, #0x50] b _020164C8 _020164C2: - ldr r1, _02016554 ; =gUnknown21C48B8 + ldr r1, _02016554 ; =gMain ldr r2, [r1, #0x58] str r2, [r1, #0x50] _020164C8: - ldr r1, _02016554 ; =gUnknown21C48B8 + ldr r1, _02016554 ; =gMain str r0, [r1, #0x38] ldr r2, [r1, #0x3c] str r2, [r1, #0x48] @@ -891,7 +891,7 @@ _0201653A: pop {r4, pc} nop _02016550: .word 0x027FFFA8 -_02016554: .word gUnknown21C48B8 +_02016554: .word gMain _02016558: .word UNK_021C48F8 _0201655C: .word 0x04000130 _02016560: .word 0x00002FFF @@ -899,7 +899,7 @@ _02016564: .word gUnk021C4918 thumb_func_start FUN_02016568 FUN_02016568: ; 0x02016568 - ldr r0, _02016690 ; =gUnknown21C48B8 + ldr r0, _02016690 ; =gMain ldr r1, [r0, #0x34] cmp r1, #0x3 bls _02016572 @@ -926,7 +926,7 @@ _02016586: orr r1, r2 str r1, [r0, #0x48] _02016596: - ldr r1, _02016690 ; =gUnknown21C48B8 + ldr r1, _02016690 ; =gMain mov r0, #0x8 ldr r2, [r1, #0x44] add r3, r2, #0x0 @@ -936,7 +936,7 @@ _02016596: orr r0, r2 str r0, [r1, #0x44] _020165A8: - ldr r1, _02016690 ; =gUnknown21C48B8 + ldr r1, _02016690 ; =gMain mov r0, #0x8 ldr r2, [r1, #0x4c] add r3, r2, #0x0 @@ -965,7 +965,7 @@ _020165CE: lsr r0, r0, #0x1 orr r1, r0 _020165DC: - ldr r2, _02016690 ; =gUnknown21C48B8 + ldr r2, _02016690 ; =gMain ldr r0, _02016694 ; =0x0000F3FF ldr r3, [r2, #0x48] and r0, r3 @@ -989,7 +989,7 @@ _020165FA: lsr r1, r1, #0x1 orr r0, r1 _02016608: - ldr r2, _02016690 ; =gUnknown21C48B8 + ldr r2, _02016690 ; =gMain ldr r1, _02016694 ; =0x0000F3FF ldr r3, [r2, #0x44] and r1, r3 @@ -1013,7 +1013,7 @@ _02016626: lsr r1, r1, #0x1 orr r0, r1 _02016634: - ldr r2, _02016690 ; =gUnknown21C48B8 + ldr r2, _02016690 ; =gMain ldr r1, _02016694 ; =0x0000F3FF ldr r3, [r2, #0x4c] and r1, r3 @@ -1030,7 +1030,7 @@ _02016642: orr r1, r2 str r1, [r0, #0x48] _02016652: - ldr r1, _02016690 ; =gUnknown21C48B8 + ldr r1, _02016690 ; =gMain mov r0, #0x2 ldr r2, [r1, #0x44] lsl r0, r0, #0x8 @@ -1040,7 +1040,7 @@ _02016652: orr r0, r2 str r0, [r1, #0x44] _02016664: - ldr r1, _02016690 ; =gUnknown21C48B8 + ldr r1, _02016690 ; =gMain mov r0, #0x2 ldr r2, [r1, #0x4c] lsl r0, r0, #0x8 @@ -1050,7 +1050,7 @@ _02016664: orr r0, r2 str r0, [r1, #0x4c] _02016676: - ldr r1, _02016690 ; =gUnknown21C48B8 + ldr r1, _02016690 ; =gMain ldr r0, _02016698 ; =0x0000FCFF ldr r2, [r1, #0x48] and r2, r0 @@ -1064,18 +1064,18 @@ _02016676: _0201668C: bx lr nop -_02016690: .word gUnknown21C48B8 +_02016690: .word gMain _02016694: .word 0x0000F3FF _02016698: .word 0x0000FCFF thumb_func_start FUN_0201669C FUN_0201669C: ; 0x0201669C - ldr r2, _020166A4 ; =gUnknown21C48B8 + ldr r2, _020166A4 ; =gMain str r0, [r2, #0x54] str r1, [r2, #0x58] bx lr .balign 4 -_020166A4: .word gUnknown21C48B8 +_020166A4: .word gMain thumb_func_start FUN_020166A8 FUN_020166A8: ; 0x020166A8 diff --git a/arm9/asm/unk_020166C8.s b/arm9/asm/unk_020166C8.s index 87453775..3c251114 100644 --- a/arm9/asm/unk_020166C8.s +++ b/arm9/asm/unk_020166C8.s @@ -393,7 +393,7 @@ FUN_02016988: ; 0x02016988 bl FUN_02031810 cmp r0, #0x0 beq _02016996 - bl FUN_0208A9B8 + bl PrintErrorMessageAndReset _02016996: pop {r3, pc} diff --git a/arm9/asm/unk_0201BCBC.s b/arm9/asm/unk_0201BCBC.s index c8cd3e56..49d206bb 100644 --- a/arm9/asm/unk_0201BCBC.s +++ b/arm9/asm/unk_0201BCBC.s @@ -3,9 +3,9 @@ .section .data - .global UNK_02105BB4 -UNK_02105BB4: ; 0x02105BB4 - .byte 0x00, 0x00, 0x00, 0x00 + .global gFonts +gFonts: ; 0x02105BB4 + .word 0 .section .bss @@ -25,11 +25,11 @@ UNK_021C5734: ; 0x021C5734 thumb_func_start FUN_0201BCBC FUN_0201BCBC: ; 0x0201BCBC - ldr r1, _0201BCC4 ; =UNK_02105BB4 + ldr r1, _0201BCC4 ; =gFonts str r0, [r1, #0x0] bx lr nop -_0201BCC4: .word UNK_02105BB4 +_0201BCC4: .word gFonts thumb_func_start FUN_0201BCC8 FUN_0201BCC8: ; 0x0201BCC8 @@ -141,8 +141,8 @@ FUN_0201BD7C: ; 0x0201BD7C .balign 4 _0201BD80: .word FUN_0201BCFC - thumb_func_start FUN_0201BD84 -FUN_0201BD84: ; 0x0201BD84 + thumb_func_start AddTextPrinterParameterized +AddTextPrinterParameterized: ; 0x0201BD84 push {r3, lr} sub sp, #0x18 str r0, [sp, #0x4] @@ -158,7 +158,7 @@ FUN_0201BD84: ; 0x0201BD84 strb r0, [r2, #0xb] strb r3, [r2, #0xc] strb r0, [r2, #0xd] - ldr r0, _0201BDDC ; =UNK_02105BB4 + ldr r0, _0201BDDC ; =gFonts lsl r1, r1, #0x3 ldr r0, [r0, #0x0] add r1, r0, r1 @@ -182,14 +182,14 @@ FUN_0201BD84: ; 0x0201BD84 strb r0, [r2, #0x17] ldr r2, [sp, #0x28] add r0, sp, #0x0 - bl FUN_0201BE98 + bl AddTextPrinter add sp, #0x18 pop {r3, pc} nop -_0201BDDC: .word UNK_02105BB4 +_0201BDDC: .word gFonts - thumb_func_start FUN_0201BDE0 -FUN_0201BDE0: ; 0x0201BDE0 + thumb_func_start AddTextPrinterParameterized2 +AddTextPrinterParameterized2: ; 0x0201BDE0 push {r3, lr} sub sp, #0x18 str r0, [sp, #0x4] @@ -205,7 +205,7 @@ FUN_0201BDE0: ; 0x0201BDE0 strb r0, [r2, #0xb] strb r3, [r2, #0xc] strb r0, [r2, #0xd] - ldr r0, _0201BE38 ; =UNK_02105BB4 + ldr r0, _0201BE38 ; =gFonts lsl r1, r1, #0x3 ldr r0, [r0, #0x0] add r1, r0, r1 @@ -229,14 +229,14 @@ FUN_0201BDE0: ; 0x0201BDE0 ldr r1, [sp, #0x24] ldr r2, [sp, #0x2c] add r0, sp, #0x0 - bl FUN_0201BE98 + bl AddTextPrinter add sp, #0x18 pop {r3, pc} nop -_0201BE38: .word UNK_02105BB4 +_0201BE38: .word gFonts - thumb_func_start FUN_0201BE3C -FUN_0201BE3C: ; 0x0201BE3C + thumb_func_start AddTextPrinterParameterized3 +AddTextPrinterParameterized3: ; 0x0201BE3C push {r3, lr} sub sp, #0x18 str r0, [sp, #0x4] @@ -256,7 +256,7 @@ FUN_0201BE3C: ; 0x0201BE3C strb r0, [r2, #0xe] ldr r0, [sp, #0x30] strb r0, [r2, #0xf] - ldr r0, _0201BE94 ; =UNK_02105BB4 + ldr r0, _0201BE94 ; =gFonts ldr r3, [r0, #0x0] lsl r0, r1, #0x3 add r0, r3, r0 @@ -276,17 +276,17 @@ FUN_0201BE3C: ; 0x0201BE3C ldr r1, [sp, #0x24] ldr r2, [sp, #0x34] add r0, sp, #0x0 - bl FUN_0201BE98 + bl AddTextPrinter add sp, #0x18 pop {r3, pc} nop -_0201BE94: .word UNK_02105BB4 +_0201BE94: .word gFonts - thumb_func_start FUN_0201BE98 -FUN_0201BE98: ; 0x0201BE98 + thumb_func_start AddTextPrinter +AddTextPrinter: ; 0x0201BE98 push {r3-r7, lr} add r7, r0, #0x0 - ldr r0, _0201BFD0 ; =UNK_02105BB4 + ldr r0, _0201BFD0 ; =gFonts add r6, r1, #0x0 ldr r0, [r0, #0x0] add r5, r2, #0x0 @@ -418,7 +418,7 @@ _0201BF74: lsl r7, r7, #0xa _0201BFA4: add r0, r4, #0x0 - bl FUN_0201C048 + bl RenderFont cmp r0, #0x1 beq _0201BFB4 add r5, r5, #0x1 @@ -437,7 +437,7 @@ _0201BFBE: mov r0, #0x8 pop {r3-r7, pc} nop -_0201BFD0: .word UNK_02105BB4 +_0201BFD0: .word gFonts _0201BFD4: .word UNK_021C570C _0201BFD8: .word FUN_0201BFDC @@ -461,7 +461,7 @@ FUN_0201BFDC: ; 0x0201BFDC ldrb r2, [r4, #0x13] bl FUN_0201C05C add r0, r4, #0x0 - bl FUN_0201C048 + bl RenderFont cmp r0, #0x0 beq _0201C014 cmp r0, #0x1 @@ -499,14 +499,14 @@ _0201C042: .balign 4 _0201C044: .word UNK_021C570C - thumb_func_start FUN_0201C048 -FUN_0201C048: ; 0x0201C048 + thumb_func_start RenderFont +RenderFont: ; 0x0201C048 push {r4, lr} add r4, r0, #0x0 _0201C04C: ldrb r0, [r4, #0x9] add r1, r4, #0x0 - bl FUN_02002DB0 + bl FontFunc cmp r0, #0x2 beq _0201C04C pop {r4, pc} diff --git a/arm9/asm/unk_02021590.s b/arm9/asm/unk_02021590.s index 82989218..d526846f 100644 --- a/arm9/asm/unk_02021590.s +++ b/arm9/asm/unk_02021590.s @@ -474,7 +474,7 @@ _020218EA: cmp r1, r0 bne _02021900 add r0, r4, #0x0 - bl FUN_0201B8B8 + bl MsgArray_SkipControlCode add r4, r0, #0x0 ldrh r1, [r4, #0x0] ldr r0, _0202191C ; =0x0000FFFF diff --git a/arm9/asm/unk_02021934.s b/arm9/asm/unk_02021934.s deleted file mode 100644 index 337bae11..00000000 --- a/arm9/asm/unk_02021934.s +++ /dev/null @@ -1,983 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020EE67C -UNK_020EE67C: ; 0x020EE67C - .byte 0xA2, 0x00, 0xA3, 0x00, 0xA4, 0x00, 0xA5, 0x00, 0xA6, 0x00, 0xA7, 0x00, 0xA8, 0x00, 0xA9, 0x00 - .byte 0xAA, 0x00, 0xAB, 0x00 - - .global UNK_020EE690 -UNK_020EE690: ; 0x020EE690 - .byte 0x21, 0x01, 0x22, 0x01, 0x23, 0x01, 0x24, 0x01, 0x25, 0x01, 0x26, 0x01, 0x27, 0x01, 0x28, 0x01 - - .global UNK_020EE6A0 -UNK_020EE6A0: ; 0x020EE6A0 - .byte 0x29, 0x01, 0x2A, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00 - .byte 0xE8, 0x03, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, 0xA0, 0x86, 0x01, 0x00, 0x40, 0x42, 0x0F, 0x00 - .byte 0x80, 0x96, 0x98, 0x00, 0x00, 0xE1, 0xF5, 0x05, 0x00, 0xCA, 0x9A, 0x3B - - .text - - thumb_func_start FUN_02021934 -FUN_02021934: ; 0x02021934 - push {r3-r7, lr} - add r5, r1, #0x0 - ldrh r1, [r5, #0x0] - add r7, r0, #0x0 - mov r4, #0x0 - ldr r0, _02021994 ; =0x0000FFFF - add r6, r2, #0x0 - str r4, [sp, #0x0] - cmp r1, r0 - beq _02021986 -_02021948: - ldr r0, _02021998 ; =0x0000FFFE - cmp r1, r0 - bne _02021958 - add r0, r5, #0x0 - bl FUN_0201B8B8 - add r5, r0, #0x0 - b _0202197E -_02021958: - mov r0, #0xe - lsl r0, r0, #0xc - cmp r1, r0 - bne _02021970 - ldr r0, [sp, #0x0] - sub r1, r4, r6 - cmp r0, r1 - bhs _0202196A - str r1, [sp, #0x0] -_0202196A: - mov r4, #0x0 - add r5, r5, #0x2 - b _0202197E -_02021970: - ldr r2, [r7, #0x70] - add r0, r7, #0x0 - sub r1, r1, #0x1 - blx r2 - add r0, r6, r0 - add r4, r4, r0 - add r5, r5, #0x2 -_0202197E: - ldrh r1, [r5, #0x0] - ldr r0, _02021994 ; =0x0000FFFF - cmp r1, r0 - bne _02021948 -_02021986: - ldr r0, [sp, #0x0] - sub r1, r4, r6 - cmp r0, r1 - bhs _02021990 - str r1, [sp, #0x0] -_02021990: - ldr r0, [sp, #0x0] - pop {r3-r7, pc} - .balign 4 -_02021994: .word 0x0000FFFF -_02021998: .word 0x0000FFFE - - thumb_func_start FUN_0202199C -FUN_0202199C: ; 0x0202199C - push {r3-r7, lr} - add r5, r1, #0x0 - ldrh r1, [r5, #0x0] - add r6, r0, #0x0 - ldr r0, _020219EC ; =0x0000FFFF - mov r4, #0x0 - cmp r1, r0 - beq _020219E8 - sub r7, r0, #0x1 -_020219AE: - cmp r1, r7 - bne _020219D4 - add r0, r5, #0x0 - bl FUN_0201B8E0 - ldr r1, _020219F0 ; =0x00000203 - cmp r0, r1 - bne _020219CA - add r0, r5, #0x0 - mov r1, #0x0 - bl FUN_0201B914 - add r4, r0, #0x0 - sub r4, #0xc -_020219CA: - add r0, r5, #0x0 - bl FUN_0201B8B8 - add r5, r0, #0x0 - b _020219E0 -_020219D4: - ldr r2, [r6, #0x70] - add r0, r6, #0x0 - sub r1, r1, #0x1 - blx r2 - add r4, r4, r0 - add r5, r5, #0x2 -_020219E0: - ldrh r1, [r5, #0x0] - ldr r0, _020219EC ; =0x0000FFFF - cmp r1, r0 - bne _020219AE -_020219E8: - add r0, r4, #0x0 - pop {r3-r7, pc} - .balign 4 -_020219EC: .word 0x0000FFFF -_020219F0: .word 0x00000203 - - thumb_func_start String_ctor -String_ctor: ; 0x020219F4 - push {r4, lr} - add r4, r0, #0x0 - add r0, r1, #0x0 - lsl r1, r4, #0x1 - add r1, #0xa - bl AllocFromHeap - cmp r0, #0x0 - beq _02021A14 - ldr r1, _02021A18 ; =0xB6F8D2EC - str r1, [r0, #0x4] - strh r4, [r0, #0x0] - mov r1, #0x0 - strh r1, [r0, #0x2] - ldr r1, _02021A1C ; =0x0000FFFF - strh r1, [r0, #0x8] -_02021A14: - pop {r4, pc} - nop -_02021A18: .word 0xB6F8D2EC -_02021A1C: .word 0x0000FFFF - - thumb_func_start String_dtor -String_dtor: ; 0x02021A20 - push {r4, lr} - add r4, r0, #0x0 - bne _02021A2A - bl ErrorHandling -_02021A2A: - ldr r1, [r4, #0x4] - ldr r0, _02021A44 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021A36 - bl ErrorHandling -_02021A36: - ldr r0, _02021A48 ; =0xB6F8D2ED - str r0, [r4, #0x4] - add r0, r4, #0x0 - bl FreeToHeap - pop {r4, pc} - nop -_02021A44: .word 0xB6F8D2EC -_02021A48: .word 0xB6F8D2ED - - thumb_func_start StringSetEmpty -StringSetEmpty: ; 0x02021A4C - push {r4, lr} - add r4, r0, #0x0 - bne _02021A56 - bl ErrorHandling -_02021A56: - ldr r1, [r4, #0x4] - ldr r0, _02021A6C ; =0xB6F8D2EC - cmp r1, r0 - beq _02021A62 - bl ErrorHandling -_02021A62: - mov r0, #0x0 - strh r0, [r4, #0x2] - ldr r0, _02021A70 ; =0x0000FFFF - strh r0, [r4, #0x8] - pop {r4, pc} - .balign 4 -_02021A6C: .word 0xB6F8D2EC -_02021A70: .word 0x0000FFFF - - thumb_func_start StringCopy -StringCopy: ; 0x02021A74 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021A82 - bl ErrorHandling -_02021A82: - ldr r1, [r5, #0x4] - ldr r0, _02021AC8 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021A8E - bl ErrorHandling -_02021A8E: - cmp r4, #0x0 - bne _02021A96 - bl ErrorHandling -_02021A96: - ldr r1, [r4, #0x4] - ldr r0, _02021AC8 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021AA2 - bl ErrorHandling -_02021AA2: - ldrh r2, [r4, #0x2] - ldrh r0, [r5, #0x0] - cmp r0, r2 - bls _02021AC0 - add r0, r5, #0x0 - add r1, r4, #0x0 - add r2, r2, #0x1 - add r0, #0x8 - add r1, #0x8 - lsl r2, r2, #0x1 - bl memcpy - ldrh r0, [r4, #0x2] - strh r0, [r5, #0x2] - pop {r3-r5, pc} -_02021AC0: - bl ErrorHandling - pop {r3-r5, pc} - nop -_02021AC8: .word 0xB6F8D2EC - - thumb_func_start StringDup -StringDup: ; 0x02021ACC - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021ADA - bl ErrorHandling -_02021ADA: - ldr r1, [r5, #0x4] - ldr r0, _02021B00 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021AE6 - bl ErrorHandling -_02021AE6: - ldrh r0, [r5, #0x2] - add r1, r4, #0x0 - add r0, r0, #0x1 - bl String_ctor - add r4, r0, #0x0 - beq _02021AFA - add r1, r5, #0x0 - bl StringCopy -_02021AFA: - add r0, r4, #0x0 - pop {r3-r5, pc} - nop -_02021B00: .word 0xB6F8D2EC - - thumb_func_start String16_FormatInteger -String16_FormatInteger: ; 0x02021B04 - push {r3-r7, lr} - sub sp, #0x8 - add r5, r0, #0x0 - ldr r0, [sp, #0x20] - add r6, r1, #0x0 - add r7, r3, #0x0 - str r2, [sp, #0x0] - str r0, [sp, #0x20] - cmp r5, #0x0 - bne _02021B1C - bl ErrorHandling -_02021B1C: - ldr r1, [r5, #0x4] - ldr r0, _02021C1C ; =0xB6F8D2EC - cmp r1, r0 - beq _02021B28 - bl ErrorHandling -_02021B28: - cmp r6, #0x0 - bge _02021B30 - mov r4, #0x1 - b _02021B32 -_02021B30: - mov r4, #0x0 -_02021B32: - ldr r0, [sp, #0x0] - ldrh r1, [r5, #0x0] - add r0, r0, r4 - cmp r1, r0 - bls _02021C14 - ldr r0, [sp, #0x20] - cmp r0, #0x0 - bne _02021B48 - ldr r0, _02021C20 ; =UNK_020EE67C - str r0, [sp, #0x4] - b _02021B4C -_02021B48: - ldr r0, _02021C24 ; =UNK_020EE690 - str r0, [sp, #0x4] -_02021B4C: - add r0, r5, #0x0 - bl StringSetEmpty - cmp r4, #0x0 - beq _02021B74 - mov r0, #0x0 - mvn r0, r0 - mul r6, r0 - ldr r0, [sp, #0x20] - cmp r0, #0x0 - bne _02021B66 - mov r0, #0xf1 - b _02021B68 -_02021B66: - ldr r0, _02021C28 ; =0x000001BE -_02021B68: - ldrh r2, [r5, #0x2] - add r1, r2, #0x1 - strh r1, [r5, #0x2] - lsl r1, r2, #0x1 - add r1, r5, r1 - strh r0, [r1, #0x8] -_02021B74: - ldr r0, [sp, #0x0] - lsl r1, r0, #0x2 - ldr r0, _02021C2C ; =UNK_020EE6A0 - ldr r4, [r0, r1] - cmp r4, #0x0 - beq _02021C06 -_02021B80: - add r0, r6, #0x0 - add r1, r4, #0x0 - bl _u32_div_f - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - add r0, r4, #0x0 - mul r0, r1 - sub r6, r6, r0 - cmp r7, #0x2 - bne _02021BB4 - cmp r1, #0xa - bhs _02021BA2 - ldr r0, [sp, #0x4] - lsl r1, r1, #0x1 - ldrh r1, [r0, r1] - b _02021BA4 -_02021BA2: - mov r1, #0xe2 -_02021BA4: - ldrh r0, [r5, #0x2] - add r2, r0, #0x0 - add r2, r2, #0x1 - lsl r0, r0, #0x1 - strh r2, [r5, #0x2] - add r0, r5, r0 - strh r1, [r0, #0x8] - b _02021BFA -_02021BB4: - cmp r1, #0x0 - bne _02021BBC - cmp r4, #0x1 - bne _02021BDC -_02021BBC: - mov r7, #0x2 - cmp r1, #0xa - bhs _02021BCA - ldr r0, [sp, #0x4] - lsl r1, r1, #0x1 - ldrh r1, [r0, r1] - b _02021BCC -_02021BCA: - mov r1, #0xe2 -_02021BCC: - ldrh r0, [r5, #0x2] - add r2, r0, #0x0 - add r2, r2, #0x1 - lsl r0, r0, #0x1 - strh r2, [r5, #0x2] - add r0, r5, r0 - strh r1, [r0, #0x8] - b _02021BFA -_02021BDC: - cmp r7, #0x1 - bne _02021BFA - ldr r0, [sp, #0x20] - cmp r0, #0x0 - bne _02021BEA - mov r1, #0x1 - b _02021BEC -_02021BEA: - ldr r1, _02021C30 ; =0x000001E2 -_02021BEC: - ldrh r0, [r5, #0x2] - add r2, r0, #0x0 - add r2, r2, #0x1 - lsl r0, r0, #0x1 - strh r2, [r5, #0x2] - add r0, r5, r0 - strh r1, [r0, #0x8] -_02021BFA: - add r0, r4, #0x0 - mov r1, #0xa - bl _u32_div_f - add r4, r0, #0x0 - bne _02021B80 -_02021C06: - ldrh r0, [r5, #0x2] - ldr r1, _02021C34 ; =0x0000FFFF - add sp, #0x8 - lsl r0, r0, #0x1 - add r0, r5, r0 - strh r1, [r0, #0x8] - pop {r3-r7, pc} -_02021C14: - bl ErrorHandling - add sp, #0x8 - pop {r3-r7, pc} - .balign 4 -_02021C1C: .word 0xB6F8D2EC -_02021C20: .word UNK_020EE67C -_02021C24: .word UNK_020EE690 -_02021C28: .word 0x000001BE -_02021C2C: .word UNK_020EE6A0 -_02021C30: .word 0x000001E2 -_02021C34: .word 0x0000FFFF - - thumb_func_start FUN_02021C38 -FUN_02021C38: ; 0x02021C38 - push {r3-r7, lr} - sub sp, #0x10 - str r1, [sp, #0x0] - mov r1, #0x0 - str r1, [sp, #0x8] - str r1, [sp, #0xc] - add r5, r1, #0x0 - ldrh r1, [r0, #0x2] - mov r7, #0x1 - cmp r1, #0x12 - bls _02021C56 - ldr r0, [sp, #0x8] - add sp, #0x10 - add r1, r0, #0x0 - pop {r3-r7, pc} -_02021C56: - sub r1, r1, #0x1 - str r1, [sp, #0x4] - bmi _02021CCC - lsl r1, r1, #0x1 - add r4, r0, r1 -_02021C60: - ldrh r6, [r4, #0x8] - mov r3, #0xa - mov r0, #0x0 - add r1, r6, #0x0 - sub r1, #0xa2 - asr r2, r1, #0x1f - sub r3, r1, r3 - mov r12, r2 - mov r3, r12 - sbc r3, r0 - blo _02021C98 - ldr r0, _02021CDC ; =0x00000121 - mov r3, #0xa - sub r1, r6, r0 - asr r2, r1, #0x1f - mov r0, #0x0 - sub r3, r1, r3 - mov r12, r2 - mov r3, r12 - sbc r3, r0 - blo _02021C98 - ldr r0, [sp, #0x0] - mov r1, #0x0 - str r1, [r0, #0x0] - ldr r0, [sp, #0x8] - ldr r1, [sp, #0xc] - add sp, #0x10 - pop {r3-r7, pc} -_02021C98: - add r0, r1, #0x0 - add r1, r2, #0x0 - add r2, r7, #0x0 - add r3, r5, #0x0 - bl _ll_mul - add r2, r1, #0x0 - ldr r1, [sp, #0x8] - add r0, r1, r0 - str r0, [sp, #0x8] - ldr r0, [sp, #0xc] - adc r0, r2 - str r0, [sp, #0xc] - add r0, r7, #0x0 - add r1, r5, #0x0 - mov r2, #0xa - mov r3, #0x0 - bl _ll_mul - add r7, r0, #0x0 - ldr r0, [sp, #0x4] - add r5, r1, #0x0 - sub r4, r4, #0x2 - sub r0, r0, #0x1 - str r0, [sp, #0x4] - bpl _02021C60 -_02021CCC: - ldr r0, [sp, #0x0] - mov r1, #0x1 - str r1, [r0, #0x0] - ldr r0, [sp, #0x8] - ldr r1, [sp, #0xc] - add sp, #0x10 - pop {r3-r7, pc} - nop -_02021CDC: .word 0x00000121 - - thumb_func_start FUN_02021CE0 -FUN_02021CE0: ; 0x02021CE0 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021CEE - bl ErrorHandling -_02021CEE: - ldr r1, [r5, #0x4] - ldr r0, _02021D34 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021CFA - bl ErrorHandling -_02021CFA: - cmp r4, #0x0 - bne _02021D02 - bl ErrorHandling -_02021D02: - ldr r1, [r4, #0x4] - ldr r0, _02021D34 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021D0E - bl ErrorHandling -_02021D0E: - ldrh r1, [r5, #0x8] - ldrh r0, [r4, #0x8] - cmp r1, r0 - bne _02021D2E - ldr r0, _02021D38 ; =0x0000FFFF -_02021D18: - ldrh r1, [r5, #0x8] - cmp r1, r0 - bne _02021D22 - mov r0, #0x0 - pop {r3-r5, pc} -_02021D22: - add r5, r5, #0x2 - add r4, r4, #0x2 - ldrh r2, [r5, #0x8] - ldrh r1, [r4, #0x8] - cmp r2, r1 - beq _02021D18 -_02021D2E: - mov r0, #0x1 - pop {r3-r5, pc} - nop -_02021D34: .word 0xB6F8D2EC -_02021D38: .word 0x0000FFFF - - thumb_func_start FUN_02021D3C -FUN_02021D3C: ; 0x02021D3C - push {r4, lr} - add r4, r0, #0x0 - bne _02021D46 - bl ErrorHandling -_02021D46: - ldr r1, [r4, #0x4] - ldr r0, _02021D58 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021D52 - bl ErrorHandling -_02021D52: - ldrh r0, [r4, #0x2] - pop {r4, pc} - nop -_02021D58: .word 0xB6F8D2EC - - thumb_func_start FUN_02021D5C -FUN_02021D5C: ; 0x02021D5C - push {r3-r5, lr} - add r4, r0, #0x0 - bne _02021D66 - bl ErrorHandling -_02021D66: - ldr r1, [r4, #0x4] - ldr r0, _02021D98 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021D72 - bl ErrorHandling -_02021D72: - ldrh r1, [r4, #0x2] - mov r3, #0x0 - mov r0, #0x1 - cmp r1, #0x0 - ble _02021D94 - mov r1, #0xe - add r5, r4, #0x0 - lsl r1, r1, #0xc -_02021D82: - ldrh r2, [r5, #0x8] - cmp r2, r1 - bne _02021D8A - add r0, r0, #0x1 -_02021D8A: - ldrh r2, [r4, #0x2] - add r3, r3, #0x1 - add r5, r5, #0x2 - cmp r3, r2 - blt _02021D82 -_02021D94: - pop {r3-r5, pc} - nop -_02021D98: .word 0xB6F8D2EC - - thumb_func_start FUN_02021D9C -FUN_02021D9C: ; 0x02021D9C - push {r3-r7, lr} - add r5, r1, #0x0 - add r7, r0, #0x0 - add r6, r2, #0x0 - cmp r5, #0x0 - bne _02021DAC - bl ErrorHandling -_02021DAC: - ldr r1, [r5, #0x4] - ldr r0, _02021E24 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021DB8 - bl ErrorHandling -_02021DB8: - cmp r7, #0x0 - bne _02021DC0 - bl ErrorHandling -_02021DC0: - ldr r1, [r7, #0x4] - ldr r0, _02021E24 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021DCC - bl ErrorHandling -_02021DCC: - mov r4, #0x0 - cmp r6, #0x0 - beq _02021DF6 - ldrh r0, [r5, #0x2] - cmp r0, #0x0 - ble _02021DF6 - mov r1, #0xe - add r0, r5, #0x0 - lsl r1, r1, #0xc -_02021DDE: - ldrh r2, [r0, #0x8] - cmp r2, r1 - bne _02021DEC - sub r6, r6, #0x1 - bne _02021DEC - add r4, r4, #0x1 - b _02021DF6 -_02021DEC: - ldrh r2, [r5, #0x2] - add r4, r4, #0x1 - add r0, r0, #0x2 - cmp r4, r2 - blt _02021DDE -_02021DF6: - add r0, r7, #0x0 - bl StringSetEmpty - ldrh r0, [r5, #0x2] - cmp r4, r0 - bge _02021E20 - lsl r0, r4, #0x1 - add r6, r5, r0 -_02021E06: - ldrh r1, [r6, #0x8] - mov r0, #0xe - lsl r0, r0, #0xc - cmp r1, r0 - beq _02021E20 - add r0, r7, #0x0 - bl FUN_02021FB0 - ldrh r0, [r5, #0x2] - add r4, r4, #0x1 - add r6, r6, #0x2 - cmp r4, r0 - blt _02021E06 -_02021E20: - pop {r3-r7, pc} - nop -_02021E24: .word 0xB6F8D2EC - - thumb_func_start FUN_02021E28 -FUN_02021E28: ; 0x02021E28 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021E36 - bl ErrorHandling -_02021E36: - ldr r1, [r5, #0x4] - ldr r0, _02021E84 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021E42 - bl ErrorHandling -_02021E42: - mov r0, #0x0 - strh r0, [r5, #0x2] - ldrh r1, [r4, #0x0] - ldr r0, _02021E88 ; =0x0000FFFF - cmp r1, r0 - beq _02021E76 - add r1, r0, #0x0 -_02021E50: - ldrh r2, [r5, #0x0] - ldrh r0, [r5, #0x2] - sub r2, r2, #0x1 - cmp r0, r2 - blt _02021E60 - bl ErrorHandling - b _02021E76 -_02021E60: - add r2, r0, #0x0 - add r2, r2, #0x1 - strh r2, [r5, #0x2] - ldrh r2, [r4, #0x0] - lsl r0, r0, #0x1 - add r0, r5, r0 - add r4, r4, #0x2 - strh r2, [r0, #0x8] - ldrh r0, [r4, #0x0] - cmp r0, r1 - bne _02021E50 -_02021E76: - ldrh r0, [r5, #0x2] - ldr r1, _02021E88 ; =0x0000FFFF - lsl r0, r0, #0x1 - add r0, r5, r0 - strh r1, [r0, #0x8] - pop {r3-r5, pc} - nop -_02021E84: .word 0xB6F8D2EC -_02021E88: .word 0x0000FFFF - - thumb_func_start FUN_02021E8C -FUN_02021E8C: ; 0x02021E8C - push {r3-r7, lr} - add r5, r0, #0x0 - add r7, r1, #0x0 - add r4, r2, #0x0 - cmp r5, #0x0 - bne _02021E9C - bl ErrorHandling -_02021E9C: - ldr r1, [r5, #0x4] - ldr r0, _02021EE8 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021EA8 - bl ErrorHandling -_02021EA8: - ldrh r0, [r5, #0x0] - cmp r4, r0 - bhi _02021EE2 - lsl r6, r4, #0x1 - add r0, r5, #0x0 - add r0, #0x8 - add r1, r7, #0x0 - add r2, r6, #0x0 - bl memcpy - mov r2, #0x0 - cmp r4, #0x0 - bls _02021ED4 - ldr r0, _02021EEC ; =0x0000FFFF - add r3, r5, #0x0 -_02021EC6: - ldrh r1, [r3, #0x8] - cmp r1, r0 - beq _02021ED4 - add r2, r2, #0x1 - add r3, r3, #0x2 - cmp r2, r4 - blo _02021EC6 -_02021ED4: - strh r2, [r5, #0x2] - cmp r2, r4 - bne _02021EE6 - ldr r1, _02021EEC ; =0x0000FFFF - add r0, r5, r6 - strh r1, [r0, #0x6] - pop {r3-r7, pc} -_02021EE2: - bl ErrorHandling -_02021EE6: - pop {r3-r7, pc} - .balign 4 -_02021EE8: .word 0xB6F8D2EC -_02021EEC: .word 0x0000FFFF - - thumb_func_start FUN_02021EF0 -FUN_02021EF0: ; 0x02021EF0 - push {r4-r6, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - add r4, r2, #0x0 - cmp r5, #0x0 - bne _02021F00 - bl ErrorHandling -_02021F00: - ldr r1, [r5, #0x4] - ldr r0, _02021F28 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021F0C - bl ErrorHandling -_02021F0C: - ldrh r0, [r5, #0x2] - add r2, r0, #0x1 - cmp r2, r4 - bhi _02021F22 - add r5, #0x8 - add r0, r6, #0x0 - add r1, r5, #0x0 - lsl r2, r2, #0x1 - bl memcpy - pop {r4-r6, pc} -_02021F22: - bl ErrorHandling - pop {r4-r6, pc} - .balign 4 -_02021F28: .word 0xB6F8D2EC - - thumb_func_start String_c_str -String_c_str: ; 0x02021F2C - push {r4, lr} - add r4, r0, #0x0 - bne _02021F36 - bl ErrorHandling -_02021F36: - ldr r1, [r4, #0x4] - ldr r0, _02021F48 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021F42 - bl ErrorHandling -_02021F42: - add r4, #0x8 - add r0, r4, #0x0 - pop {r4, pc} - .balign 4 -_02021F48: .word 0xB6F8D2EC - - thumb_func_start FUN_02021F4C -FUN_02021F4C: ; 0x02021F4C - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021F5A - bl ErrorHandling -_02021F5A: - ldr r1, [r5, #0x4] - ldr r0, _02021FAC ; =0xB6F8D2EC - cmp r1, r0 - beq _02021F66 - bl ErrorHandling -_02021F66: - cmp r4, #0x0 - bne _02021F6E - bl ErrorHandling -_02021F6E: - ldr r1, [r4, #0x4] - ldr r0, _02021FAC ; =0xB6F8D2EC - cmp r1, r0 - beq _02021F7A - bl ErrorHandling -_02021F7A: - ldrh r2, [r4, #0x2] - ldrh r0, [r5, #0x2] - add r1, r0, r2 - add r3, r1, #0x1 - ldrh r1, [r5, #0x0] - cmp r3, r1 - bgt _02021FA6 - add r1, r5, #0x0 - add r1, #0x8 - lsl r0, r0, #0x1 - add r0, r1, r0 - add r1, r4, #0x0 - add r2, r2, #0x1 - add r1, #0x8 - lsl r2, r2, #0x1 - bl memcpy - ldrh r1, [r5, #0x2] - ldrh r0, [r4, #0x2] - add r0, r1, r0 - strh r0, [r5, #0x2] - pop {r3-r5, pc} -_02021FA6: - bl ErrorHandling - pop {r3-r5, pc} - .balign 4 -_02021FAC: .word 0xB6F8D2EC - - thumb_func_start FUN_02021FB0 -FUN_02021FB0: ; 0x02021FB0 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - cmp r5, #0x0 - bne _02021FBE - bl ErrorHandling -_02021FBE: - ldr r1, [r5, #0x4] - ldr r0, _02021FF0 ; =0xB6F8D2EC - cmp r1, r0 - beq _02021FCA - bl ErrorHandling -_02021FCA: - ldrh r2, [r5, #0x2] - ldrh r0, [r5, #0x0] - add r1, r2, #0x1 - cmp r1, r0 - bge _02021FE8 - lsl r0, r2, #0x1 - strh r1, [r5, #0x2] - add r0, r5, r0 - strh r4, [r0, #0x8] - ldrh r0, [r5, #0x2] - ldr r1, _02021FF4 ; =0x0000FFFF - lsl r0, r0, #0x1 - add r0, r5, r0 - strh r1, [r0, #0x8] - pop {r3-r5, pc} -_02021FE8: - bl ErrorHandling - pop {r3-r5, pc} - nop -_02021FF0: .word 0xB6F8D2EC -_02021FF4: .word 0x0000FFFF - - thumb_func_start FUN_02021FF8 -FUN_02021FF8: ; 0x02021FF8 - push {r4, lr} - add r4, r0, #0x0 - bne _02022002 - bl ErrorHandling -_02022002: - ldr r1, [r4, #0x4] - ldr r0, _02022028 ; =0xB6F8D2EC - cmp r1, r0 - beq _0202200E - bl ErrorHandling -_0202200E: - ldrh r0, [r4, #0x2] - cmp r0, #0x0 - beq _02022026 - ldrh r1, [r4, #0x8] - ldr r0, _0202202C ; =0x00000145 - cmp r1, r0 - blo _02022026 - add r0, #0x19 - cmp r1, r0 - bhi _02022026 - sub r1, #0x1a - strh r1, [r4, #0x8] -_02022026: - pop {r4, pc} - .balign 4 -_02022028: .word 0xB6F8D2EC -_0202202C: .word 0x00000145 diff --git a/arm9/asm/unk_02021FF8.s b/arm9/asm/unk_02021FF8.s index 150d6003..0609835c 100644 --- a/arm9/asm/unk_02021FF8.s +++ b/arm9/asm/unk_02021FF8.s @@ -86,7 +86,7 @@ _020220A2: _020220B2: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl FUN_02021F4C + bl StringCat pop {r3-r7, pc} .balign 4 _020220BC: .word 0x000001FF diff --git a/arm9/asm/unk_020238C4.s b/arm9/asm/unk_020238C4.s index 339a723f..70e0d568 100644 --- a/arm9/asm/unk_020238C4.s +++ b/arm9/asm/unk_020238C4.s @@ -115,14 +115,14 @@ _02023970: thumb_func_start FUN_0202397C FUN_0202397C: ; 0x0202397C - ldr r3, _02023988 ; =FUN_02021EF0 + ldr r3, _02023988 ; =CopyStringToU16Array add r2, r0, #0x0 add r0, r1, #0x0 add r1, r2, #0x0 mov r2, #0x8 bx r3 .balign 4 -_02023988: .word FUN_02021EF0 +_02023988: .word CopyStringToU16Array thumb_func_start FUN_0202398C FUN_0202398C: ; 0x0202398C @@ -131,13 +131,13 @@ FUN_0202398C: ; 0x0202398C thumb_func_start FUN_02023990 FUN_02023990: ; 0x02023990 - ldr r3, _0202399C ; =FUN_02021E28 + ldr r3, _0202399C ; =CopyU16ArrayToString add r2, r0, #0x0 add r0, r1, #0x0 add r1, r2, #0x0 bx r3 nop -_0202399C: .word FUN_02021E28 +_0202399C: .word CopyU16ArrayToString thumb_func_start FUN_020239A0 FUN_020239A0: ; 0x020239A0 diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index ea875620..7470de58 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -47,14 +47,14 @@ _02023AE0: .word memset thumb_func_start FUN_02023AE4 FUN_02023AE4: ; 0x02023AE4 - ldr r3, _02023AF0 ; =FUN_02021E8C + ldr r3, _02023AF0 ; =CopyU16ArrayToStringN add r2, r0, #0x0 add r0, r1, #0x0 add r1, r2, #0x0 mov r2, #0xc bx r3 .balign 4 -_02023AF0: .word FUN_02021E8C +_02023AF0: .word CopyU16ArrayToStringN thumb_func_start FUN_02023AF4 FUN_02023AF4: ; 0x02023AF4 @@ -64,7 +64,7 @@ FUN_02023AF4: ; 0x02023AF4 bl String_ctor add r1, r5, #0x0 add r4, r0, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index 3c770b30..f48042bb 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -88,13 +88,13 @@ FUN_02024EF4: ; 0x02024EF4 add r2, r0, #0x0 add r0, r1, #0x0 ldr r1, _02024F04 ; =0x00000724 - ldr r3, _02024F08 ; =FUN_02021EF0 + ldr r3, _02024F08 ; =CopyStringToU16Array add r1, r2, r1 mov r2, #0x8 bx r3 nop _02024F04: .word 0x00000724 -_02024F08: .word FUN_02021EF0 +_02024F08: .word CopyStringToU16Array thumb_func_start FUN_02024F0C FUN_02024F0C: ; 0x02024F0C @@ -109,10 +109,10 @@ FUN_02024F18: ; 0x02024F18 add r2, r0, #0x0 add r0, r1, #0x0 ldr r1, _02024F28 ; =0x00000734 - ldr r3, _02024F2C ; =FUN_02021EF0 + ldr r3, _02024F2C ; =CopyStringToU16Array add r1, r2, r1 mov r2, #0xb bx r3 nop _02024F28: .word 0x00000734 -_02024F2C: .word FUN_02021EF0 +_02024F2C: .word CopyStringToU16Array diff --git a/arm9/asm/unk_02024F30.s b/arm9/asm/unk_02024F30.s index 899404c6..0ee173aa 100644 --- a/arm9/asm/unk_02024F30.s +++ b/arm9/asm/unk_02024F30.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -79,22 +79,22 @@ _02024FAC: beq _02024FC2 b _02024FCA _02024FBA: - ldr r0, _02024FD4 ; =gUnknown21C48B8 + ldr r0, _02024FD4 ; =gMain mov r1, #0x1 str r1, [r0, #0x34] pop {r3, pc} _02024FC2: - ldr r0, _02024FD4 ; =gUnknown21C48B8 + ldr r0, _02024FD4 ; =gMain mov r1, #0x3 str r1, [r0, #0x34] pop {r3, pc} _02024FCA: - ldr r0, _02024FD4 ; =gUnknown21C48B8 + ldr r0, _02024FD4 ; =gMain mov r1, #0x0 str r1, [r0, #0x34] pop {r3, pc} nop -_02024FD4: .word gUnknown21C48B8 +_02024FD4: .word gMain thumb_func_start FUN_02024FD8 FUN_02024FD8: ; 0x02024FD8 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index b981217f..eb1d3969 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -61,7 +61,7 @@ FUN_0202597C: ; 0x0202597C add r0, sp, #0xc add r1, sp, #0x0 bl FUN_0201265C - ldr r0, _020259D8 ; =gUnknown21C48B8 + ldr r0, _020259D8 ; =gMain ldr r6, [sp, #0xc] ldr r1, [sp, #0x8] ldr r0, [r0, #0x2c] @@ -99,7 +99,7 @@ FUN_0202597C: ; 0x0202597C add sp, #0x1c pop {r4-r7, pc} nop -_020259D8: .word gUnknown21C48B8 +_020259D8: .word gMain _020259DC: .word 0x000009B4 thumb_func_start FUN_020259E0 diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index ec6fd057..75016f0b 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -112,7 +112,7 @@ FUN_02026D98: ; 0x02026D98 add r4, r2, #0x0 add r1, #0x20 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array add r5, #0x34 strb r4, [r5, #0x0] pop {r3-r5, pc} @@ -2242,13 +2242,13 @@ FUN_02027C84: ; 0x02027C84 thumb_func_start FUN_02027C88 FUN_02027C88: ; 0x02027C88 add r2, r0, #0x0 - ldr r3, _02027C94 ; =FUN_02021E28 + ldr r3, _02027C94 ; =CopyU16ArrayToString add r2, #0x20 add r0, r1, #0x0 add r1, r2, #0x0 bx r3 .balign 4 -_02027C94: .word FUN_02021E28 +_02027C94: .word CopyU16ArrayToString thumb_func_start FUN_02027C98 FUN_02027C98: ; 0x02027C98 diff --git a/arm9/asm/unk_020281E0.s b/arm9/asm/unk_020281E0.s index edf5e64f..b55e419f 100644 --- a/arm9/asm/unk_020281E0.s +++ b/arm9/asm/unk_020281E0.s @@ -291,7 +291,7 @@ _020283D0: add r1, r2, r1 add r0, r6, #0x0 mov r2, #0x10 - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4-r6, pc} .balign 4 @@ -330,7 +330,7 @@ _02028414: add r1, r2, r1 add r0, r6, #0x0 mov r2, #0x10 - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_020286F8.s b/arm9/asm/unk_020286F8.s index d0ed994b..ffb1a935 100644 --- a/arm9/asm/unk_020286F8.s +++ b/arm9/asm/unk_020286F8.s @@ -146,7 +146,7 @@ FUN_020287C0: ; 0x020287C0 add r1, r4, r2 add r0, r3, #0x0 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4, pc} _020287D8: mov r2, #0x2c @@ -155,7 +155,7 @@ _020287D8: add r0, r3, #0x0 add r1, #0x10 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s index 8c604e39..f6d8f57e 100644 --- a/arm9/asm/unk_0202B034.s +++ b/arm9/asm/unk_0202B034.s @@ -142,7 +142,7 @@ _0202B0BA: add r0, r6, #0x0 add r1, #0xc mov r2, #0xb - bl FUN_02021EF0 + bl CopyStringToU16Array add r0, r4, #0x0 mov r1, #0x90 add r2, r6, #0x0 @@ -151,7 +151,7 @@ _0202B0BA: add r0, r6, #0x0 add r1, #0x22 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array b _0202B17C _0202B176: ldr r0, _0202B1EC ; =0x0000FFFF @@ -359,11 +359,11 @@ _0202B2CE: ldrb r0, [r5, #0x3] strb r0, [r4, #0x13] ldr r0, [r4, #0x0] - bl FUN_02021E28 + bl CopyU16ArrayToString add r1, r5, #0x0 ldr r0, [r4, #0x4] add r1, #0x22 - bl FUN_02021E28 + bl CopyU16ArrayToString mov r1, #0x0 _0202B306: ldrh r0, [r5, #0x32] diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index b9a2a3b1..eb4d094a 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -277,7 +277,7 @@ _0202BA38: add r0, r7, #0x0 add r1, #0x8 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array ldr r0, [r5, #0x0] add r6, r6, #0x1 str r0, [r4, #0x4] @@ -822,7 +822,7 @@ _0202BE14: add r1, r5, #0x0 ldr r0, [r0, #0xc] add r1, #0x8 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0202F150.s b/arm9/asm/unk_0202F150.s index 4d05c01e..22bf52e9 100644 --- a/arm9/asm/unk_0202F150.s +++ b/arm9/asm/unk_0202F150.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .bss @@ -1277,7 +1277,7 @@ FUN_0202FB80: ; 0x0202FB80 strb r0, [r1, #0x0] bl FUN_0202F984 ldr r0, _0202FC48 ; =UNK_021C59F4 - ldr r1, _0202FC50 ; =gUnknown21C48B8 + ldr r1, _0202FC50 ; =gMain ldr r0, [r0, #0x4] ldr r2, _0202FC54 ; =0x00000628 ldr r3, [r1, #0x44] @@ -1355,7 +1355,7 @@ _0202FC3A: .balign 4 _0202FC48: .word UNK_021C59F4 _0202FC4C: .word 0x0000068A -_0202FC50: .word gUnknown21C48B8 +_0202FC50: .word gMain _0202FC54: .word 0x00000628 _0202FC58: .word 0x00007FFF _0202FC5C: .word 0x0000065C @@ -4279,7 +4279,7 @@ FUN_020312BC: ; 0x020312BC add r0, sp, #0x10 add r1, sp, #0x4 bl FUN_0201265C - ldr r0, _02031340 ; =gUnknown21C48B8 + ldr r0, _02031340 ; =gMain ldr r6, [sp, #0x10] mov r5, #0x0 lsr r7, r6, #0x1c @@ -4339,7 +4339,7 @@ FUN_020312BC: ; 0x020312BC add sp, #0x20 pop {r3-r7, pc} .balign 4 -_02031340: .word gUnknown21C48B8 +_02031340: .word gMain _02031344: .word 0x00000000 _02031348: .word 0x6C078965 _0203134C: .word 0x5D588B65 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index 24d12a3a..648cf799 100644 --- a/arm9/asm/unk_02033874.s +++ b/arm9/asm/unk_02033874.s @@ -333,7 +333,7 @@ _02033B22: bl FUN_0202DFFC add r1, r0, #0x0 ldr r0, [sp, #0x10] - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r2, [sp, #0x10] add r0, r4, #0x0 add r1, r5, #0x0 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index ff184e1c..acf3edeb 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -220,7 +220,7 @@ _02033FA4: ldr r2, [sp, #0x14] add r0, r4, #0x0 add r1, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] @@ -228,7 +228,7 @@ _02033FA4: add r2, r7, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0x0 bl String_dtor bl FUN_0201E788 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index 4116fa17..f4979b35 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -155,7 +155,7 @@ FUN_02034188: ; 0x02034188 add r2, r4, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor bl FUN_0201E788 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 5a905b2d..09b94b57 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -677,7 +677,7 @@ _02035526: ldr r2, [sp, #0x20] add r0, r6, #0x0 add r1, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r2, r4, r5 add r2, #0x30 ldrb r2, [r2, #0x0] @@ -991,7 +991,7 @@ _020357D6: add r2, r7, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0x0 bl String_dtor mov r0, #0xb @@ -1035,7 +1035,7 @@ _0203584C: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] add r0, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x10 str r0, [sp, #0x0] mov r0, #0xff @@ -1046,7 +1046,7 @@ _0203584C: add r0, #0x10 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x14] diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index 92ff091d..abbd1d7e 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .bss @@ -386,7 +386,7 @@ _020375B4: beq _020375D4 ldr r0, [r4, #0x38] bl FUN_02055A38 - ldr r3, _02037758 ; =gUnknown21C48B8 + ldr r3, _02037758 ; =gMain add r0, sp, #0x8 ldr r2, [r3, #0x48] ldr r3, [r3, #0x44] @@ -500,7 +500,7 @@ _02037672: add sp, #0x10 pop {r3-r5, pc} _020376A6: - ldr r0, _02037758 ; =gUnknown21C48B8 + ldr r0, _02037758 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -553,7 +553,7 @@ _020376E2: add sp, #0x10 pop {r3-r5, pc} _0203771C: - ldr r0, _02037758 ; =gUnknown21C48B8 + ldr r0, _02037758 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -583,7 +583,7 @@ _02037754: add sp, #0x10 pop {r3-r5, pc} .balign 4 -_02037758: .word gUnknown21C48B8 +_02037758: .word gMain _0203775C: .word 0x00000146 thumb_func_start FUN_02037760 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index f4394e88..6056f12f 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1817,7 +1817,7 @@ _020384D6: bne _020384F2 ldr r0, [r1, #0x18] ldr r1, [r4, #0x10] - bl FUN_02021CE0 + bl StringCompare cmp r0, #0x0 bne _02038514 ldr r0, [r4, #0xc] @@ -1990,12 +1990,12 @@ _02038620: beq _0203866E ldr r0, [r4, #0x10] add r1, r5, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString b _0203866E _02038656: ldr r0, [r4, #0x10] add r1, r5, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString b _0203866E _02038660: cmp r5, #0x0 @@ -2003,7 +2003,7 @@ _02038660: ldr r0, [r4, #0xc] add r1, r5, #0x0 ldr r0, [r0, #0x18] - bl FUN_02021E28 + bl CopyU16ArrayToString _0203866E: ldr r0, [sp, #0x4] ldr r1, _0203867C ; =FUN_0203847C diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index be79d918..3ca3d7e7 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -144,7 +144,7 @@ _02046118: strb r0, [r4, #0x8] b _020461F8 _02046150: - ldr r0, _02046210 ; =gUnknown21C48B8 + ldr r0, _02046210 ; =gMain ldr r2, [r0, #0x48] mov r0, #0x3 tst r0, r2 @@ -233,7 +233,7 @@ _02046200: .word 0x0000034F _02046204: .word 0x00000231 _02046208: .word 0x0000FFFF _0204620C: .word 0x00000679 -_02046210: .word gUnknown21C48B8 +_02046210: .word gMain thumb_func_start FUN_02046214 FUN_02046214: ; 0x02046214 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index cf52f344..79bb65c1 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -178,7 +178,7 @@ _02048258: str r0, [r4, #0x0] b _020482EA _02048268: - ldr r0, _020482F0 ; =gUnknown21C48B8 + ldr r0, _020482F0 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -241,7 +241,7 @@ _020482EA: add sp, #0xc pop {r3-r4, pc} .balign 4 -_020482F0: .word gUnknown21C48B8 +_020482F0: .word gMain thumb_func_start FUN_020482F4 FUN_020482F4: ; 0x020482F4 @@ -271,7 +271,7 @@ FUN_020482F4: ; 0x020482F4 ldr r0, [r5, #0x20] add r1, r4, #0x0 add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x0 add r1, r4, #0x0 add r2, r0, #0x0 @@ -295,7 +295,7 @@ FUN_020482F4: ; 0x020482F4 sub r3, r3, #0x4 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0x0 bl String_dtor add r0, r4, #0x0 diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s index dd43d375..ac1c53ff 100644 --- a/arm9/asm/unk_0204B34C.s +++ b/arm9/asm/unk_0204B34C.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -697,7 +697,7 @@ _0204B866: mov r0, #0x2 str r0, [r4, #0x0] _0204B876: - ldr r0, _0204B994 ; =gUnknown21C48B8 + ldr r0, _0204B994 ; =gMain mov r1, #0x20 ldr r0, [r0, #0x44] tst r1, r0 @@ -833,7 +833,7 @@ _0204B98E: mov r0, #0x0 pop {r3-r5, pc} nop -_0204B994: .word gUnknown21C48B8 +_0204B994: .word gMain _0204B998: .word UNK_020F4850 _0204B99C: .word UNK_020F4858 diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 6351a0e1..610901c6 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -1279,7 +1279,7 @@ _0204D4D4: .word 0x00000132 thumb_func_start FUN_0204D4D8 FUN_0204D4D8: ; 0x0204D4D8 - ldr r1, _0204D4E8 ; =gUnknown21C48B8 + ldr r1, _0204D4E8 ; =gMain mov r0, #0x2 ldr r1, [r1, #0x44] tst r1, r0 @@ -1289,7 +1289,7 @@ _0204D4E4: ldr r3, _0204D4EC ; =FUN_02030F60 bx r3 .balign 4 -_0204D4E8: .word gUnknown21C48B8 +_0204D4E8: .word gMain _0204D4EC: .word FUN_02030F60 thumb_func_start FUN_0204D4F0 @@ -6102,7 +6102,7 @@ FUN_0204F9BC: ; 0x0204F9BC mov r1, #0xf bl FUN_020239A0 str r0, [sp, #0x0] - bl FUN_02021D3C + bl StringGetLength cmp r0, #0x0 beq _0204F9FE ldr r0, _0204FA54 ; =UNK_021C5A68 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index c4024a82..6971b088 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -2,7 +2,7 @@ .include "global.inc" .extern UNK_020F96DC - .extern gUnknown21C48B8 + .extern gMain .extern UNK_020FA6E8 .section .rodata @@ -429,7 +429,7 @@ _0205116A: blx r2 b _020517B8 _0205118A: - ldr r0, _020514A4 ; =gUnknown21C48B8 + ldr r0, _020514A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x2 tst r0, r1 @@ -791,7 +791,7 @@ _0205142C: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -823,7 +823,7 @@ _0205148E: str r0, [r4, #0x34] b _020517B8 .balign 4 -_020514A4: .word gUnknown21C48B8 +_020514A4: .word gMain _020514A8: add r0, r4, #0x0 bl FUN_02051A80 @@ -970,7 +970,7 @@ _020515BA: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -1025,7 +1025,7 @@ _02051642: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -1734,7 +1734,7 @@ _02051BD6: ldr r2, [r5, #0xc] mov r1, #0x0 mov r3, #0x10 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x1c] add r7, r7, #0x1 add r6, r6, r0 @@ -1754,7 +1754,7 @@ _02051BD6: ldr r0, [sp, #0x20] ldr r2, [r5, #0xc] mov r3, #0x10 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x18] bl DestroyMsgData _02051C34: @@ -1855,7 +1855,7 @@ _02051CE0: add r0, r7, #0x0 mov r1, #0x0 mov r3, #0x10 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r6, r6, #0x1 add r4, #0x10 cmp r6, #0x3 @@ -1901,7 +1901,7 @@ FUN_02051D54: ; 0x02051D54 push {r4, lr} sub sp, #0x8 add r4, r0, #0x0 - ldr r0, _02051E1C ; =gUnknown21C48B8 + ldr r0, _02051E1C ; =gMain mov r1, #0x40 ldr r0, [r0, #0x48] tst r1, r0 @@ -2001,7 +2001,7 @@ _02051DE0: add sp, #0x8 pop {r4, pc} nop -_02051E1C: .word gUnknown21C48B8 +_02051E1C: .word gMain _02051E20: .word 0x000005DC thumb_func_start FUN_02051E24 @@ -2154,7 +2154,7 @@ _02051EF2: ldr r0, [r4, #0x18] ldr r1, [r4, #0x4] ldr r2, [r4, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r1, r4, #0x0 ldr r0, [r5, #0x8] add r1, #0x8 @@ -2186,7 +2186,7 @@ _02051F7C: bl FUN_020546C8 cmp r0, #0x0 beq _0205203A - ldr r0, _02052040 ; =gUnknown21C48B8 + ldr r0, _02052040 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -2269,7 +2269,7 @@ _0205203A: mov r0, #0x0 pop {r4-r6, pc} nop -_02052040: .word gUnknown21C48B8 +_02052040: .word gMain thumb_func_start FUN_02052044 FUN_02052044: ; 0x02052044 diff --git a/arm9/asm/unk_02054590.s b/arm9/asm/unk_02054590.s index 92a182d7..772871af 100644 --- a/arm9/asm/unk_02054590.s +++ b/arm9/asm/unk_02054590.s @@ -127,7 +127,7 @@ FUN_02054658: ; 0x02054658 mov r1, #0x1 add r2, r4, #0x0 str r3, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r3-r6, pc} @@ -153,7 +153,7 @@ FUN_02054690: ; 0x02054690 add r1, r7, #0x0 add r2, r6, #0x0 str r3, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r4-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 6feef167..65e31220 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .extern UNK_020F96DC .section .rodata @@ -1455,7 +1455,7 @@ _0205D95C: bl FUN_020546C8 cmp r0, #0x1 bne _0205D9A0 - ldr r0, _0205D9A4 ; =gUnknown21C48B8 + ldr r0, _0205D9A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xf3 tst r0, r1 @@ -1482,7 +1482,7 @@ _0205D9A0: mov r0, #0x0 pop {r3-r5, pc} .balign 4 -_0205D9A4: .word gUnknown21C48B8 +_0205D9A4: .word gMain thumb_func_start FUN_0205D9A8 FUN_0205D9A8: ; 0x0205D9A8 diff --git a/arm9/asm/unk_0206015C.s b/arm9/asm/unk_0206015C.s index a12d86ab..a0436e35 100644 --- a/arm9/asm/unk_0206015C.s +++ b/arm9/asm/unk_0206015C.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -164,7 +164,7 @@ _020602A2: ldrb r0, [r4, #0xe] cmp r0, #0x3c bhs _020602B8 - ldr r0, _02060340 ; =gUnknown21C48B8 + ldr r0, _02060340 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -230,4 +230,4 @@ _02060332: .balign 4 _02060338: .word 0x00000679 _0206033C: .word 0x0000FFFF -_02060340: .word gUnknown21C48B8 +_02060340: .word gMain diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index 6bc4b7fb..cd102e3a 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -267,7 +267,7 @@ FUN_02060D90: ; 0x02060D90 bl String_ctor add r1, r7, #0x0 add r4, r0, #0x0 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, [sp, #0x24] ldr r3, [sp, #0x8] str r0, [sp, #0x0] @@ -327,7 +327,7 @@ FUN_02060E04: ; 0x02060E04 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0xb - bl FUN_02021EF0 + bl CopyStringToU16Array add r0, r4, #0x0 bl String_dtor pop {r4-r6, pc} @@ -436,7 +436,7 @@ FUN_02060ECC: ; 0x02060ECC add r0, r4, #0x0 add r1, r7, #0x0 mov r2, #0xb - bl FUN_02021EF0 + bl CopyStringToU16Array add r0, r4, #0x0 bl String_dtor _02060F0C: diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 2450a9ad..618ef08b 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -247,7 +247,7 @@ FUN_02062770: ; 0x02062770 add r0, #0xc0 ldr r0, [r0, #0x0] bl FUN_02001204 - ldr r1, _020627C8 ; =gUnknown21C48B8 + ldr r1, _020627C8 ; =gMain ldr r3, [r1, #0x48] mov r1, #0x2 tst r1, r3 @@ -287,7 +287,7 @@ _020627B8: mov r0, #0x4 pop {r4, pc} .balign 4 -_020627C8: .word gUnknown21C48B8 +_020627C8: .word gMain _020627CC: .word 0x0000FFFF thumb_func_start FUN_020627D0 @@ -301,7 +301,7 @@ FUN_020627D0: ; 0x020627D0 thumb_func_start FUN_020627DC FUN_020627DC: ; 0x020627DC push {r3, lr} - ldr r1, _02062804 ; =gUnknown21C48B8 + ldr r1, _02062804 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 tst r1, r2 @@ -320,12 +320,12 @@ _020627FE: mov r0, #0x5 pop {r3, pc} nop -_02062804: .word gUnknown21C48B8 +_02062804: .word gMain thumb_func_start FUN_02062808 FUN_02062808: ; 0x02062808 push {r4, lr} - ldr r1, _020628B8 ; =gUnknown21C48B8 + ldr r1, _020628B8 ; =gMain mov r2, #0x2 ldr r1, [r1, #0x48] add r4, r0, #0x0 @@ -387,7 +387,7 @@ _0206285C: asr r2, r2, #0x10 bl FUN_0200C714 _02062882: - ldr r0, _020628B8 ; =gUnknown21C48B8 + ldr r0, _020628B8 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x80 tst r0, r1 @@ -415,7 +415,7 @@ _020628B4: mov r0, #0x6 pop {r4, pc} .balign 4 -_020628B8: .word gUnknown21C48B8 +_020628B8: .word gMain thumb_func_start FUN_020628BC FUN_020628BC: ; 0x020628BC @@ -481,7 +481,7 @@ _02062912: add r0, r4, #0x0 ldr r2, [r2, #0x0] add r0, #0xe4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 strb r0, [r4, #0x1e] mov r0, #0xa6 lsl r0, r0, #0x2 @@ -592,7 +592,7 @@ _020629EE: add r0, r4, #0x0 ldr r2, [r2, #0x0] add r0, #0xe4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 strb r0, [r4, #0x1e] mov r0, #0xa6 lsl r0, r0, #0x2 @@ -613,7 +613,7 @@ _02062A2A: str r0, [r4, #0xc] b _02062A60 _02062A3C: - ldr r1, _02062A6C ; =gUnknown21C48B8 + ldr r1, _02062A6C ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 tst r1, r2 @@ -635,7 +635,7 @@ _02062A60: pop {r4, pc} nop _02062A68: .word 0x0001020F -_02062A6C: .word gUnknown21C48B8 +_02062A6C: .word gMain thumb_func_start FUN_02062A70 FUN_02062A70: ; 0x02062A70 @@ -1485,7 +1485,7 @@ _02063094: ldr r2, [r5, #0x3c] add r0, #0xe4 mov r1, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xa6 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -1591,7 +1591,7 @@ FUN_02063208: ; 0x02063208 ldr r2, [r4, #0x0] add r0, #0xe4 mov r1, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, pc} .balign 4 @@ -1640,7 +1640,7 @@ FUN_02063264: ; 0x02063264 add r2, r4, r2 ldr r2, [r2, #0x7c] mov r1, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xa6 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1734,7 +1734,7 @@ _02063318: ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [sp, #0x30] mov r1, #0x0 str r0, [sp, #0x0] @@ -1747,7 +1747,7 @@ _02063318: str r0, [sp, #0xc] ldr r0, [sp, #0x2c] ldr r2, [r4, #0x34] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x1 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1764,7 +1764,7 @@ _02063318: lsl r2, r2, #0x2 add r2, r4, r2 ldr r2, [r2, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x0 ldr r1, [r4, #0x34] add r2, r0, #0x0 @@ -1784,7 +1784,7 @@ _02063318: ldr r2, [r4, #0x34] mov r1, #0x0 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] add r2, r4, r0 @@ -1912,7 +1912,7 @@ FUN_02063430: ; 0x02063430 ldr r2, [r4, #0x40] add r0, #0xf4 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0xd0 ldr r0, [r4, #0x0] mov r1, #0x3 @@ -2074,7 +2074,7 @@ _02063602: bl FUN_0201FDEC b _02063646 _02063618: - ldr r0, _0206364C ; =gUnknown21C48B8 + ldr r0, _0206364C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -2102,7 +2102,7 @@ _02063646: mov r0, #0x0 pop {r3-r5, pc} nop -_0206364C: .word gUnknown21C48B8 +_0206364C: .word gMain thumb_func_start FUN_02063650 FUN_02063650: ; 0x02063650 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index f463a96a..7dab8c17 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .extern UNK_020F96DC .section .rodata @@ -155,7 +155,7 @@ FUN_020654D0: ; 0x020654D0 beq _020654EE bl FUN_0205EC18 _020654EE: - ldr r0, _02065544 ; =gUnknown21C48B8 + ldr r0, _02065544 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x2 tst r0, r1 @@ -198,7 +198,7 @@ _02065536: _02065542: pop {r3-r5, pc} .balign 4 -_02065544: .word gUnknown21C48B8 +_02065544: .word gMain _02065548: .word FUN_02065658 _0206554C: .word FUN_020654A4 _02065550: .word 0x000005DC @@ -258,7 +258,7 @@ FUN_020655B0: ; 0x020655B0 ldr r0, [r4, r0] bl FUN_02001204 add r5, r0, #0x0 - ldr r0, _02065638 ; =gUnknown21C48B8 + ldr r0, _02065638 ; =gMain mov r1, #0x2 ldr r0, [r0, #0x48] tst r1, r0 @@ -317,7 +317,7 @@ _0206562C: _02065634: pop {r4-r6, pc} nop -_02065638: .word gUnknown21C48B8 +_02065638: .word gMain _0206563C: .word FUN_02065674 _02065640: .word FUN_020654B0 _02065644: .word 0x000005DC @@ -586,7 +586,7 @@ _0206584E: add sp, #0x4 pop {r3-r4, pc} _0206585C: - ldr r0, _02065888 ; =gUnknown21C48B8 + ldr r0, _02065888 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -609,7 +609,7 @@ _02065884: add sp, #0x4 pop {r3-r4, pc} .balign 4 -_02065888: .word gUnknown21C48B8 +_02065888: .word gMain _0206588C: .word FUN_02065674 _02065890: .word FUN_020654B0 @@ -733,7 +733,7 @@ _02065970: add sp, #0x4 pop {r3-r4, pc} _0206597E: - ldr r0, _020659AC ; =gUnknown21C48B8 + ldr r0, _020659AC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -756,7 +756,7 @@ _020659A6: add sp, #0x4 pop {r3-r4, pc} nop -_020659AC: .word gUnknown21C48B8 +_020659AC: .word gMain _020659B0: .word FUN_02065674 _020659B4: .word FUN_020654B0 @@ -1132,7 +1132,7 @@ _02065C64: sub r2, #0x78 ldr r2, [r5, r2] mov r3, #0x2 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x65 lsl r0, r0, #0x2 ldr r2, _02065CF4 ; =0x000003D9 @@ -1671,7 +1671,7 @@ _020660AE: bl FUN_020257C4 add r1, r0, #0x0 ldr r0, [r5, #0x8] - bl FUN_02021E28 + bl CopyU16ArrayToString ldrb r0, [r6, #0x19] strb r0, [r5, #0x2] ldrb r1, [r5, #0x0] @@ -2101,7 +2101,7 @@ _02066426: add r2, #0x10 ldr r1, [r5, r1] ldr r2, [r3, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x45 lsl r0, r0, #0x2 ldr r2, [r5, r0] @@ -2123,7 +2123,7 @@ _0206649E: add r0, r5, r0 mov r1, #0x1 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0x4e lsl r1, r1, #0x2 strb r0, [r5, r1] diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s index bddf1314..cd1030b7 100644 --- a/arm9/asm/unk_0206ABC4.s +++ b/arm9/asm/unk_0206ABC4.s @@ -70,7 +70,7 @@ _0206AC26: add r6, r0, #0x0 add r1, r5, #0x0 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array add r0, r6, #0x0 bl String_dtor _0206AC3E: diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s index e5b5bebe..1e7eb1f4 100644 --- a/arm9/asm/unk_0206B16C.s +++ b/arm9/asm/unk_0206B16C.s @@ -464,7 +464,7 @@ _0206B492: mov r2, #0x28 mul r2, r1 add r1, r3, r2 - bl FUN_02021E28 + bl CopyU16ArrayToString pop {r3, pc} _0206B4A8: bl ErrorHandling @@ -491,7 +491,7 @@ _0206B4C2: mul r2, r1 add r1, r3, r2 mov r2, #0x14 - bl FUN_02021EF0 + bl CopyStringToU16Array bl FUN_02022830 _0206B4DC: pop {r3, pc} diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 30db1fe3..52e88375 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .extern UNK_020FA6E8 .section .rodata @@ -451,7 +451,7 @@ _0206CA9C: ldrb r0, [r0, #0x0] cmp r0, #0x8 bne _0206CAD6 - ldr r0, _0206CE0C ; =gUnknown21C48B8 + ldr r0, _0206CE0C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x2 tst r0, r1 @@ -859,7 +859,7 @@ _0206CDD6: ldr r2, _0206CE14 ; =0x0000F3FF b _0206CE2C .balign 4 -_0206CE0C: .word gUnknown21C48B8 +_0206CE0C: .word gMain _0206CE10: .word 0x00007FFF _0206CE14: .word 0x0000F3FF _0206CE18: .word 0x00000395 @@ -2668,7 +2668,7 @@ FUN_0206DD6C: ; 0x0206DD6C ldr r0, [r4, #0xc] ldr r1, [r4, #0x10] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl FreeToHeap ldr r0, [r4, #0x4] @@ -2684,7 +2684,7 @@ FUN_0206DD6C: ; 0x0206DD6C str r0, [sp, #0x8] ldr r0, [r4, #0x4] ldr r2, [r4, #0x10] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r4-r5, pc} .balign 4 diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index 6d87f0fa..d46ad82e 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -295,7 +295,7 @@ _0206E4FA: ldr r1, [sp, #0x8] add r0, r4, #0x0 add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor add r0, r4, #0x0 @@ -364,7 +364,7 @@ _0206E56A: add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor add r0, r4, #0x0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 23b8fdb0..d5e109fb 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -2,7 +2,7 @@ .include "global.inc" .extern UNK_021C48F8 - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -828,7 +828,7 @@ _0206F9A0: .word 0x00000B22 thumb_func_start FUN_0206F9A4 FUN_0206F9A4: ; 0x0206F9A4 push {r3, lr} - ldr r0, _0206F9C0 ; =gUnknown21C48B8 + ldr r0, _0206F9C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -841,7 +841,7 @@ _0206F9BA: mov r0, #0x15 pop {r3, pc} nop -_0206F9C0: .word gUnknown21C48B8 +_0206F9C0: .word gMain _0206F9C4: .word 0x000005DC thumb_func_start FUN_0206F9C8 @@ -2960,7 +2960,7 @@ FUN_02070B28: ; 0x02070B28 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 - ldr r0, _02070CC0 ; =gUnknown21C48B8 + ldr r0, _02070CC0 ; =gMain mov r1, #0x40 ldr r0, [r0, #0x4c] mov r3, #0x4 @@ -3161,7 +3161,7 @@ _02070CB8: add sp, #0x4 pop {r3-r6, pc} nop -_02070CC0: .word gUnknown21C48B8 +_02070CC0: .word gMain _02070CC4: .word 0x00000B25 _02070CC8: .word UNK_020F9468 _02070CCC: .word 0x000005A4 @@ -3507,7 +3507,7 @@ _02070F90: .word 0x00000B21 FUN_02070F94: ; 0x02070F94 push {r4, lr} add r4, r0, #0x0 - ldr r0, _020710AC ; =gUnknown21C48B8 + ldr r0, _020710AC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -3597,7 +3597,7 @@ _0207103A: mov r0, #0x0 pop {r4, pc} _0207104A: - ldr r0, _020710AC ; =gUnknown21C48B8 + ldr r0, _020710AC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x2 tst r0, r1 @@ -3647,7 +3647,7 @@ _0207108E: _020710AA: pop {r4, pc} .balign 4 -_020710AC: .word gUnknown21C48B8 +_020710AC: .word gMain _020710B0: .word 0x00000B25 _020710B4: .word 0x000005DC _020710B8: .word 0x00000B23 @@ -4200,7 +4200,7 @@ _020714CC: thumb_func_start FUN_020714D0 FUN_020714D0: ; 0x020714D0 push {r4, lr} - ldr r1, _02071550 ; =gUnknown21C48B8 + ldr r1, _02071550 ; =gMain add r4, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x1 @@ -4261,7 +4261,7 @@ _02071544: _0207154C: pop {r4, pc} nop -_02071550: .word gUnknown21C48B8 +_02071550: .word gMain _02071554: .word 0x000005DC _02071558: .word 0x00000B25 @@ -4404,7 +4404,7 @@ _02071630: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -4818,7 +4818,7 @@ _0207198A: ; jump table (using 16-bit offset) .short _02071B34 - _0207198A - 2; case 3 .short _02071BE0 - _0207198A - 2; case 4 _02071994: - ldr r2, _02071C1C ; =gUnknown21C48B8 + ldr r2, _02071C1C ; =gMain ldr r3, [r2, #0x48] mov r2, #0x1 tst r2, r3 @@ -4890,7 +4890,7 @@ _02071A1A: mov r0, #0x1a pop {r4-r6, pc} _02071A26: - ldr r0, _02071C1C ; =gUnknown21C48B8 + ldr r0, _02071C1C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x2 tst r0, r1 @@ -4976,7 +4976,7 @@ _02071AC6: mov r0, #0x1a pop {r4-r6, pc} _02071AD2: - ldr r0, _02071C1C ; =gUnknown21C48B8 + ldr r0, _02071C1C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -5065,7 +5065,7 @@ _02071B34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -5098,7 +5098,7 @@ _02071B34: mov r0, #0x14 pop {r4-r6, pc} _02071BE0: - ldr r0, _02071C1C ; =gUnknown21C48B8 + ldr r0, _02071C1C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -5125,7 +5125,7 @@ _02071C12: pop {r4-r6, pc} .balign 4 _02071C18: .word 0x00000B2A -_02071C1C: .word gUnknown21C48B8 +_02071C1C: .word gMain _02071C20: .word 0x000005DC _02071C24: .word 0x000005EC _02071C28: .word 0x000005C8 @@ -5265,7 +5265,7 @@ _02071D44: .word 0x000005A4 thumb_func_start FUN_02071D48 FUN_02071D48: ; 0x02071D48 push {r4, lr} - ldr r1, _02071DE0 ; =gUnknown21C48B8 + ldr r1, _02071DE0 ; =gMain add r4, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x1 @@ -5342,7 +5342,7 @@ _02071DBA: _02071DDE: pop {r4, pc} .balign 4 -_02071DE0: .word gUnknown21C48B8 +_02071DE0: .word gMain _02071DE4: .word 0x00000B25 _02071DE8: .word 0x000005DC _02071DEC: .word 0x000005F2 @@ -5586,7 +5586,7 @@ _02071FA0: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r4, #0xb b _02072054 _02071FF2: @@ -5623,7 +5623,7 @@ _02071FF2: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r4, #0x9 b _02072054 _02072044: @@ -5749,7 +5749,7 @@ FUN_02072140: ; 0x02072140 bl FUN_0201BD70 cmp r0, #0x0 bne _02072162 - ldr r0, _0207216C ; =gUnknown21C48B8 + ldr r0, _0207216C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -5762,7 +5762,7 @@ _02072162: pop {r4, pc} nop _02072168: .word 0x00000B24 -_0207216C: .word gUnknown21C48B8 +_0207216C: .word gMain thumb_func_start FUN_02072170 FUN_02072170: ; 0x02072170 @@ -5893,7 +5893,7 @@ _02072246: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 _02072282: mov r0, #0x89 lsl r0, r0, #0x2 @@ -6014,7 +6014,7 @@ FUN_0207230C: ; 0x0207230C add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _020723D6 _02072388: ldr r0, _02072410 ; =0x000005A4 @@ -6050,7 +6050,7 @@ _02072388: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 _020723D6: mov r0, #0x89 lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 2592e6ed..e4f28bfe 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -416,7 +416,7 @@ FUN_020727FC: ; 0x020727FC add r1, #0xc ldr r1, [r2, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -603,7 +603,7 @@ _0207297E: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor pop {r4-r6, pc} @@ -667,7 +667,7 @@ FUN_02072A00: ; 0x02072A00 add r2, #0x60 ldr r1, [r1, r2] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -700,7 +700,7 @@ FUN_02072A54: ; 0x02072A54 ldr r2, [r3, r2] add r0, r4, r6 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r2, #0x71 add r0, r5, r7 lsl r2, r2, #0x4 @@ -740,7 +740,7 @@ _02072A9C: ldr r2, [r5, r2] add r0, r4, r6 mov r3, #0x40 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _02072B0A _02072ADC: cmp r0, #0x1 @@ -763,7 +763,7 @@ _02072ADC: ldr r2, [r5, r2] add r0, r4, r6 mov r3, #0x40 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02072B0A: add r0, r4, r6 bl FUN_02019220 @@ -1497,7 +1497,7 @@ FUN_02073094: ; 0x02073094 ldr r2, _02073154 ; =0x000006A8 str r1, [sp, #0xc] ldr r2, [r5, r2] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x79 lsl r0, r0, #0x2 add r0, r5, r0 @@ -1531,7 +1531,7 @@ _020730FE: ldr r2, _02073154 ; =0x000006A8 str r1, [sp, #0xc] ldr r2, [r5, r2] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x7d lsl r0, r0, #0x2 add r0, r5, r0 @@ -1584,7 +1584,7 @@ _02073198: ldr r2, [r5, r2] add r0, r4, #0x0 mov r1, #0x1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl FUN_02019220 add sp, #0xc @@ -1676,7 +1676,7 @@ FUN_0207322C: ; 0x0207322C ldr r2, [r4, r2] add r0, r4, r0 mov r1, #0x1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _02073278 ; =0x00000B24 strb r0, [r4, r1] add sp, #0xc @@ -1793,7 +1793,7 @@ _02073332: add r0, r4, r6 add r3, r1, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r4, r6 @@ -1856,7 +1856,7 @@ _020733B4: add r0, r4, r7 add r3, r1, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r4, r7 @@ -1904,7 +1904,7 @@ _02073416: add r0, r4, r6 add r3, r1, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0x0 bl String_dtor add r0, r4, r6 @@ -1962,7 +1962,7 @@ _02073490: add r0, r4, r7 add r3, r1, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0x0 bl String_dtor add r0, r4, r7 @@ -2069,7 +2069,7 @@ _0207356C: ldr r2, [sp, #0x18] add r0, r5, r0 add r3, r1, #0x0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x18] bl String_dtor ldr r0, _02073630 ; =0x0000069C @@ -2097,7 +2097,7 @@ _0207356C: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0x1c] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [sp, #0x1c] bl String_dtor ldr r1, _02073638 ; =0x000006A4 @@ -2118,7 +2118,7 @@ _0207356C: ldr r2, [r5, r2] add r0, r5, r0 mov r1, #0x0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldrh r1, [r6, #0x0] ldr r0, _02073634 ; =0x00000B28 add r4, #0x10 @@ -2187,7 +2187,7 @@ _0207366E: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, _020736F0 ; =0x000006A4 mov r0, #0x0 ldr r1, [r5, r1] @@ -2207,7 +2207,7 @@ _0207366E: add r0, r5, r0 mov r1, #0x0 sub r3, r3, r7 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] add r6, r6, #0x2 add r0, r0, #0x1 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index e30d5da6..98d5417f 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -222,7 +222,7 @@ FUN_02073EEC: ; 0x02073EEC add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _02074018 _02073F66: ldr r0, [r5, r0] @@ -280,7 +280,7 @@ _02073F66: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, _0207404C ; =0x00000B25 mov r2, #0x2c ldrb r3, [r5, r1] @@ -340,7 +340,7 @@ FUN_0207405C: ; 0x0207405C bl FUN_0201BD70 cmp r0, #0x0 bne _0207409A - ldr r0, _020740A4 ; =gUnknown21C48B8 + ldr r0, _020740A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -365,7 +365,7 @@ _0207409A: pop {r4, pc} nop _020740A0: .word 0x00000B24 -_020740A4: .word gUnknown21C48B8 +_020740A4: .word gMain _020740A8: .word 0x000005C8 thumb_func_start FUN_020740AC @@ -697,7 +697,7 @@ _02074368: .word 0x000005C8 FUN_0207436C: ; 0x0207436C push {r4, lr} add r4, r0, #0x0 - ldr r0, _020743A4 ; =gUnknown21C48B8 + ldr r0, _020743A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -721,7 +721,7 @@ _0207439E: mov r0, #0x10 pop {r4, pc} nop -_020743A4: .word gUnknown21C48B8 +_020743A4: .word gMain _020743A8: .word 0x000005C8 thumb_func_start FUN_020743AC @@ -2168,7 +2168,7 @@ _02074F68: .word 0x00000B22 FUN_02074F6C: ; 0x02074F6C push {r4, lr} add r4, r0, #0x0 - ldr r0, _02074FA4 ; =gUnknown21C48B8 + ldr r0, _02074FA4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2192,7 +2192,7 @@ _02074F9E: mov r0, #0x13 pop {r4, pc} nop -_02074FA4: .word gUnknown21C48B8 +_02074FA4: .word gMain _02074FA8: .word 0x000005C8 thumb_func_start FUN_02074FAC @@ -2852,7 +2852,7 @@ _020754CC: .word 0x00000B2A FUN_020754D0: ; 0x020754D0 push {r4, lr} add r4, r0, #0x0 - ldr r0, _02075504 ; =gUnknown21C48B8 + ldr r0, _02075504 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r1, r0 @@ -2874,5 +2874,5 @@ FUN_020754D0: ; 0x020754D0 _02075500: pop {r4, pc} nop -_02075504: .word gUnknown21C48B8 +_02075504: .word gMain _02075508: .word 0x000005C8 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 1dd536b9..a17d5fd5 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -426,7 +426,7 @@ _0207586C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -442,7 +442,7 @@ _02075890: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -458,7 +458,7 @@ _020758B4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -474,7 +474,7 @@ _020758D8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -490,7 +490,7 @@ _020758FC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -506,7 +506,7 @@ _02075920: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -522,7 +522,7 @@ _02075944: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -538,7 +538,7 @@ _02075968: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -560,7 +560,7 @@ _0207598C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -582,7 +582,7 @@ _020759BE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -604,7 +604,7 @@ _020759F0: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -626,7 +626,7 @@ _02075A22: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -648,7 +648,7 @@ _02075A54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -670,7 +670,7 @@ _02075A86: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -693,7 +693,7 @@ _02075AB8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -716,7 +716,7 @@ _02075AEC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -739,7 +739,7 @@ _02075B20: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -762,7 +762,7 @@ _02075B54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -791,7 +791,7 @@ _02075B98: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -814,7 +814,7 @@ _02075BCA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -836,7 +836,7 @@ _02075BFE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r4-r6, pc} @@ -946,7 +946,7 @@ FUN_02075CE4: ; 0x02075CE4 mov r0, #0x5 pop {r4, pc} _02075CF8: - ldr r0, _02075D18 ; =gUnknown21C48B8 + ldr r0, _02075D18 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -963,7 +963,7 @@ _02075D10: pop {r4, pc} .balign 4 _02075D14: .word 0x00000B24 -_02075D18: .word gUnknown21C48B8 +_02075D18: .word gMain _02075D1C: .word 0x000005A4 thumb_func_start FUN_02075D20 @@ -1311,7 +1311,7 @@ _02075FDA: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor ldr r0, [sp, #0x8] @@ -1594,7 +1594,7 @@ _02076212: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor ldr r7, _020763E0 ; =0x00000B25 @@ -1706,7 +1706,7 @@ _02076360: bl FUN_0201BD70 cmp r0, #0x0 bne _020763D6 - ldr r0, _02076404 ; =gUnknown21C48B8 + ldr r0, _02076404 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -1769,7 +1769,7 @@ _020763F4: .word 0x0000070E _020763F8: .word 0xFFFFF000 _020763FC: .word 0x000005EC _02076400: .word 0x00000706 -_02076404: .word gUnknown21C48B8 +_02076404: .word gMain _02076408: .word 0x000005DC thumb_func_start FUN_0207640C @@ -1901,7 +1901,7 @@ FUN_0207640C: ; 0x0207640C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor add r0, r4, #0x0 @@ -2005,7 +2005,7 @@ _02076612: bl FUN_0201BD70 cmp r0, #0x0 bne _020766A8 - ldr r0, _02076870 ; =gUnknown21C48B8 + ldr r0, _02076870 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2019,7 +2019,7 @@ _02076612: strb r1, [r4, r0] b _02076868 _0207663C: - ldr r0, _02076870 ; =gUnknown21C48B8 + ldr r0, _02076870 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2033,7 +2033,7 @@ _0207663C: strb r1, [r4, r0] b _02076868 _0207665A: - ldr r0, _02076870 ; =gUnknown21C48B8 + ldr r0, _02076870 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2109,7 +2109,7 @@ _020766BA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2156,7 +2156,7 @@ _02076724: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2174,7 +2174,7 @@ _02076780: bl FUN_0201BD70 cmp r0, #0x0 bne _02076868 - ldr r0, _02076870 ; =gUnknown21C48B8 + ldr r0, _02076870 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2186,7 +2186,7 @@ _02076780: strb r1, [r4, r0] b _02076868 _020767A4: - ldr r0, _02076870 ; =gUnknown21C48B8 + ldr r0, _02076870 ; =gMain ldr r2, [r0, #0x48] mov r0, #0x3 tst r0, r2 @@ -2223,7 +2223,7 @@ _020767A4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2282,7 +2282,7 @@ _02076868: pop {r3-r5, pc} .balign 4 _0207686C: .word 0x00000B27 -_02076870: .word gUnknown21C48B8 +_02076870: .word gMain _02076874: .word 0x000005DC _02076878: .word 0x000005A4 _0207687C: .word 0x0000FFFE @@ -2353,7 +2353,7 @@ _020768E6: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2390,7 +2390,7 @@ FUN_02076950: ; 0x02076950 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2428,7 +2428,7 @@ FUN_020769A4: ; 0x020769A4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2468,7 +2468,7 @@ FUN_020769FC: ; 0x020769FC add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2503,7 +2503,7 @@ FUN_02076A48: ; 0x02076A48 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2650,7 +2650,7 @@ _02076B68: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2679,7 +2679,7 @@ _02076BB2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2708,7 +2708,7 @@ _02076BF2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2738,7 +2738,7 @@ _02076C34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2821,7 +2821,7 @@ _02076CDC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2844,7 +2844,7 @@ _02076D38: .word 0x00000B22 FUN_02076D3C: ; 0x02076D3C push {r3-r5, lr} add r5, r0, #0x0 - ldr r0, _02076DC0 ; =gUnknown21C48B8 + ldr r0, _02076DC0 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -2881,7 +2881,7 @@ FUN_02076D3C: ; 0x02076D3C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2903,7 +2903,7 @@ _02076DBC: mov r0, #0x12 pop {r3-r5, pc} .balign 4 -_02076DC0: .word gUnknown21C48B8 +_02076DC0: .word gMain _02076DC4: .word 0x000005A4 _02076DC8: .word 0x00000B25 _02076DCC: .word 0x0000069C @@ -2924,7 +2924,7 @@ FUN_02076DD4: ; 0x02076DD4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2962,7 +2962,7 @@ FUN_02076E28: ; 0x02076E28 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3002,7 +3002,7 @@ FUN_02076E80: ; 0x02076E80 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3040,7 +3040,7 @@ FUN_02076ED4: ; 0x02076ED4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3163,7 +3163,7 @@ FUN_02076FB0: ; 0x02076FB0 add r1, #0x8 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor cmp r4, #0x0 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 6011647b..5c572392 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -3,7 +3,7 @@ .extern UNK_021C48F8 .extern gUnk021C4918 - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -706,7 +706,7 @@ _02077594: lsl r2, r2, #0x6 ldr r2, [r4, r2] add r0, r4, r0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _020776B4 ; =0x00000458 str r0, [r4, r1] sub r1, #0x10 @@ -828,7 +828,7 @@ FUN_020776C4: ; 0x020776C4 add r5, r0, #0x0 add r4, r1, #0x0 bl FUN_02078C98 - ldr r0, _020777BC ; =gUnknown21C48B8 + ldr r0, _020777BC ; =gMain mov r1, #0x4 ldr r0, [r0, #0x48] tst r1, r0 @@ -947,7 +947,7 @@ _020777B8: add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 -_020777BC: .word gUnknown21C48B8 +_020777BC: .word gMain _020777C0: .word 0x0000045C _020777C4: .word 0x0000069E _020777C8: .word 0x000005C8 @@ -1003,7 +1003,7 @@ _0207781A: add r4, #0x1c add r1, r4, #0x0 mov r2, #0xa - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4-r6, pc} _02077836: cmp r0, #0x3 @@ -1027,7 +1027,7 @@ _02077836: add r4, #0x1c add r1, r4, #0x0 mov r2, #0xa - bl FUN_02021EF0 + bl CopyStringToU16Array pop {r4-r6, pc} _02077864: mov r0, #0x1 @@ -1132,7 +1132,7 @@ _0207790E: add r1, r4, #0x0 ldr r0, [r5, #0x18] add r1, #0xd8 - bl FUN_02021E28 + bl CopyU16ArrayToString _02077932: mov r0, #0x61 lsl r0, r0, #0x2 @@ -1642,7 +1642,7 @@ FUN_02077CD4: ; 0x02077CD4 beq _02077D88 add r1, r4, r1 mov r2, #0x20 - bl FUN_02021EF0 + bl CopyStringToU16Array _02077D88: add r1, r4, #0x0 mov r0, #0x1 @@ -1866,7 +1866,7 @@ _02077F50: add r1, r5, #0x0 add r0, r7, #0x0 add r1, #0xd8 - bl FUN_02021E28 + bl CopyU16ArrayToString mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x5a @@ -3011,7 +3011,7 @@ FUN_02078894: ; 0x02078894 mov r1, #0x1 add r2, r4, #0x0 str r3, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r5, #0x0 bl FUN_020191D0 add sp, #0xc @@ -3044,7 +3044,7 @@ _020788DE: add r2, r6, #0x0 add r3, r4, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0x0 bl FUN_020191D0 add sp, #0x10 @@ -3496,7 +3496,7 @@ _02078C94: .word 0x0000E001 FUN_02078C98: ; 0x02078C98 push {r4-r6, lr} add r5, r0, #0x0 - ldr r0, _02078D70 ; =gUnknown21C48B8 + ldr r0, _02078D70 ; =gMain mov r4, #0x0 ldr r1, [r0, #0x4c] mov r0, #0x40 @@ -3513,7 +3513,7 @@ FUN_02078C98: ; 0x02078C98 mov r6, #0x1 add r4, r4, #0x1 _02078CC0: - ldr r0, _02078D70 ; =gUnknown21C48B8 + ldr r0, _02078D70 ; =gMain ldr r1, [r0, #0x4c] mov r0, #0x80 tst r0, r1 @@ -3528,7 +3528,7 @@ _02078CC0: mov r6, #0x2 add r4, r4, #0x1 _02078CE0: - ldr r0, _02078D70 ; =gUnknown21C48B8 + ldr r0, _02078D70 ; =gMain ldr r1, [r0, #0x4c] mov r0, #0x20 tst r0, r1 @@ -3543,7 +3543,7 @@ _02078CE0: mov r6, #0x3 add r4, r4, #0x1 _02078D00: - ldr r0, _02078D70 ; =gUnknown21C48B8 + ldr r0, _02078D70 ; =gMain ldr r1, [r0, #0x4c] mov r0, #0x10 tst r0, r1 @@ -3558,7 +3558,7 @@ _02078D00: mov r6, #0x4 add r4, r4, #0x1 _02078D20: - ldr r0, _02078D70 ; =gUnknown21C48B8 + ldr r0, _02078D70 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x8 tst r0, r1 @@ -3597,7 +3597,7 @@ _02078D5A: _02078D6E: pop {r4-r6, pc} .balign 4 -_02078D70: .word gUnknown21C48B8 +_02078D70: .word gMain _02078D74: .word 0x000005DC _02078D78: .word 0x000005C8 @@ -3814,7 +3814,7 @@ _02078F0A: add r5, r0, #0x0 ldr r0, [sp, #0x28] add r1, sp, #0x38 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, [sp, #0x20] sub r3, r6, r5 str r0, [sp, #0x0] @@ -3837,7 +3837,7 @@ _02078F0A: ldr r2, [sp, #0x28] mov r1, #0x0 add r3, r5, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02078F56: add r4, r4, #0x1 _02078F58: @@ -3872,7 +3872,7 @@ FUN_02078F7C: ; 0x02078F7C add r3, r5, #0x0 add r4, r0, #0x0 str r5, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0xc] add sp, #0x10 pop {r4-r6, pc} @@ -3944,7 +3944,7 @@ _02079012: bl FUN_02019620 add r0, r4, #0x0 add r1, sp, #0xc - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r3, _0207906C ; =0x000D0E0F add r0, r6, r7 add r1, r4, #0x0 diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s index 61d5124f..7f35d1a7 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -131,7 +131,7 @@ _02079A90: thumb_func_start FUN_02079AAC FUN_02079AAC: ; 0x02079AAC push {r4-r5} - ldr r3, _02079B5C ; =gUnknown21C48B8 + ldr r3, _02079B5C ; =gMain mov r2, #0x0 ldr r3, [r3, #0x4c] mov r5, #0x40 @@ -231,7 +231,7 @@ _02079B56: pop {r4-r5} bx lr .balign 4 -_02079B5C: .word gUnknown21C48B8 +_02079B5C: .word gMain thumb_func_start FUN_02079B60 FUN_02079B60: ; 0x02079B60 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 644dbb64..32848371 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -716,7 +716,7 @@ FUN_0207A1A0: ; 0x0207A1A0 cmp r1, #0x0 beq _0207A24C ldr r0, [r4, r2] - bl FUN_02021E28 + bl CopyU16ArrayToString _0207A24C: pop {r4, pc} nop @@ -822,7 +822,7 @@ FUN_0207A310: ; 0x0207A310 mov r0, #0x12 pop {r4-r6, pc} _0207A32E: - ldr r2, _0207A43C ; =gUnknown21C48B8 + ldr r2, _0207A43C ; =gMain mov r1, #0x20 ldr r5, [r2, #0x4c] add r6, r5, #0x0 @@ -956,7 +956,7 @@ _0207A434: pop {r4-r6, pc} .balign 4 _0207A438: .word 0x0000068F -_0207A43C: .word gUnknown21C48B8 +_0207A43C: .word gMain _0207A440: .word 0x0000068C _0207A444: .word 0x0000068E @@ -1015,7 +1015,7 @@ _0207A492: thumb_func_start FUN_0207A498 FUN_0207A498: ; 0x0207A498 push {r4, lr} - ldr r1, _0207A568 ; =gUnknown21C48B8 + ldr r1, _0207A568 ; =gMain add r4, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x40 @@ -1118,7 +1118,7 @@ _0207A564: mov r0, #0x7 pop {r4, pc} .balign 4 -_0207A568: .word gUnknown21C48B8 +_0207A568: .word gMain _0207A56C: .word 0x000005DC _0207A570: .word 0x0000068D _0207A574: .word 0x0000068E @@ -1127,7 +1127,7 @@ _0207A578: .word 0x0000069C thumb_func_start FUN_0207A57C FUN_0207A57C: ; 0x0207A57C push {r4, lr} - ldr r1, _0207A644 ; =gUnknown21C48B8 + ldr r1, _0207A644 ; =gMain add r4, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x40 @@ -1219,7 +1219,7 @@ _0207A63E: mov r0, #0x8 pop {r4, pc} nop -_0207A644: .word gUnknown21C48B8 +_0207A644: .word gMain _0207A648: .word 0x000005DC _0207A64C: .word 0x0000068D _0207A650: .word 0x000005DD @@ -1227,7 +1227,7 @@ _0207A650: .word 0x000005DD thumb_func_start FUN_0207A654 FUN_0207A654: ; 0x0207A654 push {r4, lr} - ldr r1, _0207A750 ; =gUnknown21C48B8 + ldr r1, _0207A750 ; =gMain add r4, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x20 @@ -1348,7 +1348,7 @@ _0207A74C: mov r0, #0x9 pop {r4, pc} .balign 4 -_0207A750: .word gUnknown21C48B8 +_0207A750: .word gMain _0207A754: .word 0x000005DC _0207A758: .word 0x000005DD _0207A75C: .word 0x0000068D @@ -1356,7 +1356,7 @@ _0207A75C: .word 0x0000068D thumb_func_start FUN_0207A760 FUN_0207A760: ; 0x0207A760 push {r3, lr} - ldr r1, _0207A778 ; =gUnknown21C48B8 + ldr r1, _0207A778 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x3 tst r1, r2 @@ -1368,7 +1368,7 @@ _0207A774: mov r0, #0xa pop {r3, pc} .balign 4 -_0207A778: .word gUnknown21C48B8 +_0207A778: .word gMain thumb_func_start FUN_0207A77C FUN_0207A77C: ; 0x0207A77C @@ -1399,7 +1399,7 @@ _0207A79E: thumb_func_start FUN_0207A7A4 FUN_0207A7A4: ; 0x0207A7A4 push {r3-r5, lr} - ldr r3, _0207A80C ; =gUnknown21C48B8 + ldr r3, _0207A80C ; =gMain mov r1, #0x20 ldr r2, [r3, #0x4c] add r4, r0, #0x0 @@ -1451,7 +1451,7 @@ _0207A808: mov r0, #0xd pop {r3-r5, pc} .balign 4 -_0207A80C: .word gUnknown21C48B8 +_0207A80C: .word gMain _0207A810: .word 0x000005DD _0207A814: .word 0x0000068E @@ -1515,7 +1515,7 @@ _0207A880: .word 0x0000068F FUN_0207A884: ; 0x0207A884 push {r4-r6, lr} sub sp, #0x8 - ldr r1, _0207AA00 ; =gUnknown21C48B8 + ldr r1, _0207AA00 ; =gMain add r5, r0, #0x0 ldr r2, [r1, #0x48] mov r1, #0x3 @@ -1696,7 +1696,7 @@ _0207A9FA: add sp, #0x8 pop {r4-r6, pc} .balign 4 -_0207AA00: .word gUnknown21C48B8 +_0207AA00: .word gMain _0207AA04: .word 0x0000068E _0207AA08: .word 0x00000295 _0207AA0C: .word 0x00000296 @@ -1709,7 +1709,7 @@ _0207AA1C: .word 0x000003E2 FUN_0207AA20: ; 0x0207AA20 push {r3-r5, lr} add r5, r0, #0x0 - ldr r0, _0207AA68 ; =gUnknown21C48B8 + ldr r0, _0207AA68 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -1745,12 +1745,12 @@ _0207AA62: mov r0, #0x10 pop {r3-r5, pc} nop -_0207AA68: .word gUnknown21C48B8 +_0207AA68: .word gMain _0207AA6C: .word 0x0000068E thumb_func_start FUN_0207AA70 FUN_0207AA70: ; 0x0207AA70 - ldr r0, _0207AA84 ; =gUnknown21C48B8 + ldr r0, _0207AA84 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x3 tst r0, r1 @@ -1761,7 +1761,7 @@ _0207AA7E: mov r0, #0x11 bx lr nop -_0207AA84: .word gUnknown21C48B8 +_0207AA84: .word gMain thumb_func_start FUN_0207AA88 FUN_0207AA88: ; 0x0207AA88 @@ -1871,7 +1871,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r2, _0207AEAC ; =0x00000674 mov r1, #0x0 ldr r0, [r7, r2] @@ -1890,7 +1890,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r2, _0207AEAC ; =0x00000674 mov r1, #0xe ldr r0, [r7, r2] @@ -1909,7 +1909,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 mov r1, #0x6 mov r2, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index ecdfaaa3..28f9597d 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -313,7 +313,7 @@ FUN_0207D768: ; 0x0207D768 ldr r2, [r5, r2] add r0, r5, r4 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0x0 add r0, #0x3e ldrb r1, [r5, r0] @@ -410,7 +410,7 @@ FUN_0207D800: ; 0x0207D800 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -425,7 +425,7 @@ FUN_0207D800: ; 0x0207D800 ldr r2, [r5, r2] add r0, r5, r6 mov r3, #0x10 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207D88A: add r0, r5, r6 bl FUN_02019220 @@ -463,7 +463,7 @@ FUN_0207D8A0: ; 0x0207D8A0 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor b _0207D8F2 @@ -543,7 +543,7 @@ FUN_0207D958: ; 0x0207D958 add r3, #0xc ldr r0, [r1, r3] ldr r1, [r1, r2] - bl FUN_02021CE0 + bl StringCompare cmp r0, #0x0 bne _0207D98E mov r0, #0x1 @@ -617,7 +617,7 @@ _0207D9FE: lsl r2, r2, #0x6 ldr r2, [r4, r2] add r0, r6, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -672,7 +672,7 @@ FUN_0207DA48: ; 0x0207DA48 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -729,7 +729,7 @@ FUN_0207DA94: ; 0x0207DA94 ldr r2, [r4, r2] ldr r3, [sp, #0x14] add r0, r5, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x0 str r0, [sp, #0x0] add r3, sp, #0x28 @@ -760,7 +760,7 @@ FUN_0207DA94: ; 0x0207DA94 ldr r2, [r4, r2] add r0, r5, r7 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x0 str r0, [sp, #0x0] add r3, sp, #0x28 @@ -782,7 +782,7 @@ FUN_0207DA94: ; 0x0207DA94 ldr r2, [r4, r2] ldr r3, [sp, #0x18] add r0, r5, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x20 pop {r3-r7, pc} .balign 4 @@ -966,7 +966,7 @@ FUN_0207DB78: ; 0x0207DB78 lsl r2, r2, #0x6 ldr r2, [r4, r2] add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x0 str r0, [sp, #0x0] ldr r3, _0207DD7C ; =0x000F0E00 @@ -1252,7 +1252,7 @@ _0207DF36: lsl r3, r3, #0x3 sub r3, r3, r5 lsr r3, r3, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0x96 lsl r1, r1, #0x2 mov r0, #0x0 @@ -1285,7 +1285,7 @@ _0207DF36: add r5, #0x14 add r0, r2, #0x0 ldr r2, [r4, r5] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _0207DFD0 _0207DFB6: mov r1, #0x0 @@ -1299,7 +1299,7 @@ _0207DFB6: add r5, #0x14 add r0, r2, #0x0 ldr r2, [r4, r5] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207DFD0: mov r0, #0x2 mov r2, #0x99 @@ -1435,7 +1435,7 @@ FUN_0207E0C4: ; 0x0207E0C4 str r0, [sp, #0x8] add r0, r5, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207E0F8: ldr r2, [r4, #0x20] cmp r2, #0x0 @@ -1452,7 +1452,7 @@ _0207E0F8: str r0, [sp, #0x8] add r0, r5, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207E11A: ldr r2, [r4, #0x28] cmp r2, #0x0 @@ -1469,7 +1469,7 @@ _0207E11A: str r0, [sp, #0x8] add r0, r5, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207E13C: ldr r2, [r4, #0x30] cmp r2, #0x0 @@ -1486,7 +1486,7 @@ _0207E13C: str r0, [sp, #0x8] add r0, r5, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207E15E: ldr r2, [r4, #0x38] cmp r2, #0x0 @@ -1503,7 +1503,7 @@ _0207E15E: str r0, [sp, #0x8] add r0, r5, #0x0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0207E180: add r0, r4, #0x0 bl FUN_02080094 @@ -1767,7 +1767,7 @@ FUN_0207E200: ; 0x0207E200 ldr r0, [r4, r1] add r1, r1, #0x4 ldr r1, [r4, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x91 @@ -1914,7 +1914,7 @@ _0207E4C6: ldr r2, [r4, r2] add r0, #0x10 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -2253,7 +2253,7 @@ _0207E7BC: ldr r2, [r4, r2] add r0, #0x10 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -2299,7 +2299,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x1a @@ -2329,7 +2329,7 @@ FUN_0207E840: ; 0x0207E840 ldr r2, [r5, r2] add r0, #0x10 add r3, r4, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, _0207E994 ; =0x00000674 mov r1, #0xb9 ldr r0, [r5, r0] @@ -2357,7 +2357,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r0] add r3, r4, #0x0 add r0, #0x10 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0x0 bl String_dtor ldr r0, _0207E994 ; =0x00000674 @@ -2386,7 +2386,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor mov r1, #0x1a @@ -2414,7 +2414,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r0] ldr r2, [r5, r2] add r0, #0x10 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -2555,7 +2555,7 @@ _0207EA88: ldr r2, [r5, r2] add r0, r4, r6 mov r3, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x20] ldr r2, _0207EB5C ; =0x00000674 cmp r0, #0x0 @@ -2577,7 +2577,7 @@ _0207EA88: lsl r2, r2, #0x6 ldr r2, [r5, r2] add r0, r4, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0x0 add r0, #0x8d str r0, [sp, #0x0] @@ -2627,7 +2627,7 @@ _0207EB10: lsl r2, r2, #0x6 ldr r2, [r5, r2] sub r3, r3, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x24 pop {r4-r7, pc} nop @@ -3009,7 +3009,7 @@ FUN_0207EE2C: ; 0x0207EE2C ldr r2, [r5, r2] add r0, #0x50 add r3, r1, #0x0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0x0 bl DestroyMsgData mov r0, #0x75 @@ -3117,7 +3117,7 @@ _0207EF10: ldr r2, [r4, r2] add r0, r6, #0x0 mov r1, #0x1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0x0 bl FUN_02019220 add sp, #0x10 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 9e7642aa..7269a626 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -606,7 +606,7 @@ FUN_02080108: ; 0x02080108 ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -764,7 +764,7 @@ _0208036E: ldr r0, [r4, #0x8] ldr r1, [r4, #0x20] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor add sp, #0x8 @@ -881,7 +881,7 @@ _02080478: ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index 6b8df55d..e86c6f2d 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -550,7 +550,7 @@ FUN_02083888: ; 0x02083888 bl StringSetEmpty ldr r0, [r4, r7] add r1, r5, #0x4 - bl FUN_02021E28 + bl CopyU16ArrayToString ldr r0, _020838B0 ; =0x00000584 ldrb r1, [r6, r0] add r1, r1, #0x1 @@ -567,7 +567,7 @@ FUN_020838B4: ; 0x020838B4 add r0, r2, #0x0 add r1, sp, #0x0 mov r2, #0x8 - bl FUN_02021EF0 + bl CopyStringToU16Array mov r0, #0x14 add r1, r0, #0x0 bl AllocFromHeap diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index cf2ec66b..959d633f 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -302,7 +302,7 @@ FUN_020856F0: ; 0x020856F0 bl FUN_020257C4 add r1, r0, #0x0 ldr r0, [r6, #0x10] - bl FUN_02021E28 + bl CopyU16ArrayToString add r0, r4, #0x0 bl FUN_020257CC strb r0, [r6, #0xf] diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index d479cde5..7c862646 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -594,7 +594,7 @@ FUN_020867EC: ; 0x020867EC ldr r2, [sp, #0x14] add r0, r5, #0x0 add r1, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r3, #0x0 str r3, [sp, #0x0] str r6, [sp, #0x4] @@ -602,7 +602,7 @@ FUN_020867EC: ; 0x020867EC mov r1, #0x1 add r2, r4, #0x0 str r3, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r6, r0, #0x0 add r0, r7, #0x0 bl DestroyMsgData diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 2eb6f36e..20b958ad 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -563,7 +563,7 @@ _020898B8: ldr r2, [r5, #0x10] add r0, #0x1c mov r1, #0x1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0xc] cmp r4, #0x0 bne _02089918 @@ -593,7 +593,7 @@ _02089920: _0208993C: cmp r2, #0x0 bne _0208994A - ldr r0, _0208995C ; =gUnknown21C48B8 + ldr r0, _0208995C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -608,4 +608,4 @@ _02089950: pop {r4-r7, pc} nop _02089958: .word 0x000001E2 -_0208995C: .word gUnknown21C48B8 +_0208995C: .word gMain diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index df52b64f..d7d6fc47 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .section .rodata @@ -490,7 +490,7 @@ _02089CE8: ldr r2, [r5, #0x14] add r0, #0x20 mov r1, #0x1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0x10] cmp r4, #0x0 bne _02089D48 @@ -520,7 +520,7 @@ _02089D50: _02089D6C: cmp r2, #0x0 bne _02089D7A - ldr r0, _02089D8C ; =gUnknown21C48B8 + ldr r0, _02089D8C ; =gMain ldr r1, [r0, #0x48] mov r0, #0x1 tst r0, r1 @@ -535,4 +535,4 @@ _02089D80: pop {r4-r7, pc} nop _02089D88: .word 0x000001E2 -_02089D8C: .word gUnknown21C48B8 +_02089D8C: .word gMain diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index b4903516..6849192b 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -154,7 +154,7 @@ FUN_02089D90: ; 0x02089D90 add r2, r4, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor bl FUN_0201E788 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 5ab705d4..19e3631e 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -158,7 +158,7 @@ FUN_02089F24: ; 0x02089F24 add r2, r4, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor bl FUN_0201E788 @@ -327,7 +327,7 @@ _0208A0C8: add r2, r4, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor bl FUN_0201E788 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 3c3bfb6c..7425416f 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -1,7 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .extern gUnknown21C48B8 + .extern gMain .text @@ -413,7 +413,7 @@ _0208A6A2: bl FUN_0208A750 cmp r0, #0x0 beq _0208A6C8 - ldr r0, _0208A6D0 ; =gUnknown21C48B8 + ldr r0, _0208A6D0 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xf3 tst r0, r1 @@ -432,7 +432,7 @@ _0208A6C8: pop {r3-r5, pc} .balign 4 _0208A6CC: .word 0x0000FFFF -_0208A6D0: .word gUnknown21C48B8 +_0208A6D0: .word gMain thumb_func_start FUN_0208A6D4 FUN_0208A6D4: ; 0x0208A6D4 @@ -448,7 +448,7 @@ FUN_0208A6D4: ; 0x0208A6D4 ldr r0, [r5, #0xc] ldr r1, [r5, #0x8] ldr r2, [r5, #0x4] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _0208A6FA _0208A6F4: ldr r2, [r5, #0x8] @@ -574,7 +574,7 @@ _0208A7D2: add r0, r7, #0x0 mov r1, #0x0 mov r3, #0xc - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r6, r6, #0x1 add r4, #0x10 cmp r6, #0x5 @@ -662,7 +662,7 @@ _0208A882: add r0, r7, #0x0 mov r1, #0x0 mov r3, #0xc - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r6, r6, #0x1 add r4, #0x10 cmp r6, #0x2 @@ -699,7 +699,7 @@ FUN_0208A8DC: ; 0x0208A8DC push {r4, lr} sub sp, #0x8 add r4, r0, #0x0 - ldr r0, _0208A990 ; =gUnknown21C48B8 + ldr r0, _0208A990 ; =gMain mov r1, #0x40 ldr r0, [r0, #0x48] tst r1, r0 @@ -787,5 +787,5 @@ _0208A954: add sp, #0x8 pop {r4, pc} nop -_0208A990: .word gUnknown21C48B8 +_0208A990: .word gMain _0208A994: .word 0x000005DC diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index 2c02879a..bd8f0bf7 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -30,8 +30,8 @@ UNK_020FF4D8: ; 0x020FF4D8 .section .bss - .global UNK_021C8C58 -UNK_021C8C58: ; 0x021C8C58 + .global sErrorMessagePrinterLock +sErrorMessagePrinterLock: ; 0x021C8C58 .space 0x4 .text @@ -52,11 +52,11 @@ _0208A9AC: .word 0x027E0000 _0208A9B0: .word 0x00003FF8 _0208A9B4: .word MI_WaitDma - thumb_func_start FUN_0208A9B8 -FUN_0208A9B8: ; 0x0208A9B8 + thumb_func_start PrintErrorMessageAndReset +PrintErrorMessageAndReset: ; 0x0208A9B8 push {r4-r7, lr} sub sp, #0x24 - ldr r0, _0208ABC8 ; =UNK_021C8C58 + ldr r0, _0208ABC8 ; =sErrorMessagePrinterLock ldr r1, [r0, #0x0] cmp r1, #0x1 bne _0208A9C6 @@ -209,7 +209,7 @@ _0208A9C6: add r2, r4, #0x0 add r3, r1, #0x0 str r1, [sp, #0x8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor bl FUN_0201E788 @@ -273,7 +273,7 @@ _0208ABC4: add sp, #0x24 pop {r4-r7, pc} .balign 4 -_0208ABC8: .word UNK_021C8C58 +_0208ABC8: .word sErrorMessagePrinterLock _0208ABCC: .word UNK_020FF4A4 _0208ABD0: .word FUN_0208A998 _0208ABD4: .word 0xFFFFE0FF |