aboutsummaryrefslogtreecommitdiffstats
path: root/data/trainers/name_pointers.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/trainers/name_pointers.asm
parentMerge pull request #277 from Rangi42/master (diff)
parentMissingno's Pokédex weight is two bytes like the rest (diff)
downloadpokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/trainers/name_pointers.asm')
-rw-r--r--data/trainers/name_pointers.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm
index 537a95e3..98e2e406 100644
--- a/data/trainers/name_pointers.asm
+++ b/data/trainers/name_pointers.asm
@@ -12,7 +12,7 @@ TrainerNamePointers:
dw wTrainerName
dw .BurglarName
dw .EngineerName
- dw .JugglerXName
+ dw .UnusedJugglerName
dw wTrainerName
dw .SwimmerName
dw wTrainerName
@@ -48,24 +48,24 @@ TrainerNamePointers:
dw wTrainerName
dw wTrainerName
-.YoungsterName: db "YOUNGSTER@"
-.BugCatcherName: db "BUG CATCHER@"
-.LassName: db "LASS@"
-.JrTrainerMName: db "JR.TRAINER♂@"
-.JrTrainerFName: db "JR.TRAINER♀@"
-.PokemaniacName: db "POKéMANIAC@"
-.SuperNerdName: db "SUPER NERD@"
-.BurglarName: db "BURGLAR@"
-.EngineerName: db "ENGINEER@"
-.JugglerXName: db "JUGGLER@"
-.SwimmerName: db "SWIMMER@"
-.BeautyName: db "BEAUTY@"
-.RockerName: db "ROCKER@"
-.JugglerName: db "JUGGLER@"
-.BlackbeltName: db "BLACKBELT@"
-.ProfOakName: db "PROF.OAK@"
-.ChiefName: db "CHIEF@"
-.ScientistName: db "SCIENTIST@"
-.RocketName: db "ROCKET@"
-.CooltrainerMName: db "COOLTRAINER♂@"
-.CooltrainerFName: db "COOLTRAINER♀@"
+.YoungsterName: db "YOUNGSTER@"
+.BugCatcherName: db "BUG CATCHER@"
+.LassName: db "LASS@"
+.JrTrainerMName: db "JR.TRAINER♂@"
+.JrTrainerFName: db "JR.TRAINER♀@"
+.PokemaniacName: db "POKéMANIAC@"
+.SuperNerdName: db "SUPER NERD@"
+.BurglarName: db "BURGLAR@"
+.EngineerName: db "ENGINEER@"
+.UnusedJugglerName: db "JUGGLER@"
+.SwimmerName: db "SWIMMER@"
+.BeautyName: db "BEAUTY@"
+.RockerName: db "ROCKER@"
+.JugglerName: db "JUGGLER@"
+.BlackbeltName: db "BLACKBELT@"
+.ProfOakName: db "PROF.OAK@"
+.ChiefName: db "CHIEF@"
+.ScientistName: db "SCIENTIST@"
+.RocketName: db "ROCKET@"
+.CooltrainerMName: db "COOLTRAINER♂@"
+.CooltrainerFName: db "COOLTRAINER♀@"