diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-17 18:01:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 18:01:20 -0400 |
| commit | 58b8d7c297576846aeef4173bbe8a6a71608ad98 (patch) | |
| tree | 319f3958ba9d39b05eac1d8ca5d4937c1224577d /data/scripts | |
| parent | 945d3d3a27f6e5005e5481bb2ad36f1a2a220d3d (diff) | |
| parent | 459fca289caa2be09864412c82a868862978f082 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 2fe90a4c9..e8d42f184 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -978,7 +978,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B faceplayer setvar VAR_FRONTIER_FACILITY, 8 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - specialvar VAR_RESULT, sub_813990C + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED @@ -1086,7 +1086,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 faceplayer setvar VAR_FRONTIER_FACILITY, 9 goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements - specialvar VAR_RESULT, sub_813990C + specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, IsWirelessAdapterConnected |