Game-Decompilation/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2025-02-23 11:32:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JUGGLER_X -> UNUSED_JUGGLER

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
constants/trainer_constants.asm
View File

@ -6,51 +6,51 @@ OPP_\1 EQU OPP_ID_OFFSET + \1
ENDM
const_def
trainer_const NOBODY ; $00
trainer_const YOUNGSTER ; $01
trainer_const BUG_CATCHER ; $02
trainer_const LASS ; $03
trainer_const SAILOR ; $04
trainer_const JR_TRAINER_M ; $05
trainer_const JR_TRAINER_F ; $06
trainer_const POKEMANIAC ; $07
trainer_const SUPER_NERD ; $08
trainer_const HIKER ; $09
trainer_const BIKER ; $0A
trainer_const BURGLAR ; $0B
trainer_const ENGINEER ; $0C
trainer_const JUGGLER_X ; $0D
trainer_const FISHER ; $0E
trainer_const SWIMMER ; $0F
trainer_const CUE_BALL ; $10
trainer_const GAMBLER ; $11
trainer_const BEAUTY ; $12
trainer_const PSYCHIC_TR ; $13
trainer_const ROCKER ; $14
trainer_const JUGGLER ; $15
trainer_const TAMER ; $16
trainer_const BIRD_KEEPER ; $17
trainer_const BLACKBELT ; $18
trainer_const RIVAL1 ; $19
trainer_const PROF_OAK ; $1A
trainer_const CHIEF ; $1B
trainer_const SCIENTIST ; $1C
trainer_const GIOVANNI ; $1D
trainer_const ROCKET ; $1E
trainer_const COOLTRAINER_M ; $1F
trainer_const COOLTRAINER_F ; $20
trainer_const BRUNO ; $21
trainer_const BROCK ; $22
trainer_const MISTY ; $23
trainer_const LT_SURGE ; $24
trainer_const ERIKA ; $25
trainer_const KOGA ; $26
trainer_const BLAINE ; $27
trainer_const SABRINA ; $28
trainer_const GENTLEMAN ; $29
trainer_const RIVAL2 ; $2A
trainer_const RIVAL3 ; $2B
trainer_const LORELEI ; $2C
trainer_const CHANNELER ; $2D
trainer_const AGATHA ; $2E
trainer_const LANCE ; $2F
trainer_const NOBODY ; $00
trainer_const YOUNGSTER ; $01
trainer_const BUG_CATCHER ; $02
trainer_const LASS ; $03
trainer_const SAILOR ; $04
trainer_const JR_TRAINER_M ; $05
trainer_const JR_TRAINER_F ; $06
trainer_const POKEMANIAC ; $07
trainer_const SUPER_NERD ; $08
trainer_const HIKER ; $09
trainer_const BIKER ; $0A
trainer_const BURGLAR ; $0B
trainer_const ENGINEER ; $0C
trainer_const UNUSED_JUGGLER ; $0D
trainer_const FISHER ; $0E
trainer_const SWIMMER ; $0F
trainer_const CUE_BALL ; $10
trainer_const GAMBLER ; $11
trainer_const BEAUTY ; $12
trainer_const PSYCHIC_TR ; $13
trainer_const ROCKER ; $14
trainer_const JUGGLER ; $15
trainer_const TAMER ; $16
trainer_const BIRD_KEEPER ; $17
trainer_const BLACKBELT ; $18
trainer_const RIVAL1 ; $19
trainer_const PROF_OAK ; $1A
trainer_const CHIEF ; $1B
trainer_const SCIENTIST ; $1C
trainer_const GIOVANNI ; $1D
trainer_const ROCKET ; $1E
trainer_const COOLTRAINER_M ; $1F
trainer_const COOLTRAINER_F ; $20
trainer_const BRUNO ; $21
trainer_const BROCK ; $22
trainer_const MISTY ; $23
trainer_const LT_SURGE ; $24
trainer_const ERIKA ; $25
trainer_const KOGA ; $26
trainer_const BLAINE ; $27
trainer_const SABRINA ; $28
trainer_const GENTLEMAN ; $29
trainer_const RIVAL2 ; $2A
trainer_const RIVAL3 ; $2B
trainer_const LORELEI ; $2C
trainer_const CHANNELER ; $2D
trainer_const AGATHA ; $2E
trainer_const LANCE ; $2F

2
data/trainers/ai_pointers.asm
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

2
data/trainers/encounter_types.asm
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

2
data/trainers/move_choices.asm
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

44
data/trainers/name_pointers.asm
View File

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

4
data/trainers/parties.asm
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: