JUGGLER_X -> UNUSED_JUGGLER

This commit is contained in:
Rangi 2020-07-17 13:56:59 -04:00
parent 3c1cdbc4d0
commit 72a0e98c93
6 changed files with 75 additions and 75 deletions

View file

@ -19,7 +19,7 @@ ENDM
trainer_const BIKER ; $0A
trainer_const BURGLAR ; $0B
trainer_const ENGINEER ; $0C
trainer_const JUGGLER_X ; $0D
trainer_const UNUSED_JUGGLER ; $0D
trainer_const FISHER ; $0E
trainer_const SWIMMER ; $0F
trainer_const CUE_BALL ; $10

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -12,7 +12,7 @@ TrainerNamePointers:
dw wTrainerName
dw .BurglarName
dw .EngineerName
dw .JugglerXName
dw .UnusedJugglerName
dw wTrainerName
dw .SwimmerName
dw wTrainerName
@ -57,7 +57,7 @@ TrainerNamePointers:
.SuperNerdName: db "SUPER NERD@"
.BurglarName: db "BURGLAR@"
.EngineerName: db "ENGINEER@"
.JugglerXName: db "JUGGLER@"
.UnusedJugglerName: db "JUGGLER@"
.SwimmerName: db "SWIMMER@"
.BeautyName: db "BEAUTY@"
.RockerName: db "ROCKER@"

View file

@ -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: