Groundwork for Viridian Pre-Gym

This map is fully functional but has a lot of bits to iron out, as well as a need for Gym Trainers. I'm also not wholly satisfied with Yujirou's team; maybe remove Eevee?

Yes, I designed an entire tileset for this. Fear me. Bow before me. Actually, don't, this was beyond rational thought.

Current issues;
- Yujirou's sprite doesn't work properly.
- Needs Gym Trainers (hell)
- Yujirou needs an event for being beaten, the refight, and more.

data/maps/headers/ViridianPreGym.asm

@@ -0,0 +1,2 @@
+	map_header ViridianPreGym, VIRIDIAN_PRE_GYM, PREGYM, 0
+	end_map_header

data/maps/map_header_banks.asm

@@ -71,7 +71,7 @@ MapHeaderBanks::
 	db BANK(BikeShop_h)
 	db BANK(CeruleanMart_h)
 	db BANK(MtMoonPokecenter_h)
-	db BANK(CeruleanTrashedHouse_h)
+	db BANK(ViridianPreGym_h) ; was db BANK(CeruleanTrashedHouse_h)
 	db BANK(Route5Gate_h)
 	db BANK(UndergroundPathRoute5_h)
 	db BANK(Daycare_h)

data/maps/map_header_pointers.asm

@@ -71,7 +71,7 @@ MapHeaderPointers::
 	dw BikeShop_h
 	dw CeruleanMart_h
 	dw MtMoonPokecenter_h
-	dw CeruleanTrashedHouse_h ; CERULEAN_TRASHED_HOUSE_COPY
+	dw ViridianPreGym_h ; CERULEAN_TRASHED_HOUSE_COPY, CeruleanTrashedHouse_h
 	dw Route5Gate_h
 	dw UndergroundPathRoute5_h
 	dw Daycare_h

data/maps/objects/ViridianCity.asm

@@ -8,6 +8,7 @@ ViridianCity_Object:
 	warp_event 21,  9, VIRIDIAN_NICKNAME_HOUSE, 1
 	warp_event 32,  7, VIRIDIAN_GYM, 1
 	warp_event 32,  3, ROCKET_HIDEOUT_B1F, 2
+	warp_event 12, 15, VIRIDIAN_PRE_GYM, 1
 
 	def_bg_events
 	bg_event 17, 17,  8 ; ViridianCityText8

data/maps/objects/ViridianPreGym.asm

@@ -0,0 +1,13 @@
+ViridianPreGym_Object:
+	db $0 ; border block
+
+	def_warp_events
+	warp_event 5, 13, 7, VIRIDIAN_CITY
+	warp_event 4, 13, 7, VIRIDIAN_CITY
+
+	def_bg_events
+
+	def_object_events
+	object_event  5,  2, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person, Yujirou
+
+	def_warps_to VIRIDIAN_PRE_GYM

data/maps/songs.asm

@@ -70,7 +70,7 @@ MapSongBanks::
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY
+	db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_PRE_GYM, was CERULEAN_TRASHED_HOUSE_COPY
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE

data/maps/town_map_entries.asm

@@ -65,7 +65,7 @@ InternalMapEntries:
 	internal_map MT_MOON_B2F,                    6,  2, MountMoonName
 	internal_map CERULEAN_MART,                 10,  2, CeruleanCityName
 	internal_map MT_MOON_POKECENTER,             5,  2, Route4Name
-	internal_map CERULEAN_TRASHED_HOUSE_COPY,   10,  2, CeruleanCityName
+	internal_map VIRIDIAN_PRE_GYM,  			10,  2, ViridianCityName
 	internal_map DAYCARE,                       10,  4, Route5Name
 	internal_map UNDERGROUND_PATH_ROUTE_6_COPY, 10,  6, Route6Name
 	internal_map UNDERGROUND_PATH_ROUTE_7_COPY,  9,  5, Route7Name

data/tilesets/bookshelf_tile_ids.asm

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

data/tilesets/collision_tile_ids.asm

@@ -68,3 +68,7 @@ Facility_Coll::
 
 Plateau_Coll::
 	coll_tiles $1b, $23, $2c, $2d, $3b, $45
+
+PreGym_Coll::
+	coll_tiles $0B, $0E, $1E, $1F
+	;coll_tiles $01, $06, $12, $13, $17, $19, $0A, $1A, $3E, $3F, $0F, $1D, $1C, $0C, $0D, $2A, $2B, $3A, $3B

data/tilesets/tileset_headers.asm

@@ -33,4 +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
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -24,6 +24,7 @@ WarpTileIDPointers:
 	dw .ClubWarpTileIDs
 	dw .FacilityWarpTileIDs
 	dw .PlateauWarpTileIDs
+	dw .PreGymWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -91,4 +92,8 @@ ENDM
 	; fallthrough
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
+
+.PreGymWarpTileIDs:
+	warp_tiles $23
+	
 	warp_tiles ; end

data/trainers/encounter_types.asm

@@ -6,7 +6,7 @@ FemaleTrainerList::
 	db -1 ; end
 
 EvilTrainerList::
-	db OPP_UNUSED_JUGGLER
+	;db OPP_UNUSED_JUGGLER
 	db OPP_GAMBLER
 	db OPP_ROCKER
 	db OPP_JUGGLER

data/trainers/move_choices.asm

@@ -21,7 +21,7 @@ TrainerClassMoveChoiceModifications:
 	move_choices 1       ; BIKER
 	move_choices 1, 3    ; BURGLAR
 	move_choices 1       ; ENGINEER
-	move_choices 1, 2    ; UNUSED_JUGGLER
+	move_choices 1, 3,   ; UNUSED_JUGGLER
 	move_choices 1, 3    ; FISHER
 	move_choices 1, 3    ; SWIMMER
 	move_choices         ; CUE_BALL

data/trainers/names.asm

@@ -11,7 +11,7 @@ TrainerNames::
 	db "BIKER@"
 	db "BURGLAR@"
 	db "ENGINEER@"
-	db "JUGGLER@"
+	db "YUJIROU@"
 	db "FISHERMAN@"
 	db "SWIMMER@"
 	db "CUE BALL@"

data/trainers/parties.asm

@@ -11,7 +11,7 @@ TrainerDataPointers:
 	dw BikerData
 	dw BurglarData
 	dw EngineerData
-	dw UnusedJugglerData
+	dw YujirouData ; was unused juggler
 	dw FisherData
 	dw SwimmerData
 	dw CueBallData
@@ -322,10 +322,10 @@ EngineerData:
 	db 21, MAGNEMITE, 0
 	db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
 
-UnusedJugglerData:
-	; db $FF, 7, KONYA, 7, EEVEE, 10, LICKITUNG, 0
+YujirouData: ; was unused juggler
+	db $FF, 7, KONYA, 7, EEVEE, 10, LICKITUNG, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
+	db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
 
 FisherData:
 ; SS Anne 2F Rooms

data/trainers/pic_pointers_money.asm

@@ -19,7 +19,7 @@ TrainerPicAndMoneyPointers::
 	pic_money BikerPic,        2000
 	pic_money BurglarPic,      9000
 	pic_money EngineerPic,     5000
-	pic_money JugglerPic,      3500
+	pic_money YujirouPic,      9900 ; was unused juggler
 	pic_money FisherPic,       3500
 	pic_money SwimmerPic,       500
 	pic_money CueBallPic,      2500