diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 11:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:56:24 -0500 |
| commit | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (patch) | |
| tree | d45390654cd3f80ffccd4af95760133ef77366bd /asm/mystery_event_script.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
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: |