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/76 | |
| 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/76')
| -rw-r--r-- | arm9/modules/76/asm/module_76.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index ed94aa20..3a079284 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -1098,7 +1098,7 @@ MOD76_021D7D60: ; 0x021D7D60 ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add sp, #8 @@ -2000,7 +2000,7 @@ _021D84D8: ldr r0, [r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor pop {r3, r4, r5, pc} @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 |