diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-22 09:45:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 09:45:44 -0400 |
| commit | 8e4e344c7d086ef252b60d7d722741854a05ee79 (patch) | |
| tree | 26f450f8f4180de278e828cf1a9cced341f91c2f /data | |
| parent | b6dffcf8b774ca06287dda30fa5a6323bd8835f6 (diff) | |
| parent | 1ffa890d27273590f5d9b99b15c3747dc06106d8 (diff) | |
Merge branch 'master' into document-scriptmenu
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 1 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 4 | ||||
| -rw-r--r-- | data/scripts/trainer_battle.inc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 227f16eb7..d5a6ce14d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -17,6 +17,7 @@ #include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/moves.h" +#include "constants/pokemon.h" #include "constants/script_menu.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index d9a5157ab..8e49c982f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 @@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index c205a9d22..21ba0d6d3 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A compare VAR_RESULT, 0 goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 compare VAR_RESULT, 0 goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement |