aboutsummaryrefslogtreecommitdiffstats
path: root/data/trainers/encounter_types.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /data/trainers/encounter_types.asm
parentMerge pull request #269 from Rangi42/master (diff)
parentDon't compare strings with ==; use STRCMP (diff)
downloadpokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/trainers/encounter_types.asm')
-rwxr-xr-xdata/trainers/encounter_types.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm
index cc7ca605..222b5868 100755
--- a/data/trainers/encounter_types.asm
+++ b/data/trainers/encounter_types.asm
@@ -3,7 +3,7 @@ FemaleTrainerList::
db OPP_JR_TRAINER_F
db OPP_BEAUTY
db OPP_COOLTRAINER_F
- db $FF
+ db -1 ; end
EvilTrainerList::
db OPP_JUGGLER_X
@@ -14,4 +14,4 @@ EvilTrainerList::
db OPP_SCIENTIST
db OPP_GIOVANNI
db OPP_ROCKET
- db $FF
+ db -1 ; end