diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 19:21:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 19:21:51 -0400 |
| commit | 24bb85896d9e670c0fa419dc7cb6c96b5d0806c7 (patch) | |
| tree | eba61257e555461f5d9662fea9477561bef51adf /asm/naming_screen.s | |
| parent | 532907559304e1b32f8efa76e2fb8a2fc526ec02 (diff) | |
| parent | c85f726224bbe53502ba98557d2c89eef89d7fbd (diff) | |
Merge pull request #47 from PikalaxALT/roamer
Roamer
Diffstat (limited to 'asm/naming_screen.s')
| -rw-r--r-- | asm/naming_screen.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/naming_screen.s b/asm/naming_screen.s index b3c9d1f73..01217d92f 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -401,8 +401,8 @@ _0809DBD6: movs r1, 0 movs r2, 0 bl ChangeBgY - bl sub_80F6C6C - bl sub_80F6C98 + bl InitStandardTextBoxWindows + bl ResetBg0 _0809DCA4: lsls r0, r4, 3 ldr r1, _0809DD50 @ =gUnknown_83E22A0 @@ -493,7 +493,7 @@ sub_809DD60: @ 809DD60 bl SetMainCallback2 bl sub_812B234 movs r0, 0x3 - bl sub_812B1F0 + bl HelpSystem_SetSomeVariable2 pop {r0} bx r0 .align 2, 0 @@ -959,13 +959,13 @@ _0809E156: bl StringExpandPlaceholders movs r0, 0 movs r1, 0 - bl sub_80F6EE4 + bl DrawDialogueFrame ldr r2, _0809E1D0 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - bl sub_80F78A8 + bl GetTextSpeedSetting adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 |