diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
| commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
| tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/menu_helpers.s | |
| parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
| parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/menu_helpers.s')
| -rw-r--r-- | asm/menu_helpers.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 6529e74a6..32ed2997e 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] @@ -326,7 +326,7 @@ AdjustQuantityAccordingToDPadInput: @ 8122034 adds r5, r1, 0 ldrh r4, [r2] adds r6, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x30] movs r3, 0xF0 ands r3, r0 @@ -409,12 +409,12 @@ _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 bne _08122106 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 @@ -442,12 +442,12 @@ _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 bne _08122142 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x80 lsls r0, 2 @@ -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 |