Viridian Pre-Gym populated

This finishes Viridian Pre-Gym save for making trainers see you.
This commit is contained in:
Llinos Evans 2023-04-15 19:50:49 +01:00
parent 23cbfaa819
commit 7e8c16c5a6
10 changed files with 197 additions and 22 deletions

View file

@ -6,9 +6,18 @@ ViridianPreGym_Object:
warp_event 4, 13, LAST_MAP, 7
def_bg_events
bg_event 2, 7, 7 ; League poster
bg_event 4, 0, 8 ; Trainer Tips 1
bg_event 5, 0, 9 ; Trainer Tips 2
bg_event 8, 6, 10 ; PC
bg_event 3, 7, 11 ; Rhydon Statue
bg_event 6, 7, 12 ; Rhydon Statue
def_object_events
object_event 5, 2, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person, Yujirou
object_event 5, 2, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person, Yujirou 2
object_event 6, 9, SPRITE_GIRL, STAY, LEFT, 4, OPP_STUDENT, 1 ; person, Trainer 1
object_event 3, 8, SPRITE_GIRL, STAY, RIGHT, 5, OPP_STUDENT, 2 ; person, Trainer 2
object_event 1, 6, SPRITE_GYM_GUIDE, STAY, DOWN, 6 ; person
def_warps_to VIRIDIAN_PRE_GYM

View file

@ -22,5 +22,6 @@ BookshelfTileIDs:
bookshelf_tile LOBBY, $50, PokemonStuffText
bookshelf_tile LOBBY, $52, PokemonStuffText
bookshelf_tile SHIP, $36, BookOrSculptureText
bookshelf_tile PREGYM, $57, PokemonStuffText
bookshelf_tile PREGYM, $56, BookOrSculptureText
bookshelf_tile PREGYM, $57, BookOrSculptureText
db -1 ; end

View file

@ -33,5 +33,5 @@ Tilesets:
tileset Club, $07,$17, -1, -1, TILEANIM_NONE
tileset Facility, $12, -1, -1, -1, TILEANIM_WATER
tileset Plateau, -1, -1, -1, $45, TILEANIM_WATER
tileset PreGym, $20, -1, -1, -1, TILEANIM_NONE
tileset PreGym, $3A, $3B, -1, -1, TILEANIM_NONE
assert_table_length NUM_TILESETS

View file

@ -3,10 +3,10 @@ FemaleTrainerList::
db OPP_JR_TRAINER_F
db OPP_BEAUTY
db OPP_COOLTRAINER_F
db OPP_STUDENT
db -1 ; end
EvilTrainerList::
;db OPP_UNUSED_JUGGLER
db OPP_GAMBLER
db OPP_ROCKER
db OPP_JUGGLER

View file

@ -663,6 +663,8 @@ ChannelerData:
db 33, GASTLY, GASTLY, HAUNTER, 0
StudentData:
db 6, PIDGEY, HINAAZU, 0
db 4, CLEFAIRY, 0
FirefighterData: