diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /data/battle_tower/classes.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'data/battle_tower/classes.asm')
| -rw-r--r-- | data/battle_tower/classes.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/battle_tower/classes.asm b/data/battle_tower/classes.asm index 5a148e6ec..c53197548 100644 --- a/data/battle_tower/classes.asm +++ b/data/battle_tower/classes.asm @@ -1,4 +1,4 @@ -BattleTowerTrainers: ; 1f814e +BattleTowerTrainers: ; The trainer class is not used in Crystal 1.0 due to a bug. ; Instead, the sixth character in the trainer's name is used. ; See BattleTowerText in engine/events/battle_tower/trainer_text.asm. @@ -73,4 +73,3 @@ BattleTowerTrainers: ; 1f814e db "DYKSTRA@@@", SWIMMERF db "EATON@@@@@", BIKER db "WONG@@@@@@", FIREBREATHER -; 1f8450 |