diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-08-13 19:12:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 19:12:12 +0300 |
| commit | a82d0d55a67b12757b185fd149d6a14dcc7cad02 (patch) | |
| tree | 829d21a866de69dc92e1b8e5bb1857a21104027c /arm9/modules/81 | |
| parent | c259e6ed18294c001033fed62d924d379276021a (diff) | |
| parent | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (diff) | |
Merge pull request #261 from PikalaxALT/pikalax_work
Name some scrcmds; save block 2 struct resolution
Diffstat (limited to 'arm9/modules/81')
| -rw-r--r-- | arm9/modules/81/asm/module_81.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index c5c4a97f..6b04578f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2467,7 +2467,7 @@ _022390F4: ldr r1, [r4, #0x58] ldr r2, [r4, #0x54] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -2509,7 +2509,7 @@ _02239138: ldr r1, [r4, #0x58] ldr r2, [r4, #0x54] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4] bl MOD81_02238818 mov r1, #0x4c @@ -9591,7 +9591,7 @@ _0223C982: ldr r1, [r4, #0x5c] ldr r2, [r4, #0x58] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl FUN_020191D0 ldr r0, _0223CA90 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -9636,7 +9636,7 @@ _0223C9D0: ldr r1, [r4, #0x5c] ldr r2, [r4, #0x58] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 add r0, #0x48 mov r1, #0xf |