diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 21:22:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-28 22:13:39 -0500 |
| commit | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /engine/events | |
| parent | 4c35f3ac8506e5f326658bbab91c257584f7b716 (diff) | |
Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW)
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/battle_tower.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/battle_tower.asm b/engine/events/battle_tower.asm index b880a099b..a0de6ee84 100644 --- a/engine/events/battle_tower.asm +++ b/engine/events/battle_tower.asm @@ -26,13 +26,13 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ld a, [hRandomAdd] add b ld b, a ; b contains the nr of the trainer -IF DEF(CRYSTAL11) +if DEF(CRYSTAL11) and (1 << 7) - 1 cp 70 -ELSE +else and (1 << 5) - 1 cp 21 -ENDC +endc jr nc, .resample ld b, a |