diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-07 09:23:21 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-07 09:23:21 -0500 |
| commit | 64485f5cd106285e6ed7ec461db49e02b6308d8a (patch) | |
| tree | 2e10109e1907705991155c8a86b9d82b5ae2de9c /data | |
| parent | ed426e1f8fb52a79eed074597b210a0f60a30106 (diff) | |
TRAINER_SECRET_BASE propagation
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index c4b0117a5..b802723b7 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8,6 +8,7 @@ #include "constants/species.h" #include "constants/pokemon.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "constants/game_stat.h" #include "battle_string_ids.h" .include "asm/macros/battle_script.inc" @@ -2931,7 +2932,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerLost jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_EReaderOrSecretBaseTrainerEnd - jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 1024, BattleScript_EReaderOrSecretBaseTrainerEnd + jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, TRAINER_SECRET_BASE, BattleScript_EReaderOrSecretBaseTrainerEnd jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_RivalBattleLost BattleScript_LocalBattleLostPrintWhiteOut:: jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd |