Fix trainer sprite loading

Moved Yujirou to the end of the file and made the bank switching code more efficient, was swamp code before.
This commit is contained in:
May Evans 2023-04-02 21:37:57 +01:00
parent bd23dfa61e
commit fc597000fb
5 changed files with 11 additions and 13 deletions

View file

@ -11,7 +11,6 @@ TrainerDataPointers:
dw BikerData
dw BurglarData
dw EngineerData
dw YujirouData ; was unused juggler
dw FisherData
dw SwimmerData
dw CueBallData
@ -46,6 +45,7 @@ TrainerDataPointers:
dw ChannelerData
dw AgathaData
dw LanceData
dw YujirouData ; was unused juggler
; if first byte != $FF, then
; first byte is level (of all pokemon on this team)
@ -322,11 +322,6 @@ EngineerData:
db 21, MAGNEMITE, 0
db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
YujirouData: ; was unused juggler
db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
; post-game rematch team (currently unused)
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
FisherData:
; SS Anne 2F Rooms
db 17, GOLDEEN, TENTACOOL, GOLDEEN, 0
@ -858,3 +853,8 @@ LanceData:
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CHARIZARD, 59, CRYITHAN, 62, DRAGONITE, 0
; post-game rematch team (currently unused)
; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0
YujirouData: ; was unused juggler
db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
; post-game rematch team (currently unused)
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0