diff options
Diffstat (limited to 'arm9/modules/05')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E1AD8.s | 16 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 22 |
2 files changed, 19 insertions, 19 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 |