diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-14 11:53:20 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-14 14:20:49 -0800 |
| commit | 12681346688870e71b1a33dae7e52f9e1302080f (patch) | |
| tree | 4b489a31e653ca27d43bd5f8c3c6d00c25394134 /asm/menu_helpers.s | |
| parent | 2f76de380c28a7c0f2163e1f45e1ff007258f877 (diff) | |
decompile string_util
Diffstat (limited to 'asm/menu_helpers.s')
| -rw-r--r-- | asm/menu_helpers.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 6529e74a6..d936c5085 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -131,13 +131,13 @@ DisplayMessageAndContinueTask: @ 8121E7C adds r0, r6, 0 movs r1, 0x1 bl sub_8197B1C - ldr r4, =gUnknown_02021FC4 + ldr r4, =gStringVar4 ldr r0, [sp, 0x30] cmp r0, r4 beq _08121EC0 adds r0, r4, 0 ldr r1, [sp, 0x30] - bl ExpandStringRefs + bl StringExpandPlaceholders _08121EC0: ldr r2, =gUnknown_03003014 ldrb r0, [r2] @@ -409,7 +409,7 @@ _081220C8: thumb_func_start GetLRKeysState GetLRKeysState: @ 81220D0 push {lr} - ldr r0, =gUnknown_03005D90 + ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -442,7 +442,7 @@ _08122108: thumb_func_start sub_812210C sub_812210C: @ 812210C push {lr} - ldr r0, =gUnknown_03005D90 + ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -479,7 +479,7 @@ sub_8122148: @ 8122148 lsrs r0, 16 cmp r0, 0xAF bne _08122174 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x00001919 |