diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-10 10:11:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-10 10:11:48 -0400 |
| commit | f17073efa07f1ee054dd6ab1fdd2c5ce35dbf27a (patch) | |
| tree | 1faccb9341907667d84fa2cda0ad226b68ad3f40 /arm9/modules/05 | |
| parent | c259e6ed18294c001033fed62d924d379276021a (diff) | |
Name some symbols in scrcmd space
Diffstat (limited to 'arm9/modules/05')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E1AD8.s | 14 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 8dba7426..75dbdcd9 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -340,7 +340,7 @@ MOD05_021E1D38: ; 0x021E1D38 ldr r0, [r0] ldr r1, [r1, #0x1c] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x9b ldrb r2, [r0] @@ -782,7 +782,7 @@ MOD05_021E2094: ; 0x021E2094 ldr r0, [r0] ldr r1, [r1, #0x1c] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x9b ldrb r1, [r0] @@ -1201,7 +1201,7 @@ MOD05_021E23D0: ; 0x021E23D0 ldr r0, [r0] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] str r7, [sp, #4] @@ -1373,7 +1373,7 @@ MOD05_021E2540: ; 0x021E2540 ldr r0, [r0] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders str r7, [sp] mov r0, #0xff str r0, [sp, #4] @@ -1840,7 +1840,7 @@ MOD05_021E28A0: ; 0x021E28A0 ldr r2, [sp, #0x10] add r0, r6, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -1968,7 +1968,7 @@ MOD05_021E29C8: ; 0x021E29C8 ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -2088,7 +2088,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 6e557880..c3d8b34d 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -311,7 +311,7 @@ MOD05_021E2DD4: ; 0x021E2DD4 ldr r0, [r4, #8] ldr r1, [r4] ldr r2, [r4, #4] - bl FUN_0200B7B8 + bl StringExpandPlaceholders pop {r4, pc} .balign 4, 0 @@ -27473,7 +27473,7 @@ _021F0204: ldr r0, [r4, #0x38] ldr r1, [r4, #0xc] ldr r2, [r4, #8] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x30] add r1, r4, #0 ldr r0, [r0, #8] @@ -40043,7 +40043,7 @@ MOD05_021F6140: ; 0x021F6140 ldr r0, [r5, #0x34] ldr r1, [r5, #0x2c] ldr r2, [r5, #0x30] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0xc] bl LoadPlayerDataAddress add r2, r0, #0 |