diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
| commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
| tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /data/scripts | |
| parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
| parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1914fee4f..e0b289899 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -22,7 +22,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB - specialvar VAR_RESULT, sub_801B27C + specialvar VAR_RESULT, ValidateReceivedWonderCard compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF goto OldaleTown_PokemonCenter_2F_EventScript_276AFB |