diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 13:59:07 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 13:59:07 -0500 |
| commit | bc79f17b9dff053ce5613e4008596a55a6110d66 (patch) | |
| tree | 96533d3cf291a5a877f2235016c51617e5f58dac /engine | |
| parent | 417937cffc2a7c3cfac49f3b00caf1a856d0a925 (diff) | |
More maskbits
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/battle_tower/load_trainer.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 08571dcef..67c9d2232 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -27,12 +27,12 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 add b ld b, a ; b contains the nr of the trainer if DEF(_CRYSTAL11) - and BATTLETOWER_TRAINER_MASK + maskbits BATTLETOWER_NUM_UNIQUE_TRAINERS cp BATTLETOWER_NUM_UNIQUE_TRAINERS else -; Crystal 1.0 used the wrong constants here, so only the first 21 +; Crystal 1.0 used the wrong constant here, so only the first 21 ; trainers in BattleTowerTrainers can be sampled. - and BATTLETOWER_PKMN_MASK + maskbits BATTLETOWER_NUM_UNIQUE_PKMN cp BATTLETOWER_NUM_UNIQUE_PKMN endc jr nc, .resample @@ -115,7 +115,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld a, [hRandomAdd] add b ld b, a - and BATTLETOWER_PKMN_MASK + maskbits BATTLETOWER_NUM_UNIQUE_PKMN cp BATTLETOWER_NUM_UNIQUE_PKMN jr nc, .resample ; in register 'a' is the chosen Pkmn of the LevelGroup |