diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
| commit | aa6e1a91fc89d01ad65eb532d6832767c936807a (patch) | |
| tree | 77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /asm/mystery_event_script.s | |
| parent | 46e957bacd9ba5538262c89bb87e1915167bb201 (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 18b6066d9..b150bb586 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -511,20 +511,20 @@ sub_80DAB80: @ 80DAB80 cmp r4, r0 bne _080DABD0 ldr r0, _080DABC8 @ =gStringVar1 - ldr r1, _080DABCC @ =gUnknown_8415A62 + ldr r1, _080DABCC @ =gText_EggNickname movs r2, 0xB bl StringCopyN b _080DABDA .align 2, 0 _080DABC8: .4byte gStringVar1 -_080DABCC: .4byte gUnknown_8415A62 +_080DABCC: .4byte gText_EggNickname _080DABD0: ldr r0, _080DABF0 @ =gStringVar1 ldr r1, _080DABF4 @ =gUnknown_8415A66 movs r2, 0xB bl StringCopyN _080DABDA: - ldr r0, _080DABF8 @ =gUnknown_2024029 + ldr r0, _080DABF8 @ =gPlayerPartyCount ldrb r0, [r0] cmp r0, 0x6 bne _080DAC04 @@ -536,7 +536,7 @@ _080DABDA: .align 2, 0 _080DABF0: .4byte gStringVar1 _080DABF4: .4byte gUnknown_8415A66 -_080DABF8: .4byte gUnknown_2024029 +_080DABF8: .4byte gPlayerPartyCount _080DABFC: .4byte gStringVar4 _080DAC00: .4byte gUnknown_8488D8E _080DAC04: |