diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-16 17:57:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 17:57:50 -0400 |
| commit | d574795b729742efb26b80a1c5b798cd0f58c3f4 (patch) | |
| tree | 46256c02f8d772d76a81c1ec2a9f4bd15fb05b0f /asm/mystery_event_script.s | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
| parent | 5e12833b13223ecc6a5a9c91332ed71303358680 (diff) | |
Merge pull request #32 from Diegoisawesome/master
Extract baserom calls from data2.s and begin tidying up strings.s
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 5ebe80e05..d481c2a3b 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -669,14 +669,14 @@ sub_8153CC8: @ 8153CC8 cmp r4, r0 bne _08153D18 ldr r0, =gStringVar1 - ldr r1, =gEggNickname + ldr r1, =gText_EggNickname movs r2, 0xB bl StringCopyN b _08153D22 .pool _08153D18: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085E8268 + ldr r1, =gText_Pokemon movs r2, 0xB bl StringCopyN _08153D22: |