Shinjuku Jack, final Mewtwo theme

This renovates the Celadon Mansion Roof House to feature a faithful restoration of Shinjuku Jack. Notes are in the script file.

Also, LuciShrimp's Mewtwo theme is finished!

data/maps/headers/CeladonMansionRoofHouse.asm

@@ -1,2 +1,2 @@
-	map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0
+	map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, JACKY, 0
 	end_map_header

data/maps/objects/CeladonMansionRoofHouse.asm

@@ -1,14 +1,17 @@
 CeladonMansionRoofHouse_Object:
-	db $a ; border block
+	db $0 ; border block
 
 	def_warp_events
-	warp_event  2,  7, CELADON_MANSION_ROOF, 3
-	warp_event  3,  7, CELADON_MANSION_ROOF, 3
+	warp_event  5,  7, CELADON_MANSION_ROOF, 3
+	warp_event  6,  7, CELADON_MANSION_ROOF, 3
 
 	def_bg_events
+	bg_event  0,  2, 3 ; N64
+	bg_event  4,  2, 4 ; Super Mario 64
+	bg_event  1,  2, 5 ; Wave Race 64
 
 	def_object_events
-	object_event  2,  2, SPRITE_HIKER, STAY, DOWN, 1 ; person
-	object_event  4,  3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
+	object_event  3,  3, SPRITE_ROCKER, STAY, DOWN, 1 ; person
+	object_event  1,  5, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
 
 	def_warps_to CELADON_MANSION_ROOF_HOUSE

data/tilesets/collision_tile_ids.asm

@@ -81,3 +81,6 @@ RocketHouse_Coll::
 
 BetaMart_Coll::
 	coll_tiles $01, $11, $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4D, $4C
+
+Jacky_Coll::
+	coll_tiles $01, $40, $11, $04, $14, $02, $03, $13, $12, 

data/tilesets/tileset_headers.asm

@@ -38,4 +38,5 @@ Tilesets:
 	tileset Celeste,      -1, -1, -1, $18, TILEANIM_WATER
 	tileset RocketHouse, $0A, -1, -1,  -1, TILEANIM_NONE
 	tileset BetaMart,    $18, -1, -1,  -1, TILEANIM_NONE
+	tileset Jacky,	 	  -1,  -1,  -1, -1, TILEANIM_NONE
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -29,6 +29,7 @@ WarpTileIDPointers:
 	dw .CelesteWarpTileIDs
 	dw .RocketHouseWarpTileIDs
 	dw .BetaMartWarpTileIDs
+	dw .JackyWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -110,6 +111,9 @@ ENDM
 .BetaMartWarpTileIDs:
 	warp_tiles $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4B, $4C
 
+.JackyWarpTileIDs:
+	warp_tiles $04, $14
+
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
 	warp_tiles ; end

data/trainers/names.asm

@@ -50,6 +50,6 @@ TrainerNames::
 	li "STUDENT"
 	li "FIREFIGHTER"
 	li "JUNIOR"
-	li "JACK"
+	li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky".
 	li "JESSIE&JAMES"
 	assert_list_length NUM_TRAINERS

data/trainers/parties.asm

@@ -743,8 +743,10 @@ JuniorData:
 	db 63, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0   ; no idea what to do with this guy's team, so I'll redo this later 
 	
 JackData:
+; Celadon University Roof House
+	db 23, MANKEY, MACHOP, SCYTHER, HITMONCHAN, 0 ; Scyther is Kage-Maru. 
 ; Silph Gauntlet 7F (Chief's Office)
-	db 70, ANIMON, PURAKKUSU, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0   ; not 100% sure what to do with this guy...
+;	db 70, ANIMON, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0   ; not 100% sure what to do with this guy...
 
 JessieJamesData:
 	db 14, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon