Minor improvements from to-do list

Celadon University JrTrainerF is now a Student, replaced Eevee on Cycling Road.
This commit is contained in:
Llinos Evans 2023-05-01 19:45:30 +01:00
parent d22bb2994b
commit 4c892ce51a
3 changed files with 5 additions and 3 deletions

View file

@ -178,7 +178,7 @@ JrTrainerFData:
; Route 6 ; Route 6
db 16, RATTATA, PIKACHU, 0 db 16, RATTATA, PIKACHU, 0
db 16, PIDGEY, PIDGEY, PIDGEY, 0 db 16, PIDGEY, PIDGEY, PIDGEY, 0
; Unused - used in celadon university ; Unused
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0 db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
; Route 9 ; Route 9
db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0
@ -674,6 +674,8 @@ StudentData:
db 6, CLEFAIRY, 0 db 6, CLEFAIRY, 0
; Silph Gauntlet ; Silph Gauntlet
db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise
; Celadon University
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
FirefighterData: FirefighterData:
; For Cerulean Gym ; For Cerulean Gym

View file

@ -8,7 +8,7 @@ Route17WildMons:
db 26, DODUO db 26, DODUO
db 28, DODUO db 28, DODUO
db 29, GRIMER db 29, GRIMER
db 25, EEVEE db 25, PUCHIKOON
db 27, DODRIO db 27, DODRIO
end_grass_wildmons end_grass_wildmons

View file

@ -37,7 +37,7 @@ CeladonUniversityOutsideText1: ; Starter girl
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
call Delay3 call Delay3
ld a, OPP_JR_TRAINER_F ld a, OPP_STUDENT
ld [wCurOpponent], a ld [wCurOpponent], a
ld a, 4 ld a, 4
ld [wTrainerNo], a ld [wTrainerNo], a