diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 17:26:40 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 17:26:40 -0500 |
| commit | cc0fd6e12c0afe9b70f55114eb3123014318e107 (patch) | |
| tree | 2f14fd504debcb9aa65caf52e3465c7630b0affc /engine | |
| parent | a8cf8979d9acf66d1bdf4ea115ab6a0faa8f9d34 (diff) | |
CRYSTAL11 → _CRYSTAL11
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/battle_tower/load_trainer.asm | 2 | ||||
| -rwxr-xr-x | engine/events/battle_tower/trainer_text.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 5389f3f2e..bf8b20a27 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -26,7 +26,7 @@ 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 $7f else and $1f diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 21704ff2d..96c91caa9 100755 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -7,7 +7,7 @@ BattleTowerText:: ; 11c000 push af ld a, BANK(BT_OTTrainerClass) ld [rSVBK], a -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) ld hl, BT_OTTrainerClass else ; BUG ALERT @@ -16,7 +16,7 @@ else ; uses it to get the gender of the trainer. ; As a consequence, the enemy trainer's dialog will ; always be sampled from the female array. - ld hl, BT_OTName + 5 + ld hl, BT_OTName + NAME_LENGTH_JAPANESE - 1 endc ld a, [hl] dec a |