diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/trainers/ai_pointers.asm | 2 | ||||
| -rwxr-xr-x | data/trainers/encounter_types.asm | 2 | ||||
| -rw-r--r-- | data/trainers/move_choices.asm | 2 | ||||
| -rw-r--r-- | data/trainers/name_pointers.asm | 44 | ||||
| -rwxr-xr-x | data/trainers/parties.asm | 4 |
5 files changed, 27 insertions, 27 deletions
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm index d2e3b11c..9008be86 100644 --- a/data/trainers/ai_pointers.asm +++ b/data/trainers/ai_pointers.asm @@ -15,7 +15,7 @@ TrainerAIPointers: dbw 3, GenericAI dbw 3, GenericAI dbw 3, GenericAI - dbw 3, JugglerAI ; juggler_x + dbw 3, JugglerAI ; unused_juggler dbw 3, GenericAI dbw 3, GenericAI dbw 3, GenericAI diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm index 222b5868..5bca2517 100755 --- a/data/trainers/encounter_types.asm +++ b/data/trainers/encounter_types.asm @@ -6,7 +6,7 @@ FemaleTrainerList:: db -1 ; end EvilTrainerList:: - db OPP_JUGGLER_X + db OPP_UNUSED_JUGGLER db OPP_GAMBLER db OPP_ROCKER db OPP_JUGGLER diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 4bc42767..6e6df63c 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -20,7 +20,7 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; BIKER move_choices 1, 3 ; BURGLAR move_choices 1 ; ENGINEER - move_choices 1, 2 ; JUGGLER_X + move_choices 1, 2 ; UNUSED_JUGGLER move_choices 1, 3 ; FISHER move_choices 1, 3 ; SWIMMER move_choices ; CUE_BALL 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♀@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 24b4b9ca..005cb1dd 100755 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -11,7 +11,7 @@ TrainerDataPointers: dw BikerData dw BurglarData dw EngineerData - dw Juggler1Data + dw UnusedJugglerData dw FisherData dw SwimmerData dw CueBallData @@ -308,7 +308,7 @@ EngineerData: db 21, MAGNEMITE, 0 db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0 -Juggler1Data: +UnusedJugglerData: ; none FisherData: |