diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-07 11:18:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-07 11:52:46 -0400 |
| commit | 20573e3d384f73f63836864a0c6c9b0069ee9e9d (patch) | |
| tree | aef4dd41cf400efbf95a1e83dd3ed8c6c4f48111 /arm9/modules | |
| parent | a91c5b4d723eff82947091956f02853ef4c8d955 (diff) | |
Name text printer funcs
Diffstat (limited to 'arm9/modules')
52 files changed, 1083 insertions, 1083 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 019e4eea..8dba7426 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -1063,7 +1063,7 @@ _021E22B8: ldr r0, _021E235C ; =0x000005DC bl FUN_020054C8 _021E22EE: - ldr r0, _021E2360 ; =gUnknown21C48B8 + ldr r0, _021E2360 ; =gMain mov r1, #0x40 ldr r0, [r0, #0x4c] tst r1, r0 @@ -1120,7 +1120,7 @@ _021E235A: pop {r4, r5, r6, pc} .balign 4, 0 _021E235C: .word 0x000005DC -_021E2360: .word gUnknown21C48B8 +_021E2360: .word gMain _021E2364: .word 0x0000FFFE thumb_func_start MOD05_021E2368 @@ -1209,7 +1209,7 @@ MOD05_021E23D0: ; 0x021E23D0 ldr r0, [r5, #0x18] mov r1, #1 add r2, r6, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -1383,7 +1383,7 @@ MOD05_021E2540: ; 0x021E2540 ldr r3, [sp, #0x10] add r0, r5, #0 add r2, r6, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -1769,7 +1769,7 @@ MOD05_021E27E8: ; 0x021E27E8 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl DestroyMsgData add r0, r6, #0 @@ -1855,7 +1855,7 @@ MOD05_021E28A0: ; 0x021E28A0 add r0, r5, #0 add r2, r4, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 @@ -1982,7 +1982,7 @@ MOD05_021E29C8: ; 0x021E29C8 ldr r0, [sp, #0xc] add r2, r4, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 @@ -2102,7 +2102,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 ldr r0, [sp, #0xc] add r2, r4, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index f525e8c6..6e557880 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -384,7 +384,7 @@ MOD05_021E2E68: ; 0x021E2E68 str r3, [sp, #8] ldr r0, [r4, #0xc] ldr r2, [r4] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, [r4, #0x14] strb r0, [r1] add sp, #0xc @@ -835,7 +835,7 @@ MOD05_021E31D4: ; 0x021E31D4 add r3, #0x30 ldrb r3, [r3] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, pc} nop @@ -7957,7 +7957,7 @@ _021E6824: _021E682A: ldr r0, [r4, #0xc] bl FUN_020552F8 - ldr r2, _021E68D4 ; =gUnknown21C48B8 + ldr r2, _021E68D4 ; =gMain str r0, [sp] ldr r1, [r2, #0x48] ldr r2, [r2, #0x44] @@ -8031,7 +8031,7 @@ _021E68C6: .balign 4, 0 _021E68CC: .word 0x00000651 _021E68D0: .word 0x00000652 -_021E68D4: .word gUnknown21C48B8 +_021E68D4: .word gMain thumb_func_start MOD05_021E68D8 MOD05_021E68D8: ; 0x021E68D8 @@ -11660,7 +11660,7 @@ MOD05_021E8410: ; 0x021E8410 ldr r0, [r5, #0x10] add r2, r6, #0 add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor mov r0, #1 @@ -11691,7 +11691,7 @@ _021E846E: ldr r0, [r5, #0x10] add r2, r6, #0 add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor sub r2, r7, #4 @@ -11718,7 +11718,7 @@ _021E846E: ldr r0, [r5, #0x10] mov r1, #0 add r2, r6, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor _021E84D6: @@ -39943,7 +39943,7 @@ _021F6088: thumb_func_start MOD05_021F6098 MOD05_021F6098: ; 0x021F6098 - ldr r0, _021F60A8 ; =gUnknown21C48B8 + ldr r0, _021F60A8 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r1, r0 @@ -39952,11 +39952,11 @@ MOD05_021F6098: ; 0x021F6098 _021F60A4: bx lr nop -_021F60A8: .word gUnknown21C48B8 +_021F60A8: .word gMain thumb_func_start MOD05_021F60AC MOD05_021F60AC: ; 0x021F60AC - ldr r0, _021F60C0 ; =gUnknown21C48B8 + ldr r0, _021F60C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -39967,7 +39967,7 @@ _021F60BA: mov r0, #0 bx lr nop -_021F60C0: .word gUnknown21C48B8 +_021F60C0: .word gMain thumb_func_start MOD05_021F60C4 MOD05_021F60C4: ; 0x021F60C4 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index f74e8b93..485937c9 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8638,7 +8638,7 @@ MOD06_0223D7EC: ; 0x0223D7EC mov r0, #0 pop {r3, r4, r5, pc} _0223D804: - ldr r0, _0223D90C ; =gUnknown21C48B8 + ldr r0, _0223D90C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -8759,7 +8759,7 @@ _0223D908: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_0223D90C: .word gUnknown21C48B8 +_0223D90C: .word gMain _0223D910: .word 0x00000241 _0223D914: .word 0x000001BE @@ -9308,7 +9308,7 @@ _0223DD86: add r0, #0x18 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor lsl r1, r5, #0x10 @@ -9436,7 +9436,7 @@ MOD06_0223DE34: ; 0x0223DE34 add r2, r4, #0 sub r3, r5, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -9478,7 +9478,7 @@ MOD06_0223DED0: ; 0x0223DED0 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor b _0223DF30 @@ -9539,7 +9539,7 @@ _0223DF30: add r2, r4, #0 sub r3, r3, r6 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -9874,7 +9874,7 @@ _0223E214: add r2, r6, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor add r0, r6, #0 @@ -9907,7 +9907,7 @@ MOD06_0223E29C: ; 0x0223E29C mov r0, #6 pop {r4, pc} _0223E2C4: - ldr r0, _0223E37C ; =gUnknown21C48B8 + ldr r0, _0223E37C ; =gMain mov r1, #1 ldr r2, [r0, #0x48] add r0, r2, #0 @@ -9985,7 +9985,7 @@ _0223E374: pop {r4, pc} .align 2, 0 _0223E378: .word 0x00000638 -_0223E37C: .word gUnknown21C48B8 +_0223E37C: .word gMain _0223E380: .word 0x000005DC thumb_func_start MOD06_0223E384 @@ -10215,7 +10215,7 @@ _0223E50A: add r2, r4, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add r0, r5, #0 @@ -10261,7 +10261,7 @@ _0223E50A: add r2, r4, #0 sub r3, r3, r6 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -10591,7 +10591,7 @@ MOD06_0223E858: ; 0x0223E858 mov r0, #0xa pop {r3, r4, r5, pc} _0223E86E: - ldr r0, _0223E948 ; =gUnknown21C48B8 + ldr r0, _0223E948 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -10691,7 +10691,7 @@ _0223E944: mov r0, #0xa pop {r3, r4, r5, pc} .align 2, 0 -_0223E948: .word gUnknown21C48B8 +_0223E948: .word gMain _0223E94C: .word 0x00000241 thumb_func_start MOD06_0223E950 @@ -10707,7 +10707,7 @@ MOD06_0223E950: ; 0x0223E950 mov r0, #0xb pop {r4, pc} _0223E966: - ldr r0, _0223E9B8 ; =gUnknown21C48B8 + ldr r0, _0223E9B8 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -10743,7 +10743,7 @@ _0223E9B2: mov r0, #0xb pop {r4, pc} nop -_0223E9B8: .word gUnknown21C48B8 +_0223E9B8: .word gMain thumb_func_start MOD06_0223E9BC MOD06_0223E9BC: ; 0x0223E9BC @@ -11730,7 +11730,7 @@ _0223F11A: ldr r2, [r2] add r0, #0x20 mov r3, #8 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, _0223F26C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x7c] @@ -11770,7 +11770,7 @@ _0223F11A: ldr r2, [r2, #8] add r0, #0x20 mov r3, #0x58 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0x10 pop {r3, r4, r5, pc} _0223F21C: @@ -11806,7 +11806,7 @@ _0223F21C: ldr r2, [r2] add r0, #0x20 mov r3, #8 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -11958,7 +11958,7 @@ MOD06_0223F344: ; 0x0223F344 str r1, [sp, #8] ldr r2, [r2, #0x1c] add r0, #0x30 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {pc} nop @@ -12343,7 +12343,7 @@ MOD06_0223F6D8: ; 0x0223F6D8 bl MOD06_0223F5D0 cmp r0, #0 bne _0223F712 - ldr r0, _0223F718 ; =gUnknown21C48B8 + ldr r0, _0223F718 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -12357,7 +12357,7 @@ _0223F712: pop {r3, r4, r5, pc} .align 2, 0 _0223F714: .word MOD6_02252420 -_0223F718: .word gUnknown21C48B8 +_0223F718: .word gMain _0223F71C: .word MOD06_0223F720 thumb_func_start MOD06_0223F720 @@ -12492,7 +12492,7 @@ _0223F7E0: ldr r2, [r2] add r0, #0x20 mov r3, #8 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, sp, #0xc ldrh r0, [r0] bl FUN_0202DFA4 @@ -12529,7 +12529,7 @@ _0223F7E0: str r1, [sp, #8] ldr r2, [r2, #8] add r0, #0x20 - bl FUN_0201BD84 + bl AddTextPrinterParameterized _0223F892: add sp, #0x10 pop {r4, pc} @@ -12750,7 +12750,7 @@ _0223FA02: str r1, [sp, #8] ldr r2, [r2, #0x18] add r0, #0x30 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -13312,7 +13312,7 @@ MOD06_0223FEF0: ; 0x0223FEF0 bl FUN_020546C8 cmp r0, #0 beq _0223FF26 - ldr r0, _0223FF2C ; =gUnknown21C48B8 + ldr r0, _0223FF2C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -13330,7 +13330,7 @@ _0223FF26: pop {r3, r4, r5, pc} .align 2, 0 _0223FF28: .word MOD6_02252420 -_0223FF2C: .word gUnknown21C48B8 +_0223FF2C: .word gMain thumb_func_start MOD06_0223FF30 MOD06_0223FF30: ; 0x0223FF30 @@ -13344,7 +13344,7 @@ MOD06_0223FF30: ; 0x0223FF30 bl FUN_020546C8 cmp r0, #0 beq _0223FF5C - ldr r0, _0223FF64 ; =gUnknown21C48B8 + ldr r0, _0223FF64 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -13356,7 +13356,7 @@ _0223FF5C: pop {r3, pc} nop _0223FF60: .word MOD6_02252420 -_0223FF64: .word gUnknown21C48B8 +_0223FF64: .word gMain _0223FF68: .word MOD06_0223FF6C thumb_func_start MOD06_0223FF6C @@ -13606,7 +13606,7 @@ MOD06_02240164: ; 0x02240164 bl FUN_020546C8 cmp r0, #0 beq _02240192 - ldr r0, _02240198 ; =gUnknown21C48B8 + ldr r0, _02240198 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -13622,7 +13622,7 @@ _02240192: pop {r4, pc} .align 2, 0 _02240194: .word MOD6_02252420 -_02240198: .word gUnknown21C48B8 +_02240198: .word gMain thumb_func_start MOD06_0224019C MOD06_0224019C: ; 0x0224019C @@ -14172,7 +14172,7 @@ MOD06_0224062C: ; 0x0224062C bl FUN_020546C8 cmp r0, #0 beq _0224065E - ldr r0, _02240664 ; =gUnknown21C48B8 + ldr r0, _02240664 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -14189,7 +14189,7 @@ _0224065E: pop {r4, pc} .align 2, 0 _02240660: .word MOD6_02252420 -_02240664: .word gUnknown21C48B8 +_02240664: .word gMain thumb_func_start MOD06_02240668 MOD06_02240668: ; 0x02240668 @@ -14267,7 +14267,7 @@ MOD06_022406EC: ; 0x022406EC bl FUN_020546C8 cmp r0, #0 beq _02240718 - ldr r0, _02240720 ; =gUnknown21C48B8 + ldr r0, _02240720 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -14280,7 +14280,7 @@ _02240718: pop {r3, r4, r5, pc} nop _0224071C: .word MOD6_02252420 -_02240720: .word gUnknown21C48B8 +_02240720: .word gMain thumb_func_start MOD06_02240724 MOD06_02240724: ; 0x02240724 @@ -15015,7 +15015,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r2, [sp, #0x28] mov r3, #0x39 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r6, #0 mov r4, #0x10 mov r7, #0xff @@ -15033,7 +15033,7 @@ _02240CFE: ldr r2, [sp, #0x2c] mov r1, #0 mov r3, #2 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r6, r6, #1 add r4, #0xf cmp r6, #9 @@ -15240,7 +15240,7 @@ _02240E8C: ldr r2, [sp, #0x28] mov r1, #0 sub r3, r3, r4 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x20] add r7, r7, #1 add r0, r0, #1 @@ -15503,7 +15503,7 @@ _022410D2: bl FUN_020546C8 cmp r0, #0 beq _0224117E - ldr r0, _02241184 ; =gUnknown21C48B8 + ldr r0, _02241184 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -15521,7 +15521,7 @@ _022410F0: str r0, [r4, #0x7c] b _0224117E _02241104: - ldr r1, _02241184 ; =gUnknown21C48B8 + ldr r1, _02241184 ; =gMain ldr r2, [r1, #0x48] mov r1, #3 tst r1, r2 @@ -15575,7 +15575,7 @@ _0224117E: mov r0, #0 pop {r4, pc} nop -_02241184: .word gUnknown21C48B8 +_02241184: .word gMain thumb_func_start MOD06_02241188 MOD06_02241188: ; 0x02241188 @@ -19317,7 +19317,7 @@ MOD06_02242F54: ; 0x02242F54 push {r3, r4, lr} sub sp, #4 add r4, r0, #0 - ldr r0, _02242FE0 ; =gUnknown21C48B8 + ldr r0, _02242FE0 ; =gMain ldr r1, [r0, #0x48] mov r0, #4 tst r0, r1 @@ -19385,7 +19385,7 @@ _02242FDC: add sp, #4 pop {r3, r4, pc} .align 2, 0 -_02242FE0: .word gUnknown21C48B8 +_02242FE0: .word gMain _02242FE4: .word MOD6_02250C40 _02242FE8: .word 0x000003D9 @@ -19497,7 +19497,7 @@ MOD06_02243080: ; 0x02243080 mov r1, #1 add r2, r6, #0 str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -40815,7 +40815,7 @@ _0224D432: str r0, [r4, #4] b _0224D462 _0224D442: - ldr r0, _0224D468 ; =gUnknown21C48B8 + ldr r0, _0224D468 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -40834,7 +40834,7 @@ _0224D462: mov r0, #0 pop {r3, r4, r5, pc} nop -_0224D468: .word gUnknown21C48B8 +_0224D468: .word gMain thumb_func_start MOD06_0224D46C MOD06_0224D46C: ; 0x0224D46C @@ -40923,7 +40923,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r4, #0 add r2, r6, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r5, #0 bl String_dtor ldr r0, [r4, #0x10] @@ -40943,7 +40943,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r4, #0 add r2, r5, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r5, #0 bl String_dtor mov r0, #0 @@ -40970,7 +40970,7 @@ _0224D576: mov r0, #0 str r0, [sp, #8] add r0, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x24] @@ -41003,7 +41003,7 @@ _0224D5BE: mov r0, #0 str r0, [sp, #8] add r0, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x14] @@ -41058,7 +41058,7 @@ _0224D60C: mov r0, #0 str r0, [sp, #8] add r0, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x2c] bl String_dtor add r7, r7, #1 @@ -41647,7 +41647,7 @@ _0224DB3E: bl MOD06_0224DD28 cmp r0, #0 beq _0224DB9A - ldr r0, _0224DB68 ; =gUnknown21C48B8 + ldr r0, _0224DB68 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -41659,7 +41659,7 @@ _0224DB3E: _0224DB5C: .word MOD6_02252080 _0224DB60: .word MOD06_0224E410 _0224DB64: .word 0x000005DC -_0224DB68: .word gUnknown21C48B8 +_0224DB68: .word gMain _0224DB6C: mov r0, #0x55 lsl r0, r0, #2 @@ -41873,7 +41873,7 @@ _0224DCEC: str r3, [sp, #0xc] ldr r0, [r5, #4] ldr r2, [r5, #0x10] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r0, [r5, #0xc] ldr r0, [r5, #4] bl FUN_020191D0 @@ -42167,7 +42167,7 @@ _0224DF64: str r0, [sp, #0xc] ldr r0, [r5, #4] ldr r2, [r5, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r7, #1 add r6, r6, #4 add r4, #0x10 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index fd5e5c2a..11506c14 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2464,7 +2464,7 @@ MOD07_02213220: ; 0x02213220 add r2, r7, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, _022132C0 ; =0x00000B44 ldr r0, [r4, r0] str r0, [sp, #0x10] @@ -4525,7 +4525,7 @@ _022142BE: add r3, r1, #0 add r0, r7, r0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x18 mul r0, r4 add r2, r5, r0 @@ -4553,7 +4553,7 @@ _022142BE: add r0, r7, r0 mov r3, #0x40 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x24 pop {r4, r5, r6, r7, pc} _02214344: @@ -4574,7 +4574,7 @@ _02214344: mov r3, #0x40 add r0, r7, r0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0221436C: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -4638,7 +4638,7 @@ MOD07_0221437C: ; 0x0221437C add r0, r5, r4 mov r3, #0x10 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4703,7 +4703,7 @@ MOD07_022143FC: ; 0x022143FC add r2, r4, #0 sub r3, r3, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] mov r1, #0x1a add r2, r4, #0 @@ -4719,7 +4719,7 @@ MOD07_022143FC: ; 0x022143FC mov r3, #0x1c add r0, r7, r0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -4762,7 +4762,7 @@ MOD07_022143FC: ; 0x022143FC add r0, r7, r0 str r1, [sp, #0xc] str r3, [sp, #0x24] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x2c pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index cec0bf0a..bd4cc319 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -1196,7 +1196,7 @@ MOD08_022126A4: ; 0x022126A4 mov r1, #1 add r2, #0x8d strb r1, [r2] - ldr r3, _022126D8 ; =gUnknown21C48B8 + ldr r3, _022126D8 ; =gMain lsl r2, r1, #9 ldr r4, [r3, #0x44] tst r2, r4 @@ -1219,7 +1219,7 @@ _022126D4: pop {r3, r4} bx lr .align 2, 0 -_022126D8: .word gUnknown21C48B8 +_022126D8: .word gMain thumb_func_start MOD08_022126DC MOD08_022126DC: ; 0x022126DC diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 9c6c8435..882a9e27 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -1544,7 +1544,7 @@ _02212AA0: .word 0x0000207B MOD09_02212AA4: ; 0x02212AA4 push {r4, lr} add r4, r0, #0 - ldr r0, _02212AC4 ; =gUnknown21C48B8 + ldr r0, _02212AC4 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -1560,7 +1560,7 @@ _02212AC0: mov r0, #0x12 pop {r4, pc} .align 2, 0 -_02212AC4: .word gUnknown21C48B8 +_02212AC4: .word gMain _02212AC8: .word 0x00002079 thumb_func_start MOD09_02212ACC @@ -4110,7 +4110,7 @@ MOD09_02213E84: ; 0x02213E84 str r0, [sp, #0xc] ldrb r3, [r3, #0x10] add r0, r5, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _02213F22 _02213F06: ldrb r7, [r3, #0x14] @@ -4125,7 +4125,7 @@ _02213F06: str r0, [sp, #0xc] ldrb r3, [r3, #0x10] add r0, r5, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02213F22: ldr r0, [sp, #0x18] bl String_dtor @@ -4171,7 +4171,7 @@ _02213F22: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _02213F9E _02213F8A: mov r0, #0xff @@ -4182,7 +4182,7 @@ _02213F8A: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02213F9E: add r0, r6, #0 bl String_dtor @@ -4218,7 +4218,7 @@ _02213FA6: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _02214002 _02213FEE: mov r0, #0xff @@ -4229,7 +4229,7 @@ _02213FEE: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02214002: add r0, r6, #0 bl String_dtor @@ -4500,7 +4500,7 @@ MOD09_022141D8: ; 0x022141D8 add r2, r6, #0 add r0, r0, r4 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -4573,7 +4573,7 @@ _022142BA: add r2, r6, #0 add r0, r0, r5 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _022142F8 ; =0x00002070 @@ -4649,7 +4649,7 @@ _02214362: str r0, [sp, #0xc] ldrh r1, [r1, #0x10] add r0, r4, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor add r0, r7, #0 @@ -4689,7 +4689,7 @@ MOD09_022143A0: ; 0x022143A0 ldr r3, [sp, #0x10] add r0, r0, r5 add r2, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor ldr r0, _022143F4 ; =0x00002070 @@ -4735,7 +4735,7 @@ MOD09_022143F8: ; 0x022143F8 add r2, r5, #0 add r0, r4, r0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor ldr r0, _02214450 ; =0x00002050 @@ -4782,7 +4782,7 @@ MOD09_0221445C: ; 0x0221445C mov r1, #2 add r2, r7, #0 lsr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r5, r4 @@ -4826,7 +4826,7 @@ MOD09_022144C0: ; 0x022144C0 add r3, r1, #0 add r0, r2, r0 add r2, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor ldr r0, _02214688 ; =0x00001FA8 @@ -4870,7 +4870,7 @@ MOD09_022144C0: ; 0x022144C0 ldr r0, [r5, r0] add r3, r1, #0 add r0, r0, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x1c] @@ -4893,7 +4893,7 @@ MOD09_022144C0: ; 0x022144C0 add r3, r1, #0 add r0, r2, r0 ldr r2, [sp, #0x20] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x20] bl String_dtor ldr r0, _02214688 ; =0x00001FA8 @@ -4965,7 +4965,7 @@ _022145F4: str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor ldr r0, [sp, #0x10] @@ -5029,7 +5029,7 @@ MOD09_02214694: ; 0x02214694 ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xe0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214784 ; =0x00001FA8 @@ -5086,7 +5086,7 @@ MOD09_02214694: ; 0x02214694 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -5138,7 +5138,7 @@ MOD09_02214790: ; 0x02214790 ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xf0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214880 ; =0x00001FA8 @@ -5195,7 +5195,7 @@ MOD09_02214790: ; 0x02214790 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -5248,7 +5248,7 @@ MOD09_0221488C: ; 0x0221488C add r3, r1, #0 add r0, r0, r2 add r2, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214980 ; =0x00001FA8 @@ -5305,7 +5305,7 @@ MOD09_0221488C: ; 0x0221488C str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -5360,7 +5360,7 @@ MOD09_0221498C: ; 0x0221498C add r3, r1, #0 add r0, r2, r0 add r2, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214A80 ; =0x00001FA8 @@ -5417,7 +5417,7 @@ MOD09_0221498C: ; 0x0221498C str r1, [sp, #0xc] ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -5472,7 +5472,7 @@ MOD09_02214A8C: ; 0x02214A8C add r3, r1, #0 add r0, r2, r0 add r2, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214B80 ; =0x00001FA8 @@ -5529,7 +5529,7 @@ MOD09_02214A8C: ; 0x02214A8C str r1, [sp, #0xc] ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -5586,7 +5586,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xd0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, _02214D18 ; =0x00001FA8 @@ -5622,7 +5622,7 @@ MOD09_02214B8C: ; 0x02214B8C str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor ldr r0, _02214D18 ; =0x00001FA8 @@ -5666,7 +5666,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, [r5, r0] sub r3, r6, r3 add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x1c] @@ -5708,7 +5708,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, [r5, r0] add r3, r6, r3 add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x20] bl String_dtor ldr r0, [sp, #0x24] @@ -5769,7 +5769,7 @@ MOD09_02214D24: ; 0x02214D24 ldr r0, [r5, r0] add r3, r1, #0 add r0, r0, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r7, #0 @@ -5808,7 +5808,7 @@ MOD09_02214DA0: ; 0x02214DA0 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r5, r4 @@ -5857,7 +5857,7 @@ MOD09_02214DE8: ; 0x02214DE8 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor b _02214EB8 @@ -5907,7 +5907,7 @@ _02214E42: str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor add r0, r7, #0 @@ -5944,7 +5944,7 @@ MOD09_02214ED0: ; 0x02214ED0 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r5, r4 @@ -5993,7 +5993,7 @@ MOD09_02214F18: ; 0x02214F18 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor b _02214FE8 @@ -6043,7 +6043,7 @@ _02214F72: str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor add r0, r7, #0 @@ -6087,7 +6087,7 @@ MOD09_02215000: ; 0x02215000 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r7, #0 @@ -6134,7 +6134,7 @@ MOD09_02215060: ; 0x02215060 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x10] @@ -6182,7 +6182,7 @@ MOD09_022150C8: ; 0x022150C8 str r0, [sp, #8] add r0, r5, r4 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r5, r4 @@ -6243,7 +6243,7 @@ _0221516C: str r0, [sp, #8] add r0, r5, r4 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r5, r4 @@ -6290,7 +6290,7 @@ MOD09_022151A8: ; 0x022151A8 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, _022152D4 ; =0x00001FA8 @@ -6332,7 +6332,7 @@ MOD09_022151A8: ; 0x022151A8 add r0, r4, r6 sub r3, r7, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x20] bl String_dtor ldr r0, [sp, #0x24] @@ -6372,7 +6372,7 @@ MOD09_022151A8: ; 0x022151A8 add r0, r4, r6 add r3, r7, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x28] bl String_dtor ldr r0, [sp, #0x2c] @@ -6430,7 +6430,7 @@ _02215306: mov r1, #2 add r2, r6, #0 lsr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r5, r4 @@ -6477,7 +6477,7 @@ _02215368: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -6519,7 +6519,7 @@ MOD09_022153B0: ; 0x022153B0 add r0, r4, r6 mov r3, #0x28 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor ldr r0, _022154F0 ; =0x00001FA8 @@ -6543,7 +6543,7 @@ MOD09_022153B0: ; 0x022153B0 add r0, r4, r6 mov r3, #0x50 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, _022154F0 ; =0x00001FA8 @@ -6579,7 +6579,7 @@ MOD09_022153B0: ; 0x022153B0 add r2, r7, #0 str r1, [sp, #0xc] str r3, [sp, #0x1c] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x20] bl String_dtor ldr r0, _022154F0 ; =0x00001FA8 @@ -6619,7 +6619,7 @@ MOD09_022153B0: ; 0x022153B0 add r2, r7, #0 sub r3, r3, r5 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x24] bl String_dtor add r0, r7, #0 @@ -6711,7 +6711,7 @@ MOD09_022154FC: ; 0x022154FC add r0, r4, r6 sub r3, r3, r5 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x14] @@ -7051,7 +7051,7 @@ _02215840: ldr r0, [sp, #0x18] mov r1, #2 add r3, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor cmp r5, #0 @@ -7073,7 +7073,7 @@ _02215840: add r2, r5, #0 add r3, r4, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _022158C0 _022158A4: mov r0, #8 @@ -7088,7 +7088,7 @@ _022158A4: add r2, r5, #0 add r3, r4, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _022158C0: add r0, r5, #0 bl String_dtor @@ -8178,7 +8178,7 @@ MOD09_022161B0: ; 0x022161B0 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, #0x40 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor ldr r0, _02216304 ; =0x00002070 @@ -8301,7 +8301,7 @@ MOD09_0221633C: ; 0x0221633C sub r2, #0xb0 ldr r2, [r4, r2] mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _02216374 ; =0x0000207B strb r0, [r4, r1] add sp, #0xc @@ -13585,7 +13585,7 @@ _02218E8A: MOD09_02218E90: ; 0x02218E90 push {r4, lr} add r4, r0, #0 - ldr r0, _02218EB0 ; =gUnknown21C48B8 + ldr r0, _02218EB0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -13601,7 +13601,7 @@ _02218EAC: mov r0, #0xa pop {r4, pc} .align 2, 0 -_02218EB0: .word gUnknown21C48B8 +_02218EB0: .word gMain _02218EB4: .word 0x0000114B thumb_func_start MOD09_02218EB8 @@ -14465,7 +14465,7 @@ MOD09_02219560: ; 0x02219560 mov r0, #0 str r0, [sp, #0xc] add r0, r5, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 @@ -14565,7 +14565,7 @@ _022195C4: mov r1, #2 add r0, #0x40 add r2, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor ldr r0, [r5, #0x2c] @@ -14641,7 +14641,7 @@ MOD09_02219694: ; 0x02219694 str r0, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor _02219726: @@ -14711,7 +14711,7 @@ MOD09_02219738: ; 0x02219738 str r3, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor _022197BA: @@ -14858,7 +14858,7 @@ MOD09_02219884: ; 0x02219884 add r0, r4, r0 add r3, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor ldr r0, [r5, #0x10] @@ -14896,7 +14896,7 @@ MOD09_02219884: ; 0x02219884 ldr r2, [r5, #0x18] add r0, r4, r0 add r3, r6, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor ldr r0, [r5, #0x10] @@ -14939,7 +14939,7 @@ MOD09_02219884: ; 0x02219884 ldr r2, [r5, #0x18] add r0, r4, r0 sub r3, r6, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor mov r0, #0x19 @@ -15100,7 +15100,7 @@ MOD09_02219A8C: ; 0x02219A8C str r1, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -15147,7 +15147,7 @@ MOD09_02219AFC: ; 0x02219AFC add r0, r4, #0 mov r3, #4 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -15255,7 +15255,7 @@ MOD09_02219C08: ; 0x02219C08 ldr r2, [r4, #0x18] add r0, #0x1c mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r4, #0x32 strb r0, [r4] add sp, #0xc @@ -17372,7 +17372,7 @@ MOD09_0221AC98: ; 0x0221AC98 mov r0, #1 pop {r3, r4, pc} _0221ACA8: - ldr r1, _0221ACDC ; =gUnknown21C48B8 + ldr r1, _0221ACDC ; =gMain ldr r2, [r1, #0x48] mov r1, #0xf3 tst r1, r2 @@ -17397,7 +17397,7 @@ _0221ACD4: add sp, #4 pop {r3, r4, pc} nop -_0221ACDC: .word gUnknown21C48B8 +_0221ACDC: .word gMain _0221ACE0: .word 0x000005DC thumb_func_start MOD09_0221ACE4 @@ -17460,7 +17460,7 @@ MOD09_0221AD30: ; 0x0221AD30 mvn r0, r0 pop {r4, r5, r6, r7, pc} _0221AD46: - ldr r0, _0221AEBC ; =gUnknown21C48B8 + ldr r0, _0221AEBC ; =gMain mov r1, #0x40 ldr r0, [r0, #0x48] tst r1, r0 @@ -17631,7 +17631,7 @@ _0221AE8A: mvn r0, r0 pop {r4, r5, r6, r7, pc} _0221AE92: - ldr r0, _0221AEBC ; =gUnknown21C48B8 + ldr r0, _0221AEBC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -17654,7 +17654,7 @@ _0221AEB6: add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0221AEBC: .word gUnknown21C48B8 +_0221AEBC: .word gMain _0221AEC0: .word 0x000005DC _0221AEC4: .word 0x000005DD diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 4f33530a..ed9b4dc3 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -677,7 +677,7 @@ MOD11_0222DB50: ; 0x0222DB50 add r0, sp, #0x20 add r1, sp, #0x14 bl FUN_0201265C - ldr r0, _0222DF10 ; =gUnknown21C48B8 + ldr r0, _0222DF10 ; =gMain ldr r6, [sp, #0x24] ldr r5, [r0, #0x2c] ldr r1, [sp, #0x18] @@ -1057,7 +1057,7 @@ _0222DC42: pop {r3, r4, r5, r6, r7, pc} nop _0222DF0C: .word 0x00002430 -_0222DF10: .word gUnknown21C48B8 +_0222DF10: .word gMain _0222DF14: .word MOD11_0225DA20 _0222DF18: .word MOD11_0225D9D8 _0222DF1C: .word 0x00100010 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index f080d018..5640bb75 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -215,7 +215,7 @@ _0222F30E: ldr r0, [r5, #8] mov r1, #1 add r2, r6, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -4864,7 +4864,7 @@ _022316CC: str r0, [sp, #8] add r0, r6, #0 add r2, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, r0, #0 add r0, r4, #0 bl String_dtor @@ -4902,7 +4902,7 @@ _02231708: str r0, [sp, #8] add r0, r6, #0 add r2, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, r0, #0 add r0, r4, #0 bl String_dtor @@ -4927,7 +4927,7 @@ _0223174C: str r0, [sp, #8] ldr r2, [r5, #0x18] add r0, r6, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, r0, #0 _02231778: lsl r0, r5, #0x18 @@ -4971,7 +4971,7 @@ MOD11_0223178C: ; 0x0223178C ldr r2, [r5, #0x18] add r0, r7, #0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -5027,7 +5027,7 @@ _0223182E: ldr r4, [sp, #0x20] ldr r2, [r5, #0x18] add r3, r4, r3 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -8728,7 +8728,7 @@ MOD11_02233598: ; 0x02233598 mov r1, #4 tst r0, r1 bne _022335D2 - ldr r0, _022335FC ; =gUnknown21C48B8 + ldr r0, _022335FC ; =gMain ldr r1, [r0, #0x48] ldr r0, _02233600 ; =0x00000C03 tst r0, r1 @@ -8763,7 +8763,7 @@ _022335F2: mov r0, #0 pop {r4, r5, r6, pc} nop -_022335FC: .word gUnknown21C48B8 +_022335FC: .word gMain _02233600: .word 0x00000C03 thumb_func_start MOD11_02233604 @@ -24031,7 +24031,7 @@ _0223ADEC: str r0, [r4, #0x28] pop {r4, r5, r6, r7, pc} _0223AE3C: - ldr r0, _0223AF68 ; =gUnknown21C48B8 + ldr r0, _0223AF68 ; =gMain ldr r1, [r0, #0x48] ldr r0, _0223AF6C ; =0x00000C03 tst r0, r1 @@ -24169,7 +24169,7 @@ _0223AF58: .word MOD11_0225DC60 _0223AF5C: .word 0x000003B3 _0223AF60: .word MOD11_0225DC90 _0223AF64: .word 0x000003B5 -_0223AF68: .word gUnknown21C48B8 +_0223AF68: .word gMain _0223AF6C: .word 0x00000C03 _0223AF70: .word 0x000005DC _0223AF74: .word 0x0000FFFE @@ -25397,7 +25397,7 @@ _0223B990: bl MOD16_021EEF84 cmp r0, #0 beq _0223BA4C - ldr r0, _0223BBE0 ; =gUnknown21C48B8 + ldr r0, _0223BBE0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -25659,7 +25659,7 @@ _0223BBCA: _0223BBD4: .word 0x0000FFFF _0223BBD8: .word 0x00000367 _0223BBDC: .word 0x0000219C -_0223BBE0: .word gUnknown21C48B8 +_0223BBE0: .word gMain _0223BBE4: .word 0x000005DC _0223BBE8: .word 0x00000496 _0223BBEC: @@ -28118,7 +28118,7 @@ _0223CF5C: add r0, sp, #0x68 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x68 mov r1, #1 mov r2, #5 @@ -69293,7 +69293,7 @@ _02250D98: strb r0, [r4, #0xa] pop {r4, r5, r6, r7, pc} _02250DA0: - ldr r0, _02250E98 ; =gUnknown21C48B8 + ldr r0, _02250E98 ; =gMain ldr r1, [r0, #0x48] mov r0, #8 tst r0, r1 @@ -69404,7 +69404,7 @@ _02250E88: .word 0x000004CA _02250E8C: .word 0x0000039A _02250E90: .word 0x000004C6 _02250E94: .word 0x00000197 -_02250E98: .word gUnknown21C48B8 +_02250E98: .word gMain _02250E9C: .word 0x000005DD _02250EA0: ldrb r1, [r4, #9] @@ -82495,7 +82495,7 @@ MOD11_022574F0: ; 0x022574F0 str r1, [sp, #0x14] add r0, sp, #0x24 add r3, r1, #0 - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 ldr r0, [r5, #4] ldr r6, [sp, #0x30] ldr r0, [r0] @@ -83068,7 +83068,7 @@ _02257A26: str r1, [sp, #0x14] add r0, sp, #0x18 add r3, r1, #0 - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 ldr r0, [r4, #4] ldr r5, [sp, #0x24] ldr r0, [r0] @@ -83194,7 +83194,7 @@ _02257B1E: str r1, [sp, #0x14] add r0, sp, #0x24 add r3, r1, #0 - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 ldr r0, [r4, #4] ldr r5, [sp, #0x30] ldr r0, [r0] @@ -88303,7 +88303,7 @@ _0225A49C: ldr r2, [sp, #0x18] add r0, sp, #0x3c str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 b _0225A4E6 _0225A4DA: add r3, r4, #0 @@ -88938,7 +88938,7 @@ _0225A994: add r0, r4, #0 add r2, r6, #0 str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -90879,7 +90879,7 @@ _0225B8D4: ldrb r0, [r5, r0] cmp r0, #1 beq _0225B8EC - ldr r1, _0225B918 ; =gUnknown21C48B8 + ldr r1, _0225B918 ; =gMain ldr r2, [r1, #0x48] ldr r1, _0225B91C ; =0x00000CF3 tst r1, r2 @@ -90908,7 +90908,7 @@ _0225B90C: pop {r4, r5, r6, pc} nop _0225B914: .word MOD11_0225FAAC -_0225B918: .word gUnknown21C48B8 +_0225B918: .word gMain _0225B91C: .word 0x00000CF3 _0225B920: .word 0x000005DC _0225B924: .word 0x000006F4 @@ -91006,7 +91006,7 @@ _0225B9CA: str r0, [sp, #0xc] cmp r0, #3 bne _0225B9EC - ldr r0, _0225BAF8 ; =gUnknown21C48B8 + ldr r0, _0225BAF8 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x40 tst r0, r1 @@ -91022,7 +91022,7 @@ _0225B9EC: ldr r0, [sp, #0xc] cmp r0, #0 bne _0225BA34 - ldr r0, _0225BAF8 ; =gUnknown21C48B8 + ldr r0, _0225BAF8 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x20 tst r0, r1 @@ -91153,7 +91153,7 @@ _0225BAE8: .word MOD11_0225FAAC _0225BAEC: .word MOD11_0225F698 _0225BAF0: .word 0x000006EC _0225BAF4: .word 0x0000069F -_0225BAF8: .word gUnknown21C48B8 +_0225BAF8: .word gMain _0225BAFC: .word 0x000005DC _0225BB00: .word 0x000006A3 @@ -92596,7 +92596,7 @@ _0225C594: str r1, [sp] ldrsb r1, [r0, r5] mov ip, r1 - ldr r1, _0225C764 ; =gUnknown21C48B8 + ldr r1, _0225C764 ; =gMain ldr r1, [r1, #0x48] tst r3, r1 beq _0225C5FA @@ -92846,7 +92846,7 @@ _0225C75E: add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop -_0225C764: .word gUnknown21C48B8 +_0225C764: .word gMain _0225C768: .word 0x000005DC thumb_func_start MOD11_0225C76C diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 0c8a54b8..c8a949ca 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -7590,7 +7590,7 @@ _022313B0: ldr r2, [sp, #0x8c] add r0, sp, #0x34 str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 ldr r2, [sp, #0x18] add r0, sp, #0x34 mov r1, #1 @@ -9563,7 +9563,7 @@ _022322FE: ldr r2, [sp, #0x18] add r0, sp, #0x3c str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 b _02232348 _0223233C: add r3, r4, #0 @@ -10952,7 +10952,7 @@ _02232DA8: add r0, r4, #0 add r2, r6, #0 str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -11011,7 +11011,7 @@ _02232E3C: ldrb r0, [r5, r0] cmp r0, #1 beq _02232E54 - ldr r1, _02232E80 ; =gUnknown21C48B8 + ldr r1, _02232E80 ; =gMain ldr r2, [r1, #0x48] ldr r1, _02232E84 ; =0x00000CF3 tst r1, r2 @@ -11041,7 +11041,7 @@ _02232E76: pop {r4, r5, r6, pc} .align 2, 0 _02232E7C: .word MOD12_02245074 -_02232E80: .word gUnknown21C48B8 +_02232E80: .word gMain _02232E84: .word 0x00000CF3 _02232E88: .word 0x000005DC @@ -11469,7 +11469,7 @@ MOD12_0223318C: ; 0x0223318C add r2, r3, #0 mov r3, #0x40 mov ip, r1 - ldr r1, _02233364 ; =gUnknown21C48B8 + ldr r1, _02233364 ; =gMain ldr r1, [r1, #0x48] tst r3, r1 beq _022331FA @@ -11719,7 +11719,7 @@ _0223335E: add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop -_02233364: .word gUnknown21C48B8 +_02233364: .word gMain _02233368: .word 0x000005DC thumb_func_start MOD12_0223336C @@ -15284,7 +15284,7 @@ _02234F42: ldr r2, [r5, #0x58] add r0, #0x34 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x8b lsl r1, r1, #2 strb r0, [r5, r1] @@ -25527,7 +25527,7 @@ _02239AF4: ldr r2, [r5, #0x4c] add r0, #0x34 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, #0xd0 strb r0, [r5] add r0, r6, #0 @@ -28407,7 +28407,7 @@ _0223B14C: ldr r0, [r0, #0x18] cmp r0, #0x1e bge _0223B186 - ldr r0, _0223B348 ; =gUnknown21C48B8 + ldr r0, _0223B348 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -28664,7 +28664,7 @@ _0223B340: pop {r4, r5, r6, r7, pc} .align 2, 0 _0223B344: .word 0x00000171 -_0223B348: .word gUnknown21C48B8 +_0223B348: .word gMain _0223B34C: .word UNK_021C48F8 _0223B350: .word 0x000006ED _0223B354: .word MOD12_02245F84 @@ -29335,7 +29335,7 @@ _0223B8AC: ldr r1, _0223B914 ; =MOD12_02246070 cmp r2, r1 bne _0223B8F0 - ldr r1, _0223B918 ; =gUnknown21C48B8 + ldr r1, _0223B918 ; =gMain mov r2, #0x11 ldr r1, [r1, #0x48] add r3, r1, #0 @@ -29382,7 +29382,7 @@ _0223B90A: nop _0223B910: .word MOD12_02246094 _0223B914: .word MOD12_02246070 -_0223B918: .word gUnknown21C48B8 +_0223B918: .word gMain thumb_func_start MOD12_0223B91C MOD12_0223B91C: ; 0x0223B91C @@ -29927,7 +29927,7 @@ _0223BD1C: ldr r2, [sp, #0x1c] add r0, sp, #0x38 str r3, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 add r0, sp, #0x38 mov r1, #2 mov r2, #0x17 @@ -34778,7 +34778,7 @@ _0223E210: ldr r2, [r2] add r0, #0x78 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _0223E270 ; =0x00000AB8 strb r0, [r5, r1] add r0, r6, #0 @@ -35115,7 +35115,7 @@ _0223E49A: ldr r2, [r2] add r0, #0x88 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor ldr r0, _0223E51C ; =0x00001BF1 @@ -43565,7 +43565,7 @@ _02242618: ldr r2, [r2] add r0, #0x34 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0xe6 lsl r1, r1, #2 strb r0, [r5, r1] @@ -43914,7 +43914,7 @@ _022428E6: add r2, r7, #0 add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #3 str r0, [sp] mov r0, #0 @@ -43932,7 +43932,7 @@ _022428E6: ldr r2, [r2] add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r5, r5, #1 cmp r5, #4 blt _022428E6 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index f067eaf5..911f12fe 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -73,7 +73,7 @@ _021D7568: ldr r0, [r4, r0] cmp r0, #0 beq _021D75AA - ldr r0, _021D75B4 ; =gUnknown21C48B8 + ldr r0, _021D75B4 ; =gMain ldr r2, [r0, #0x48] mov r0, #2 lsl r0, r0, #0xa @@ -105,7 +105,7 @@ _021D75AA: mov r0, #1 pop {r4, pc} nop -_021D75B4: .word gUnknown21C48B8 +_021D75B4: .word gMain thumb_func_start MOD14_021D75B8 MOD14_021D75B8: ; 0x021D75B8 @@ -346,7 +346,7 @@ _021D7764: _021D776A: b _021D7970 _021D776C: - ldr r1, _021D7974 ; =gUnknown21C48B8 + ldr r1, _021D7974 ; =gMain ldr r2, [r1, #0x48] mov r1, #1 tst r1, r2 @@ -368,7 +368,7 @@ _021D7792: bl MOD14_021D7610 b _021D7970 _021D779C: - ldr r0, _021D7974 ; =gUnknown21C48B8 + ldr r0, _021D7974 ; =gMain mov r2, #2 ldr r1, [r0, #0x48] tst r1, r2 @@ -587,7 +587,7 @@ _021D7970: mov r0, #0 pop {r4, pc} .align 2, 0 -_021D7974: .word gUnknown21C48B8 +_021D7974: .word gMain _021D7978: .word MOD14_021D8804 _021D797C: .word MOD14_021D8A68 _021D7980: .word MOD14_021D86BC @@ -652,7 +652,7 @@ _021D79EC: ; jump table .short _021D7CB6 - _021D79EC - 2 ; case 5 .short _021D7CE4 - _021D79EC - 2 ; case 6 _021D79FA: - ldr r1, _021D7D00 ; =gUnknown21C48B8 + ldr r1, _021D7D00 ; =gMain mov r2, #1 ldr r1, [r1, #0x48] tst r2, r1 @@ -698,7 +698,7 @@ _021D7A40: tst r0, r1 bne _021D7A6A _021D7A56: - ldr r0, _021D7D00 ; =gUnknown21C48B8 + ldr r0, _021D7D00 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x10 tst r0, r1 @@ -714,7 +714,7 @@ _021D7A6A: str r1, [r4, r0] b _021D7CF8 _021D7A74: - ldr r0, _021D7D00 ; =gUnknown21C48B8 + ldr r0, _021D7D00 ; =gMain add r1, r4, #0 ldr r0, [r0, #0x44] bl MOD14_021DB5B4 @@ -987,7 +987,7 @@ _021D7CB6: bl MOD14_021DCB98 cmp r0, #0 beq _021D7CF8 - ldr r0, _021D7D00 ; =gUnknown21C48B8 + ldr r0, _021D7D00 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -1017,7 +1017,7 @@ _021D7CF8: add sp, #4 pop {r3, r4, pc} nop -_021D7D00: .word gUnknown21C48B8 +_021D7D00: .word gMain _021D7D04: .word MOD14_021D8804 _021D7D08: .word MOD14_021D8A68 _021D7D0C: .word MOD14_021DAC80 @@ -1041,7 +1041,7 @@ MOD14_021D7D20: ; 0x021D7D20 _021D7D34: b _021D7EE8 _021D7D36: - ldr r5, _021D7EEC ; =gUnknown21C48B8 + ldr r5, _021D7EEC ; =gMain add r2, r3, #0 ldr r1, [r5, #0x44] add r2, #0x70 @@ -1241,7 +1241,7 @@ _021D7EE8: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_021D7EEC: .word gUnknown21C48B8 +_021D7EEC: .word gMain _021D7EF0: .word MOD14_021DABE8 _021D7EF4: .word MOD14_021D8D70 _021D7EF8: .word MOD14_021D86BC @@ -1269,7 +1269,7 @@ _021D7F20: _021D7F26: b _021D80F2 _021D7F28: - ldr r3, _021D80F8 ; =gUnknown21C48B8 + ldr r3, _021D80F8 ; =gMain mov r1, #1 ldr r5, [r3, #0x48] tst r1, r5 @@ -1481,7 +1481,7 @@ _021D80F2: mov r0, #0 pop {r3, r4, r5, pc} nop -_021D80F8: .word gUnknown21C48B8 +_021D80F8: .word gMain _021D80FC: .word MOD14_021D854C _021D8100: .word MOD14_021D86BC _021D8104: .word MOD14_021DABE8 @@ -1513,7 +1513,7 @@ _021D8132: ; jump table .short _021D838A - _021D8132 - 2 ; case 4 .short _021D83A8 - _021D8132 - 2 ; case 5 _021D813E: - ldr r3, _021D83C8 ; =gUnknown21C48B8 + ldr r3, _021D83C8 ; =gMain mov r1, #1 ldr r5, [r3, #0x48] tst r1, r5 @@ -1795,7 +1795,7 @@ _021D838A: bl MOD14_021D7600 b _021D83C4 _021D83A8: - ldr r0, _021D83C8 ; =gUnknown21C48B8 + ldr r0, _021D83C8 ; =gMain ldr r2, [r0, #0x48] mov r0, #3 tst r0, r2 @@ -1812,7 +1812,7 @@ _021D83C4: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_021D83C8: .word gUnknown21C48B8 +_021D83C8: .word gMain _021D83CC: .word 0x000005F3 _021D83D0: .word MOD14_021D86BC _021D83D4: .word MOD14_021DABE8 @@ -2139,7 +2139,7 @@ _021D8660: mov r0, #5 str r0, [r5] _021D8674: - ldr r0, _021D86B8 ; =gUnknown21C48B8 + ldr r0, _021D86B8 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -2169,7 +2169,7 @@ _021D86A8: .word MOD14_021DA7C4 _021D86AC: .word 0x000005F3 _021D86B0: .word 0x000005DD _021D86B4: .word MOD14_021D850C -_021D86B8: .word gUnknown21C48B8 +_021D86B8: .word gMain thumb_func_start MOD14_021D86BC MOD14_021D86BC: ; 0x021D86BC @@ -2295,7 +2295,7 @@ _021D87A6: mov r0, #3 str r0, [r5] _021D87BA: - ldr r0, _021D8800 ; =gUnknown21C48B8 + ldr r0, _021D8800 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -2325,7 +2325,7 @@ _021D87F0: .word 0x000005F3 _021D87F4: .word MOD14_021DA7C4 _021D87F8: .word 0x000005DD _021D87FC: .word MOD14_021D850C -_021D8800: .word gUnknown21C48B8 +_021D8800: .word gMain thumb_func_start MOD14_021D8804 MOD14_021D8804: ; 0x021D8804 @@ -2949,7 +2949,7 @@ _021D8D24: bl MOD14_021D7620 pop {r3, r4, r5, pc} _021D8D3A: - ldr r0, _021D8D6C ; =gUnknown21C48B8 + ldr r0, _021D8D6C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -2969,7 +2969,7 @@ _021D8D5C: .word 0x000005DD _021D8D60: .word MOD14_021DA3E4 _021D8D64: .word MOD14_021DA9D0 _021D8D68: .word MOD14_021DA7C4 -_021D8D6C: .word gUnknown21C48B8 +_021D8D6C: .word gMain thumb_func_start MOD14_021D8D70 MOD14_021D8D70: ; 0x021D8D70 @@ -3597,7 +3597,7 @@ _021D924A: ; jump table .short _021D942C - _021D924A - 2 ; case 3 .short _021D9440 - _021D924A - 2 ; case 4 _021D9254: - ldr r1, _021D9458 ; =gUnknown21C48B8 + ldr r1, _021D9458 ; =gMain ldr r2, [r1, #0x44] mov r1, #1 tst r1, r2 @@ -3619,7 +3619,7 @@ _021D927C: bl MOD14_021D7610 pop {r3, r4, r5, pc} _021D9284: - ldr r1, _021D9458 ; =gUnknown21C48B8 + ldr r1, _021D9458 ; =gMain ldr r2, [r1, #0x44] mov r1, #1 tst r1, r2 @@ -3631,7 +3631,7 @@ _021D9284: beq _021D92B6 cmp r0, #2 bne _021D9342 - ldr r1, _021D9458 ; =gUnknown21C48B8 + ldr r1, _021D9458 ; =gMain mov r0, #0xf0 ldr r2, [r1, #0x44] ldr r1, [r1, #0x48] @@ -3698,7 +3698,7 @@ _021D9326: bl MOD14_021DCBC0 cmp r0, #0 beq _021D9342 - ldr r0, _021D9458 ; =gUnknown21C48B8 + ldr r0, _021D9458 ; =gMain add r1, r4, #0 ldr r0, [r0, #0x44] bl MOD14_021DB790 @@ -3720,7 +3720,7 @@ _021D9350: ; jump table .short _021D9396 - _021D9350 - 2 ; case 3 .short _021D93BC - _021D9350 - 2 ; case 4 _021D935A: - ldr r1, _021D9458 ; =gUnknown21C48B8 + ldr r1, _021D9458 ; =gMain mov r0, #0xf0 ldr r2, [r1, #0x44] ldr r1, [r1, #0x48] @@ -3780,7 +3780,7 @@ _021D93BC: bl MOD14_021DCB2C pop {r3, r4, r5, pc} _021D93E2: - ldr r0, _021D9458 ; =gUnknown21C48B8 + ldr r0, _021D9458 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -3835,7 +3835,7 @@ _021D9440: _021D9454: pop {r3, r4, r5, pc} nop -_021D9458: .word gUnknown21C48B8 +_021D9458: .word gMain _021D945C: .word 0x000005DC _021D9460: .word MOD14_021D94BC _021D9464: .word 0x000005F3 @@ -3969,7 +3969,7 @@ _021D954E: str r0, [r5] pop {r3, r4, r5, pc} _021D9574: - ldr r0, _021D95B0 ; =gUnknown21C48B8 + ldr r0, _021D95B0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -3996,7 +3996,7 @@ _021D95A4: nop _021D95A8: .word 0x000005EB _021D95AC: .word 0x000005F3 -_021D95B0: .word gUnknown21C48B8 +_021D95B0: .word gMain thumb_func_start MOD14_021D95B4 MOD14_021D95B4: ; 0x021D95B4 @@ -4177,7 +4177,7 @@ _021D971C: bl MOD14_021DCB98 cmp r0, #0 beq _021D9762 - ldr r0, _021D976C ; =gUnknown21C48B8 + ldr r0, _021D976C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4206,7 +4206,7 @@ _021D9762: .align 2, 0 _021D9764: .word 0x000005F3 _021D9768: .word 0x000005DC -_021D976C: .word gUnknown21C48B8 +_021D976C: .word gMain thumb_func_start MOD14_021D9770 MOD14_021D9770: ; 0x021D9770 @@ -4391,7 +4391,7 @@ _021D98E8: bl MOD14_021DCB98 cmp r0, #0 beq _021D9928 - ldr r0, _021D9930 ; =gUnknown21C48B8 + ldr r0, _021D9930 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4417,7 +4417,7 @@ _021D9928: pop {r3, r4, r5, pc} nop _021D992C: .word 0x000005EB -_021D9930: .word gUnknown21C48B8 +_021D9930: .word gMain thumb_func_start MOD14_021D9934 MOD14_021D9934: ; 0x021D9934 @@ -4602,7 +4602,7 @@ _021D9AB2: bl MOD14_021DCB98 cmp r0, #0 beq _021D9B74 - ldr r0, _021D9B80 ; =gUnknown21C48B8 + ldr r0, _021D9B80 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4620,7 +4620,7 @@ _021D9AD8: bl MOD14_021DCB98 cmp r0, #0 beq _021D9B74 - ldr r0, _021D9B80 ; =gUnknown21C48B8 + ldr r0, _021D9B80 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4689,7 +4689,7 @@ _021D9B74: nop _021D9B78: .word 0x000005F3 _021D9B7C: .word 0x000001C1 -_021D9B80: .word gUnknown21C48B8 +_021D9B80: .word gMain thumb_func_start MOD14_021D9B84 MOD14_021D9B84: ; 0x021D9B84 @@ -5059,7 +5059,7 @@ _021D9E62: _021D9E70: b _021D9F76 _021D9E72: - ldr r0, _021D9F7C ; =gUnknown21C48B8 + ldr r0, _021D9F7C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5082,7 +5082,7 @@ _021D9E96: bl MOD14_021DCBC0 cmp r0, #0 beq _021D9F76 - ldr r0, _021D9F7C ; =gUnknown21C48B8 + ldr r0, _021D9F7C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5105,7 +5105,7 @@ _021D9EC8: bl MOD14_021DCBC0 cmp r0, #0 beq _021D9F76 - ldr r0, _021D9F7C ; =gUnknown21C48B8 + ldr r0, _021D9F7C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5158,7 +5158,7 @@ _021D9F36: bl MOD14_021DCB98 cmp r0, #0 beq _021D9F76 - ldr r0, _021D9F7C ; =gUnknown21C48B8 + ldr r0, _021D9F7C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5184,7 +5184,7 @@ _021D9F76: pop {r3, r4, r5, pc} .align 2, 0 _021D9F78: .word 0x000005F3 -_021D9F7C: .word gUnknown21C48B8 +_021D9F7C: .word gMain thumb_func_start MOD14_021D9F80 MOD14_021D9F80: ; 0x021D9F80 @@ -5963,7 +5963,7 @@ _021DA58E: bl MOD14_021DCB98 cmp r0, #0 beq _021DA5D6 - ldr r0, _021DA5E8 ; =gUnknown21C48B8 + ldr r0, _021DA5E8 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5995,7 +5995,7 @@ _021DA5D8: .word MOD14_021E6264 _021DA5DC: .word SDK_OVERLAY_MODULE_75_ID _021DA5E0: .word MOD75_021EC68C _021DA5E4: .word MOD14_021E6A00 -_021DA5E8: .word gUnknown21C48B8 +_021DA5E8: .word gMain _021DA5EC: .word 0x000005DD thumb_func_start MOD14_021DA5F0 @@ -6187,7 +6187,7 @@ _021DA76C: bl MOD14_021DCB98 cmp r0, #0 beq _021DA7B2 - ldr r0, _021DA7BC ; =gUnknown21C48B8 + ldr r0, _021DA7BC ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -6216,7 +6216,7 @@ _021DA7B2: .align 2, 0 _021DA7B4: .word MOD14_021E6A00 _021DA7B8: .word 0x000005F3 -_021DA7BC: .word gUnknown21C48B8 +_021DA7BC: .word gMain _021DA7C0: .word 0x000005DD thumb_func_start MOD14_021DA7C4 @@ -6435,7 +6435,7 @@ _021DA978: bl MOD14_021DCB98 cmp r0, #0 beq _021DA9BE - ldr r0, _021DA9C8 ; =gUnknown21C48B8 + ldr r0, _021DA9C8 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -6464,7 +6464,7 @@ _021DA9BE: .align 2, 0 _021DA9C0: .word MOD14_021E6A00 _021DA9C4: .word 0x000005F3 -_021DA9C8: .word gUnknown21C48B8 +_021DA9C8: .word gMain _021DA9CC: .word 0x000005DD thumb_func_start MOD14_021DA9D0 @@ -6527,7 +6527,7 @@ _021DAA2A: str r0, [r4] pop {r3, r4, r5, pc} _021DAA42: - ldr r0, _021DAA78 ; =gUnknown21C48B8 + ldr r0, _021DAA78 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xf3 tst r1, r0 @@ -6553,7 +6553,7 @@ _021DAA5E: _021DAA74: pop {r3, r4, r5, pc} nop -_021DAA78: .word gUnknown21C48B8 +_021DAA78: .word gMain thumb_func_start MOD14_021DAA7C MOD14_021DAA7C: ; 0x021DAA7C @@ -6669,7 +6669,7 @@ _021DAB3E: bl MOD14_021DCB98 cmp r0, #0 beq _021DABDC - ldr r0, _021DABE0 ; =gUnknown21C48B8 + ldr r0, _021DABE0 ; =gMain mov r1, #0x22 ldr r0, [r0, #0x48] lsl r1, r1, #4 @@ -6743,7 +6743,7 @@ _021DABDC: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_021DABE0: .word gUnknown21C48B8 +_021DABE0: .word gMain _021DABE4: .word 0x000005DD thumb_func_start MOD14_021DABE8 @@ -6907,7 +6907,7 @@ _021DAD2C: bl FUN_020054C8 pop {r3, r4, r5, r6, r7, pc} _021DAD34: - ldr r0, _021DAF6C ; =gUnknown21C48B8 + ldr r0, _021DAF6C ; =gMain ldr r1, [r0, #0x48] mov r0, #0xf3 tst r0, r1 @@ -7176,7 +7176,7 @@ _021DAF5E: _021DAF60: .word 0x000005E4 _021DAF64: .word MOD14_021DAF78 _021DAF68: .word 0x000005F3 -_021DAF6C: .word gUnknown21C48B8 +_021DAF6C: .word gMain _021DAF70: .word 0x000005DD _021DAF74: .word 0x000005DC @@ -7262,7 +7262,7 @@ _021DAFFE: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _021DB01E: - ldr r0, _021DB1BC ; =gUnknown21C48B8 + ldr r0, _021DB1BC ; =gMain ldr r1, [r0, #0x48] mov r0, #0xf3 tst r0, r1 @@ -7459,7 +7459,7 @@ _021DB1B0: .align 2, 0 _021DB1B4: .word 0x000005E4 _021DB1B8: .word MOD14_021DAC80 -_021DB1BC: .word gUnknown21C48B8 +_021DB1BC: .word gMain _021DB1C0: .word 0x000005DD _021DB1C4: .word 0x000005DC @@ -13851,7 +13851,7 @@ MOD14_021DE1D0: ; 0x021DE1D0 mov r3, #0x54 add r0, r4, #0 sub r3, r3, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FreeToHeap _021DE250: @@ -20217,7 +20217,7 @@ _021E13D2: mov r1, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E13E6: add sp, #0x1c pop {r3, r4, r5, r6, pc} @@ -20391,7 +20391,7 @@ MOD14_021E153C: ; 0x021E153C str r1, [sp, #0xc] ldr r0, [r5, #4] ldr r2, [r4, #0x18] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 str r1, [sp] mov r0, #0xff @@ -20403,7 +20403,7 @@ MOD14_021E153C: ; 0x021E153C ldr r0, [r5, #4] ldr r2, [r4, #0x14] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 str r1, [sp] mov r0, #0xff @@ -20415,7 +20415,7 @@ MOD14_021E153C: ; 0x021E153C ldr r0, [r5, #4] ldr r2, [r4, #0x14] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r0, [r4, #0xe] cmp r0, #0 beq _021E15A2 @@ -20434,7 +20434,7 @@ _021E15A2: ldr r0, [r5, #4] ldr r2, [r5, #0x44] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021E15D8 _021E15BE: mov r1, #0 @@ -20448,7 +20448,7 @@ _021E15BE: ldr r0, [r5, #4] ldr r2, [r5, #0x48] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E15D8: ldrb r0, [r4, #0xf] cmp r0, #0 @@ -20464,7 +20464,7 @@ _021E15D8: ldr r0, [r5, #4] ldr r2, [r4, #0x1c] add r0, #0x30 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrh r2, [r4, #8] cmp r2, #0 beq _021E1616 @@ -20630,7 +20630,7 @@ MOD14_021E1704: ; 0x021E1704 ldr r0, [r5, #4] ldr r2, [r4, #0x1c] add r0, #0x30 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E1742: add r0, r5, #0 bl MOD14_021E1114 @@ -20845,7 +20845,7 @@ MOD14_021E189C: ; 0x021E189C ldr r0, [r5, #0x18] ldr r2, [r5, #0x34] mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [r5, #0x18] bl FUN_02019548 ldr r0, [r5] @@ -21018,7 +21018,7 @@ _021E1A26: ldr r0, [sp, #0x14] ldr r2, [r5, #0x30] mov r3, #0xa - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E1A4C: ldr r0, [sp, #0x10] add r6, r6, #1 @@ -22273,7 +22273,7 @@ MOD14_021E2394: ; 0x021E2394 mov r3, #0x30 add r0, r4, #0 sub r3, r3, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FUN_02019548 add sp, #0x10 @@ -22717,7 +22717,7 @@ MOD14_021E26E4: ; 0x021E26E4 ldr r2, [r5, r2] add r0, #0x20 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5, #0x10] add r0, #0x20 bl FUN_020191D0 @@ -27077,7 +27077,7 @@ _021E47AE: ldr r2, [r2] add r0, r7, #0 add r3, r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 sub r4, r4, #1 bpl _021E4800 mov r4, #0x11 @@ -29068,7 +29068,7 @@ _021E5742: str r0, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] add r6, r6, #2 add r0, r0, #1 @@ -29099,7 +29099,7 @@ _021E5786: str r1, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E57B8: add r0, r7, #0 bl FUN_02019548 @@ -29189,7 +29189,7 @@ _021E5840: str r1, [sp, #0xc] ldr r2, [r6, #0x2c] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r7, #0 add r6, #8 _021E5872: @@ -29220,7 +29220,7 @@ _021E5872: str r0, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r7, #1 add r6, r6, #2 cmp r7, #7 @@ -29252,7 +29252,7 @@ _021E58C8: str r0, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r7, #1 add r6, #0x10 cmp r7, #8 @@ -29343,7 +29343,7 @@ _021E5970: str r0, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E59A8: ldr r0, [sp, #0x14] add r6, r6, #2 @@ -29379,7 +29379,7 @@ _021E59C6: str r0, [sp, #0xc] ldr r2, [r5, #0x74] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r7, #1 add r6, #0x18 cmp r7, #4 @@ -29779,7 +29779,7 @@ MOD14_021E5CFC: ; 0x021E5CFC str r1, [sp, #0xc] ldr r2, [r5, #0x28] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021E5D56: add r0, r4, #0 bl FUN_02019548 @@ -30289,7 +30289,7 @@ _021E615A: MOD14_021E6160: ; 0x021E6160 push {r3, r4, r5, lr} add r4, r0, #0 - ldr r0, _021E6208 ; =gUnknown21C48B8 + ldr r0, _021E6208 ; =gMain add r4, #0x74 ldr r1, [r0, #0x48] mov r0, #0x40 @@ -30375,7 +30375,7 @@ _021E6202: sub r0, r0, #4 pop {r3, r4, r5, pc} nop -_021E6208: .word gUnknown21C48B8 +_021E6208: .word gMain _021E620C: .word 0x000005DD thumb_func_start MOD14_021E6210 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 01d6e3e1..5a05b6f7 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -68,7 +68,7 @@ MOD15_021D7558: ; 0x021D7558 push {r4, lr} bl FUN_02006278 add r4, r0, #0 - ldr r0, _021D7594 ; =gUnknown21C48B8 + ldr r0, _021D7594 ; =gMain ldr r1, [r0, #0x48] strh r1, [r4, #0x30] ldr r1, [r0, #0x44] @@ -94,7 +94,7 @@ _021D7586: blx r2 pop {r4, pc} nop -_021D7594: .word gUnknown21C48B8 +_021D7594: .word gMain thumb_func_start MOD15_021D7598 MOD15_021D7598: ; 0x021D7598 @@ -4876,7 +4876,7 @@ _021D9A66: ldr r0, [sp, #0x24] mov r1, #1 add r3, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r1, [sp, #0x1c] mov r0, #1 mov r2, #0 @@ -5173,7 +5173,7 @@ MOD15_021D9C58: ; 0x021D9C58 ldrsh r3, [r3, r6] ldr r2, [r5, #0x4c] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D9CA2: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -5244,7 +5244,7 @@ _021D9CDC: add r0, #0x1c add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r5, #0 @@ -5266,7 +5266,7 @@ _021D9D40: add r0, r4, #0 ldr r2, [r4, #0x4c] add r0, #0x1c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D9DB0 _021D9D66: ldr r0, [r4, #0x48] @@ -5284,7 +5284,7 @@ _021D9D66: add r0, r4, #0 ldr r2, [r4, #0x4c] add r0, #0x1c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D9DB0 _021D9D8C: ldr r0, [r4, #0x48] @@ -5302,7 +5302,7 @@ _021D9D8C: add r0, r4, #0 ldr r2, [r4, #0x4c] add r0, #0x1c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D9DB0: add r4, #0x1c add r0, r4, #0 @@ -5478,7 +5478,7 @@ MOD15_021D9ECC: ; 0x021D9ECC add r0, r5, #0 ldr r2, [r5, #0x4c] add r0, #0x2c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5, #0x48] ldr r2, [r5, #0x4c] mov r1, #0xa @@ -5495,7 +5495,7 @@ MOD15_021D9ECC: ; 0x021D9ECC ldr r2, [r5, #0x4c] add r0, #0x2c mov r3, #0xe - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r2, [r5, #0x60] add r0, r5, #0 lsl r2, r2, #0x10 @@ -5674,7 +5674,7 @@ MOD15_021DA044: ; 0x021DA044 str r0, [sp, #8] add r0, sp, #0x10 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x10 bl FUN_02019548 add r0, r4, #0 @@ -6040,7 +6040,7 @@ _021DA31A: str r0, [sp, #0xc] add r0, sp, #0x28 add r2, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x28 bl FUN_02019270 add r0, sp, #0x28 @@ -6137,7 +6137,7 @@ _021DA430: add r0, sp, #0x20 mov r1, #0 add r3, r3, #3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r5, r5, #1 cmp r5, r7 blo _021DA40C @@ -6228,7 +6228,7 @@ _021DA4C2: ldr r3, [sp, #0x18] add r0, r6, #0 mov r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl FUN_02019270 add r0, r6, #0 @@ -7368,7 +7368,7 @@ MOD15_021DAD98: ; 0x021DAD98 ldr r2, [r5, #0x3c] add r0, #0x10 mul r3, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DADD4: @@ -7390,7 +7390,7 @@ _021DADD4: add r0, r5, #0 ldr r2, [r5, #0x3c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r2, #0 mov r0, #1 add r1, r7, #0 @@ -7784,7 +7784,7 @@ _021DB120: mov r0, #0 str r0, [sp, #0xc] ldr r0, [sp, #0x10] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, r4, #1 add r5, r5, #2 cmp r4, #4 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 1c08b8e1..a6d13041 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -1184,7 +1184,7 @@ MOD16_021D7D9C: ; 0x021D7D9C add r0, r5, #0 mov r1, #2 mov r3, #0x16 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 str r1, [sp] mov r0, #0xff @@ -1196,7 +1196,7 @@ MOD16_021D7D9C: ; 0x021D7D9C add r0, r5, #0 mov r1, #2 mov r3, #0x31 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -5727,7 +5727,7 @@ MOD16_021D9F8C: ; 0x021D9F8C str r2, [r0, r1] bx lr _021D9F9C: - ldr r1, _021D9FB4 ; =gUnknown21C48B8 + ldr r1, _021D9FB4 ; =gMain ldr r1, [r1, #0x44] cmp r1, #0 beq _021D9FAA @@ -5739,7 +5739,7 @@ _021D9FAA: .align 2, 0 _021D9FAC: .word UNK_021C48F8 _021D9FB0: .word 0x00001758 -_021D9FB4: .word gUnknown21C48B8 +_021D9FB4: .word gMain thumb_func_end MOD16_021D9F8C thumb_func_start MOD16_021D9FB8 @@ -8491,7 +8491,7 @@ _021DB3E4: str r0, [sp, #0xc] add r0, r6, #0 add r2, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #2 add r1, r4, #0 mov r2, #0 @@ -8522,7 +8522,7 @@ MOD16_021DB42C: ; 0x021DB42C str r0, [sp, #0xc] add r0, r1, #0 mov r1, #2 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, pc} .align 2, 0 @@ -11019,7 +11019,7 @@ MOD16_021DC540: ; 0x021DC540 thumb_func_start MOD16_021DC550 MOD16_021DC550: ; 0x021DC550 - ldr r1, _021DC594 ; =gUnknown21C48B8 + ldr r1, _021DC594 ; =gMain mov r2, #2 ldr r1, [r1, #0x48] tst r2, r1 @@ -11058,7 +11058,7 @@ _021DC588: _021DC590: bx lr nop -_021DC594: .word gUnknown21C48B8 +_021DC594: .word gMain thumb_func_end MOD16_021DC550 thumb_func_start MOD16_021DC598 @@ -11549,7 +11549,7 @@ MOD16_021DC958: ; 0x021DC958 add r2, r4, #0 mov r3, #8 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 mov r1, #1 add r2, r4, #0 @@ -11564,7 +11564,7 @@ MOD16_021DC958: ; 0x021DC958 add r2, r4, #0 mov r3, #0x80 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] add r0, r4, #0 @@ -11582,7 +11582,7 @@ MOD16_021DC958: ; 0x021DC958 add r2, r4, #0 mov r3, #0x30 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] ldr r1, [sp, #0x10] @@ -11600,7 +11600,7 @@ MOD16_021DC958: ; 0x021DC958 add r2, r4, #0 mov r3, #0xb4 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -11644,7 +11644,7 @@ MOD16_021DCA2C: ; 0x021DCA2C add r2, r4, #0 mov r3, #8 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] add r0, r4, #0 @@ -11662,7 +11662,7 @@ MOD16_021DCA2C: ; 0x021DCA2C add r2, r4, #0 mov r3, #0x30 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -12852,7 +12852,7 @@ MOD16_021DD370: ; 0x021DD370 add r0, r5, #0 mov r1, #2 mov r3, #0x16 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] mov r1, #0x63 add r2, r7, #0 @@ -12868,7 +12868,7 @@ MOD16_021DD370: ; 0x021DD370 add r0, r5, #0 mov r1, #2 mov r3, #0x31 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r4, [sp, #0x10] lsl r6, r6, #2 add r4, #0x28 @@ -13853,7 +13853,7 @@ _021DDB54: .word 0x0000068B thumb_func_start MOD16_021DDB58 MOD16_021DDB58: ; 0x021DDB58 push {r3, r4, r5, lr} - ldr r2, _021DDC24 ; =gUnknown21C48B8 + ldr r2, _021DDC24 ; =gMain add r4, r1, #0 ldr r3, [r2, #0x44] add r5, r0, #0 @@ -13950,7 +13950,7 @@ _021DDC0E: _021DDC20: pop {r3, r4, r5, pc} nop -_021DDC24: .word gUnknown21C48B8 +_021DDC24: .word gMain _021DDC28: .word 0x0000068B thumb_func_end MOD16_021DDB58 @@ -17112,7 +17112,7 @@ _021DF394: add r2, r6, #0 add r3, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -17164,7 +17164,7 @@ MOD16_021DF3E4: ; 0x021DF3E4 add r2, r6, #0 add r3, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -17409,7 +17409,7 @@ MOD16_021DF5D0: ; 0x021DF5D0 add r0, r4, #4 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor add sp, #0x10 @@ -17503,7 +17503,7 @@ _021DF698: add r0, r5, #4 add r2, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -17630,7 +17630,7 @@ _021DF774: add r0, r5, #4 add r2, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x14 @@ -17898,7 +17898,7 @@ MOD16_021DF970: ; 0x021DF970 add r2, r4, #0 mov r3, #0x60 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor mov r0, #1 @@ -20278,7 +20278,7 @@ _021E0A9A: MOD16_021E0AB0: ; 0x021E0AB0 push {r4, lr} add r4, r0, #0 - ldr r0, _021E0BB4 ; =gUnknown21C48B8 + ldr r0, _021E0BB4 ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -20399,7 +20399,7 @@ _021E0B86: add r0, #0x8c str r1, [r0] _021E0B94: - ldr r0, _021E0BB4 ; =gUnknown21C48B8 + ldr r0, _021E0BB4 ; =gMain mov r1, #2 ldr r0, [r0, #0x48] tst r0, r1 @@ -20417,7 +20417,7 @@ _021E0B94: _021E0BB2: pop {r4, pc} .align 2, 0 -_021E0BB4: .word gUnknown21C48B8 +_021E0BB4: .word gMain thumb_func_end MOD16_021E0AB0 thumb_func_start MOD16_021E0BB8 @@ -20569,7 +20569,7 @@ _021E0C7E: MOD16_021E0CB8: ; 0x021E0CB8 push {r4, lr} add r4, r0, #0 - ldr r0, _021E0D8C ; =gUnknown21C48B8 + ldr r0, _021E0D8C ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -20681,7 +20681,7 @@ _021E0D82: _021E0D88: pop {r4, pc} nop -_021E0D8C: .word gUnknown21C48B8 +_021E0D8C: .word gMain thumb_func_end MOD16_021E0CB8 thumb_func_start MOD16_021E0D90 @@ -20833,7 +20833,7 @@ _021E0E56: MOD16_021E0E90: ; 0x021E0E90 push {r4, lr} add r4, r0, #0 - ldr r0, _021E0FD8 ; =gUnknown21C48B8 + ldr r0, _021E0FD8 ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -21011,7 +21011,7 @@ _021E0FD0: _021E0FD6: pop {r4, pc} .align 2, 0 -_021E0FD8: .word gUnknown21C48B8 +_021E0FD8: .word gMain thumb_func_end MOD16_021E0E90 thumb_func_start MOD16_021E0FDC @@ -21190,7 +21190,7 @@ _021E10D0: MOD16_021E1110: ; 0x021E1110 push {r4, lr} add r4, r0, #0 - ldr r0, _021E1278 ; =gUnknown21C48B8 + ldr r0, _021E1278 ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -21385,7 +21385,7 @@ _021E1270: _021E1276: pop {r4, pc} .align 2, 0 -_021E1278: .word gUnknown21C48B8 +_021E1278: .word gMain thumb_func_end MOD16_021E1110 thumb_func_start MOD16_021E127C @@ -21591,7 +21591,7 @@ _021E13C8: MOD16_021E13E0: ; 0x021E13E0 push {r4, lr} add r4, r0, #0 - ldr r0, _021E1530 ; =gUnknown21C48B8 + ldr r0, _021E1530 ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -21773,7 +21773,7 @@ _021E1528: _021E152E: pop {r4, pc} .align 2, 0 -_021E1530: .word gUnknown21C48B8 +_021E1530: .word gMain thumb_func_end MOD16_021E13E0 thumb_func_start MOD16_021E1534 @@ -21925,7 +21925,7 @@ _021E15FA: MOD16_021E1634: ; 0x021E1634 push {r4, lr} add r4, r0, #0 - ldr r0, _021E1800 ; =gUnknown21C48B8 + ldr r0, _021E1800 ; =gMain ldr r1, [r0, #0x44] mov r0, #1 tst r0, r1 @@ -22173,14 +22173,14 @@ _021E17F6: _021E17FC: pop {r4, pc} nop -_021E1800: .word gUnknown21C48B8 +_021E1800: .word gMain thumb_func_end MOD16_021E1634 thumb_func_start MOD16_021E1804 MOD16_021E1804: ; 0x021E1804 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _021E1890 ; =gUnknown21C48B8 + ldr r0, _021E1890 ; =gMain add r4, r1, #0 ldr r1, [r0, #0x48] mov r0, #0x10 @@ -22195,7 +22195,7 @@ MOD16_021E1804: ; 0x021E1804 add r0, #0x8c str r1, [r0] _021E1826: - ldr r0, _021E1890 ; =gUnknown21C48B8 + ldr r0, _021E1890 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x20 tst r0, r1 @@ -22209,7 +22209,7 @@ _021E1826: add r0, #0x8c str r1, [r0] _021E1842: - ldr r0, _021E1890 ; =gUnknown21C48B8 + ldr r0, _021E1890 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x40 tst r0, r1 @@ -22223,7 +22223,7 @@ _021E1842: add r0, #0x8c str r1, [r0] _021E185E: - ldr r0, _021E1890 ; =gUnknown21C48B8 + ldr r0, _021E1890 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x80 tst r0, r1 @@ -22247,7 +22247,7 @@ _021E187A: bl MOD16_021E1894 pop {r3, r4, r5, pc} .align 2, 0 -_021E1890: .word gUnknown21C48B8 +_021E1890: .word gMain thumb_func_end MOD16_021E1804 thumb_func_start MOD16_021E1894 @@ -28676,7 +28676,7 @@ MOD16_021E4850: ; 0x021E4850 bne _021E48B2 ldr r0, [r4] bl MOD16_021E2F30 - ldr r1, _021E48B8 ; =gUnknown21C48B8 + ldr r1, _021E48B8 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x20 tst r1, r2 @@ -28713,7 +28713,7 @@ _021E48B2: pop {r3, r4, r5, pc} .align 2, 0 _021E48B4: .word UNK_021C48F8 -_021E48B8: .word gUnknown21C48B8 +_021E48B8: .word gMain thumb_func_end MOD16_021E4850 thumb_func_start MOD16_021E48BC @@ -29797,7 +29797,7 @@ MOD16_021E5064: ; 0x021E5064 add r2, r7, #0 mov r3, #0x98 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] mov r1, #0xa add r2, r7, #0 @@ -29811,7 +29811,7 @@ MOD16_021E5064: ; 0x021E5064 add r2, r7, #0 mov r3, #0x98 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x18] @@ -29868,7 +29868,7 @@ MOD16_021E5104: ; 0x021E5104 add r2, r4, #0 mov r3, #0xb8 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -29907,7 +29907,7 @@ MOD16_021E5158: ; 0x021E5158 add r2, r4, #0 mov r3, #0xb8 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -29952,7 +29952,7 @@ _021E51DA: add r0, r5, #0 add r2, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl MOD16_021DBBAC add sp, #0x10 @@ -34499,7 +34499,7 @@ _021E731E: mov r3, #0xb8 add r0, r0, #4 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x14] @@ -34563,7 +34563,7 @@ _021E73CA: ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl MOD16_021DBBAC add sp, #0x10 @@ -35496,7 +35496,7 @@ MOD16_021E7AB4: ; 0x021E7AB4 add r2, r4, #0 add r0, r0, #4 mov r3, #0x80 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl MOD16_021DBBAC add sp, #0x10 @@ -35532,7 +35532,7 @@ MOD16_021E7AF0: ; 0x021E7AF0 ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl MOD16_021DBBAC add sp, #0x10 @@ -37567,7 +37567,7 @@ _021E8AB8: .word 0x0000068B thumb_func_start MOD16_021E8ABC MOD16_021E8ABC: ; 0x021E8ABC - ldr r1, _021E8AE0 ; =gUnknown21C48B8 + ldr r1, _021E8AE0 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x40 tst r1, r2 @@ -37587,7 +37587,7 @@ _021E8AD8: str r1, [r0, #0x34] bx lr nop -_021E8AE0: .word gUnknown21C48B8 +_021E8AE0: .word gMain thumb_func_end MOD16_021E8ABC thumb_func_start MOD16_021E8AE4 @@ -40195,7 +40195,7 @@ MOD16_021E9E34: ; 0x021E9E34 add r5, r0, #0 ldr r4, [r5, #4] bl MOD16_021E9E64 - ldr r0, _021E9E5C ; =gUnknown21C48B8 + ldr r0, _021E9E5C ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -40209,7 +40209,7 @@ MOD16_021E9E34: ; 0x021E9E34 _021E9E58: pop {r3, r4, r5, pc} nop -_021E9E5C: .word gUnknown21C48B8 +_021E9E5C: .word gMain _021E9E60: .word 0x000005DD thumb_func_end MOD16_021E9E34 @@ -40338,7 +40338,7 @@ MOD16_021E9F48: ; 0x021E9F48 beq _021E9F58 b _021EA066 _021E9F58: - ldr r0, _021EA068 ; =gUnknown21C48B8 + ldr r0, _021EA068 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x10 tst r0, r1 @@ -40348,7 +40348,7 @@ _021E9F58: mov r2, #1 bl MOD16_021DB4CC _021E9F6C: - ldr r0, _021EA068 ; =gUnknown21C48B8 + ldr r0, _021EA068 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x20 tst r0, r1 @@ -40358,7 +40358,7 @@ _021E9F6C: sub r2, r1, #1 bl MOD16_021DB4CC _021E9F80: - ldr r0, _021EA068 ; =gUnknown21C48B8 + ldr r0, _021EA068 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -40470,7 +40470,7 @@ _021EA052: _021EA066: pop {r4, r5, r6, pc} .align 2, 0 -_021EA068: .word gUnknown21C48B8 +_021EA068: .word gMain _021EA06C: .word 0x0000068B _021EA070: .word 0x000005DD thumb_func_end MOD16_021E9F48 @@ -40552,7 +40552,7 @@ MOD16_021EA0EC: ; 0x021EA0EC ldr r0, [r1, #0x30] cmp r0, #0 bne _021EA10A - ldr r0, _021EA11C ; =gUnknown21C48B8 + ldr r0, _021EA11C ; =gMain ldr r2, [r0, #0x48] mov r0, #0x80 tst r0, r2 @@ -40561,7 +40561,7 @@ MOD16_021EA0EC: ; 0x021EA0EC str r0, [r1, #0x30] bx lr _021EA10A: - ldr r0, _021EA11C ; =gUnknown21C48B8 + ldr r0, _021EA11C ; =gMain ldr r2, [r0, #0x48] mov r0, #0x40 tst r0, r2 @@ -40571,7 +40571,7 @@ _021EA10A: _021EA118: bx lr nop -_021EA11C: .word gUnknown21C48B8 +_021EA11C: .word gMain thumb_func_end MOD16_021EA0EC thumb_func_start MOD16_021EA120 @@ -44906,7 +44906,7 @@ MOD16_021EC144: ; 0x021EC144 ldr r0, [r4, #4] bl MOD16_021D9DE8 add r6, r0, #0 - ldr r0, _021EC1B4 ; =gUnknown21C48B8 + ldr r0, _021EC1B4 ; =gMain mov r1, #1 ldr r0, [r0, #0x48] tst r0, r1 @@ -44957,7 +44957,7 @@ _021EC1A6: _021EC1B0: pop {r4, r5, r6, pc} nop -_021EC1B4: .word gUnknown21C48B8 +_021EC1B4: .word gMain thumb_func_end MOD16_021EC144 thumb_func_start MOD16_021EC1B8 @@ -45841,7 +45841,7 @@ MOD16_021EC7E8: ; 0x021EC7E8 ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 mov r1, #9 add r2, r4, #0 @@ -45857,7 +45857,7 @@ MOD16_021EC7E8: ; 0x021EC7E8 add r2, r4, #0 add r0, r0, #4 mov r3, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 mov r1, #9 add r2, r4, #0 @@ -45873,7 +45873,7 @@ MOD16_021EC7E8: ; 0x021EC7E8 add r2, r4, #0 add r0, r0, #4 mov r3, #0x98 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -45920,7 +45920,7 @@ MOD16_021EC898: ; 0x021EC898 ldr r2, [sp, #0x18] add r0, r0, #4 mov r3, #0x1a - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] add r2, r4, #0 @@ -45941,7 +45941,7 @@ MOD16_021EC898: ; 0x021EC898 ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x10] @@ -45965,7 +45965,7 @@ MOD16_021EC898: ; 0x021EC898 ldr r0, [r5] mov r3, #0x92 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r6, #4] bl MOD16_021D9F4C cmp r0, #0 @@ -45997,7 +45997,7 @@ _021EC970: ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r7, #0 @@ -47497,7 +47497,7 @@ _021ED48C: thumb_func_start MOD16_021ED4C8 MOD16_021ED4C8: ; 0x021ED4C8 push {r3, lr} - ldr r2, _021ED504 ; =gUnknown21C48B8 + ldr r2, _021ED504 ; =gMain ldr r3, [r2, #0x48] mov r2, #1 tst r3, r2 @@ -47528,7 +47528,7 @@ _021ED4FA: _021ED500: pop {r3, pc} nop -_021ED504: .word gUnknown21C48B8 +_021ED504: .word gMain _021ED508: .word 0x000005DD thumb_func_end MOD16_021ED4C8 @@ -48821,7 +48821,7 @@ MOD16_021EDEC8: ; 0x021EDEC8 ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 mov r1, #0xa add r2, r4, #0 @@ -48837,7 +48837,7 @@ MOD16_021EDEC8: ; 0x021EDEC8 add r2, r4, #0 add r0, r0, #4 mov r3, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 mov r1, #0xa add r2, r4, #0 @@ -48853,7 +48853,7 @@ MOD16_021EDEC8: ; 0x021EDEC8 add r2, r4, #0 add r0, r0, #4 mov r3, #0x98 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -48899,7 +48899,7 @@ MOD16_021EDF78: ; 0x021EDF78 ldr r2, [sp, #0x18] add r0, r0, #4 mov r3, #0x1a - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] add r2, r4, #0 @@ -48920,7 +48920,7 @@ MOD16_021EDF78: ; 0x021EDF78 ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x10] @@ -48944,7 +48944,7 @@ MOD16_021EDF78: ; 0x021EDF78 ldr r0, [r5] mov r3, #0x92 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r6] bl MOD16_021D9F4C cmp r0, #0 @@ -48976,7 +48976,7 @@ _021EE04E: ldr r0, [r5] add r2, r4, #0 add r0, r0, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r7, #0 @@ -50911,7 +50911,7 @@ MOD16_021EEE80: ; 0x021EEE80 thumb_func_start MOD16_021EEEB4 MOD16_021EEEB4: ; 0x021EEEB4 - ldr r1, _021EEEC4 ; =gUnknown21C48B8 + ldr r1, _021EEEC4 ; =gMain ldr r2, [r1, #0x44] mov r1, #1 tst r2, r1 @@ -50920,7 +50920,7 @@ MOD16_021EEEB4: ; 0x021EEEB4 _021EEEC0: bx lr nop -_021EEEC4: .word gUnknown21C48B8 +_021EEEC4: .word gMain thumb_func_end MOD16_021EEEB4 thumb_func_start MOD16_021EEEC8 @@ -52441,7 +52441,7 @@ MOD16_021EFA6C: ; 0x021EFA6C add r2, r5, #0 mov r3, #0x20 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor add r0, r4, #0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index a968dcb0..624ed28f 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -2238,7 +2238,7 @@ _021D858A: str r0, [r5] b _021D8710 _021D85AA: - ldr r0, _021D8728 ; =gUnknown21C48B8 + ldr r0, _021D8728 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 and r1, r0 @@ -2423,7 +2423,7 @@ _021D8710: _021D871C: .word 0x00000554 _021D8720: .word 0x00000151 _021D8724: .word 0x000006CC -_021D8728: .word gUnknown21C48B8 +_021D8728: .word gMain _021D872C: .word UNK_021C48F8 _021D8730: .word 0x0000069C _021D8734: .word 0x0000048C @@ -4727,7 +4727,7 @@ MOD17_021D9918: ; 0x021D9918 ldr r0, [r5, r0] mov r1, #1 add r2, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -4783,7 +4783,7 @@ MOD17_021D99E0: ; 0x021D99E0 ldr r0, [r5, r0] mov r1, #1 add r2, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -4863,7 +4863,7 @@ _021D9AD0: add r2, #0x28 ldr r2, [r5, r2] mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r6, r0, #0 add r0, r4, #0 bl String_dtor @@ -11290,7 +11290,7 @@ _021DC898: add r0, r4, #0 add r2, r7, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r6, #0 @@ -11954,7 +11954,7 @@ _021DCD98: mov r0, #0 str r0, [sp, #0xc] add r0, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r6, r0, #0 add r0, r4, #0 bl String_dtor @@ -12005,7 +12005,7 @@ _021DCE00: str r0, [sp, #0xc] ldr r2, [r4] add r0, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, r0, #0 add r0, r5, #0 bl DestroyMsgData @@ -13928,7 +13928,7 @@ _021DDC9C: str r0, [r4] b _021DDCEA _021DDCAC: - ldr r1, _021DDCF0 ; =gUnknown21C48B8 + ldr r1, _021DDCF0 ; =gMain ldr r2, [r1, #0x48] mov r1, #3 tst r1, r2 @@ -13964,7 +13964,7 @@ _021DDCEA: add sp, #0xc pop {r4, r5, pc} .align 2, 0 -_021DDCF0: .word gUnknown21C48B8 +_021DDCF0: .word gMain thumb_func_end MOD17_021DDC30 thumb_func_start MOD17_021DDCF4 @@ -14395,7 +14395,7 @@ _021DDFF8: ldr r0, [r5, r0] add r2, r7, #0 sub r3, r3, r4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor ldr r0, [r5] @@ -14437,7 +14437,7 @@ _021DDFF8: mov r3, #0x80 add r2, r4, #0 sub r3, r3, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r7, #0 @@ -14555,7 +14555,7 @@ _021DE1A0: mov r3, #0x80 add r2, r4, #0 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] mov r1, #0x2c bl NewString_ReadMsgData @@ -14587,7 +14587,7 @@ _021DE1A0: mov r3, #0x80 add r2, r4, #0 sub r3, r3, r5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor ldr r0, [sp, #0x10] diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index a604a281..fd50f831 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -2251,7 +2251,7 @@ _0223A844: ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A86C - ldr r0, _0223AB0C ; =gUnknown21C48B8 + ldr r0, _0223AB0C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -2330,7 +2330,7 @@ _0223A8E4: ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A924 - ldr r0, _0223AB0C ; =gUnknown21C48B8 + ldr r0, _0223AB0C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -2384,7 +2384,7 @@ _0223A958: ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A98A - ldr r0, _0223AB0C ; =gUnknown21C48B8 + ldr r0, _0223AB0C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -2559,7 +2559,7 @@ _0223AAF2: _0223AB00: .word 0x00000621 _0223AB04: .word MOD18_02251380 _0223AB08: .word UNK_021C48F8 -_0223AB0C: .word gUnknown21C48B8 +_0223AB0C: .word gMain _0223AB10: .word 0x000005E3 _0223AB14: .word 0x000003D9 _0223AB18: .word 0x000009E8 @@ -2669,7 +2669,7 @@ _0223ABDC: ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223AC04 - ldr r0, _0223AC20 ; =gUnknown21C48B8 + ldr r0, _0223AC20 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -2686,7 +2686,7 @@ _0223AC10: _0223AC14: .word MOD18_02251380 _0223AC18: .word 0x000006A1 _0223AC1C: .word UNK_021C48F8 -_0223AC20: .word gUnknown21C48B8 +_0223AC20: .word gMain thumb_func_end MOD18_0223A64C thumb_func_start MOD18_0223AC24 @@ -22176,7 +22176,7 @@ _0224416E: ldrh r1, [r1] add r2, r5, #0 bl MOD18_022440C4 - ldr r0, _02244310 ; =gUnknown21C48B8 + ldr r0, _02244310 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -22322,7 +22322,7 @@ _02244268: mvn r0, r0 pop {r3, r4, r5, r6, r7, pc} _0224428C: - ldr r0, _02244310 ; =gUnknown21C48B8 + ldr r0, _02244310 ; =gMain ldr r1, [r0, #0x48] mov r0, #4 tst r0, r1 @@ -22388,7 +22388,7 @@ _02244308: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_02244310: .word gUnknown21C48B8 +_02244310: .word gMain _02244314: .word 0x000005DC thumb_func_end MOD18_02244140 @@ -23360,7 +23360,7 @@ _02244AB8: mov r3, #0 ldr r0, [sp, #0xc] str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r7] mov r0, #1 add sp, #0x10 @@ -27087,7 +27087,7 @@ _02246762: bl MOD18_0224DF88 cmp r0, #0 bne _02246848 - ldr r0, _02246864 ; =gUnknown21C48B8 + ldr r0, _02246864 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -27158,7 +27158,7 @@ _02246802: bl MOD18_0224DF88 cmp r0, #0 bne _0224682A - ldr r0, _02246864 ; =gUnknown21C48B8 + ldr r0, _02246864 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -27193,7 +27193,7 @@ _02246854: .word 0x000003D9 _02246858: .word MOD18_022513EC _0224685C: .word 0x000013E6 _02246860: .word 0x00000604 -_02246864: .word gUnknown21C48B8 +_02246864: .word gMain _02246868: .word 0x000012E4 thumb_func_end MOD18_02246514 @@ -27361,7 +27361,7 @@ _022469C6: bl MOD18_0224DF88 cmp r0, #0 bne _02246A80 - ldr r0, _02246AD4 ; =gUnknown21C48B8 + ldr r0, _02246AD4 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r1, r0 @@ -27470,7 +27470,7 @@ _02246ACA: pop {r4, r5, r6, r7, pc} nop _02246AD0: .word 0x0000061E -_02246AD4: .word gUnknown21C48B8 +_02246AD4: .word gMain _02246AD8: .word MOD18_022504F8 _02246ADC: .word 0x000003D9 _02246AE0: .word MOD18_022453E0 @@ -28585,7 +28585,7 @@ _0224737C: bl MOD18_0224DF88 cmp r0, #0 bne _02247406 - ldr r0, _02247410 ; =gUnknown21C48B8 + ldr r0, _02247410 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -28605,7 +28605,7 @@ _022473AA: bl MOD18_0224DF88 cmp r0, #0 bne _02247406 - ldr r0, _02247410 ; =gUnknown21C48B8 + ldr r0, _02247410 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -28644,7 +28644,7 @@ _02247406: pop {r4, r5, pc} nop _0224740C: .word 0x000005E3 -_02247410: .word gUnknown21C48B8 +_02247410: .word gMain thumb_func_end MOD18_02247338 thumb_func_start MOD18_02247414 @@ -30392,7 +30392,7 @@ _02248186: bl MOD18_0224DF88 cmp r0, #0 bne _02248256 - ldr r0, _022484C0 ; =gUnknown21C48B8 + ldr r0, _022484C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -30476,7 +30476,7 @@ _02248240: bl MOD18_0224DF88 cmp r0, #0 bne _02248256 - ldr r0, _022484C0 ; =gUnknown21C48B8 + ldr r0, _022484C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -30782,7 +30782,7 @@ _0224849A: strb r1, [r0] b _022485F6 nop -_022484C0: .word gUnknown21C48B8 +_022484C0: .word gMain _022484C4: .word MOD18_0224804C _022484C8: .word MOD18_02248034 _022484CC: .word MOD18_022513F0 @@ -30859,7 +30859,7 @@ _0224856E: bl MOD18_0224DF88 cmp r0, #0 bne _022485F6 - ldr r0, _02248658 ; =gUnknown21C48B8 + ldr r0, _02248658 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -30967,7 +30967,7 @@ _02248652: add sp, #4 pop {r3, r4, r5, r6, pc} nop -_02248658: .word gUnknown21C48B8 +_02248658: .word gMain thumb_func_end MOD18_02248054 thumb_func_start MOD18_0224865C @@ -31478,7 +31478,7 @@ _02248A56: mov r1, #0xc add r0, #0x2e strb r1, [r0] - ldr r0, _02248D8C ; =gUnknown21C48B8 + ldr r0, _02248D8C ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -31557,7 +31557,7 @@ _02248AF4: bl MOD18_0224DF88 cmp r0, #0 bne _02248B86 - ldr r0, _02248D8C ; =gUnknown21C48B8 + ldr r0, _02248D8C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -31691,7 +31691,7 @@ _02248C10: bl MOD18_0224DF88 cmp r0, #0 bne _02248C8E - ldr r0, _02248D8C ; =gUnknown21C48B8 + ldr r0, _02248D8C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -31860,7 +31860,7 @@ _02248D74: strb r1, [r0] b _02248DB6 nop -_02248D8C: .word gUnknown21C48B8 +_02248D8C: .word gMain _02248D90: .word MOD18_02250520 _02248D94: .word 0x000003D9 _02248D98: .word MOD18_022489C4 @@ -33159,7 +33159,7 @@ _02249734: bl MOD18_0224DF88 cmp r0, #0 bne _022497BA - ldr r0, _022497C0 ; =gUnknown21C48B8 + ldr r0, _022497C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -33177,7 +33177,7 @@ _02249762: bl MOD18_0224DF88 cmp r0, #0 bne _022497BA - ldr r0, _022497C0 ; =gUnknown21C48B8 + ldr r0, _022497C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -33216,7 +33216,7 @@ _022497BA: pop {r3, r4, r5, pc} .align 2, 0 _022497BC: .word 0x00000246 -_022497C0: .word gUnknown21C48B8 +_022497C0: .word gMain _022497C4: .word 0x00000245 thumb_func_end MOD18_02249684 @@ -35379,7 +35379,7 @@ _0224A98E: bl MOD18_0224DF88 cmp r0, #0 bne _0224A9AA - ldr r0, _0224A9B0 ; =gUnknown21C48B8 + ldr r0, _0224A9B0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -35391,7 +35391,7 @@ _0224A9AA: pop {r3, r4, r5, pc} .align 2, 0 _0224A9AC: .word 0x00000246 -_0224A9B0: .word gUnknown21C48B8 +_0224A9B0: .word gMain thumb_func_end MOD18_0224A914 thumb_func_start MOD18_0224A9B4 @@ -37163,7 +37163,7 @@ MOD18_0224B7D8: ; 0x0224B7D8 bl MOD18_0224DF88 cmp r0, #0 bne _0224B7FC - ldr r0, _0224B800 ; =gUnknown21C48B8 + ldr r0, _0224B800 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -37176,7 +37176,7 @@ _0224B7FC: mov r0, #0 pop {r3, pc} .align 2, 0 -_0224B800: .word gUnknown21C48B8 +_0224B800: .word gMain thumb_func_end MOD18_0224B7D8 thumb_func_start MOD18_0224B804 @@ -37504,7 +37504,7 @@ _0224BA70: strb r0, [r4, r1] pop {r3, r4, r5, r6, pc} _0224BAB4: - ldr r0, _0224BD48 ; =gUnknown21C48B8 + ldr r0, _0224BD48 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -37657,7 +37657,7 @@ _0224BC06: bl MOD18_0224DF88 cmp r0, #0 bne _0224BC1C - ldr r0, _0224BD48 ; =gUnknown21C48B8 + ldr r0, _0224BD48 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -37798,7 +37798,7 @@ _0224BD3A: nop _0224BD40: .word 0x00000246 _0224BD44: .word MOD18_0224B204 -_0224BD48: .word gUnknown21C48B8 +_0224BD48: .word gMain _0224BD4C: .word MOD18_0224B228 _0224BD50: .word MOD18_0224B84C thumb_func_end MOD18_0224B9D0 @@ -38658,7 +38658,7 @@ _0224C434: str r1, [sp, #8] ldr r2, [r4, #0x68] add r0, #0x20 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r0, #1 mvn r0, r0 cmp r5, r0 @@ -38697,7 +38697,7 @@ _0224C434: ldr r2, [r4, #0x6c] add r0, #0x20 mov r3, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized _0224C4C2: mov r0, #1 mvn r0, r0 @@ -38967,7 +38967,7 @@ _0224C6C4: str r1, [sp, #8] ldr r2, [r4, #0x68] add r0, #0x20 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r0, #1 mvn r0, r0 cmp r6, r0 @@ -39004,7 +39004,7 @@ _0224C6C4: ldr r2, [r4, #0x6c] add r0, #0x20 mov r3, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, _0224C7BC ; =0x00000215 strb r5, [r4, r0] add r0, r0, #5 @@ -39027,7 +39027,7 @@ _0224C74E: ldr r2, [r4, #0x68] add r0, #0x20 mov r3, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized _0224C778: mov r0, #0x92 lsl r0, r0, #2 @@ -39548,7 +39548,7 @@ MOD18_0224CB34: ; 0x0224CB34 str r1, [sp, #8] ldr r2, [r5, #0x68] add r0, #0x30 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0x14 pop {r4, r5, pc} nop @@ -40014,14 +40014,14 @@ _0224CF40: bl MOD18_0224DF88 cmp r0, #0 bne _0224CF6C - ldr r0, _0224CF60 ; =gUnknown21C48B8 + ldr r0, _0224CF60 ; =gMain b _0224CF64 .align 2, 0 _0224CF50: .word 0x00000246 _0224CF54: .word 0x0000024A _0224CF58: .word 0x000005DC _0224CF5C: .word 0x0000FFFC -_0224CF60: .word gUnknown21C48B8 +_0224CF60: .word gMain _0224CF64: ldr r1, [r0, #0x48] mov r0, #1 @@ -40062,7 +40062,7 @@ _0224CFA8: bl MOD18_0224DF88 cmp r0, #0 bne _0224D0AA - ldr r0, _0224D1DC ; =gUnknown21C48B8 + ldr r0, _0224D1DC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -40257,7 +40257,7 @@ _0224D14E: bl MOD18_0224DF88 cmp r0, #0 bne _0224D1CE - ldr r0, _0224D1DC ; =gUnknown21C48B8 + ldr r0, _0224D1DC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -40292,7 +40292,7 @@ _0224D1A0: bl MOD18_0224DF88 cmp r0, #0 bne _0224D1CE - ldr r0, _0224D1DC ; =gUnknown21C48B8 + ldr r0, _0224D1DC ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -40310,7 +40310,7 @@ _0224D1CE: nop _0224D1D4: .word 0x000005E3 _0224D1D8: .word 0x00000246 -_0224D1DC: .word gUnknown21C48B8 +_0224D1DC: .word gMain _0224D1E0: .word MOD18_0224C510 _0224D1E4: .word 0x00000215 _0224D1E8: .word MOD18_0225066C @@ -40529,7 +40529,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0xc] mov r1, #1 add r2, r4, #0 @@ -40543,7 +40543,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0xc] mov r1, #3 add r2, r4, #0 @@ -40557,7 +40557,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #0x39 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0xc] mov r1, #2 add r2, r4, #0 @@ -40571,7 +40571,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #0x84 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0xc] mov r1, #3 add r2, r4, #0 @@ -40585,7 +40585,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #0x39 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r5, #0 bl FUN_020239C0 add r2, r0, #0 @@ -40614,7 +40614,7 @@ MOD18_0224D364: ; 0x0224D364 add r0, r7, #0 mov r3, #0x94 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x1c] mov r1, #0 add r2, r5, #0 @@ -40636,7 +40636,7 @@ MOD18_0224D364: ; 0x0224D364 add r0, r7, #0 mov r3, #0x39 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] bl FUN_020269A0 add r1, r0, #0 @@ -40653,7 +40653,7 @@ MOD18_0224D364: ; 0x0224D364 add r2, r4, #0 mov r3, #0x39 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r5, #0 mov r6, #0x27 _0224D4D0: @@ -40670,7 +40670,7 @@ _0224D4D0: mov r1, #0 add r2, r4, #0 mov r3, #2 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, r5, #1 add r6, #0x10 cmp r5, #7 @@ -40708,7 +40708,7 @@ _0224D500: add r0, r7, #0 mov r1, #0 mov r3, #0x94 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x14] add r6, r6, #4 add r0, r0, #1 @@ -40767,7 +40767,7 @@ _0224D5B0: .word MOD18_022513FC thumb_func_start MOD18_0224D5B4 MOD18_0224D5B4: ; 0x0224D5B4 push {r3, lr} - ldr r2, _0224D5C8 ; =gUnknown21C48B8 + ldr r2, _0224D5C8 ; =gMain ldr r3, [r2, #0x48] mov r2, #3 tst r2, r3 @@ -40776,7 +40776,7 @@ MOD18_0224D5B4: ; 0x0224D5B4 _0224D5C4: pop {r3, pc} nop -_0224D5C8: .word gUnknown21C48B8 +_0224D5C8: .word gMain thumb_func_end MOD18_0224D5B4 thumb_func_start MOD18_0224D5CC @@ -41105,7 +41105,7 @@ MOD18_0224D814: ; 0x0224D814 add r2, r6, #0 mov r3, #2 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] mov r1, #0xd add r2, r4, #0 @@ -41119,7 +41119,7 @@ MOD18_0224D814: ; 0x0224D814 add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x14] bl FUN_020269CC add r2, r0, #0 @@ -41147,7 +41147,7 @@ MOD18_0224D814: ; 0x0224D814 add r2, r6, #0 mov r3, #0x66 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] mov r1, #0xf add r2, r4, #0 @@ -41161,7 +41161,7 @@ MOD18_0224D814: ; 0x0224D814 add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r5, #0 str r5, [sp, #0x20] _0224D8FA: @@ -41197,7 +41197,7 @@ _0224D8FA: mov r1, #0 add r2, r6, #0 mov r3, #2 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x24] bl FUN_020239C0 add r2, r0, #0 @@ -41227,7 +41227,7 @@ _0224D8FA: ldr r0, [sp, #0xc] add r2, r6, #0 mov r3, #0x66 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x24] bl FreeToHeap b _0224D9DE @@ -41249,7 +41249,7 @@ _0224D994: mov r1, #0 add r2, r4, #0 mov r3, #2 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r0, [sp, #0x10] mov r1, #0x34 add r2, r4, #0 @@ -41264,7 +41264,7 @@ _0224D994: ldr r0, [sp, #0xc] add r2, r4, #0 mov r3, #0x66 - bl FUN_0201BD84 + bl AddTextPrinterParameterized _0224D9DE: ldr r0, [sp, #0x20] add r5, #0x11 @@ -41519,7 +41519,7 @@ MOD18_0224DBB8: ; 0x0224DBB8 cmp r0, #0 bne _0224DBDE _0224DBCE: - ldr r0, _0224DBE0 ; =gUnknown21C48B8 + ldr r0, _0224DBE0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -41529,7 +41529,7 @@ _0224DBCE: _0224DBDE: pop {r4, pc} .align 2, 0 -_0224DBE0: .word gUnknown21C48B8 +_0224DBE0: .word gMain thumb_func_end MOD18_0224DBB8 thumb_func_start MOD18_0224DBE4 @@ -41624,7 +41624,7 @@ _0224DC74: add r0, r5, #0 str r3, [sp, #8] add r0, #8 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0x30] str r6, [r5, #0x1c] str r7, [r5, #0x3c] @@ -42359,7 +42359,7 @@ MOD18_0224E0CC: ; 0x0224E0CC add r2, r4, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor mov r6, #0 @@ -42826,7 +42826,7 @@ _0224E454: add r0, #0x18 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r0, #4 bl FUN_0200AA80 mov r1, #1 @@ -42862,7 +42862,7 @@ _0224E454: add r2, r4, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl FUN_0200AB18 ldr r0, [sp, #0x28] @@ -43624,7 +43624,7 @@ _0224EBA2: stmia r2!, {r0, r1} ldmia r3!, {r0, r1} stmia r2!, {r0, r1} - ldr r0, _0224EDC8 ; =gUnknown21C48B8 + ldr r0, _0224EDC8 ; =gMain mov r1, #0x20 ldr r0, [r0, #0x4c] mov r6, #1 @@ -43722,7 +43722,7 @@ _0224EC3A: add r0, r6, #0 bl MOD05_021E7EB0 _0224EC88: - ldr r0, _0224EDC8 ; =gUnknown21C48B8 + ldr r0, _0224EDC8 ; =gMain ldr r2, [r0, #0x48] mov r0, #1 add r1, r2, #0 @@ -43870,7 +43870,7 @@ _0224EDBA: .align 2, 0 _0224EDC0: .word 0x00000508 _0224EDC4: .word 0x000004DC -_0224EDC8: .word gUnknown21C48B8 +_0224EDC8: .word gMain _0224EDCC: .word 0xFFFF0000 _0224EDD0: .word 0x000005FE _0224EDD4: .word 0x00000521 @@ -43965,7 +43965,7 @@ _0224EE52: ldr r6, [r2, #0x58] ldr r5, [r2, #0x60] bne _0224EF54 - ldr r0, _0224F150 ; =gUnknown21C48B8 + ldr r0, _0224F150 ; =gMain mov r2, #0x20 ldr r0, [r0, #0x4c] tst r2, r0 @@ -44038,7 +44038,7 @@ _0224EF1A: mov r0, #0 str r0, [sp] _0224EF1E: - ldr r0, _0224F150 ; =gUnknown21C48B8 + ldr r0, _0224F150 ; =gMain mov r1, #1 ldr r0, [r0, #0x48] add r2, r0, #0 @@ -44306,7 +44306,7 @@ _0224F140: .align 2, 0 _0224F148: .word 0x000004DC _0224F14C: .word 0x000004FC -_0224F150: .word gUnknown21C48B8 +_0224F150: .word gMain _0224F154: .word 0x00000523 _0224F158: .word 0x00000522 _0224F15C: .word 0x000005EB @@ -44512,7 +44512,7 @@ _0224F2BE: ldr r6, [r2, #0x58] ldr r4, [r2, #0x60] bne _0224F3C0 - ldr r0, _0224F520 ; =gUnknown21C48B8 + ldr r0, _0224F520 ; =gMain mov r2, #0x20 ldr r0, [r0, #0x4c] tst r2, r0 @@ -44585,7 +44585,7 @@ _0224F386: mov r0, #0 str r0, [sp] _0224F38A: - ldr r0, _0224F520 ; =gUnknown21C48B8 + ldr r0, _0224F520 ; =gMain mov r1, #1 ldr r0, [r0, #0x48] add r2, r0, #0 @@ -44773,7 +44773,7 @@ _0224F510: nop _0224F518: .word 0x000004DC _0224F51C: .word 0x000004FC -_0224F520: .word gUnknown21C48B8 +_0224F520: .word gMain _0224F524: .word 0x000005EB thumb_func_end MOD18_0224F258 @@ -44835,7 +44835,7 @@ _0224F58C: stmia r2!, {r0, r1} ldmia r3!, {r0, r1} stmia r2!, {r0, r1} - ldr r0, _0224F75C ; =gUnknown21C48B8 + ldr r0, _0224F75C ; =gMain mov r1, #0x20 ldr r0, [r0, #0x4c] mov r6, #1 @@ -44928,7 +44928,7 @@ _0224F604: add r0, r6, #0 bl MOD05_021E7EB0 _0224F650: - ldr r0, _0224F75C ; =gUnknown21C48B8 + ldr r0, _0224F75C ; =gMain ldr r2, [r0, #0x48] mov r0, #1 add r1, r2, #0 @@ -45051,7 +45051,7 @@ _0224F750: pop {r4, r5, r6, r7, pc} nop _0224F758: .word 0x000004DC -_0224F75C: .word gUnknown21C48B8 +_0224F75C: .word gMain _0224F760: .word 0xFFFF0000 _0224F764: .word 0x000005FE _0224F768: .word 0x000004FC @@ -45915,7 +45915,7 @@ MOD18_0224FD70: ; 0x0224FD70 ldrh r5, [r4, #0x20] cmp r5, #0 beq _0224FDA0 - ldr r0, _0224FDD4 ; =gUnknown21C48B8 + ldr r0, _0224FDD4 ; =gMain ldr r0, [r0, #0x44] cmp r0, #0 bne _0224FD9C @@ -45960,7 +45960,7 @@ _0224FDCE: pop {r3, r4, r5, pc} .align 2, 0 _0224FDD0: .word UNK_021C48F8 -_0224FDD4: .word gUnknown21C48B8 +_0224FDD4: .word gMain _0224FDD8: .word 0x000004F8 thumb_func_end MOD18_0224FD70 @@ -45974,7 +45974,7 @@ MOD18_0224FDDC: ; 0x0224FDDC ldrh r5, [r4, #0x20] cmp r5, #0 beq _0224FE0E - ldr r0, _0224FE44 ; =gUnknown21C48B8 + ldr r0, _0224FE44 ; =gMain ldr r0, [r0, #0x44] cmp r0, #0 bne _0224FE0A @@ -46021,7 +46021,7 @@ _0224FE3E: pop {r3, r4, r5, pc} .align 2, 0 _0224FE40: .word UNK_021C48F8 -_0224FE44: .word gUnknown21C48B8 +_0224FE44: .word gMain _0224FE48: .word 0x000004F8 thumb_func_end MOD18_0224FDDC @@ -46035,7 +46035,7 @@ MOD18_0224FE4C: ; 0x0224FE4C ldrh r4, [r4, #0x20] cmp r4, #0 beq _0224FE80 - ldr r0, _0224FE8C ; =gUnknown21C48B8 + ldr r0, _0224FE8C ; =gMain ldr r0, [r0, #0x44] cmp r0, #0 bne _0224FE7C @@ -46059,7 +46059,7 @@ _0224FE80: pop {r4, pc} nop _0224FE88: .word UNK_021C48F8 -_0224FE8C: .word gUnknown21C48B8 +_0224FE8C: .word gMain _0224FE90: .word 0x000004F8 thumb_func_end MOD18_0224FE4C @@ -46073,7 +46073,7 @@ MOD18_0224FE94: ; 0x0224FE94 ldrh r5, [r4, #0x20] cmp r5, #0 beq _0224FEC4 - ldr r0, _0224FEF8 ; =gUnknown21C48B8 + ldr r0, _0224FEF8 ; =gMain ldr r0, [r0, #0x44] cmp r0, #0 bne _0224FEC0 @@ -46118,7 +46118,7 @@ _0224FEF2: pop {r3, r4, r5, pc} .align 2, 0 _0224FEF4: .word UNK_021C48F8 -_0224FEF8: .word gUnknown21C48B8 +_0224FEF8: .word gMain _0224FEFC: .word 0x000004F8 thumb_func_end MOD18_0224FE94 diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index fafafb07..e1d888d4 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -1088,7 +1088,7 @@ _02255048: sub r3, r5, r3 add r0, r4, #0 lsr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FUN_02019548 add sp, #0x10 @@ -1126,7 +1126,7 @@ MOD38_02255084: ; 0x02255084 ldr r2, [r5] add r0, r4, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FUN_02019548 add sp, #0x10 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index da27d823..a027b5d8 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -665,7 +665,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r0, sp, #0x14 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x14 bl FUN_02019270 add r0, sp, #0x14 diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 3c2ae879..abb1ea34 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -1185,7 +1185,7 @@ MOD47_022550FC: ; 0x022550FC add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #0xa @@ -1208,7 +1208,7 @@ MOD47_022550FC: ; 0x022550FC add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 bl FUN_02019548 @@ -1248,7 +1248,7 @@ MOD47_02255184: ; 0x02255184 add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 bl FUN_02019548 @@ -1288,7 +1288,7 @@ MOD47_022551D8: ; 0x022551D8 add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #3 @@ -1305,7 +1305,7 @@ MOD47_022551D8: ; 0x022551D8 ldr r2, [r4, #0x5c] add r0, #0x20 mov r3, #0x10 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 bl FUN_02019548 @@ -1345,7 +1345,7 @@ MOD47_02255250: ; 0x02255250 add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #4 @@ -1368,7 +1368,7 @@ MOD47_02255250: ; 0x02255250 add r0, r4, #0 ldr r2, [r4, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 bl FUN_02019548 @@ -1409,7 +1409,7 @@ MOD47_022552D8: ; 0x022552D8 add r0, r5, #0 ldr r2, [r5, #0x5c] add r0, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 str r0, [sp, #0x10] add r0, r5, #0 @@ -1434,7 +1434,7 @@ _0225532C: ldr r0, [sp, #0x14] ldr r2, [r5, #0x5c] mov r3, #8 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] mov r2, #2 @@ -1453,7 +1453,7 @@ _0225532C: ldr r0, [sp, #0x14] ldr r2, [r5, #0x5c] mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] add r6, r6, #1 add r0, r0, #1 diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 8c011bb6..6527f0f7 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -448,7 +448,7 @@ MOD49_02254AD4: ; 0x02254AD4 add r0, sp, #0x1c lsr r3, r3, #1 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x1c bl FUN_02019548 add r0, r4, #0 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 5e3f79d8..1224b249 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -817,7 +817,7 @@ MOD51_02254E48: ; 0x02254E48 ldr r2, [r6] add r0, r7, r4 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #6 str r0, [sp] mov r0, #0xff @@ -830,7 +830,7 @@ MOD51_02254E48: ; 0x02254E48 ldr r2, [r6, #4] add r0, r0, r4 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, r4 bl FUN_02019220 ldr r0, [sp, #0x1c] @@ -849,7 +849,7 @@ MOD51_02254E48: ; 0x02254E48 add r0, r5, r4 mov r1, #1 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02254F22: add r0, r5, r4 bl FUN_02019220 @@ -1303,7 +1303,7 @@ _02255290: .word MOD51_02255740 MOD51_02255294: ; 0x02255294 push {r4, lr} add r4, r0, #0 - ldr r0, _022552F4 ; =gUnknown21C48B8 + ldr r0, _022552F4 ; =gMain mov r1, #2 ldr r2, [r0, #0x48] lsl r1, r1, #8 @@ -1347,7 +1347,7 @@ _022552C6: _022552F0: pop {r4, pc} nop -_022552F4: .word gUnknown21C48B8 +_022552F4: .word gMain _022552F8: .word 0x000005E5 thumb_func_end MOD51_02255294 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index be4a50be..ed7427c8 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -1387,7 +1387,7 @@ MOD53_021D7FDC: ; 0x021D7FDC add r0, r7, r0 mov r1, #1 add r3, r3, #2 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 str r0, [sp, #0x14] mov r0, #0x9e @@ -3459,7 +3459,7 @@ _021D908C: ldr r2, [r4, #0x14] add r0, r5, #0 mov r3, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D90DC _021D90C0: mov r0, #0 @@ -3474,7 +3474,7 @@ _021D90C0: ldr r2, [r4, #0x14] add r0, r5, #0 mov r3, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D90DC: add r0, r5, #0 bl FUN_020191D0 @@ -3654,7 +3654,7 @@ _021D9218: ldr r2, [r5, #0x2c] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0x30] cmp r4, #0 bne _021D9238 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index dc2741b9..963dafe4 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1192,7 +1192,7 @@ MOD54_021D7E98: ; 0x021D7E98 add r0, r5, #0 add r2, r7, #0 asr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1279,7 +1279,7 @@ MOD54_021D7F70: ; 0x021D7F70 push {r3, r4, lr} sub sp, #4 add r4, r0, #0 - ldr r0, _021D808C ; =gUnknown21C48B8 + ldr r0, _021D808C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -1405,7 +1405,7 @@ _021D8086: add sp, #4 pop {r3, r4, pc} nop -_021D808C: .word gUnknown21C48B8 +_021D808C: .word gMain _021D8090: .word 0x00004A48 _021D8094: .word 0x000005F2 _021D8098: .word 0x00004A3C @@ -1530,7 +1530,7 @@ MOD54_021D8150: ; 0x021D8150 ldr r0, [r5, r0] cmp r0, #0 beq _021D81A8 - ldr r0, _021D8270 ; =gUnknown21C48B8 + ldr r0, _021D8270 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xc3 tst r0, r1 @@ -1548,7 +1548,7 @@ _021D8184: ldr r0, [r5, r0] cmp r0, #0 beq _021D81A8 - ldr r0, _021D8270 ; =gUnknown21C48B8 + ldr r0, _021D8270 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xc3 tst r0, r1 @@ -1652,7 +1652,7 @@ _021D825E: pop {r4, r5, r6, pc} nop _021D826C: .word 0x00004A3C -_021D8270: .word gUnknown21C48B8 +_021D8270: .word gMain _021D8274: .word 0x000005F2 _021D8278: .word 0x00004A50 _021D827C: .word 0x00004A54 @@ -1797,7 +1797,7 @@ MOD54_021D8370: ; 0x021D8370 cmp r0, #0 beq _021D83A4 _021D838A: - ldr r0, _021D8414 ; =gUnknown21C48B8 + ldr r0, _021D8414 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xc3 tst r0, r1 @@ -1861,7 +1861,7 @@ _021D8404: pop {r3, r4, r5, pc} nop _021D8410: .word 0x00004A48 -_021D8414: .word gUnknown21C48B8 +_021D8414: .word gMain _021D8418: .word 0x000005F2 _021D841C: .word 0x00004A56 thumb_func_end MOD54_021D8370 @@ -2158,7 +2158,7 @@ MOD54_021D8630: ; 0x021D8630 cmp r0, #0 beq _021D8664 _021D864A: - ldr r0, _021D86D4 ; =gUnknown21C48B8 + ldr r0, _021D86D4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0xc3 tst r0, r1 @@ -2223,7 +2223,7 @@ _021D86C6: pop {r3, r4, r5, pc} .align 2, 0 _021D86D0: .word 0x00004A48 -_021D86D4: .word gUnknown21C48B8 +_021D86D4: .word gMain _021D86D8: .word 0x000005F2 thumb_func_end MOD54_021D8630 @@ -2839,7 +2839,7 @@ _021D8B2A: ldr r2, [r4, #0x2c] add r0, r6, #0 mov r3, #5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -2851,7 +2851,7 @@ _021D8B2A: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D8BDE _021D8BAC: mov r0, #0xff @@ -2864,7 +2864,7 @@ _021D8BAC: ldr r2, [r4, #0x2c] add r0, r6, #0 mov r3, #5 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -2876,7 +2876,7 @@ _021D8BAC: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D8BDE: ldr r0, [sp, #0x18] bl String_dtor @@ -3034,7 +3034,7 @@ MOD54_021D8C90: ; 0x021D8C90 ldr r2, [r5, #0x44] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc str r0, [r5, #0x4c] pop {r4, r5, r6, r7, pc} @@ -3048,7 +3048,7 @@ _021D8D00: ldr r2, [r5, #0x44] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r0, #0xff str r0, [r5, #0x4c] add sp, #0xc diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index a59e1058..45cf9f2e 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -1260,7 +1260,7 @@ _021D7F02: ldr r2, [r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -1485,7 +1485,7 @@ MOD55_021D80F0: ; 0x021D80F0 add r0, r5, #0 add r2, r6, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D8128: @@ -1497,7 +1497,7 @@ _021D8128: add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD55_021D80F0 @@ -1596,7 +1596,7 @@ MOD55_021D81DC: ; 0x021D81DC add r0, r5, #0 pop {r3, r4, r5, pc} _021D81EE: - ldr r2, _021D82B8 ; =gUnknown21C48B8 + ldr r2, _021D82B8 ; =gMain mov r1, #1 ldr r0, [r2, #0x48] tst r1, r0 @@ -1700,7 +1700,7 @@ _021D82B2: add r0, r5, #0 pop {r3, r4, r5, pc} nop -_021D82B8: .word gUnknown21C48B8 +_021D82B8: .word gMain _021D82BC: .word 0x000005DC thumb_func_end MOD55_021D81DC @@ -2194,7 +2194,7 @@ MOD55_021D868C: ; 0x021D868C bl FUN_0201BD70 cmp r0, #0 bne _021D86CA - ldr r0, _021D86D0 ; =gUnknown21C48B8 + ldr r0, _021D86D0 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -2216,7 +2216,7 @@ _021D86CA: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_021D86D0: .word gUnknown21C48B8 +_021D86D0: .word gMain thumb_func_end MOD55_021D868C thumb_func_start MOD55_021D86D4 @@ -2636,7 +2636,7 @@ _021D89AE: add r0, r5, #0 mov r1, #0 mov r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r7, #1 _021D8A00: cmp r7, #0 @@ -2797,7 +2797,7 @@ _021D8AEE: ldr r2, [r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -2855,7 +2855,7 @@ _021D8B6C: ldr r2, [r2] add r0, r5, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 @@ -3024,7 +3024,7 @@ MOD55_021D8D14: ; 0x021D8D14 ldrb r1, [r5, r1] cmp r1, #0 beq _021D8D52 - ldr r1, _021D8E5C ; =gUnknown21C48B8 + ldr r1, _021D8E5C ; =gMain ldr r1, [r1, #0x48] cmp r1, #0 beq _021D8D52 @@ -3045,7 +3045,7 @@ MOD55_021D8D14: ; 0x021D8D14 strb r1, [r5, r0] b _021D8E36 _021D8D52: - ldr r2, _021D8E5C ; =gUnknown21C48B8 + ldr r2, _021D8E5C ; =gMain mov r0, #1 ldr r3, [r2, #0x48] add r1, r3, #0 @@ -3175,7 +3175,7 @@ _021D8E58: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_021D8E5C: .word gUnknown21C48B8 +_021D8E5C: .word gMain _021D8E60: .word 0x000005DC _021D8E64: .word 0x000003CB _021D8E68: .word 0x000003C9 @@ -3641,7 +3641,7 @@ _021D91D6: ldr r2, [r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -3720,7 +3720,7 @@ _021D92CE: lsl r0, r0, #2 ldr r2, [r2] add r0, r5, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -3803,7 +3803,7 @@ _021D9338: lsl r0, r0, #2 ldr r2, [r2] add r0, r5, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 @@ -3824,7 +3824,7 @@ _021D93D8: .word 0x00010200 thumb_func_start MOD55_021D93DC MOD55_021D93DC: ; 0x021D93DC - ldr r2, _021D93F4 ; =gUnknown21C48B8 + ldr r2, _021D93F4 ; =gMain ldr r3, [r2, #0x48] mov r2, #3 tst r2, r3 @@ -3837,7 +3837,7 @@ _021D93EE: add r0, r1, #0 bx lr nop -_021D93F4: .word gUnknown21C48B8 +_021D93F4: .word gMain thumb_func_end MOD55_021D93DC thumb_func_start MOD55_021D93F8 @@ -4207,7 +4207,7 @@ _021D969A: ldr r2, [r2] add r0, r4, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 @@ -4404,7 +4404,7 @@ _021D987C: ldr r2, [r2] add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x34 bl FUN_02023928 add r5, r0, #0 @@ -4456,7 +4456,7 @@ _021D987C: add r2, #0xc4 ldr r2, [r2] add r0, r4, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r2, r4, #0 add r2, #0xc8 ldr r0, [r4, #0x10] @@ -4478,7 +4478,7 @@ _021D987C: ldr r2, [r2] add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #1 @@ -4527,7 +4527,7 @@ _021D987C: add r2, #0xc0 ldr r2, [r2] add r0, r4, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #2 @@ -4584,7 +4584,7 @@ _021D9A64: add r2, #0xc0 ldr r2, [r2] add r0, r4, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r2, r4, #0 add r2, #0xc0 ldr r0, [r4, #0x10] @@ -4606,7 +4606,7 @@ _021D9A64: ldr r2, [r2] add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #3 @@ -4666,7 +4666,7 @@ _021D9AE8: add r2, #0xc0 ldr r2, [r2] add r0, r4, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r2, r4, #0 add r2, #0xc0 ldr r0, [r4, #0x10] @@ -4688,7 +4688,7 @@ _021D9AE8: ldr r2, [r2] add r0, r4, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #6 @@ -4770,7 +4770,7 @@ _021D9AE8: add r2, #0xc0 ldr r2, [r2] add r0, r4, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D9C18: mov r0, #0xd2 lsl r0, r0, #2 @@ -4822,7 +4822,7 @@ MOD55_021D9C50: ; 0x021D9C50 add r0, r4, #0 pop {r4, r5, pc} _021D9C82: - ldr r0, _021D9CBC ; =gUnknown21C48B8 + ldr r0, _021D9CBC ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4850,7 +4850,7 @@ _021D9CB2: pop {r4, r5, pc} .align 2, 0 _021D9CB8: .word 0x04000540 -_021D9CBC: .word gUnknown21C48B8 +_021D9CBC: .word gMain _021D9CC0: .word 0x000005DC thumb_func_end MOD55_021D9C50 @@ -5416,7 +5416,7 @@ _021DA0D0: ldr r2, [r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, #0xe4 str r0, [r5] add sp, #0x14 @@ -5498,7 +5498,7 @@ _021DA17C: ldr r2, [r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r1, r5, #0 add r1, #0xe4 str r0, [r1] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 9144e290..8b6b5517 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1372,7 +1372,7 @@ _022128CE: ldr r2, [r4, r2] add r0, r4, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -1699,7 +1699,7 @@ _02212BE4: .word 0x000001E2 MOD56_02212BE8: ; 0x02212BE8 push {r3, r4, r5, lr} add r4, r1, #0 - ldr r1, _02212C44 ; =gUnknown21C48B8 + ldr r1, _02212C44 ; =gMain add r5, r0, #0 ldr r2, [r1, #0x48] mov r1, #3 @@ -1739,7 +1739,7 @@ _02212C40: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_02212C44: .word gUnknown21C48B8 +_02212C44: .word gMain _02212C48: .word MOD56_02216310 _02212C4C: .word 0x000001D9 thumb_func_end MOD56_02212BE8 @@ -2263,7 +2263,7 @@ MOD56_02213030: ; 0x02213030 MOD56_02213048: ; 0x02213048 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _02213088 ; =gUnknown21C48B8 + ldr r0, _02213088 ; =gMain add r4, r1, #0 ldr r1, [r0, #0x48] mov r0, #3 @@ -2293,7 +2293,7 @@ _02213084: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_02213088: .word gUnknown21C48B8 +_02213088: .word gMain thumb_func_end MOD56_02213048 thumb_func_start MOD56_0221308C @@ -2320,7 +2320,7 @@ MOD56_02213098: ; 0x02213098 MOD56_022130A4: ; 0x022130A4 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _022130F0 ; =gUnknown21C48B8 + ldr r0, _022130F0 ; =gMain add r4, r1, #0 ldr r1, [r0, #0x48] mov r0, #3 @@ -2354,7 +2354,7 @@ _022130EA: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_022130F0: .word gUnknown21C48B8 +_022130F0: .word gMain thumb_func_end MOD56_022130A4 thumb_func_start MOD56_022130F4 @@ -2691,7 +2691,7 @@ MOD56_02213368: ; 0x02213368 MOD56_02213388: ; 0x02213388 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _02213418 ; =gUnknown21C48B8 + ldr r0, _02213418 ; =gMain add r4, r1, #0 ldr r1, [r0, #0x48] mov r0, #3 @@ -2756,7 +2756,7 @@ _02213412: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_02213418: .word gUnknown21C48B8 +_02213418: .word gMain thumb_func_end MOD56_02213388 thumb_func_start MOD56_0221341C @@ -2799,7 +2799,7 @@ _0221344C: add r2, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, [r4, #4] @@ -3000,7 +3000,7 @@ _022135DC: ldr r2, [r4, r2] add r0, r4, r0 sub r3, r5, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 @@ -3135,7 +3135,7 @@ _022136B8: mov r3, ip add r0, r4, r0 sub r3, r6, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 @@ -3170,7 +3170,7 @@ _02213722: ldr r2, [r2] add r0, r4, r0 mov r3, #8 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 @@ -3734,7 +3734,7 @@ _02213B2C: ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -3998,7 +3998,7 @@ MOD56_02213D98: ; 0x02213D98 add r1, r6, #0 cmp r0, r1 bne _02213DEE - ldr r0, _02213F84 ; =gUnknown21C48B8 + ldr r0, _02213F84 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 lsl r0, r0, #0xa @@ -4222,7 +4222,7 @@ _02213F7E: add r0, r4, #0 pop {r4, r5, r6, pc} nop -_02213F84: .word gUnknown21C48B8 +_02213F84: .word gMain _02213F88: .word 0x000005DD _02213F8C: .word 0x00000624 thumb_func_end MOD56_02213D98 @@ -4264,7 +4264,7 @@ _02213FC8: MOD56_02213FCC: ; 0x02213FCC push {r3, r4, r5, lr} add r4, r1, #0 - ldr r1, _022140A0 ; =gUnknown21C48B8 + ldr r1, _022140A0 ; =gMain add r5, r0, #0 ldr r2, [r1, #0x48] mov r1, #2 @@ -4356,7 +4356,7 @@ _0221409A: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_022140A0: .word gUnknown21C48B8 +_022140A0: .word gMain thumb_func_end MOD56_02213FCC thumb_func_start MOD56_022140A4 @@ -4400,7 +4400,7 @@ MOD56_022140DC: ; 0x022140DC bl FUN_0201BD70 cmp r0, #0 bne _02214116 - ldr r0, _0221411C ; =gUnknown21C48B8 + ldr r0, _0221411C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4420,7 +4420,7 @@ _02214116: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_0221411C: .word gUnknown21C48B8 +_0221411C: .word gMain thumb_func_end MOD56_022140DC thumb_func_start MOD56_02214120 @@ -4501,7 +4501,7 @@ _022141C2: bl MOD56_02213030 b _0221422E _022141D2: - ldr r0, _02214234 ; =gUnknown21C48B8 + ldr r0, _02214234 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4547,7 +4547,7 @@ _0221422E: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_02214234: .word gUnknown21C48B8 +_02214234: .word gMain thumb_func_end MOD56_02214120 thumb_func_start MOD56_02214238 @@ -4703,7 +4703,7 @@ _0221435E: ldr r1, [r5, r0] sub r1, r1, #1 str r1, [r5, r0] - ldr r1, _022143B0 ; =gUnknown21C48B8 + ldr r1, _022143B0 ; =gMain ldr r2, [r1, #0x48] mov r1, #3 tst r1, r2 @@ -4741,7 +4741,7 @@ _022143AC: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_022143B0: .word gUnknown21C48B8 +_022143B0: .word gMain thumb_func_end MOD56_0221432C thumb_func_start MOD56_022143B4 @@ -4760,7 +4760,7 @@ MOD56_022143B4: ; 0x022143B4 add r0, r4, #0 pop {r3, r4, r5, pc} _022143D0: - ldr r0, _02214400 ; =gUnknown21C48B8 + ldr r0, _02214400 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4782,7 +4782,7 @@ _022143FA: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_02214400: .word gUnknown21C48B8 +_02214400: .word gMain thumb_func_end MOD56_022143B4 thumb_func_start MOD56_02214404 @@ -4801,7 +4801,7 @@ MOD56_02214404: ; 0x02214404 add r0, r4, #0 pop {r3, r4, r5, pc} _02214420: - ldr r0, _02214460 ; =gUnknown21C48B8 + ldr r0, _02214460 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4834,7 +4834,7 @@ _0221445C: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_02214460: .word gUnknown21C48B8 +_02214460: .word gMain thumb_func_end MOD56_02214404 thumb_func_start MOD56_02214464 @@ -4910,7 +4910,7 @@ _022144C6: MOD56_022144DC: ; 0x022144DC push {r4, lr} add r4, r1, #0 - ldr r1, _02214500 ; =gUnknown21C48B8 + ldr r1, _02214500 ; =gMain ldr r2, [r1, #0x48] mov r1, #3 tst r1, r2 @@ -4927,7 +4927,7 @@ _022144FC: add r0, r4, #0 pop {r4, pc} .align 2, 0 -_02214500: .word gUnknown21C48B8 +_02214500: .word gMain thumb_func_end MOD56_022144DC thumb_func_start MOD56_02214504 @@ -6090,7 +6090,7 @@ _02214E24: .word 0x000001E2 MOD56_02214E28: ; 0x02214E28 push {r3, r4, r5, lr} add r4, r1, #0 - ldr r1, _02214F08 ; =gUnknown21C48B8 + ldr r1, _02214F08 ; =gMain add r5, r0, #0 ldr r2, [r1, #0x48] mov r1, #2 @@ -6188,7 +6188,7 @@ _02214F02: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_02214F08: .word gUnknown21C48B8 +_02214F08: .word gMain thumb_func_end MOD56_02214E28 thumb_func_start MOD56_02214F0C @@ -7065,7 +7065,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 @@ -7096,7 +7096,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x36 bl FUN_02023928 add r6, r0, #0 @@ -7152,7 +7152,7 @@ _02215532: add r2, #0x61 ldr r2, [r5, r2] add r0, r5, r0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -7175,7 +7175,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5] add r1, r4, #0 mov r2, #1 @@ -7221,7 +7221,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #0x1e - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5] add r1, r4, #0 mov r2, #2 @@ -7275,7 +7275,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -7298,7 +7298,7 @@ _02215532: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5] add r1, r4, #0 mov r2, #3 @@ -7366,7 +7366,7 @@ _02215822: ldr r2, [r5, r2] add r0, r5, r0 sub r3, r3, r6 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -7389,7 +7389,7 @@ _02215822: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5] add r1, r4, #0 mov r2, #6 @@ -7468,7 +7468,7 @@ _02215822: ldr r2, [r5, r2] add r0, r5, r0 sub r3, r4, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _0221594C: mov r0, #0xe7 lsl r0, r0, #2 @@ -7510,7 +7510,7 @@ _02215984: lsl r0, r0, #4 str r1, [r5, r0] _02215996: - ldr r0, _022159AC ; =gUnknown21C48B8 + ldr r0, _022159AC ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -7523,7 +7523,7 @@ _022159A8: add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 -_022159AC: .word gUnknown21C48B8 +_022159AC: .word gMain thumb_func_end MOD56_02215968 thumb_func_start MOD56_022159B0 @@ -7591,7 +7591,7 @@ MOD56_022159B0: ; 0x022159B0 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -8295,7 +8295,7 @@ _02215F82: ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x5e lsl r1, r1, #2 str r0, [r5, r1] @@ -8407,7 +8407,7 @@ _02216048: ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x5e lsl r1, r1, #2 str r0, [r5, r1] diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 22452327..b876924b 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -1669,7 +1669,7 @@ _021D8282: _021D8288: cmp r6, #0 bne _021D82A2 - ldr r0, _021D82B8 ; =gUnknown21C48B8 + ldr r0, _021D82B8 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -1689,7 +1689,7 @@ _021D82A8: .word 0x000030D4 _021D82AC: .word UNK_021C48F8 _021D82B0: .word MOD57_021D9754 _021D82B4: .word 0x00003318 -_021D82B8: .word gUnknown21C48B8 +_021D82B8: .word gMain thumb_func_end MOD57_021D81F8 thumb_func_start MOD57_021D82BC @@ -2788,7 +2788,7 @@ _021D8AB6: add r0, r7, r0 add r2, r5, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D8AE0: add r0, r4, #1 lsl r0, r0, #0x18 @@ -2859,7 +2859,7 @@ _021D8AE0: str r1, [sp, #0xc] add r0, #0x20 add r2, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r0, [r6, #4] lsl r0, r0, #0x1c lsr r0, r0, #0x1f @@ -2961,7 +2961,7 @@ _021D8C32: add r0, #0x50 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #2 add r2, r6, #0 str r1, [sp] @@ -3010,7 +3010,7 @@ _021D8C32: add r0, r7, #0 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 @@ -3103,7 +3103,7 @@ _021D8D72: add r0, r6, r0 add r2, r5, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -3216,7 +3216,7 @@ _021D8E74: add r0, #0x70 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0xf @@ -3241,7 +3241,7 @@ _021D8E74: add r0, #0x70 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r2, #0 ldr r0, [sp, #0x10] str r5, [sp] @@ -3270,7 +3270,7 @@ _021D8E74: add r2, r5, #0 mov r3, #0x70 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r2, #0 ldr r0, [sp, #0x10] str r5, [sp] @@ -3299,7 +3299,7 @@ _021D8E74: add r2, r5, #0 mov r3, #0xb0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] str r5, [sp] ldr r0, [r0, #0x3c] @@ -3396,7 +3396,7 @@ MOD57_021D8FD8: ; 0x021D8FD8 add r0, r7, #0 sub r3, r5, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -3426,7 +3426,7 @@ MOD57_021D9024: ; 0x021D9024 add r0, r7, #0 sub r3, r5, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3517,7 +3517,7 @@ _021D906E: add r0, r7, #0 add r2, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r4, #0 @@ -3547,7 +3547,7 @@ MOD57_021D9144: ; 0x021D9144 str r3, [sp, #8] mov r3, #0xcd str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, pc} _021D9164: diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 845ac5cc..5d8425be 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1045,7 +1045,7 @@ MOD58_021DA2CC: ; 0x021DA2CC lsr r3, r4, #0x1f add r3, r4, r3 asr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5, #0xc] add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -1206,7 +1206,7 @@ _021DA3C2: add r0, r5, r0 mov r1, #1 asr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 str r0, [sp, #0x14] mov r0, #0x9d @@ -2236,7 +2236,7 @@ MOD58_021DAB94: ; 0x021DAB94 ldr r2, [r5, #0x34] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0x38] add sp, #0xc pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index f24eb24c..1493661d 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -1008,7 +1008,7 @@ _021D7C5E: ldr r2, [r5, #0x5c] add r0, #0x1c mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized str r0, [r5, #0x58] mov r0, #1 str r0, [r5, #0x50] @@ -1028,7 +1028,7 @@ _021D7D1C: _021D7D36: cmp r2, #0 bne _021D7D46 - ldr r0, _021D7D64 ; =gUnknown21C48B8 + ldr r0, _021D7D64 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 @@ -1048,7 +1048,7 @@ _021D7D54: nop _021D7D5C: .word MOD59_021D9DB8 _021D7D60: .word 0x000003E2 -_021D7D64: .word gUnknown21C48B8 +_021D7D64: .word gMain thumb_func_end MOD59_021D7C44 thumb_func_start MOD59_021D7D68 @@ -1308,7 +1308,7 @@ _021D7EFA: ldr r2, [r4, #0x5c] add r0, #0x1c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D7FCC _021D7F7C: ldr r1, _021D8044 ; =0x021D9D90 @@ -1347,7 +1347,7 @@ _021D7F7C: ldr r2, [r4, #0x5c] add r0, #0x1c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D7FCC: ldr r0, [r4, #0x5c] bl String_dtor @@ -1370,7 +1370,7 @@ _021D7FE4: str r0, [r4, #0x54] b _021D803C _021D7FF6: - ldr r0, _021D8050 ; =gUnknown21C48B8 + ldr r0, _021D8050 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 @@ -1412,7 +1412,7 @@ _021D803C: _021D8044: .word MOD59_021D9D90 _021D8048: .word 0x00010200 _021D804C: .word 0x000F0200 -_021D8050: .word gUnknown21C48B8 +_021D8050: .word gMain _021D8054: .word 0x000005DC thumb_func_end MOD59_021D7ECC @@ -3002,7 +3002,7 @@ _021D8CBC: str r0, [r4, #0xc] bl _021D985C _021D8CF8: - ldr r0, _021D8D78 ; =gUnknown21C48B8 + ldr r0, _021D8D78 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _021D8D08 @@ -3059,7 +3059,7 @@ _021D8D3E: .align 2, 0 _021D8D70: .word 0x00000405 _021D8D74: .word MOD59_021D9E44 -_021D8D78: .word gUnknown21C48B8 +_021D8D78: .word gMain _021D8D7C: bl FUN_0200E308 cmp r0, #1 @@ -3387,7 +3387,7 @@ _021D9030: str r0, [r4, #0xc] bl _021D985C _021D9054: - ldr r0, _021D9370 ; =gUnknown21C48B8 + ldr r0, _021D9370 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _021D90DA @@ -3722,7 +3722,7 @@ _021D92FC: str r0, [r4, #0xc] b _021D985C _021D930A: - ldr r0, _021D9370 ; =gUnknown21C48B8 + ldr r0, _021D9370 ; =gMain mov r1, #1 ldr r0, [r0, #0x48] and r1, r0 @@ -3778,7 +3778,7 @@ _021D9368: bl MOD59_021D8504 b _021D985C .align 2, 0 -_021D9370: .word gUnknown21C48B8 +_021D9370: .word gMain _021D9374: .word MOD59_021D9DC0 _021D9378: .word 0x0000FFFF _021D937C: .word 0x00000706 @@ -4962,7 +4962,7 @@ _021D9C9A: add r0, #0x10 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -4988,7 +4988,7 @@ _021D9D30: str r0, [r4, #0xc] b _021D9D66 _021D9D36: - ldr r0, _021D9D74 ; =gUnknown21C48B8 + ldr r0, _021D9D74 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 @@ -5019,7 +5019,7 @@ _021D9D66: .align 2, 0 _021D9D6C: .word MOD59_021DA04C _021D9D70: .word 0x000F0200 -_021D9D74: .word gUnknown21C48B8 +_021D9D74: .word gMain thumb_func_end MOD59_021D9C74 thumb_func_start MOD59_021D9D78 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 8d19e186..58961d48 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -273,7 +273,7 @@ _021D7706: mov r0, #0 pop {r3, r4, pc} _021D7714: - ldr r0, _021D77AC ; =gUnknown21C48B8 + ldr r0, _021D77AC ; =gMain mov r1, #1 ldr r0, [r0, #0x48] tst r1, r0 @@ -352,7 +352,7 @@ _021D77A0: add sp, #0xc pop {r3, r4, pc} .align 2, 0 -_021D77AC: .word gUnknown21C48B8 +_021D77AC: .word gMain _021D77B0: .word 0x0000061B thumb_func_end MOD60_021D76B8 @@ -1016,7 +1016,7 @@ MOD60_021D7D18: ; 0x021D7D18 add r0, #0x2c add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl StringSetEmpty ldr r1, _021D7DF0 ; =gGameVersion @@ -1036,7 +1036,7 @@ MOD60_021D7D18: ; 0x021D7D18 mov r1, #1 add r2, r5, #0 mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r6, #0 mov r4, #0 add r7, #0x3c @@ -1059,7 +1059,7 @@ _021D7D7E: add r0, r7, #0 add r2, r5, #0 mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1235,7 +1235,7 @@ MOD60_021D7EA4: ; 0x021D7EA4 add r2, r3, r2 ldr r2, [r2, #0x60] mov r3, #0x94 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] add r0, #0x3c bl FUN_020191D0 @@ -1321,7 +1321,7 @@ _021D7F8E: ldr r2, [r6, #0x60] mov r1, #0 add r3, #0x64 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 ldr r1, [r6, #0x60] add r2, r0, #0 @@ -1351,7 +1351,7 @@ _021D7FC8: ldr r0, [sp, #0x20] ldr r2, [r2, #0x60] add r3, r6, r3 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D7FF2: add r0, r4, #1 lsl r0, r0, #0x10 @@ -1388,7 +1388,7 @@ MOD60_021D801C: ; 0x021D801C add r4, r1, r0 cmp r2, #6 beq _021D8080 - ldr r0, _021D80F8 ; =gUnknown21C48B8 + ldr r0, _021D80F8 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x10 tst r0, r1 @@ -1424,7 +1424,7 @@ _021D805C: lsr r1, r1, #0x10 bl MOD60_021D7EA4 _021D8080: - ldr r0, _021D80F8 ; =gUnknown21C48B8 + ldr r0, _021D80F8 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x40 tst r0, r1 @@ -1483,7 +1483,7 @@ _021D80BE: _021D80F6: pop {r3, r4, r5, pc} .align 2, 0 -_021D80F8: .word gUnknown21C48B8 +_021D80F8: .word gMain thumb_func_end MOD60_021D801C .rodata diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index fb9ea05a..ec5a0d99 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -114,7 +114,7 @@ _021D759E: thumb_func_start MOD61_021D75AC MOD61_021D75AC: ; 0x021D75AC push {r3, lr} - ldr r0, _021D75C8 ; =gUnknown21C48B8 + ldr r0, _021D75C8 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -127,14 +127,14 @@ _021D75C2: mov r0, #0 pop {r3, pc} nop -_021D75C8: .word gUnknown21C48B8 +_021D75C8: .word gMain _021D75CC: .word 0x000005E3 thumb_func_end MOD61_021D75AC thumb_func_start MOD61_021D75D0 MOD61_021D75D0: ; 0x021D75D0 push {r3, r4, r5, lr} - ldr r1, _021D76E0 ; =gUnknown21C48B8 + ldr r1, _021D76E0 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] mov r1, #1 @@ -278,7 +278,7 @@ _021D76DC: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_021D76E0: .word gUnknown21C48B8 +_021D76E0: .word gMain _021D76E4: .word 0x000005DD _021D76E8: .word 0x000005E3 _021D76EC: .word 0x000005DC @@ -324,12 +324,12 @@ _021D7702: mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor b _021D777C _021D774E: - ldr r0, _021D778C ; =gUnknown21C48B8 + ldr r0, _021D778C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -360,7 +360,7 @@ _021D777C: pop {r3, r4, r5, pc} .align 2, 0 _021D7788: .word 0x0001020F -_021D778C: .word gUnknown21C48B8 +_021D778C: .word gMain thumb_func_end MOD61_021D76F0 thumb_func_start MOD61_021D7790 @@ -452,7 +452,7 @@ _021D77F2: add r0, r5, #0 str r3, [sp, #0xc] add r0, #0x94 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 strb r0, [r5, #0xf] add r0, r4, #0 bl String_dtor @@ -1557,7 +1557,7 @@ _021D8122: add r0, r6, #0 mov r1, #1 mov r3, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r6, #0 @@ -1618,7 +1618,7 @@ _021D8196: add r0, r0, r1 mov r1, #1 asr r3, r3, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r1, [sp, #0x14] ldr r0, [sp, #0x18] add r0, r0, r1 @@ -1643,7 +1643,7 @@ _021D81F8: ldr r2, [r2, #0x10] add r0, #0x74 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x74 add r0, r4, #0 bl FUN_020191D0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index ff70fe6d..044f1cb5 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1173,7 +1173,7 @@ MOD62_0222DE00: ; 0x0222DE00 add r0, sp, #0x1c mov r1, #2 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x1c mov r1, #2 mov r2, #0x35 @@ -3276,7 +3276,7 @@ _0222EE96: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_020191D0 add r0, r5, #0 @@ -3587,7 +3587,7 @@ _0222F0FE: add r0, r5, #0 add r2, r4, #0 mov r3, #7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl FUN_020191D0 add r0, r4, #0 @@ -3653,7 +3653,7 @@ _0222F194: add r0, r5, r4 mov r3, #7 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, r4 bl FUN_020191D0 ldr r0, [sp, #0x10] @@ -3718,7 +3718,7 @@ _0222F226: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_020191D0 add r0, r5, #0 @@ -4697,7 +4697,7 @@ _0222F9B0: .word MOD62_02231220 MOD62_0222F9B4: ; 0x0222F9B4 push {r4, lr} add r4, r0, #0 - ldr r0, _0222FA3C ; =gUnknown21C48B8 + ldr r0, _0222FA3C ; =gMain mov r1, #0x10 ldr r0, [r0, #0x4c] tst r1, r0 @@ -4769,7 +4769,7 @@ _0222FA38: mov r0, #1 pop {r4, pc} .align 2, 0 -_0222FA3C: .word gUnknown21C48B8 +_0222FA3C: .word gMain thumb_func_end MOD62_0222F9B4 thumb_func_start MOD62_0222FA40 @@ -5005,7 +5005,7 @@ _0222FBF0: bl FUN_020054C8 b _0222FD4C _0222FC4C: - ldr r0, _0222FD68 ; =gUnknown21C48B8 + ldr r0, _0222FD68 ; =gMain ldr r2, [r0, #0x48] mov r0, #1 tst r0, r2 @@ -5133,7 +5133,7 @@ _0222FD4C: nop _0222FD60: .word 0x00000418 _0222FD64: .word 0x000005DC -_0222FD68: .word gUnknown21C48B8 +_0222FD68: .word gMain _0222FD6C: .word 0x000005DD thumb_func_end MOD62_0222FAB4 @@ -7120,7 +7120,7 @@ _02230D84: str r1, [r4, r0] b _02230DC6 _02230DA2: - ldr r0, _02230DD8 ; =gUnknown21C48B8 + ldr r0, _02230DD8 ; =gMain ldr r3, [r0, #0x48] ldr r0, _02230DDC ; =0x00000CF3 tst r0, r3 @@ -7145,7 +7145,7 @@ _02230DC6: mov r0, #1 pop {r4, pc} nop -_02230DD8: .word gUnknown21C48B8 +_02230DD8: .word gMain _02230DDC: .word 0x00000CF3 thumb_func_end MOD62_02230D6C @@ -7215,7 +7215,7 @@ _02230E46: bl FUN_020054C8 b _02230F18 _02230E66: - ldr r0, _02230F2C ; =gUnknown21C48B8 + ldr r0, _02230F2C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -7263,7 +7263,7 @@ _02230EA4: bl FUN_020054C8 b _02230F18 _02230ED0: - ldr r1, _02230F2C ; =gUnknown21C48B8 + ldr r1, _02230F2C ; =gMain ldr r2, [r1, #0x48] ldr r1, _02230F34 ; =0x00000CF3 tst r1, r2 @@ -7304,7 +7304,7 @@ _02230F18: pop {r4, pc} .align 2, 0 _02230F28: .word 0x000005DC -_02230F2C: .word gUnknown21C48B8 +_02230F2C: .word gMain _02230F30: .word 0x000005DD _02230F34: .word 0x00000CF3 thumb_func_end MOD62_02230DE0 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 0ef96370..8d172847 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -114,7 +114,7 @@ _021D75C8: cmp r0, #1 bne _021D7614 add r0, r4, #0 - ldr r1, _021D77A4 ; =gUnknown21C48B8 + ldr r1, _021D77A4 ; =gMain mov r2, #0 add r0, #0xb4 str r2, [r0] @@ -192,7 +192,7 @@ _021D765A: mov r1, #0x1e lsl r1, r1, #4 ldr r0, [r4, r1] - ldr r2, _021D77A4 ; =gUnknown21C48B8 + ldr r2, _021D77A4 ; =gMain add r0, r0, #1 str r0, [r4, r1] ldr r3, [r2, #0x48] @@ -337,7 +337,7 @@ _021D779C: add sp, #0xc pop {r3, r4, r5, r6, pc} nop -_021D77A4: .word gUnknown21C48B8 +_021D77A4: .word gMain _021D77A8: .word 0x00000495 _021D77AC: .word 0x000005F4 _021D77B0: .word 0x00007FFF @@ -429,7 +429,7 @@ _021D7854: .word MOD63_021DBA90 thumb_func_start MOD63_021D7858 MOD63_021D7858: ; 0x021D7858 - ldr r0, _021D787C ; =gUnknown21C48B8 + ldr r0, _021D787C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 @@ -450,7 +450,7 @@ _021D7878: mov r0, #0 bx lr .align 2, 0 -_021D787C: .word gUnknown21C48B8 +_021D787C: .word gMain thumb_func_end MOD63_021D7858 thumb_func_start MOD63_021D7880 @@ -2090,7 +2090,7 @@ _021D844C: add r0, r6, #0 add r2, r4, #0 str r1, [sp, #0x14] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 add r0, r4, #0 bl String_dtor add r0, r7, #0 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index fb0726a4..c6b8180b 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -629,7 +629,7 @@ MOD63_021D8D98: ; 0x021D8D98 ldrb r0, [r5, r0] cmp r0, #0 beq _021D8DD4 - ldr r0, _021D8E5C ; =gUnknown21C48B8 + ldr r0, _021D8E5C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -640,7 +640,7 @@ MOD63_021D8D98: ; 0x021D8D98 _021D8DBC: mov r0, #1 str r0, [r5, #8] - ldr r1, _021D8E5C ; =gUnknown21C48B8 + ldr r1, _021D8E5C ; =gMain mov r0, #0 str r0, [r1, #0x6c] ldr r1, _021D8E60 ; =0x00007FFF @@ -722,7 +722,7 @@ _021D8E50: mov r0, #0 pop {r3, r4, r5, pc} nop -_021D8E5C: .word gUnknown21C48B8 +_021D8E5C: .word gMain _021D8E60: .word 0x00007FFF _021D8E64: .word 0x00000A8C thumb_func_end MOD63_021D8D98 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 30ea656a..3f68cd7c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -1500,7 +1500,7 @@ _021D80C6: ; jump table _021D80D2: add r0, r4, #0 bl MOD64_021D8384 - ldr r0, _021D80F8 ; =gUnknown21C48B8 + ldr r0, _021D80F8 ; =gMain mov r1, #1 ldr r0, [r0, #0x48] tst r0, r1 @@ -1517,7 +1517,7 @@ _021D80F4: mov r0, #0 pop {r4, pc} .align 2, 0 -_021D80F8: .word gUnknown21C48B8 +_021D80F8: .word gMain _021D80FC: .word 0x000005DC thumb_func_end MOD64_021D80A4 @@ -1857,7 +1857,7 @@ _021D8362: MOD64_021D8384: ; 0x021D8384 push {r4, lr} add r4, r0, #0 - ldr r0, _021D83BC ; =gUnknown21C48B8 + ldr r0, _021D83BC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x20 tst r0, r1 @@ -1869,7 +1869,7 @@ MOD64_021D8384: ; 0x021D8384 ldr r0, _021D83C0 ; =0x000005DC bl FUN_020054C8 _021D83A0: - ldr r0, _021D83BC ; =gUnknown21C48B8 + ldr r0, _021D83BC ; =gMain ldr r1, [r0, #0x48] mov r0, #0x10 tst r0, r1 @@ -1884,7 +1884,7 @@ _021D83A0: _021D83BA: pop {r4, pc} .align 2, 0 -_021D83BC: .word gUnknown21C48B8 +_021D83BC: .word gMain _021D83C0: .word 0x000005DC thumb_func_end MOD64_021D8384 @@ -2329,7 +2329,7 @@ _021D86F8: add r0, r5, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 mov r2, #2 add r7, r0, #0 @@ -2386,7 +2386,7 @@ _021D8770: str r3, [sp, #0xc] ldr r2, [r4] add r0, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 mov r2, #2 add r4, r0, #0 @@ -3522,7 +3522,7 @@ _021D8FEC: add r0, r5, #0 mov r3, #1 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add r0, r4, #0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 14644108..f6048964 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -325,7 +325,7 @@ MOD65_021D774C: ; 0x021D774C _021D7762: bl MOD65_021D7710 add r1, r0, #0 - ldr r0, _021D77F8 ; =gUnknown21C48B8 + ldr r0, _021D77F8 ; =gMain ldr r0, [r0, #0x44] cmp r0, #0 beq _021D7784 @@ -356,7 +356,7 @@ _021D7796: mov r0, #0 pop {r3, r4, r5, pc} _021D77A2: - ldr r0, _021D77F8 ; =gUnknown21C48B8 + ldr r0, _021D77F8 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -401,7 +401,7 @@ _021D77F2: mov r0, #0 pop {r3, r4, r5, pc} nop -_021D77F8: .word gUnknown21C48B8 +_021D77F8: .word gMain _021D77FC: .word 0x000005DC thumb_func_end MOD65_021D774C @@ -427,7 +427,7 @@ MOD65_021D7818: ; 0x021D7818 ldr r0, [r0] bl FUN_02001204 add r4, r0, #0 - ldr r0, _021D78A4 ; =gUnknown21C48B8 + ldr r0, _021D78A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -488,7 +488,7 @@ _021D789E: mov r0, #0 pop {r3, r4, r5, pc} nop -_021D78A4: .word gUnknown21C48B8 +_021D78A4: .word gMain _021D78A8: .word 0x000005DC thumb_func_end MOD65_021D7818 @@ -565,7 +565,7 @@ MOD65_021D7920: ; 0x021D7920 mov r0, #0 pop {r4, pc} _021D7932: - ldr r0, _021D7988 ; =gUnknown21C48B8 + ldr r0, _021D7988 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -605,7 +605,7 @@ _021D7940: strh r0, [r4, #0x18] pop {r4, pc} .align 2, 0 -_021D7988: .word gUnknown21C48B8 +_021D7988: .word gMain thumb_func_end MOD65_021D7920 thumb_func_start MOD65_021D798C @@ -1420,7 +1420,7 @@ _021D7FCA: mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 strb r0, [r5, #0x1f] add sp, #0x10 pop {r4, r5, r6, pc} @@ -1988,7 +1988,7 @@ _021D8434: add r4, r3, r4 ldr r2, [r2, #0x68] asr r3, r4, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -2194,7 +2194,7 @@ _021D85D4: ldr r2, [r4, #0x34] add r0, #0xf8 mov r3, #8 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r2, [r4, #0x20] mov r1, #0x7e lsl r1, r1, #2 @@ -2443,7 +2443,7 @@ MOD65_021D87D4: ; 0x021D87D4 ldr r2, [r5, #0x4c] add r0, r5, r0 mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 str r0, [sp, #0x10] add r0, #0xe8 @@ -2474,7 +2474,7 @@ _021D8800: ldr r2, [r5, #0x50] add r0, r0, r1 mov r1, #2 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r6, r6, #1 add r5, r5, #4 add r4, r4, #1 @@ -3874,7 +3874,7 @@ MOD65_021D92C4: ; 0x021D92C4 add r0, r4, #0 ldr r2, [r4, #0x20] add r0, #0x6c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 strh r0, [r4, #0xc] mov r0, #0 strh r0, [r4, #0xe] @@ -3898,7 +3898,7 @@ MOD65_021D9338: ; 0x021D9338 mov r0, #7 pop {r4, pc} _021D934E: - ldr r0, _021D937C ; =gUnknown21C48B8 + ldr r0, _021D937C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -3921,7 +3921,7 @@ _021D9366: mov r0, #8 pop {r4, pc} .align 2, 0 -_021D937C: .word gUnknown21C48B8 +_021D937C: .word gMain thumb_func_end MOD65_021D9338 thumb_func_start MOD65_021D9380 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index a489d51f..50786029 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -1109,7 +1109,7 @@ MOD66_021D7D98: ; 0x021D7D98 ldrb r3, [r1, #0x14] cmp r3, #1 bhi _021D7DB6 - ldr r1, _021D7DCC ; =gUnknown21C48B8 + ldr r1, _021D7DCC ; =gMain ldr r2, [r1, #0x48] mov r1, #2 tst r1, r2 @@ -1124,13 +1124,13 @@ _021D7DB6: mov r0, #0 pop {r3, pc} _021D7DBE: - ldr r1, _021D7DCC ; =gUnknown21C48B8 + ldr r1, _021D7DCC ; =gMain ldr r1, [r1, #0x44] bl MOD66_021D8054 mov r0, #0 pop {r3, pc} nop -_021D7DCC: .word gUnknown21C48B8 +_021D7DCC: .word gMain _021D7DD0: .word 0x000005DD thumb_func_end MOD66_021D7D98 @@ -1141,7 +1141,7 @@ MOD66_021D7DD4: ; 0x021D7DD4 ldrb r1, [r1, #0x14] cmp r1, #1 bhi _021D7E0E - ldr r2, _021D7E24 ; =gUnknown21C48B8 + ldr r2, _021D7E24 ; =gMain ldr r3, [r2, #0x48] mov r2, #1 tst r2, r3 @@ -1170,20 +1170,20 @@ _021D7E0E: mov r0, #0 pop {r3, pc} _021D7E16: - ldr r1, _021D7E24 ; =gUnknown21C48B8 + ldr r1, _021D7E24 ; =gMain ldr r1, [r1, #0x44] bl MOD66_021D8054 mov r0, #0 pop {r3, pc} nop -_021D7E24: .word gUnknown21C48B8 +_021D7E24: .word gMain _021D7E28: .word 0x000005DD thumb_func_end MOD66_021D7DD4 thumb_func_start MOD66_021D7E2C MOD66_021D7E2C: ; 0x021D7E2C push {r3, lr} - ldr r2, _021D7E4C ; =gUnknown21C48B8 + ldr r2, _021D7E4C ; =gMain mov r1, #2 ldr r3, [r2, #0x48] tst r1, r3 @@ -1198,7 +1198,7 @@ _021D7E42: mov r0, #0 pop {r3, pc} .align 2, 0 -_021D7E4C: .word gUnknown21C48B8 +_021D7E4C: .word gMain _021D7E50: .word 0x000005DD thumb_func_end MOD66_021D7E2C @@ -1360,7 +1360,7 @@ _021D7F44: ldr r2, [r6] add r0, r7, #0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl FUN_020191D0 add r4, #0x58 @@ -1758,7 +1758,7 @@ _021D825C: add r2, #0x88 ldr r2, [r2] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D8278: ldrb r0, [r5] cmp r0, #1 @@ -1779,7 +1779,7 @@ _021D8278: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor _021D82AA: @@ -1843,7 +1843,7 @@ _021D8300: str r1, [sp, #0xc] ldrh r3, [r4, #0xc] add r0, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor _021D832C: @@ -1877,7 +1877,7 @@ _021D8348: str r1, [sp, #0xc] ldrh r3, [r4, #0x10] add r0, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor _021D8372: @@ -2115,7 +2115,7 @@ MOD66_021D84C8: ; 0x021D84C8 add r0, r5, #0 lsr r3, r4, #1 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl FUN_020191D0 add r0, r6, #0 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 3c03a849..82805b95 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -482,7 +482,7 @@ _021D78D2: thumb_func_start MOD67_021D78D8 MOD67_021D78D8: ; 0x021D78D8 push {r3, lr} - ldr r1, _021D7954 ; =gUnknown21C48B8 + ldr r1, _021D7954 ; =gMain ldr r3, [r1, #0x48] mov r1, #0x20 add r2, r3, #0 @@ -532,7 +532,7 @@ _021D792E: mov r0, #4 pop {r3, pc} _021D793A: - ldr r0, _021D7954 ; =gUnknown21C48B8 + ldr r0, _021D7954 ; =gMain ldr r1, [r0, #0x48] mov r0, #8 tst r0, r1 @@ -546,7 +546,7 @@ _021D7950: mov r0, #1 pop {r3, pc} .align 2, 0 -_021D7954: .word gUnknown21C48B8 +_021D7954: .word gMain _021D7958: .word 0x0000105C thumb_func_end MOD67_021D78D8 @@ -1215,7 +1215,7 @@ _021D7E32: str r1, [sp, #0xc] ldr r2, [r5, #0x58] add r0, r7, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 ldr r1, [r5, #0x58] add r2, r0, #0 @@ -1239,7 +1239,7 @@ _021D7E32: add r0, r7, #0 add r3, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, [r5, #0x50] @@ -1267,7 +1267,7 @@ _021D7E32: str r1, [sp, #0xc] ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor mov r0, #1 @@ -1794,7 +1794,7 @@ _021D82F2: ldr r2, [r4, #0x58] add r0, r7, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor _021D832E: @@ -2016,7 +2016,7 @@ MOD67_021D84A8: ; 0x021D84A8 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2047,7 +2047,7 @@ MOD67_021D84E4: ; 0x021D84E4 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2078,7 +2078,7 @@ MOD67_021D8520: ; 0x021D8520 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2109,7 +2109,7 @@ MOD67_021D855C: ; 0x021D855C add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2140,7 +2140,7 @@ MOD67_021D8598: ; 0x021D8598 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2171,7 +2171,7 @@ MOD67_021D85D4: ; 0x021D85D4 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2202,7 +2202,7 @@ MOD67_021D8610: ; 0x021D8610 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2233,7 +2233,7 @@ MOD67_021D864C: ; 0x021D864C add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2274,7 +2274,7 @@ MOD67_021D8688: ; 0x021D8688 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2319,7 +2319,7 @@ MOD67_021D86DC: ; 0x021D86DC ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2360,7 +2360,7 @@ MOD67_021D873C: ; 0x021D873C ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2401,7 +2401,7 @@ MOD67_021D8790: ; 0x021D8790 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2444,7 +2444,7 @@ MOD67_021D87E4: ; 0x021D87E4 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2499,7 +2499,7 @@ _021D886E: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2549,7 +2549,7 @@ _021D88D2: ldr r2, [r5, #0x58] add r0, r7, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x14 @@ -2580,7 +2580,7 @@ MOD67_021D8914: ; 0x021D8914 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2611,7 +2611,7 @@ MOD67_021D8950: ; 0x021D8950 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -2652,7 +2652,7 @@ MOD67_021D898C: ; 0x021D898C ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2695,7 +2695,7 @@ MOD67_021D89E0: ; 0x021D89E0 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2738,7 +2738,7 @@ MOD67_021D8A3C: ; 0x021D8A3C ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2781,7 +2781,7 @@ MOD67_021D8A98: ; 0x021D8A98 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2824,7 +2824,7 @@ MOD67_021D8AF4: ; 0x021D8AF4 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2867,7 +2867,7 @@ MOD67_021D8B50: ; 0x021D8B50 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2910,7 +2910,7 @@ MOD67_021D8BAC: ; 0x021D8BAC ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2953,7 +2953,7 @@ MOD67_021D8C08: ; 0x021D8C08 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -2996,7 +2996,7 @@ MOD67_021D8C64: ; 0x021D8C64 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3039,7 +3039,7 @@ MOD67_021D8CC0: ; 0x021D8CC0 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3082,7 +3082,7 @@ MOD67_021D8D1C: ; 0x021D8D1C ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3125,7 +3125,7 @@ MOD67_021D8D78: ; 0x021D8D78 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3156,7 +3156,7 @@ MOD67_021D8DD4: ; 0x021D8DD4 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -3187,7 +3187,7 @@ MOD67_021D8E10: ; 0x021D8E10 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -3218,7 +3218,7 @@ MOD67_021D8E4C: ; 0x021D8E4C add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -3249,7 +3249,7 @@ MOD67_021D8E88: ; 0x021D8E88 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -3280,7 +3280,7 @@ MOD67_021D8EC4: ; 0x021D8EC4 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -3396,7 +3396,7 @@ _021D8F9A: ldr r2, [r5, #0x58] add r0, r7, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -3481,7 +3481,7 @@ _021D9046: ldr r2, [r5, #0x58] add r0, r7, #0 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -3578,7 +3578,7 @@ _021D9114: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3645,7 +3645,7 @@ _021D9198: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3720,7 +3720,7 @@ _021D921C: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3787,7 +3787,7 @@ _021D92B4: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3862,7 +3862,7 @@ _021D9338: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3906,7 +3906,7 @@ MOD67_021D9390: ; 0x021D9390 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3958,7 +3958,7 @@ MOD67_021D93EC: ; 0x021D93EC ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -3989,7 +3989,7 @@ MOD67_021D9458: ; 0x021D9458 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -4034,7 +4034,7 @@ MOD67_021D9494: ; 0x021D9494 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -4065,7 +4065,7 @@ MOD67_021D94F0: ; 0x021D94F0 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -4132,7 +4132,7 @@ _021D956C: ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -4163,7 +4163,7 @@ MOD67_021D95B0: ; 0x021D95B0 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -4209,7 +4209,7 @@ MOD67_021D95EC: ; 0x021D95EC ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -4240,7 +4240,7 @@ MOD67_021D964C: ; 0x021D964C add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -4292,7 +4292,7 @@ MOD67_021D9688: ; 0x021D9688 ldr r0, [sp, #0x10] ldr r2, [r5, #0x58] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -4323,7 +4323,7 @@ MOD67_021D96F4: ; 0x021D96F4 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 4e6952dc..c7cef5c8 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -540,7 +540,7 @@ MOD68_021D7904: ; 0x021D7904 add r0, r5, r4 lsr r3, r3, #1 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 @@ -710,7 +710,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r0, r4, #0 mov r3, #0x10 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r0, r6, #0 @@ -732,7 +732,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r0, r4, #0 mov r3, #0x28 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor add r0, r4, #0 @@ -770,7 +770,7 @@ MOD68_021D7AE4: ; 0x021D7AE4 add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -806,7 +806,7 @@ MOD68_021D7B34: ; 0x021D7B34 add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -851,7 +851,7 @@ _021D7BA4: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -887,7 +887,7 @@ MOD68_021D7BDC: ; 0x021D7BDC add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -974,7 +974,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r0, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 @@ -1084,7 +1084,7 @@ _021D7D98: .word 0x04000050 thumb_func_start MOD68_021D7D9C MOD68_021D7D9C: ; 0x021D7D9C push {r4, lr} - ldr r1, _021D7E70 ; =gUnknown21C48B8 + ldr r1, _021D7E70 ; =gMain add r4, r0, #0 ldr r3, [r1, #0x44] mov r2, #0x40 @@ -1197,7 +1197,7 @@ _021D7E6C: mov r0, #1 pop {r4, pc} .align 2, 0 -_021D7E70: .word gUnknown21C48B8 +_021D7E70: .word gMain _021D7E74: .word UNK_021C48F8 thumb_func_end MOD68_021D7D9C diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index c21637a9..6bde4c55 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -611,7 +611,7 @@ _0222DAB4: str r0, [r4] b _0222DAD4 _0222DAC4: - ldr r0, _0222DAE0 ; =gUnknown21C48B8 + ldr r0, _0222DAE0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -625,7 +625,7 @@ _0222DAD4: pop {r4, pc} nop _0222DADC: .word 0x00001B3C -_0222DAE0: .word gUnknown21C48B8 +_0222DAE0: .word gMain thumb_func_start MOD69_0222DAE4 MOD69_0222DAE4: ; 0x0222DAE4 @@ -2336,7 +2336,7 @@ _0222E8B2: ldr r0, [r5, #0x10] ldr r2, [r5, #0x18] add r3, r3, r7 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] add r6, r6, #1 add r4, #0x10 @@ -2663,7 +2663,7 @@ MOD69_0222EB4C: ; 0x0222EB4C str r1, [sp, #0xc] ldr r2, [r4, r2] add r0, #0x14 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, _0222EC5C ; =0x00001B50 ldr r2, [r4, #0xc] ldr r0, [r4, r0] @@ -2741,7 +2741,7 @@ MOD69_0222EB4C: ; 0x0222EB4C str r1, [sp, #0xc] ldr r2, [r4, r2] add r0, #0x14 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, #0x14 add r0, r4, #0 bl FUN_02019548 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 30e49b16..59c97d17 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -115,7 +115,7 @@ _021D75B8: beq _021D768A b _021D768E _021D75C4: - ldr r0, _021D7694 ; =gUnknown21C48B8 + ldr r0, _021D7694 ; =gMain mov r1, #2 ldr r0, [r0, #0x48] add r2, r0, #0 @@ -216,7 +216,7 @@ _021D768E: mov r0, #0 pop {r3, r4, r5, pc} nop -_021D7694: .word gUnknown21C48B8 +_021D7694: .word gMain thumb_func_end MOD70_021D758C thumb_func_start MOD70_021D7698 @@ -1112,7 +1112,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 ldr r2, [r5, r2] add r0, r6, #0 add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl FUN_02019548 add sp, #0xc @@ -1154,7 +1154,7 @@ _021D7DC8: ldr r0, [sp, #0xc] ldr r2, [r7] add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r2, #6 lsl r2, r2, #6 ldr r0, [r5, r2] @@ -1171,7 +1171,7 @@ _021D7DC8: ldr r0, [sp, #0xc] ldr r2, [r5, r2] mov r3, #0x48 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r2, #0x61 lsl r2, r2, #2 ldr r0, [r5, r2] @@ -1188,7 +1188,7 @@ _021D7DC8: ldr r0, [sp, #0xc] ldr r2, [r5, r2] mov r3, #0x5e - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldrh r0, [r7, #0x10] ldr r1, [r7, #8] bl GetGenderBySpeciesAndPersonality @@ -1230,7 +1230,7 @@ _021D7E68: ldr r0, [sp, #0xc] ldr r2, [r5, r2] mov r3, #0xae - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r2, #6 lsl r2, r2, #6 ldr r0, [r5, r2] @@ -1266,7 +1266,7 @@ _021D7E68: ldr r0, [sp, #0xc] ldr r2, [r5, r2] mov r3, #0xc2 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r2, #6 lsl r2, r2, #6 ldr r0, [r5, r2] @@ -1284,7 +1284,7 @@ _021D7E68: ldr r0, [sp, #0xc] ldr r2, [r5, r2] add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x19 lsl r1, r1, #4 mov r0, #0 @@ -1300,7 +1300,7 @@ _021D7E68: str r1, [sp, #8] ldr r0, [sp, #0xc] ldr r2, [r7, #4] - bl FUN_0201BD84 + bl AddTextPrinterParameterized b _021D7F66 _021D7F1C: mov r4, #0 @@ -1334,7 +1334,7 @@ _021D7F1E: ldr r2, [r5, r2] mov r1, #0 mul r3, r6 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r4, r4, #1 add r7, r7, #2 cmp r4, #4 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index b60cc139..a409c3fb 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -3378,7 +3378,7 @@ _0222F220: .word MOD71_022311D8 thumb_func_start MOD71_0222F224 MOD71_0222F224: ; 0x0222F224 push {r3, r4} - ldr r3, _0222F260 ; =gUnknown21C48B8 + ldr r3, _0222F260 ; =gMain mov r1, #0 ldr r3, [r3, #0x4c] mov r4, #0x40 @@ -3413,7 +3413,7 @@ _0222F25C: pop {r3, r4} bx lr .align 2, 0 -_0222F260: .word gUnknown21C48B8 +_0222F260: .word gMain thumb_func_end MOD71_0222F224 thumb_func_start MOD71_0222F264 @@ -3809,7 +3809,7 @@ MOD71_0222F538: ; 0x0222F538 lsl r0, r0, #2 add r0, r4, r0 bl MOD71_0222F224 - ldr r0, _0222F588 ; =gUnknown21C48B8 + ldr r0, _0222F588 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -3846,7 +3846,7 @@ _0222F584: mov r0, #0 pop {r4, pc} .align 2, 0 -_0222F588: .word gUnknown21C48B8 +_0222F588: .word gMain _0222F58C: .word MOD71_0222F674 _0222F590: .word 0x00002214 _0222F594: .word MOD71_0222FDD8 @@ -4132,7 +4132,7 @@ MOD71_0222F7E4: ; 0x0222F7E4 push {r4, lr} sub sp, #0x10 add r4, r0, #0 - ldr r0, _0222F83C ; =gUnknown21C48B8 + ldr r0, _0222F83C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -4171,7 +4171,7 @@ _0222F834: add sp, #0x10 pop {r4, pc} nop -_0222F83C: .word gUnknown21C48B8 +_0222F83C: .word gMain _0222F840: .word 0x00000588 _0222F844: .word MOD71_0222F538 _0222F848: .word 0x00002214 @@ -6958,7 +6958,7 @@ _02230F20: add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -7005,7 +7005,7 @@ _02230F76: add r1, r4, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, r0, #0 add r0, r6, #0 bl String_dtor diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index e49a20ed..6a1954b8 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -1059,7 +1059,7 @@ _021D7D94: ldrh r0, [r0, #0x20] cmp r0, #0 bne _021D7DAE - ldr r0, _021D7F54 ; =gUnknown21C48B8 + ldr r0, _021D7F54 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -1108,7 +1108,7 @@ _021D7DF4: ldr r0, [r4, #0x1c] cmp r0, #0 blt _021D7E14 - ldr r0, _021D7F54 ; =gUnknown21C48B8 + ldr r0, _021D7F54 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -1221,7 +1221,7 @@ _021D7ED6: ldr r0, [r4, #0x1c] cmp r0, #0 blt _021D7EF4 - ldr r0, _021D7F54 ; =gUnknown21C48B8 + ldr r0, _021D7F54 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -1272,7 +1272,7 @@ _021D7F44: .word 0x0000063C _021D7F48: .word 0x00001410 _021D7F4C: .word 0x000006C3 _021D7F50: .word UNK_021C48F8 -_021D7F54: .word gUnknown21C48B8 +_021D7F54: .word gMain _021D7F58: .word 0x0000152C _021D7F5C: .word 0x00001420 _021D7F60: .word 0x00001418 @@ -5140,7 +5140,7 @@ MOD73_021D9D5C: ; 0x021D9D5C mov r1, #1 add r2, r5, #0 add r3, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -6112,7 +6112,7 @@ _021DA446: ldr r0, [r5, #8] ldr r2, [r2, #0x38] mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5, #8] bl FUN_020191D0 mov r0, #2 @@ -6184,7 +6184,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 ldr r0, [r4, #0xc] ldr r2, [r2, #0x34] mov r3, #0x38 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0xc] mov r1, #0 mov r2, #0x1f @@ -6203,7 +6203,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 ldr r0, [r4, #0x10] ldr r2, [r2, #0x64] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x10] mov r1, #0 mov r2, #0x1f @@ -6235,7 +6235,7 @@ MOD73_021DA550: ; 0x021DA550 ldr r0, [r4, #0xc] ldr r2, [r2, #0x4c] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r3, #2 str r3, [sp] mov r0, #1 @@ -6284,7 +6284,7 @@ MOD73_021DA550: ; 0x021DA550 ldr r0, [r4, #0xc] ldr r2, [r2, #8] mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x30 str r0, [sp] mov r1, #0 @@ -6296,7 +6296,7 @@ MOD73_021DA550: ; 0x021DA550 ldr r0, [r4, #0xc] ldr r2, [r2, #0x54] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 str r1, [sp] mov r0, #1 @@ -6334,7 +6334,7 @@ _021DA61A: ldr r0, [r4, #0xc] ldr r2, [r2, #8] mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x44 str r0, [sp] mov r1, #0 @@ -6346,7 +6346,7 @@ _021DA61A: ldr r0, [r4, #0xc] ldr r2, [r2, #0x5c] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 str r1, [sp] mov r0, #1 @@ -6384,7 +6384,7 @@ _021DA682: ldr r0, [r4, #0xc] ldr r2, [r2, #8] mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0xc] bl FUN_02019220 add sp, #0x10 @@ -6440,7 +6440,7 @@ MOD73_021DA6BC: ; 0x021DA6BC ldr r0, [r4, #0x10] ldr r2, [r2, #8] mov r3, #0x10 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x10] bl FUN_02019220 add sp, #0x10 @@ -6565,7 +6565,7 @@ _021DA7EC: ldr r0, [r4, #0x14] mov r1, #1 add r2, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r1, #0 ldr r0, [r4, #0x14] mov r2, #1 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 743c4a76..1e7b6d56 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -358,7 +358,7 @@ _021D77A8: .word 0x00003FF8 thumb_func_start MOD74_021D77AC MOD74_021D77AC: ; 0x021D77AC - ldr r0, _021D77C0 ; =gUnknown21C48B8 + ldr r0, _021D77C0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -369,14 +369,14 @@ _021D77BA: mov r0, #0 bx lr nop -_021D77C0: .word gUnknown21C48B8 +_021D77C0: .word gMain thumb_func_end MOD74_021D77AC thumb_func_start MOD74_021D77C4 MOD74_021D77C4: ; 0x021D77C4 push {r3, r4, r5, lr} sub sp, #8 - ldr r1, _021D78B8 ; =gUnknown21C48B8 + ldr r1, _021D78B8 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] mov r1, #2 @@ -503,13 +503,13 @@ _021D788E: add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 -_021D78B8: .word gUnknown21C48B8 +_021D78B8: .word gMain thumb_func_end MOD74_021D77C4 thumb_func_start MOD74_021D78BC MOD74_021D78BC: ; 0x021D78BC push {r4, lr} - ldr r1, _021D78E8 ; =gUnknown21C48B8 + ldr r1, _021D78E8 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] mov r1, #1 @@ -531,13 +531,13 @@ _021D78E4: mov r0, #0 pop {r4, pc} .align 2, 0 -_021D78E8: .word gUnknown21C48B8 +_021D78E8: .word gMain thumb_func_end MOD74_021D78BC thumb_func_start MOD74_021D78EC MOD74_021D78EC: ; 0x021D78EC push {r4, lr} - ldr r1, _021D7908 ; =gUnknown21C48B8 + ldr r1, _021D7908 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] mov r1, #3 @@ -550,7 +550,7 @@ _021D7902: mov r0, #0 pop {r4, pc} nop -_021D7908: .word gUnknown21C48B8 +_021D7908: .word gMain thumb_func_end MOD74_021D78EC thumb_func_start MOD74_021D790C @@ -984,7 +984,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r2, [r2, #0x4c] add r0, r4, #0 mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -1012,7 +1012,7 @@ MOD74_021D7C10: ; 0x021D7C10 str r1, [sp, #0xc] ldr r2, [r5, #0x30] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, sp, #0x18 ldrb r0, [r0, #0x10] add r0, #0x18 @@ -1029,7 +1029,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r2, [r5, #0x54] add r0, r4, #0 mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -1057,7 +1057,7 @@ MOD74_021D7C10: ; 0x021D7C10 str r1, [sp, #0xc] ldr r2, [r5, #0x30] add r0, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FUN_020191D0 add sp, #0x14 @@ -1094,7 +1094,7 @@ MOD74_021D7D1C: ; 0x021D7D1C ldr r2, [r4, #0x30] add r0, #0x6c asr r3, r5, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r1, [r4, #0xa] ldr r0, [r4, #0x28] ldr r2, [r4, #0x30] @@ -1111,7 +1111,7 @@ MOD74_021D7D1C: ; 0x021D7D1C ldr r2, [r4, #0x30] add r0, #0x7c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r1, [r4, #0xa] ldr r0, [r4, #0x28] ldr r2, [r4, #0x30] @@ -1129,7 +1129,7 @@ MOD74_021D7D1C: ; 0x021D7D1C ldr r2, [r4, #0x30] add r0, #0x8c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r0, [r4, #0xa] cmp r0, #0 beq _021D7DB8 @@ -1192,7 +1192,7 @@ _021D7E04: ldr r2, [r4, #0x30] add r0, #0x9c mov r3, #4 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r4, #0x20] mov r1, #0 bl FUN_0202A444 @@ -1228,7 +1228,7 @@ _021D7E04: ldr r2, [r4, #0x30] add r3, #0x40 add r0, #0x9c - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #3 str r0, [sp] add r0, r4, #0 @@ -1366,7 +1366,7 @@ MOD74_021D7F44: ; 0x021D7F44 add r2, r5, #0 add r3, #0xa0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D7F90 _021D7F8C: mov r0, #3 @@ -1410,7 +1410,7 @@ _021D7FC0: ldr r2, [r2] mov r1, #0 add r3, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r4, r4, #1 add r5, #0x48 cmp r4, #3 @@ -1486,7 +1486,7 @@ MOD74_021D8008: ; 0x021D8008 ldr r2, [r4, #0x30] add r0, #0x6c asr r3, r5, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldrb r1, [r4, #0xa] ldr r0, [r4, #0x28] ldr r2, [r4, #0x30] @@ -1511,7 +1511,7 @@ MOD74_021D8008: ; 0x021D8008 ldr r2, [r4, #0x30] add r0, #0x6c asr r3, r5, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -1554,7 +1554,7 @@ MOD74_021D80D0: ; 0x021D80D0 ldr r2, [r4, #0x48] add r0, #0x8c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D8172 _021D8108: ldrb r0, [r5, #6] @@ -1578,7 +1578,7 @@ _021D8108: ldr r2, [r4, #0x30] add r0, #0x8c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021D8172 _021D813C: mov r1, #0 @@ -1603,7 +1603,7 @@ _021D813C: ldr r2, [r4, #0x30] add r0, #0x8c add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021D8172: add r0, r4, #0 add r0, #0x8c @@ -1649,7 +1649,7 @@ MOD74_021D818C: ; 0x021D818C add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor add sp, #0x10 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 2cdd52f1..e61c2137 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -2020,7 +2020,7 @@ MOD75_021E7B7C: ; 0x021E7B7C add r1, r4, #6 add r2, r4, #4 bl FUN_02001448 - ldr r0, _021E7CD8 ; =gUnknown21C48B8 + ldr r0, _021E7CD8 ; =gMain ldr r1, [r0, #0x48] mov r0, #4 tst r0, r1 @@ -2172,7 +2172,7 @@ _021E7CD2: add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 -_021E7CD8: .word gUnknown21C48B8 +_021E7CD8: .word gMain _021E7CDC: .word 0x000005DC _021E7CE0: .word 0x0000048A thumb_func_end MOD75_021E7B7C @@ -2207,7 +2207,7 @@ _021E7D10: .word 0x00000427 MOD75_021E7D14: ; 0x021E7D14 push {r4, lr} add r4, r0, #0 - ldr r0, _021E7DF8 ; =gUnknown21C48B8 + ldr r0, _021E7DF8 ; =gMain ldr r1, [r0, #0x4c] mov r0, #0x20 tst r0, r1 @@ -2319,7 +2319,7 @@ _021E7DF2: mov r0, #0 pop {r4, pc} nop -_021E7DF8: .word gUnknown21C48B8 +_021E7DF8: .word gMain _021E7DFC: .word 0x00000424 _021E7E00: .word 0x000006CA _021E7E04: .word 0x00000429 @@ -2594,7 +2594,7 @@ _021E801C: .word 0x00000478 MOD75_021E8020: ; 0x021E8020 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _021E8188 ; =gUnknown21C48B8 + ldr r0, _021E8188 ; =gMain ldr r1, _021E818C ; =0x00000429 ldr r2, [r0, #0x48] mov r0, #0x20 @@ -2772,7 +2772,7 @@ _021E8182: mov r0, #0 pop {r3, r4, r5, pc} nop -_021E8188: .word gUnknown21C48B8 +_021E8188: .word gMain _021E818C: .word 0x00000429 _021E8190: .word 0x000006CA _021E8194: .word 0x00000478 @@ -3760,7 +3760,7 @@ _021E88D0: strb r0, [r5, r1] pop {r3, r4, r5, r6, pc} _021E8912: - ldr r0, _021E89EC ; =gUnknown21C48B8 + ldr r0, _021E89EC ; =gMain ldr r1, [r0, #0x48] mov r0, #4 tst r0, r1 @@ -3834,7 +3834,7 @@ _021E899A: _021E89AA: ldr r0, _021E89E8 ; =0x000005DC bl FUN_020054C8 - ldr r0, _021E89EC ; =gUnknown21C48B8 + ldr r0, _021E89EC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -3863,7 +3863,7 @@ _021E89E0: pop {r3, r4, r5, r6, pc} nop _021E89E8: .word 0x000005DC -_021E89EC: .word gUnknown21C48B8 +_021E89EC: .word gMain thumb_func_end MOD75_021E88BC thumb_func_start MOD75_021E89F0 @@ -4488,7 +4488,7 @@ MOD75_021E8EB0: ; 0x021E8EB0 bl FUN_0201BD70 cmp r0, #0 bne _021E8F00 - ldr r0, _021E8F08 ; =gUnknown21C48B8 + ldr r0, _021E8F08 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4524,7 +4524,7 @@ _021E8F00: pop {r4, pc} .align 2, 0 _021E8F04: .word 0x00000426 -_021E8F08: .word gUnknown21C48B8 +_021E8F08: .word gMain _021E8F0C: .word UNK_021C48F8 thumb_func_end MOD75_021E8EB0 @@ -4707,7 +4707,7 @@ _021E9070: bl FUN_0201BD70 cmp r0, #0 bne _021E9132 - ldr r0, _021E91B0 ; =gUnknown21C48B8 + ldr r0, _021E91B0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -4850,7 +4850,7 @@ _021E91A0: _021E91A4: .word 0x00000483 _021E91A8: .word 0x000003D9 _021E91AC: .word 0x00000426 -_021E91B0: .word gUnknown21C48B8 +_021E91B0: .word gMain _021E91B4: .word UNK_021C48F8 thumb_func_end MOD75_021E8FD8 @@ -5123,7 +5123,7 @@ _021E93D2: bl FUN_0201BD70 cmp r0, #0 bne _021E9422 - ldr r0, _021E9434 ; =gUnknown21C48B8 + ldr r0, _021E9434 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5163,7 +5163,7 @@ _021E9422: _021E9428: .word 0x00000483 _021E942C: .word 0x000003D9 _021E9430: .word 0x00000426 -_021E9434: .word gUnknown21C48B8 +_021E9434: .word gMain _021E9438: .word UNK_021C48F8 thumb_func_end MOD75_021E9394 @@ -5311,7 +5311,7 @@ _021E9544: mov r0, #7 pop {r4, pc} _021E955E: - ldr r0, _021E95B4 ; =gUnknown21C48B8 + ldr r0, _021E95B4 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -5347,7 +5347,7 @@ _021E95A6: nop _021E95AC: .word 0x00000488 _021E95B0: .word 0x00000638 -_021E95B4: .word gUnknown21C48B8 +_021E95B4: .word gMain _021E95B8: .word 0x000005DC thumb_func_end MOD75_021E94D0 @@ -5559,7 +5559,7 @@ MOD75_021E9750: ; 0x021E9750 bl FUN_0201BD70 cmp r0, #0 bne _021E9794 - ldr r0, _021E979C ; =gUnknown21C48B8 + ldr r0, _021E979C ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5588,7 +5588,7 @@ _021E9794: pop {r4, pc} .align 2, 0 _021E9798: .word 0x00000426 -_021E979C: .word gUnknown21C48B8 +_021E979C: .word gMain _021E97A0: .word UNK_021C48F8 _021E97A4: .word 0x00000479 thumb_func_end MOD75_021E9750 @@ -5791,7 +5791,7 @@ MOD75_021E9930: ; 0x021E9930 bl FUN_0201BD70 cmp r0, #0 bne _021E9970 - ldr r0, _021E9978 ; =gUnknown21C48B8 + ldr r0, _021E9978 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -5818,7 +5818,7 @@ _021E9970: pop {r4, pc} .align 2, 0 _021E9974: .word 0x00000426 -_021E9978: .word gUnknown21C48B8 +_021E9978: .word gMain _021E997C: .word UNK_021C48F8 thumb_func_end MOD75_021E9930 @@ -6180,7 +6180,7 @@ _021E9C62: mov r0, #0x12 pop {r3, r4, r5, pc} _021E9C80: - ldr r0, _021E9D60 ; =gUnknown21C48B8 + ldr r0, _021E9D60 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -6275,7 +6275,7 @@ _021E9D4C: _021E9D54: .word 0x00000488 _021E9D58: .word 0x00000426 _021E9D5C: .word 0x00000638 -_021E9D60: .word gUnknown21C48B8 +_021E9D60: .word gMain _021E9D64: .word 0x000005DC _021E9D68: .word 0x0000048C thumb_func_end MOD75_021E9B88 @@ -6542,7 +6542,7 @@ MOD75_021E9F74: ; 0x021E9F74 bl FUN_0201BD70 cmp r0, #0 bne _021E9FC8 - ldr r0, _021E9FD0 ; =gUnknown21C48B8 + ldr r0, _021E9FD0 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -6578,7 +6578,7 @@ _021E9FC8: pop {r4, pc} .align 2, 0 _021E9FCC: .word 0x00000426 -_021E9FD0: .word gUnknown21C48B8 +_021E9FD0: .word gMain _021E9FD4: .word UNK_021C48F8 _021E9FD8: .word 0x00000479 thumb_func_end MOD75_021E9F74 @@ -7742,7 +7742,7 @@ MOD75_021EA880: ; 0x021EA880 add r2, r6, #0 sub r3, r4, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -8073,7 +8073,7 @@ _021EAB18: add r2, r4, #0 mov r3, #0x28 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -8109,7 +8109,7 @@ MOD75_021EAB44: ; 0x021EAB44 add r0, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -8129,7 +8129,7 @@ MOD75_021EAB44: ; 0x021EAB44 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -8148,7 +8148,7 @@ MOD75_021EAB44: ; 0x021EAB44 add r0, r4, #0 mov r3, #0x60 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -8168,7 +8168,7 @@ MOD75_021EAB44: ; 0x021EAB44 add r2, r6, #0 mov r3, #0x60 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -8188,7 +8188,7 @@ MOD75_021EAB44: ; 0x021EAB44 add r2, r6, #0 mov r3, #0x60 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x10] @@ -8234,7 +8234,7 @@ MOD75_021EAB44: ; 0x021EAB44 ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0x30 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] mov r1, #2 bl GetWazaAttr @@ -8289,7 +8289,7 @@ _021EACC6: ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x10] mov r1, #4 bl GetWazaAttr @@ -8343,7 +8343,7 @@ _021EAD3C: ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0xa0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -8419,7 +8419,7 @@ MOD75_021EADDC: ; 0x021EADDC ldr r2, [r5, r2] add r0, r5, #4 mov r3, #0x73 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _021EAE2E _021EAE18: mov r2, #0xff @@ -8431,7 +8431,7 @@ _021EAE18: ldr r2, [r5, r2] add r0, r5, #4 mov r3, #0x6d - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _021EAE2E: mov r0, #0xa mov r1, #6 @@ -8470,7 +8470,7 @@ _021EAE2E: add r2, r7, #0 sub r3, r4, r3 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add sp, #0x14 @@ -8657,7 +8657,7 @@ MOD75_021EAFB0: ; 0x021EAFB0 add r0, r5, #4 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -9042,7 +9042,7 @@ _021EB298: mov r1, #1 add r2, r7, #0 str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r7, #0 bl String_dtor ldr r0, [sp, #0x18] @@ -9178,7 +9178,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 add r0, #0x14 mov r3, #0x28 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r5, #0x14 add r0, r5, #0 bl FUN_02019220 @@ -9256,7 +9256,7 @@ MOD75_021EB454: ; 0x021EB454 mov r1, #1 add r2, r4, #0 str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r5, #0x34 add r0, r5, #0 bl FUN_02019220 @@ -9318,7 +9318,7 @@ MOD75_021EB504: ; 0x021EB504 ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0x10 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_02019220 add r0, r6, #0 @@ -9459,7 +9459,7 @@ MOD75_021EB660: ; 0x021EB660 ldr r2, [r4, r2] add r0, #0x64 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add sp, #0xc pop {r3, r4, pc} nop @@ -9580,7 +9580,7 @@ _021EB722: ldr r2, [r5, r2] add r0, r4, #0 add r3, r1, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -9630,7 +9630,7 @@ _021EB722: mov r5, #0x60 add r0, r4, #0 sub r3, r5, r3 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_02019220 add r0, r6, #0 @@ -9674,7 +9674,7 @@ MOD75_021EB808: ; 0x021EB808 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor b _021EB866 @@ -9735,7 +9735,7 @@ _021EB866: mov r5, #0x50 add r0, r4, #0 sub r3, r5, r3 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_02019220 add r0, r6, #0 @@ -9775,7 +9775,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor mov r0, #0x45 @@ -9829,7 +9829,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 mov r5, #0x58 add r0, r4, #0 sub r3, r5, r3 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl FUN_02019220 add sp, #0xc diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 9677faac..ed94aa20 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -574,7 +574,7 @@ _021D7970: MOD76_021D7974: ; 0x021D7974 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _021D7A88 ; =gUnknown21C48B8 + ldr r0, _021D7A88 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x30 tst r1, r0 @@ -699,7 +699,7 @@ _021D7A82: mov r0, #1 pop {r3, r4, r5, pc} nop -_021D7A88: .word gUnknown21C48B8 +_021D7A88: .word gMain _021D7A8C: .word 0x000005DD _021D7A90: .word 0x00000186 thumb_func_end MOD76_021D7974 @@ -1063,7 +1063,7 @@ _021D7D3E: add r0, r1, r0 ldr r1, [sp, #0x10] ldr r2, [r5, r2] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD76_021D7CC8 @@ -1634,7 +1634,7 @@ MOD76_021D81AC: ; 0x021D81AC ldr r2, [r5, r2] add r0, #0xb8 add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl DestroyMsgData lsl r1, r4, #0x10 @@ -2065,7 +2065,7 @@ MOD76_021D853C: ; 0x021D853C add r0, r4, #0 ldr r2, [r4, r2] add r0, #0xc8 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _021D8590 ; =0x00000185 strb r0, [r4, r1] add sp, #0xc diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 2af1f3b9..8fe53b7d 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -630,7 +630,7 @@ _021D7A32: ldr r1, _021D7B8C ; =0x0000C2D8 ldrh r6, [r4, r1] bl MOD77_021D7E24 - ldr r0, _021D7B90 ; =gUnknown21C48B8 + ldr r0, _021D7B90 ; =gMain mov r3, #2 ldr r1, [r0, #0x48] add r0, r1, #0 @@ -708,7 +708,7 @@ _021D7AC0: bl MOD77_021D86B4 b _021D7B66 _021D7ADA: - ldr r2, _021D7B90 ; =gUnknown21C48B8 + ldr r2, _021D7B90 ; =gMain add r0, r4, #0 ldr r2, [r2, #0x44] bl MOD77_021D8B20 @@ -787,7 +787,7 @@ _021D7B80: .word 0x000001D9 _021D7B84: .word 0x0000C314 _021D7B88: .word 0x0000C328 _021D7B8C: .word 0x0000C2D8 -_021D7B90: .word gUnknown21C48B8 +_021D7B90: .word gMain _021D7B94: .word 0x0000C2F8 _021D7B98: .word 0x000005DD _021D7B9C: .word 0x00000403 @@ -1586,7 +1586,7 @@ MOD77_021D7FAC: ; 0x021D7FAC add r0, r5, r0 mov r1, #2 add r2, r4, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor mov r0, #2 @@ -1695,7 +1695,7 @@ _021D82B0: add r2, #0x58 ldr r2, [r5, r2] mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _021D8354 ; =0x0000C068 mov r2, #1 str r0, [r5, r1] @@ -1720,7 +1720,7 @@ _021D830A: _021D832A: cmp r2, #0 bne _021D8338 - ldr r0, _021D8358 ; =gUnknown21C48B8 + ldr r0, _021D8358 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -1739,7 +1739,7 @@ _021D8348: .word 0x0000C064 _021D834C: .word 0x0000C06C _021D8350: .word 0x0000C014 _021D8354: .word 0x0000C068 -_021D8358: .word gUnknown21C48B8 +_021D8358: .word gMain thumb_func_end MOD77_021D8294 thumb_func_start MOD77_021D835C @@ -2017,7 +2017,7 @@ MOD77_021D8510: ; 0x021D8510 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -2093,7 +2093,7 @@ MOD77_021D85E0: ; 0x021D85E0 add r0, r5, r0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized _021D865C: mov r1, #0 ldr r0, _021D8690 ; =0x0000C044 @@ -2103,7 +2103,7 @@ _021D865C: add r2, r7, #0 add r3, r1, #0 str r1, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add r0, r7, #0 @@ -2173,7 +2173,7 @@ MOD77_021D86B4: ; 0x021D86B4 mov r1, #1 add r2, r4, #0 str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 bl String_dtor add sp, #0x20 @@ -2267,7 +2267,7 @@ _021D8748: add r0, r5, r0 add r2, r6, #0 mov r3, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized _021D87C8: mov r0, #0 str r0, [sp] @@ -2278,7 +2278,7 @@ _021D87C8: add r0, r5, r0 add r2, r7, #0 mov r3, #0 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add r0, r7, #0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 83c24108..1c8a9d21 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2965,7 +2965,7 @@ MOD80_0222EC98: ; 0x0222EC98 ldr r2, [r7, r2] add r0, r7, r0 mov r1, #1 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0 str r0, [sp, #0x14] ldr r0, _0222ED90 ; =0x00000ED8 @@ -3243,7 +3243,7 @@ _0222EEF8: .word 0x00000D5C MOD80_0222EEFC: ; 0x0222EEFC push {r3, r4, lr} sub sp, #4 - ldr r1, _0222F084 ; =gUnknown21C48B8 + ldr r1, _0222F084 ; =gMain mov r2, #2 ldr r1, [r1, #0x48] add r4, r0, #0 @@ -3423,7 +3423,7 @@ _0222F07C: add sp, #4 pop {r3, r4, pc} nop -_0222F084: .word gUnknown21C48B8 +_0222F084: .word gMain _0222F088: .word 0x00000F0F _0222F08C: .word 0x00000D5C _0222F090: .word 0x000005DC @@ -3694,7 +3694,7 @@ MOD80_0222F250: ; 0x0222F250 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -3736,7 +3736,7 @@ MOD80_0222F2A8: ; 0x0222F2A8 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -3769,7 +3769,7 @@ MOD80_0222F300: ; 0x0222F300 mov r1, #1 add r2, r6, #0 str r3, [sp, #8] - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r6, #0 bl String_dtor add sp, #0xc @@ -4421,7 +4421,7 @@ MOD80_0222F864: ; 0x0222F864 MOD80_0222F86C: ; 0x0222F86C push {r4, lr} sub sp, #8 - ldr r1, _0222F8C0 ; =gUnknown21C48B8 + ldr r1, _0222F8C0 ; =gMain mov r2, #1 ldr r3, [r1, #0x48] add r4, r0, #0 @@ -4458,7 +4458,7 @@ _0222F8B8: add sp, #8 pop {r4, pc} nop -_0222F8C0: .word gUnknown21C48B8 +_0222F8C0: .word gMain _0222F8C4: .word 0x00000F0F _0222F8C8: .word 0x000005DC thumb_func_end MOD80_0222F86C @@ -4821,7 +4821,7 @@ MOD80_0222FB3C: ; 0x0222FB3C ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -5707,7 +5707,7 @@ MOD80_022302F0: ; 0x022302F0 thumb_func_start MOD80_022302F8 MOD80_022302F8: ; 0x022302F8 push {r3, r4, r5, lr} - ldr r1, _02230388 ; =gUnknown21C48B8 + ldr r1, _02230388 ; =gMain mov r2, #1 ldr r1, [r1, #0x48] add r4, r0, #0 @@ -5776,7 +5776,7 @@ _02230384: mov r0, #3 pop {r3, r4, r5, pc} .align 2, 0 -_02230388: .word gUnknown21C48B8 +_02230388: .word gMain _0223038C: .word 0x00000F0F _02230390: .word 0x000005DC thumb_func_end MOD80_022302F8 @@ -5999,7 +5999,7 @@ MOD80_022304F8: ; 0x022304F8 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -6777,7 +6777,7 @@ MOD80_02230B94: ; 0x02230B94 push {r3, r4, r5, lr} add r4, r0, #0 bl MOD80_02231008 - ldr r0, _02230CB4 ; =gUnknown21C48B8 + ldr r0, _02230CB4 ; =gMain mov r2, #1 ldr r1, [r0, #0x48] add r0, r1, #0 @@ -6910,7 +6910,7 @@ _02230CAE: mov r0, #3 pop {r3, r4, r5, pc} nop -_02230CB4: .word gUnknown21C48B8 +_02230CB4: .word gMain _02230CB8: .word 0x000005DC _02230CBC: .word 0x00000B22 _02230CC0: .word 0x00000F0F @@ -7339,7 +7339,7 @@ MOD80_02231008: ; 0x02231008 push {r3, r4, lr} sub sp, #0xc add r4, r0, #0 - ldr r0, _02231100 ; =gUnknown21C48B8 + ldr r0, _02231100 ; =gMain mov r1, #0x40 ldr r0, [r0, #0x48] tst r1, r0 @@ -7461,7 +7461,7 @@ _022310D0: add sp, #0xc pop {r3, r4, pc} nop -_02231100: .word gUnknown21C48B8 +_02231100: .word gMain _02231104: .word 0x000005DC _02231108: .word MOD80_02237A80 _0223110C: .word MOD80_02237A82 @@ -8393,7 +8393,7 @@ MOD80_0223187C: ; 0x0223187C ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -9406,7 +9406,7 @@ MOD80_0223213C: ; 0x0223213C beq _0223214E b _02232250 _0223214E: - ldr r0, _02232370 ; =gUnknown21C48B8 + ldr r0, _02232370 ; =gMain ldr r2, [r0, #0x48] mov r0, #2 tst r0, r2 @@ -9530,7 +9530,7 @@ _02232232: _02232250: cmp r0, #6 bne _022322BA - ldr r0, _02232370 ; =gUnknown21C48B8 + ldr r0, _02232370 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -9664,7 +9664,7 @@ _02232368: add sp, #8 pop {r3, r4, r5, pc} nop -_02232370: .word gUnknown21C48B8 +_02232370: .word gMain _02232374: .word 0x000005DC _02232378: .word 0x00000F0F thumb_func_end MOD80_0223213C @@ -9673,7 +9673,7 @@ _02232378: .word 0x00000F0F MOD80_0223237C: ; 0x0223237C push {r4, r5, r6, lr} add r5, r0, #0 - ldr r0, _02232448 ; =gUnknown21C48B8 + ldr r0, _02232448 ; =gMain mov r4, #0 ldr r0, [r0, #0x48] mov r2, #0x40 @@ -9776,7 +9776,7 @@ _0223243A: bl FUN_02020238 pop {r4, r5, r6, pc} nop -_02232448: .word gUnknown21C48B8 +_02232448: .word gMain _0223244C: .word MOD80_02237340 _02232450: .word 0x000005DC _02232454: .word MOD80_022372C0 @@ -10693,7 +10693,7 @@ _02232B62: ldr r2, [r5, r2] add r0, r4, #0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -11673,7 +11673,7 @@ MOD80_022332EC: ; 0x022332EC ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -12128,7 +12128,7 @@ _022336F4: .word 0x00000F0F MOD80_022336F8: ; 0x022336F8 push {r3, r4, lr} sub sp, #0x14 - ldr r1, _02233770 ; =gUnknown21C48B8 + ldr r1, _02233770 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] mov r1, #2 @@ -12183,7 +12183,7 @@ _02233714: add sp, #0x14 pop {r3, r4, pc} .align 2, 0 -_02233770: .word gUnknown21C48B8 +_02233770: .word gMain _02233774: .word 0x0000011A _02233778: .word 0x00000ED8 _0223377C: .word 0x0000014E @@ -18782,7 +18782,7 @@ MOD80_02236A8C: ; 0x02236A8C MOD80_02236AAC: ; 0x02236AAC push {r4, lr} add r4, r0, #0 - ldr r0, _02236AD4 ; =gUnknown21C48B8 + ldr r0, _02236AD4 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -18801,7 +18801,7 @@ _02236ACE: mov r0, #3 pop {r4, pc} nop -_02236AD4: .word gUnknown21C48B8 +_02236AD4: .word gMain _02236AD8: .word 0x00000EC8 thumb_func_end MOD80_02236AAC @@ -19067,7 +19067,7 @@ MOD80_02236C70: ; 0x02236C70 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] @@ -19138,7 +19138,7 @@ MOD80_02236D1C: ; 0x02236D1C add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end MOD80_02236D1C @@ -19165,7 +19165,7 @@ MOD80_02236D50: ; 0x02236D50 add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -19222,7 +19222,7 @@ MOD80_02236D8C: ; 0x02236D8C ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized mov r1, #0x2e lsl r1, r1, #6 str r0, [r5, r1] diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index c9b3d1e5..c5c4a97f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2477,7 +2477,7 @@ _022390F4: ldr r2, [r4, #0x58] add r0, #0x44 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x44 mov r1, #0x6d @@ -2537,7 +2537,7 @@ _0223918A: ldr r2, [r4, #0x58] add r0, #0x44 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x44 bl FUN_02019548 @@ -9601,7 +9601,7 @@ _0223C982: ldr r2, [r4, #0x5c] add r0, #0x48 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x48 mov r1, #0x6d @@ -9650,7 +9650,7 @@ _0223C9D0: ldr r2, [r4, #0x5c] add r0, #0x48 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x48 bl FUN_02019548 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 7270d974..36d3f681 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -2561,7 +2561,7 @@ MOD82_0222E988: ; 0x0222E988 MOD82_0222E9CC: ; 0x0222E9CC push {r3, r4, lr} sub sp, #0x1c - ldr r2, _0222EA9C ; =gUnknown21C48B8 + ldr r2, _0222EA9C ; =gMain mov r1, #0x40 ldr r3, [r2, #0x4c] add r4, r0, #0 @@ -2661,7 +2661,7 @@ _0222EA94: add sp, #0x1c pop {r3, r4, pc} nop -_0222EA9C: .word gUnknown21C48B8 +_0222EA9C: .word gMain _0222EAA0: .word 0x000005DC thumb_func_end MOD82_0222E9CC @@ -3153,7 +3153,7 @@ _0222EE70: .word 0x00000B94 thumb_func_start MOD82_0222EE74 MOD82_0222EE74: ; 0x0222EE74 push {r4, lr} - ldr r2, _0222EF18 ; =gUnknown21C48B8 + ldr r2, _0222EF18 ; =gMain mov r1, #0x40 ldr r3, [r2, #0x4c] add r4, r0, #0 @@ -3231,7 +3231,7 @@ _0222EF12: mov r0, #3 pop {r4, pc} nop -_0222EF18: .word gUnknown21C48B8 +_0222EF18: .word gMain _0222EF1C: .word 0x00000B94 _0222EF20: .word 0x000005DC thumb_func_end MOD82_0222EE74 @@ -3299,7 +3299,7 @@ MOD82_0222EF54: ; 0x0222EF54 thumb_func_start MOD82_0222EF9C MOD82_0222EF9C: ; 0x0222EF9C push {r4, lr} - ldr r2, _0222F040 ; =gUnknown21C48B8 + ldr r2, _0222F040 ; =gMain mov r1, #0x40 ldr r3, [r2, #0x4c] add r4, r0, #0 @@ -3379,7 +3379,7 @@ _0222F03C: mov r0, #3 pop {r4, pc} .align 2, 0 -_0222F040: .word gUnknown21C48B8 +_0222F040: .word gMain _0222F044: .word 0x000005DC thumb_func_end MOD82_0222EF9C @@ -4055,7 +4055,7 @@ MOD82_0222F4D8: ; 0x0222F4D8 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _0222F544 ; =0x00000B9C str r0, [r5, r1] add r0, r6, #0 @@ -4094,7 +4094,7 @@ _0222F56C: .word 0x00000EBC MOD82_0222F570: ; 0x0222F570 push {r4, lr} add r4, r0, #0 - ldr r0, _0222F598 ; =gUnknown21C48B8 + ldr r0, _0222F598 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -4114,7 +4114,7 @@ _0222F594: mov r0, #3 pop {r4, pc} .align 2, 0 -_0222F598: .word gUnknown21C48B8 +_0222F598: .word gMain thumb_func_end MOD82_0222F570 thumb_func_start MOD82_0222F59C @@ -4150,7 +4150,7 @@ MOD82_0222F59C: ; 0x0222F59C ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _0222F5F0 ; =0x00000B9C str r0, [r5, r1] add sp, #0xc @@ -4216,7 +4216,7 @@ MOD82_0222F62C: ; 0x0222F62C add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end MOD82_0222F62C @@ -4243,7 +4243,7 @@ MOD82_0222F660: ; 0x0222F660 add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -4393,7 +4393,7 @@ MOD82_0222F740: ; 0x0222F740 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized ldr r1, _0222F7BC ; =0x00000B9C str r0, [r5, r1] add r0, r4, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index bece508d..391b40c8 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -70,7 +70,7 @@ _0222D632: blt _0222D5E0 b _0222D668 _0222D63C: - ldr r0, _0222D674 ; =gUnknown21C48B8 + ldr r0, _0222D674 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -96,7 +96,7 @@ _0222D668: pop {r4, r5, r6, r7, pc} nop _0222D670: .word MOD83_0223A794 -_0222D674: .word gUnknown21C48B8 +_0222D674: .word gMain _0222D678: .word 0x000005DC thumb_func_end MOD83_0222D5C4 @@ -477,7 +477,7 @@ _0222D932: str r0, [r4, r1] b _0222D994 _0222D94A: - ldr r0, _0222D9B8 ; =gUnknown21C48B8 + ldr r0, _0222D9B8 ; =gMain ldr r2, [r0, #0x48] mov r0, #3 tst r0, r2 @@ -489,7 +489,7 @@ _0222D94A: mov r1, #0x13 lsl r0, r0, #2 str r1, [r4, r0] - ldr r1, _0222D9B8 ; =gUnknown21C48B8 + ldr r1, _0222D9B8 ; =gMain add r0, #0xc ldr r1, [r1, #0x48] str r1, [r4, r0] @@ -522,7 +522,7 @@ _0222D9A8: .word MOD83_0223A804 _0222D9AC: .word MOD83_0223A818 _0222D9B0: .word MOD83_0223A82C _0222D9B4: .word MOD83_0223A840 -_0222D9B8: .word gUnknown21C48B8 +_0222D9B8: .word gMain _0222D9BC: .word 0x000005DC thumb_func_end MOD83_0222D7E0 @@ -920,7 +920,7 @@ MOD83_0222DCA0: ; 0x0222DCA0 add r0, r6, #0 add r2, r5, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl String_dtor add sp, #0x10 @@ -1027,7 +1027,7 @@ _0222DD88: add r2, r7, #0 ldr r0, [r0, #0x10] mov r3, #0x20 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor _0222DDB8: @@ -2119,7 +2119,7 @@ _0222E616: str r1, [r4, r0] b _0222E788 _0222E656: - ldr r0, _0222E7A4 ; =gUnknown21C48B8 + ldr r0, _0222E7A4 ; =gMain mov r1, #3 ldr r0, [r0, #0x48] tst r1, r0 @@ -2207,7 +2207,7 @@ _0222E6FA: sub r1, #0x41 bl MOD83_0222E2A8 _0222E708: - ldr r0, _0222E7A4 ; =gUnknown21C48B8 + ldr r0, _0222E7A4 ; =gMain ldr r1, [r0, #0x48] mov r0, #0x80 tst r0, r1 @@ -2281,7 +2281,7 @@ _0222E788: .align 2, 0 _0222E79C: .word 0x00007D8C _0222E7A0: .word MOD83_0222E464 -_0222E7A4: .word gUnknown21C48B8 +_0222E7A4: .word gMain _0222E7A8: .word 0x000005DC thumb_func_end MOD83_0222E540 @@ -2727,7 +2727,7 @@ MOD83_0222EB04: ; 0x0222EB04 mov r0, #1 pop {r3, r4, pc} _0222EB4E: - ldr r0, _0222EB78 ; =gUnknown21C48B8 + ldr r0, _0222EB78 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -2747,7 +2747,7 @@ _0222EB70: add sp, #0x5c pop {r3, r4, pc} nop -_0222EB78: .word gUnknown21C48B8 +_0222EB78: .word gMain thumb_func_end MOD83_0222EB04 thumb_func_start MOD83_0222EB7C @@ -3206,7 +3206,7 @@ _0222EF5A: bl FUN_0201BD70 cmp r0, #0 bne _0222F02C - ldr r0, _0222F040 ; =gUnknown21C48B8 + ldr r0, _0222F040 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r1, r0 @@ -3271,7 +3271,7 @@ _0222EFC2: strb r2, [r4, r1] b _0222F02C _0222EFFC: - ldr r0, _0222F040 ; =gUnknown21C48B8 + ldr r0, _0222F040 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _0222F02C @@ -3302,7 +3302,7 @@ _0222F02C: nop _0222F038: .word 0x00003174 _0222F03C: .word 0x0000317C -_0222F040: .word gUnknown21C48B8 +_0222F040: .word gMain _0222F044: .word 0x000032D2 thumb_func_end MOD83_0222EE8C @@ -3504,7 +3504,7 @@ _0222F1D6: _0222F1EE: cmp r4, #0 beq _0222F206 - ldr r0, _0222F20C ; =gUnknown21C48B8 + ldr r0, _0222F20C ; =gMain ldr r0, [r0, #0x48] tst r0, r4 beq _0222F206 @@ -3517,7 +3517,7 @@ _0222F206: mov r0, #0 pop {r3, r4, r5, pc} nop -_0222F20C: .word gUnknown21C48B8 +_0222F20C: .word gMain thumb_func_end MOD83_0222F1B4 thumb_func_start MOD83_0222F210 @@ -3711,7 +3711,7 @@ _0222F35E: str r0, [r4, r5] b _0222F736 _0222F39C: - ldr r0, _0222F5F4 ; =gUnknown21C48B8 + ldr r0, _0222F5F4 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -3991,7 +3991,7 @@ _0222F5E4: .word 0x000034D8 _0222F5E8: .word 0x00000708 _0222F5EC: .word 0x00003170 _0222F5F0: .word 0x000005DC -_0222F5F4: .word gUnknown21C48B8 +_0222F5F4: .word gMain _0222F5F8: .word MOD83_0223AD6C _0222F5FC: mov r0, #0x16 @@ -4060,7 +4060,7 @@ _0222F664: lsl r0, r0, #2 str r1, [r4, r0] _0222F686: - ldr r0, _0222F748 ; =gUnknown21C48B8 + ldr r0, _0222F748 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -4113,7 +4113,7 @@ _0222F6D0: lsl r0, r0, #2 str r1, [r4, r0] _0222F6F2: - ldr r0, _0222F748 ; =gUnknown21C48B8 + ldr r0, _0222F748 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -4151,7 +4151,7 @@ _0222F736: _0222F73C: .word 0x00003170 _0222F740: .word 0x000034D8 _0222F744: .word 0x000005DC -_0222F748: .word gUnknown21C48B8 +_0222F748: .word gMain thumb_func_end MOD83_0222F210 thumb_func_start MOD83_0222F74C @@ -6013,7 +6013,7 @@ _02230554: str r0, [sp, #8] str r3, [sp, #0xc] add r0, r5, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r0, [r4, #0x6c] ldr r0, [r4, #0x14] cmp r0, #0 @@ -6069,7 +6069,7 @@ MOD83_022305A4: ; 0x022305A4 add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 mov r1, #0 mov r2, #0x1f @@ -6931,7 +6931,7 @@ _02230CFA: mov r0, #8 str r0, [r5] _02230D20: - ldr r0, _02230D80 ; =gUnknown21C48B8 + ldr r0, _02230D80 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -6970,7 +6970,7 @@ _02230D70: .word MOD83_0223B888 _02230D74: .word MOD83_02230084 _02230D78: .word 0x00000624 _02230D7C: .word 0x00000438 -_02230D80: .word gUnknown21C48B8 +_02230D80: .word gMain _02230D84: .word 0x00000434 _02230D88: .word MOD83_0222FFD8 _02230D8C: @@ -7031,7 +7031,7 @@ _02230DE4: str r0, [r5] b _02231334 _02230E14: - ldr r0, _02231124 ; =gUnknown21C48B8 + ldr r0, _02231124 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -7064,7 +7064,7 @@ _02230E4C: str r0, [r5] _02230E58: bl FUN_02031190 - ldr r1, _02231124 ; =gUnknown21C48B8 + ldr r1, _02231124 ; =gMain ldr r2, [r1, #0x48] mov r1, #2 tst r1, r2 @@ -7292,7 +7292,7 @@ _02231030: str r0, [r5] b _02231334 _0223105A: - ldr r0, _02231124 ; =gUnknown21C48B8 + ldr r0, _02231124 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 bne _02231064 @@ -7390,7 +7390,7 @@ _0223111A: b _02231334 .align 2, 0 _02231120: .word 0x00000434 -_02231124: .word gUnknown21C48B8 +_02231124: .word gMain _02231128: .word 0x00002990 _0223112C: .word 0x0000043C _02231130: .word 0x00000624 @@ -7527,7 +7527,7 @@ _02231244: str r0, [r5] b _02231334 _02231252: - ldr r0, _02231354 ; =gUnknown21C48B8 + ldr r0, _02231354 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _02231334 @@ -7570,7 +7570,7 @@ _02231298: str r0, [r4, r1] pop {r4, r5, r6, r7, pc} _022312AA: - ldr r0, _02231354 ; =gUnknown21C48B8 + ldr r0, _02231354 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _02231334 @@ -7647,7 +7647,7 @@ _02231340: nop _0223134C: .word 0x0000043C _02231350: .word 0x00000624 -_02231354: .word gUnknown21C48B8 +_02231354: .word gMain _02231358: .word 0x000005DC _0223135C: .word 0x000015D8 _02231360: .word 0x0000298C @@ -7939,7 +7939,7 @@ _02231572: _0223157A: pop {r4, pc} _0223157C: - ldr r0, _022315CC ; =gUnknown21C48B8 + ldr r0, _022315CC ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -7978,7 +7978,7 @@ _022315BC: _022315C0: .word MOD83_0223B888 _022315C4: .word MOD83_02231440 _022315C8: .word 0x000005D4 -_022315CC: .word gUnknown21C48B8 +_022315CC: .word gMain thumb_func_end MOD83_022314B4 thumb_func_start MOD83_022315D0 @@ -8254,7 +8254,7 @@ MOD83_022317A8: ; 0x022317A8 add r0, r5, #0 add r2, r7, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r5, #0 bl FUN_020191D0 add r0, r7, #0 @@ -8567,7 +8567,7 @@ MOD83_02231A4C: ; 0x02231A4C mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #1 @@ -8629,7 +8629,7 @@ _02231ADE: mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor mov r0, #1 @@ -8723,7 +8723,7 @@ MOD83_02231B84: ; 0x02231B84 mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor mov r0, #0 @@ -8768,7 +8768,7 @@ MOD83_02231BD8: ; 0x02231BD8 mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 @@ -9156,7 +9156,7 @@ _02231EBE: ldr r1, [r4, #0x14] ldr r3, [r4, #0x28] add r0, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x30] bl String_dtor _02231F20: @@ -9293,7 +9293,7 @@ _02231FFE: str r3, [sp, #0xc] ldr r1, [r4, #0x14] add r0, r6, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [sp, #0x14] bl String_dtor ldr r0, _02232090 ; =0x000029A4 @@ -10078,7 +10078,7 @@ _02232664: .word 0x00003CE8 MOD83_02232668: ; 0x02232668 push {r3, r4, r5, r6, r7, lr} add r7, r2, #0 - ldr r2, _02232768 ; =gUnknown21C48B8 + ldr r2, _02232768 ; =gMain add r6, r1, #0 ldr r3, [r2, #0x48] ldr r1, _0223276C ; =0x00003CEC @@ -10092,7 +10092,7 @@ MOD83_02232668: ; 0x02232668 mov r2, #1 str r2, [r5, r1] _02232686: - ldr r1, _02232768 ; =gUnknown21C48B8 + ldr r1, _02232768 ; =gMain ldr r2, [r1, #0x48] mov r1, #0x20 tst r1, r2 @@ -10131,7 +10131,7 @@ _022326C4: ldr r0, [r5, r0] bl FUN_02020130 _022326CC: - ldr r0, _02232768 ; =gUnknown21C48B8 + ldr r0, _02232768 ; =gMain mov r4, #0 ldr r1, [r0, #0x48] mov r0, #2 @@ -10209,7 +10209,7 @@ _0223275A: _02232764: pop {r3, r4, r5, r6, r7, pc} nop -_02232768: .word gUnknown21C48B8 +_02232768: .word gMain _0223276C: .word 0x00003CEC _02232770: .word 0x00002D64 _02232774: .word 0x00002D68 @@ -10381,7 +10381,7 @@ _022328DC: ldr r1, _02232B6C ; =0x00002B60 mov r2, #0x40 ldr r6, [r4, r1] - ldr r1, _02232B74 ; =gUnknown21C48B8 + ldr r1, _02232B74 ; =gMain ldr r1, [r1, #0x48] add r3, r1, #0 tst r3, r2 @@ -10461,7 +10461,7 @@ _0223297E: add r1, r5, #0 mov r2, #0 bl MOD83_02232208 - ldr r0, _02232B74 ; =gUnknown21C48B8 + ldr r0, _02232B74 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -10513,7 +10513,7 @@ _022329D6: b _02232CF4 _022329FA: bl MOD83_022324DC - ldr r0, _02232B74 ; =gUnknown21C48B8 + ldr r0, _02232B74 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r1, r0 @@ -10672,7 +10672,7 @@ _02232B64: .word 0x00002B58 _02232B68: .word 0x00002B5C _02232B6C: .word 0x00002B60 _02232B70: .word 0x0000299C -_02232B74: .word gUnknown21C48B8 +_02232B74: .word gMain _02232B78: .word 0x000005DC _02232B7C: .word 0x00002B70 _02232B80: .word 0x00002B90 @@ -10813,7 +10813,7 @@ _02232C90: bl MOD83_02233084 b _02232CF4 _02232CB8: - ldr r0, _02232D38 ; =gUnknown21C48B8 + ldr r0, _02232D38 ; =gMain ldr r1, [r0, #0x48] mov r0, #3 tst r0, r1 @@ -10869,7 +10869,7 @@ _02232D28: .word 0x00002BE0 _02232D2C: .word 0x00002BD4 _02232D30: .word 0x00002D78 _02232D34: .word 0x00003CF0 -_02232D38: .word gUnknown21C48B8 +_02232D38: .word gMain _02232D3C: .word 0x00002BE4 _02232D40: .word 0x00003CE8 thumb_func_end MOD83_02232788 @@ -11125,7 +11125,7 @@ _02232EE6: ldr r0, [sp, #0x10] ldr r2, [sp, #0x20] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 b _02232F4A _02232F30: mov r0, #0xff @@ -11139,7 +11139,7 @@ _02232F30: ldr r0, [sp, #0x10] ldr r2, [sp, #0x20] add r3, r1, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 _02232F4A: ldr r0, [sp, #0x20] bl String_dtor @@ -11173,7 +11173,7 @@ _02232F4A: ldr r0, [sp, #0x10] add r2, r7, #0 mov r3, #0x50 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r7, #0 bl String_dtor add r5, #0x18 @@ -11257,7 +11257,7 @@ MOD83_02232FE4: ; 0x02232FE4 add r0, r4, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl FUN_020191D0 add r0, r6, #0 @@ -15551,7 +15551,7 @@ _02234FB2: str r0, [sp, #0xc] ldr r0, [r5] ldr r1, [r5, #0x28] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r0, [r5, #0x48] ldr r0, [sp, #0x18] bl String_dtor @@ -15592,7 +15592,7 @@ _02235004: str r0, [sp, #0xc] ldr r0, [r5] ldr r1, [r5, #0x28] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r0, [r5, #0x48] add r0, r7, #0 bl String_dtor @@ -15616,7 +15616,7 @@ _0223504C: ldr r0, [r5] ldr r1, [r5, #0x28] ldr r2, [r5, #0x3c] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 str r0, [r5, #0x48] mov r0, #0 str r0, [r5, #0x3c] @@ -18479,7 +18479,7 @@ _02236730: ldrh r0, [r0, #0x20] cmp r0, #0 bne _02236740 - ldr r0, _02236760 ; =gUnknown21C48B8 + ldr r0, _02236760 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _02236750 @@ -18497,7 +18497,7 @@ _02236750: _02236754: .word 0x000005DC _02236758: .word 0x00000474 _0223675C: .word UNK_021C48F8 -_02236760: .word gUnknown21C48B8 +_02236760: .word gMain thumb_func_end MOD83_022366D0 thumb_func_start MOD83_02236764 @@ -18795,7 +18795,7 @@ _022369CE: ldrh r0, [r0, #0x20] cmp r0, #0 bne _022369DE - ldr r0, _02236B58 ; =gUnknown21C48B8 + ldr r0, _02236B58 ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _02236A0E @@ -18972,7 +18972,7 @@ _02236B48: .word 0x0000E880 _02236B4C: .word MOD83_0223650C _02236B50: .word 0x0000E88C _02236B54: .word UNK_021C48F8 -_02236B58: .word gUnknown21C48B8 +_02236B58: .word gMain _02236B5C: .word 0x00000498 _02236B60: .word 0x0000E898 _02236B64: .word 0x0000E888 @@ -19225,7 +19225,7 @@ _02236D54: ldrh r0, [r0, #0x20] cmp r0, #0 bne _02236D64 - ldr r0, _02236DCC ; =gUnknown21C48B8 + ldr r0, _02236DCC ; =gMain ldr r0, [r0, #0x48] cmp r0, #0 beq _02236D90 @@ -19270,7 +19270,7 @@ _02236DBC: .word 0x0000E898 _02236DC0: .word 0x0000061B _02236DC4: .word 0x0000042C _02236DC8: .word UNK_021C48F8 -_02236DCC: .word gUnknown21C48B8 +_02236DCC: .word gMain thumb_func_end MOD83_02236804 thumb_func_start MOD83_02236DD0 @@ -23124,7 +23124,7 @@ _0223899C: ldr r0, [r5, #0x10] ldr r1, [r5, #0x40] ldr r3, [r5, #0x20] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r0, #0 b _02238A12 _022389D0: @@ -23153,7 +23153,7 @@ _022389D0: str r0, [sp, #0xc] ldr r0, [r5, #0x10] ldr r1, [r5, #0x40] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r7, r0, #0 mov r0, #0 str r0, [r5, #0xc] @@ -26076,7 +26076,7 @@ _0223A02C: bl MOD83_02239DF0 str r0, [r5] _0223A034: - ldr r0, _0223A280 ; =gUnknown21C48B8 + ldr r0, _0223A280 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -26120,7 +26120,7 @@ _0223A07A: ldr r0, _0223A274 ; =0x0000100D str r0, [r5] _0223A088: - ldr r0, _0223A280 ; =gUnknown21C48B8 + ldr r0, _0223A280 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -26241,7 +26241,7 @@ _0223A174: ldr r0, [r0] cmp r0, #0 bne _0223A1C4 - ldr r0, _0223A280 ; =gUnknown21C48B8 + ldr r0, _0223A280 ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -26353,7 +26353,7 @@ _0223A270: .word MOD83_0223CADC _0223A274: .word 0x0000100D _0223A278: .word MOD04_021DD984 _0223A27C: .word 0x00001004 -_0223A280: .word gUnknown21C48B8 +_0223A280: .word gMain _0223A284: .word 0x00001005 _0223A288: .word 0x00001006 _0223A28C: .word MOD83_02239EF4 @@ -26380,7 +26380,7 @@ _0223A2CE: str r0, [r5] b _0223A342 _0223A2D4: - ldr r0, _0223A34C ; =gUnknown21C48B8 + ldr r0, _0223A34C ; =gMain ldr r1, [r0, #0x48] mov r0, #1 tst r0, r1 @@ -26406,7 +26406,7 @@ _0223A2F8: str r0, [r5] b _0223A342 _0223A30C: - ldr r0, _0223A34C ; =gUnknown21C48B8 + ldr r0, _0223A34C ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -26427,7 +26427,7 @@ _0223A31E: str r0, [r5] b _0223A342 _0223A332: - ldr r0, _0223A34C ; =gUnknown21C48B8 + ldr r0, _0223A34C ; =gMain ldr r1, [r0, #0x48] mov r0, #2 tst r0, r1 @@ -26440,7 +26440,7 @@ _0223A342: pop {r3, r4, r5, pc} nop _0223A348: .word 0x00001010 -_0223A34C: .word gUnknown21C48B8 +_0223A34C: .word gMain _0223A350: .word 0x00002620 _0223A354: .word MOD83_0223CADC _0223A358: .word 0x000015F4 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 5794638d..a00ea88f 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -318,7 +318,7 @@ _021D778E: ldr r0, [r4, #0x1c] cmp r0, #0 bne _021D77C8 - ldr r0, _021D7928 ; =gUnknown21C48B8 + ldr r0, _021D7928 ; =gMain ldr r1, [r0, #0x48] mov r0, #8 tst r0, r1 @@ -438,7 +438,7 @@ _021D7868: str r0, [r5] b _021D7920 _021D7874: - ldr r0, _021D7928 ; =gUnknown21C48B8 + ldr r0, _021D7928 ; =gMain ldr r1, [r0, #0x48] mov r0, #9 tst r0, r1 @@ -526,7 +526,7 @@ _021D7920: add sp, #0xc pop {r4, r5, pc} nop -_021D7928: .word gUnknown21C48B8 +_021D7928: .word gMain _021D792C: .word 0x0000122C _021D7930: .word MOD84_021DA6FC _021D7934: .word 0x00001228 diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 1b7cf306..f80b3bb3 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -707,7 +707,7 @@ _021D864C: str r1, [sp, #0xc] ldr r0, [r5, #0x24] ldr r2, [r5, #0x30] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 cmp r4, #0xf0 ble _021D86D0 ldr r0, [r5, #0x28] @@ -723,7 +723,7 @@ _021D864C: str r1, [sp, #0xc] ldr r0, [r5, #0x28] ldr r2, [r5, #0x30] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r1, [r5, #0x28] sub r4, #0xf0 ldrb r2, [r1, #7] @@ -911,7 +911,7 @@ _021D87D0: str r1, [sp, #0x14] ldr r0, [r5, #0x24] ldr r2, [r5, #0x30] - bl FUN_0201BE3C + bl AddTextPrinterParameterized3 ldr r0, [r5, #0x24] bl FUN_02019548 add sp, #0x18 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 76c469d4..c40d4f3b 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -862,7 +862,7 @@ MOD85_021D7BEC: ; 0x021D7BEC ldr r2, [r4, #0x18] add r0, #8 mov r1, #1 - bl FUN_0201BD84 + bl AddTextPrinterParameterized add r4, #8 add r0, r4, #0 bl FUN_02019220 @@ -1892,7 +1892,7 @@ _021D8418: thumb_func_start MOD85_021D841C MOD85_021D841C: ; 0x021D841C push {r4, lr} - ldr r1, _021D850C ; =gUnknown21C48B8 + ldr r1, _021D850C ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] ldr r1, [r4, #0x7c] @@ -2004,7 +2004,7 @@ _021D8508: mov r0, #0 pop {r4, pc} .align 2, 0 -_021D850C: .word gUnknown21C48B8 +_021D850C: .word gMain _021D8510: .word 0x00000626 thumb_func_end MOD85_021D841C @@ -2734,7 +2734,7 @@ _021D8A4C: thumb_func_start MOD85_021D8A50 MOD85_021D8A50: ; 0x021D8A50 push {r4, lr} - ldr r1, _021D8B40 ; =gUnknown21C48B8 + ldr r1, _021D8B40 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] ldr r1, [r4, #0x7c] @@ -2846,7 +2846,7 @@ _021D8B3C: mov r0, #0 pop {r4, pc} .align 2, 0 -_021D8B40: .word gUnknown21C48B8 +_021D8B40: .word gMain _021D8B44: .word 0x00000626 thumb_func_end MOD85_021D8A50 @@ -3448,7 +3448,7 @@ _021D8FAC: thumb_func_start MOD85_021D8FB0 MOD85_021D8FB0: ; 0x021D8FB0 push {r4, lr} - ldr r1, _021D90A8 ; =gUnknown21C48B8 + ldr r1, _021D90A8 ; =gMain add r4, r0, #0 ldr r2, [r1, #0x48] ldr r1, [r4, #0x7c] @@ -3563,7 +3563,7 @@ _021D90A2: mov r0, #0 pop {r4, pc} nop -_021D90A8: .word gUnknown21C48B8 +_021D90A8: .word gMain _021D90AC: .word 0x000005F5 thumb_func_end MOD85_021D8FB0 @@ -7637,7 +7637,7 @@ _021DAE16: str r0, [r5] pop {r3, r4, r5, pc} _021DAE20: - ldr r1, _021DAE68 ; =gUnknown21C48B8 + ldr r1, _021DAE68 ; =gMain mov r0, #3 ldr r2, [r1, #0x44] ldr r1, _021DAE6C ; =0x00000C03 @@ -7674,7 +7674,7 @@ _021DAE5E: .align 2, 0 _021DAE60: .word 0x0000062D _021DAE64: .word 0x0000C350 -_021DAE68: .word gUnknown21C48B8 +_021DAE68: .word gMain _021DAE6C: .word 0x00000C03 thumb_func_end MOD85_021DAD70 @@ -9772,7 +9772,7 @@ _021DBD4C: thumb_func_start MOD85_021DBD54 MOD85_021DBD54: ; 0x021DBD54 - ldr r1, _021DBD70 ; =gUnknown21C48B8 + ldr r1, _021DBD70 ; =gMain ldr r1, [r1, #0x48] and r1, r0 cmp r1, r0 @@ -9788,7 +9788,7 @@ _021DBD6A: mov r0, #0 bx lr nop -_021DBD70: .word gUnknown21C48B8 +_021DBD70: .word gMain thumb_func_end MOD85_021DBD54 thumb_func_start MOD85_021DBD74 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 0be44134..166d85a6 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -174,7 +174,7 @@ _021D764E: str r0, [r5] b _021D76A0 _021D765C: - ldr r0, _021D76A8 ; =gUnknown21C48B8 + ldr r0, _021D76A8 ; =gMain ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 @@ -213,7 +213,7 @@ _021D76A0: add sp, #0xc pop {r3, r4, r5, r6, pc} nop -_021D76A8: .word gUnknown21C48B8 +_021D76A8: .word gMain _021D76AC: .word UNK_021C48F8 thumb_func_end MOD86_021D758C @@ -828,7 +828,7 @@ MOD86_021D7B80: ; 0x021D7B80 add r2, r4, #0 mov r3, #0x30 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x20 str r0, [sp] mov r1, #0 @@ -840,7 +840,7 @@ MOD86_021D7B80: ; 0x021D7B80 add r2, r4, #0 mov r3, #0x30 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r6, #0 bl String_dtor ldr r0, [r5, #4] @@ -864,7 +864,7 @@ _021D7C02: add r0, #0x14 add r2, r4, #0 str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r3, #0x40 str r3, [sp] mov r1, #0 @@ -875,7 +875,7 @@ _021D7C02: str r1, [sp, #0xc] add r0, #0x24 add r2, r4, #0 - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 ldr r0, [r5, #0x34] mov r1, #3 add r2, r4, #0 @@ -891,7 +891,7 @@ _021D7C02: add r2, r4, #0 mov r3, #0x8a str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 mov r0, #0x90 str r0, [sp] mov r1, #0 @@ -903,7 +903,7 @@ _021D7C02: add r2, r4, #0 mov r3, #0x8a str r1, [sp, #0xc] - bl FUN_0201BDE0 + bl AddTextPrinterParameterized2 add r0, r4, #0 bl String_dtor add sp, #0x10 |