From 8cd8f1ded0815532ea9379200e42f667597b7d7f Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 16 Jul 2023 17:14:43 +0100
Subject: [PATCH] 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!
---
 README.md                                     |    5 +
 constants/event_constants.asm                 |    4 +-
 constants/tileset_constants.asm               |    1 +
 crysaudio/music/RBY/mewtwo01.asm              | 1339 ++++++++++++++---
 data/maps/headers/CeladonMansionRoofHouse.asm |    2 +-
 data/maps/objects/CeladonMansionRoofHouse.asm |   13 +-
 data/tilesets/collision_tile_ids.asm          |    3 +
 data/tilesets/tileset_headers.asm             |    1 +
 data/tilesets/warp_tile_ids.asm               |    4 +
 data/trainers/names.asm                       |    2 +-
 data/trainers/parties.asm                     |    4 +-
 gfx/blocksets/jacky.bst                       |  Bin 0 -> 256 bytes
 gfx/tilesets.asm                              |    6 +-
 gfx/tilesets/jacky.png                        |  Bin 0 -> 1743 bytes
 maps.asm                                      |   10 +-
 maps/CeladonMansionRoofHouse.blk              |    3 +-
 ram/wram.asm                                  |    2 +-
 scripts/CeladonMansionRoofHouse.asm           |  154 +-
 text/CeladonMansionRoofHouse.asm              |  103 +-
 19 files changed, 1397 insertions(+), 259 deletions(-)
 create mode 100644 gfx/blocksets/jacky.bst
 create mode 100644 gfx/tilesets/jacky.png

diff --git a/README.md b/README.md
index 1cd37794..ed382a85 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,10 @@ New Areas
 	- This area also houses Hisuian Arcanine and Electrode, the idea being that Bill's Time Machine has brought them back from the truly distant past!
 - Silph Co. holds a special challenge for Pokemon League Champions...
 
+New Music
+====
+- Mewtwo has its own theme song, being a demake of the iconic Stadium battle theme. Composed by LuciShrimp.
+
 Improved Areas
 ====
 - Some barriers to travel across the region have been removed (for example, Pewter City can be left without defeating Brock) allowing for slightly more open world gameplay. Not all, though! 
@@ -109,6 +113,7 @@ Improved Areas
 - Route 25 has been given a facelift, adding Bill's Lighthouse in place of the Sea Cottage.
 - Vermilion City now features Officer Jenny with the Squirtle. She only appears if Pikachu or Eevee are chosen.
 - Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. 
+- Celadon Mansion's Roof House now features Shinjuku Jacky, a cut representation of a famous Virtua Fighter player. The house has also been redesigned, derived from the unused "Grandpa's House", featuring Nintendo 64s.
 - Pokemon Tower was shortened, being less intensive and adding room for more maps.
 - Fuchsia City has been made to resemble the more walkable LGPE version, removing the Cut trees among other things.
 - The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. 
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 035198f4..915c8af9 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -12,7 +12,9 @@
 	const EVENT_FUCK ; If you trigger this you're a psychopath. Used for mom and oak post-game scenes.
 	const EVENT_RECEIVED_CITRINE_PASS
 	const EVENT_BEAT_OAK_ONCE
-	const_skip 13
+	const EVENT_BEAT_JACKY
+	const EVENT_GOT_MANSION_GIFT
+	const_skip 11
 	const EVENT_GOT_TOWN_MAP
 	const EVENT_ENTERED_BLUES_HOUSE
 	const EVENT_DAISY_WALKING
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 97af1b5c..c23af843 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -30,4 +30,5 @@
 	const CELESTE	   ; 26
 	const ROCKETHOUSE
 	const BETAMART
+	const JACKY
 DEF NUM_TILESETS EQU const_value
diff --git a/crysaudio/music/RBY/mewtwo01.asm b/crysaudio/music/RBY/mewtwo01.asm
index caccba51..845ade74 100644
--- a/crysaudio/music/RBY/mewtwo01.asm
+++ b/crysaudio/music/RBY/mewtwo01.asm
@@ -901,49 +901,591 @@ Music_Mewtwo01_Ch1:
 	octave 2
 	note D_, 1
 	note D#, 1
-	note_type 6, 15, 8
-	volume_envelope 7, 8
-	rest 16
-	rest 7
-	note_type 12, 15, 8
 	volume_envelope 7, 8
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
 	rest 1
-	note_type 6, 15, 8
-	volume_envelope 7, 8
-	rest 7
-	note_type 4, 15, 8
-	volume_envelope 7, 8
-	rest 6
-	note_type 6, 15, 8
-	volume_envelope 7, 8
-	rest 16
-	rest 14
-	note_type 12, 15, 8
-	volume_envelope 7, 8
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
 	rest 1
-	note_type 6, 15, 8
-	volume_envelope 7, 8
-	rest 16
-	rest 16
-	rest 16
-	rest 8
-	note_type 4, 15, 8
-	volume_envelope 7, 8
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note D_, 1
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note D_, 1
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	rest 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note D_, 1
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	rest 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note D_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	note D#, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note D#, 1
+	rest 1
+	note C_, 1
+	note C_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note C_, 1
+	note C_, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note C_, 1
+	octave 3
+	note_type 12, 7, 8
+	note D_, 1
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 1
+	note A#, 1
+	note A_, 1
+	note_type 12, 7, 8
+	octave 3
+	note D_, 1
+	volume_envelope 12, 8
+	note D_, 1
+	note D_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note_type 12, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note A_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 1
+	note A#, 1
+	note A_, 1
+	octave 2
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 1
+	note A_, 2
+	note_type 9, 7, 8
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note_type 3, 7, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	octave 2
+	note D_, 2
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 1
+	note A_, 2
+	note_type 9, 7, 8
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note_type 3, 7, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	octave 2
+	note D_, 2
+	octave 1
+	note G_, 2
+	note B_, 2
+	octave 2
+	note D_, 2
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 1
+	note A_, 2
+	note_type 9, 7, 8
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note_type 3, 7, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	octave 2
+	note D_, 2
+	octave 1
+	note G_, 2
+	note B_, 2
+	octave 2
+	note D_, 2
+	octave 1
+	note_type 9, 7, 8
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note_type 3, 7, 8
+	note A#, 2
+	note G#, 2
+	note A#, 2
+	octave 2
+	note_type 10, 7, 8
+	note E_, 2
+	note_type 1, 7, 8
+	rest 4
+	note_type 9, 7, 8
+	octave 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note_type 3, 7, 8
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note_type 1, 7, 8
 	rest 6
-	note_type 12, 15, 8
+	note_type 3, 7, 8
+	note G#, 2
+	note B_, 2
+	note_type 9, 7, 8
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note_type 3, 7, 8
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	octave 2
+	note_type 9, 7, 8
+	note E_, 2
+	note_type 1, 7, 8
+	rest 6
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 1
+	note_type 6, 7, 8
+	note G_, 2
+	note G_, 2
+	note_type 9, 7, 8
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note_type 3, 7, 8
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	octave 2
+	note_type 12, 7, 8
+	note E_, 2
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 1
+	note G_, 2
+	note_type 9, 7, 8
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note_type 3, 7, 8
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	octave 2
+	note_type 12, 7, 8
+	note E_, 2
+	note_type 9, 7, 8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note_type 3, 7, 8
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	octave 1
+	note B_, 2
+	note A_, 2
+	note_type 9, 7, 8
+	volume_envelope 8, 8
+	note A_, 2
+	volume_envelope 9, 8
+	note A_, 2
+	note_type 3, 7, 8
+	volume_envelope 10, 8
+	note A_, 2
+	note_type 6, 7, 8
+	volume_envelope 10, 8
+	note A_, 2
+	note_type 3, 7, 8
+	volume_envelope 10, 8
+	note A_, 2
+	octave 2
+	note_type 6, 7, 8
+	volume_envelope 11, 8
+	note E_, 2
+	octave 1
+	note_type 3, 7, 8
+	volume_envelope 11, 8
+	note B_, 2
+	note_type 6, 7, 8
+	volume_envelope 12, 8
+	note A_, 2
+	note_type 1, 7, 8
+	rest 6
+	note_type 9, 7, 8
+	volume_envelope 13, 8
+	note A_, 2
+	note A_, 2
+	note_type 3, 7, 8
+	volume_envelope 14, 8
+	note A_, 2
+	note_type 6, 7, 8
+	volume_envelope 14, 8
+	note A_, 2
+	note_type 3, 7, 8
+	volume_envelope 14, 8
+	note A_, 2
+	octave 2
+	note_type 6, 7, 8
+	volume_envelope 15, 8
+	note E_, 2
+	note_type 3, 7, 8
+	volume_envelope 15, 8
+	note A_, 2
+	note G_, 2
+	note_type 6, 7, 8
+	volume_envelope 15, 8
+	note F_, 1
+	note E_, 1
+	note_type 12, 7, 8
 	octave 8
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
 	sound_loop 0, .mainLoop
 
 Music_Mewtwo01_Ch2:
@@ -1278,16 +1820,20 @@ Music_Mewtwo01_Ch2:
 	octave 3
 	note A#, 1
 	note G_, 1
-	note_type 13, 15, 7
+	note_type 12, 15, 7
 	note A_, 7
-	note_type 1, 15, 7
-	rest 5
+	note_type 6, 15, 7
+	note A_, 1
+	note A_, 1
 	note_type 12, 15, 7
 	note B_, 3
 	octave 4
 	note F#, 5
+	note_type 13, 15, 7
 	note C#, 7
-	rest 1
+	note_type 1, 15, 7
+	rest 5
+	note_type 12, 15, 7
 	note D#, 4
 	note_type 6, 15, 7
 	note A#, 4
@@ -1298,10 +1844,10 @@ Music_Mewtwo01_Ch2:
 	note_type 12, 15, 7
 	note D_, 1
 	rest 1
-	volume_envelope 8, 7
+	volume_envelope 10, 7
 	note D_, 1
 	rest 1
-	volume_envelope 4, 7
+	volume_envelope 5, 7
 	note D_, 1
 	note_type 6, 6, 7
 	volume_envelope 15, 7
@@ -1310,10 +1856,20 @@ Music_Mewtwo01_Ch2:
 	rest 6
 	volume_envelope 4, 7
 	note_type 12, 4, 7
+	volume_envelope 3, 7
+	note D_, 1
+	note_type 6, 4, 7
+	rest 2
+	note_type 12, 4, 7
 	volume_envelope 2, 7
 	note D_, 1
 	note_type 6, 4, 7
-	rest 10
+	rest 2
+	volume_envelope 1, 7
+	note_type 12, 1, 7
+	note D_, 1
+	note_type 6, 1, 7
+	rest 2
 	note_type 12, 4, 7
 	rest 4
 	note_type 6, 15, 7
@@ -1349,8 +1905,24 @@ Music_Mewtwo01_Ch2:
 	note G_, 1
 	note D_, 1
 	rest 1
-	note_type 12, 4, 7
+	octave 3
+	volume_envelope 2, 7
+	note G_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	rest 1
+	note_type 6, 4, 7
+	octave 3
+	volume_envelope 1, 7
+	note G_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	note_type 1, 4, 7
 	rest 6
+	note_type 12, 4, 7
+	rest 2
 	volume_envelope 12, 7
 	note G_, 3
 	vibrato 0, 2, 3
@@ -1378,16 +1950,12 @@ Music_Mewtwo01_Ch2:
 	note F_, 1
 	note_type 6, 12, 7
 	note F_, 1
-	octave 5
 	note G#, 1
-	octave 4
 	note G_, 1
 	rest 2
 	volume_envelope 4, 7
 	note F_, 1
-	octave 5
 	note G#, 1
-	octave 4
 	note G_, 1
 	rest 4
 	note_type 12, 12, 7
@@ -1487,15 +2055,13 @@ Music_Mewtwo01_Ch2:
 	volume_envelope 14, 7
 	note F_, 1
 	note A#, 1
-	octave 3
-	note A#, 1
+	note C_, 1
 	rest 1
-	octave 4
 	volume_envelope 4, 7
 	note F_, 1
 	note A#, 1
+	note C_, 1
 	octave 3
-	note A#, 1
 	rest 1
 	note_type 12, 11, 7
 	note A_, 1
@@ -1560,8 +2126,7 @@ Music_Mewtwo01_Ch2:
 	note A_, 2
 	note G_, 3
 	note F_, 1
-	note D#, 3
-	rest 1
+	note D#, 4
 	octave 3
 	note D_, 2
 	note A_, 2
@@ -1592,18 +2157,138 @@ Music_Mewtwo01_Ch2:
 	note C_, 2
 	octave 4
 	note A#, 2
-	note A_, 16
-	note A_, 16
-	note A_, 16
-	note A_, 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
+	note D_, 10
+	note C_, 2
+	note_type 8, 11, 7
+	note F_, 2
+	note D#, 2
+	note C_, 2
+	note_type 3, 11, 7
+	note D_, 11
+	note E_, 1
+	note F_, 1
+	note_type 11, 11, 7
+	note A_, 7
+	note_type 1, 11, 7
+	rest 1
+	note_type 3, 11, 7
+	rest 1
+	note_type 12, 11, 7
+	note G_, 2
+	note_type 8, 11, 7
+	octave 5
+	note C_, 2
+	octave 4
+	note A#, 2
+	note G_, 2
+	note_type 12, 11, 7
+	octave 5
+	note D_, 10
+	note C_, 2
+	note_type 8, 11, 7
+	note F_, 2
+	note D#, 2
+	note C_, 2
+	note_type 3, 11, 7
+	note D_, 11
+	note E_, 1
+	note F_, 1
+	note_type 11, 11, 7
+	note A_, 7
+	note_type 1, 11, 7
+	rest 4
+	note_type 11, 11, 7
+	note A_, 2
+	note_type 1, 11, 7
+	rest 2
+	note_type 8, 11, 7
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note_type 12, 11, 7
+	octave 4
+	note F_, 6
+	note E_, 1
+	note F_, 1
+	note G_, 3
+	note D_, 3
+	note G_, 2
+	note F_, 3
+	note E_, 3
+	note C_, 2
+	octave 3
+	note B_, 3
+	note G_, 5
+	octave 4
+	note F_, 6
+	note E_, 1
+	note F_, 1
+	note G_, 3
+	note B_, 3
+	octave 5
+	note D_, 5
+	octave 4
+	note B_, 3
+	note A_, 2
+	note G#, 3
+	note_type 6, 11, 7
+	note G#, 1
+	note A_, 1
+	note_type 12, 11, 7
+	note B_, 4
+	octave 5
+	note C_, 6
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 3
+	octave 4
+	note A_, 3
+	octave 5
+	note D_, 2
+	note C_, 6
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 3
+	note E_, 3
+	note D_, 2
+	note C_, 6
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 3
+	octave 4
+	note A_, 3
+	octave 5
+	note D_, 2
+	note C_, 6
+	octave 4
+	note B_, 1
+	note A_, 1
+	octave 5
+	note E_, 2
+	note_type 9, 11, 7
+	note E_, 1
+	note_type 1, 11, 7
+	rest 3
+	note_type 6, 11, 7
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	octave 4
+	note B_, 1
+	note G_, 1
+	note E_, 1
+	note B_, 1
+	note G_, 1
+	note E_, 1
+	octave 3
+	note A_, 1
+	note_type 12, 11, 7
 	octave 8
 	sound_loop 0, .mainLoop
 
@@ -1843,18 +2528,11 @@ Music_Mewtwo01_Ch3:
 	volume_envelope 3, 4
 	note B_, 2
 	octave 4
-	note_type 7, 1, 0
-	volume_envelope 3, 4
+	note_type 8, 3, 4
 	note E_, 12
-	note_type 1, 1, 0
-	rest 5
-	note_type 7, 1, 0
-	rest 1
 	note_type 4, 1, 0
 	volume_envelope 3, 4
-	note G#, 3
-	note G#, 1
-	note G#, 8
+	note G#, 12
 	note_type 2, 3, 4
 	note D#, 12
 	note_type 6, 1, 0
@@ -1865,7 +2543,6 @@ Music_Mewtwo01_Ch3:
 	note D#, 1
 	rest 1
 	note_type 12, 3, 4
-	octave 4
 	note E_, 1
 	note A_, 1
 	note G_, 1
@@ -1900,12 +2577,24 @@ Music_Mewtwo01_Ch3:
 	note G_, 1
 	note E_, 1
 	note A_, 1
-	note G_, 3
-	note D_, 7
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note G#, 2
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note A#, 1
+	note G#, 1
 	note F_, 1
 	note A#, 1
 	note G#, 1
@@ -1920,97 +2609,142 @@ Music_Mewtwo01_Ch3:
 	note G#, 1
 	note F_, 1
 	note A#, 1
+	note A_, 1
 	note G_, 1
+	note E_, 1
+	note A_, 1
 	note G_, 1
+	note E_, 1
+	note A_, 1
 	note G_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note G_, 1
-	note G_, 1
-	note D_, 1
-	note D_, 1
+	note E_, 1
+	note A_, 1
 	note G_, 1
+	note E_, 1
+	note A_, 1
 	note G_, 1
+	note E_, 1
+	note A_, 1
 	note F_, 1
-	octave 5
-	note C_, 1
 	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
 	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	note D#, 8
-	note A#, 4
-	note D#, 4
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	note D#, 8
-	octave 5
-	note C_, 4
-	note D_, 4
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note F_, 1
-	octave 5
-	note C_, 1
-	octave 4
-	note A#, 1
-	note_type 6, 3, 4
 	octave 3
-	volume_envelope 3, 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note_type 6, 3, 4
+	volume_envelope 2, 3
 	note C_, 1
 	note C_, 1
 	note D_, 1
@@ -2034,26 +2768,26 @@ Music_Mewtwo01_Ch3:
 	note A_, 1
 	note_type 6, 1, 2
 	octave 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note C_, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note F_, 1
 	note D#, 1
 	note D_, 1
 	note C_, 1
 	note D#, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note C_, 1
 	note_type 6, 1, 2
 	octave 3
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	octave 4
 	note C_, 1
@@ -2065,7 +2799,7 @@ Music_Mewtwo01_Ch3:
 	note F_, 1
 	note G_, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note A#, 1
 	octave 4
@@ -2075,22 +2809,22 @@ Music_Mewtwo01_Ch3:
 	note F_, 1
 	note D#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	note D#, 1
 	note D#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note D#, 1
 	note D_, 1
 	note D#, 1
 	note C_, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	rest 1
 	note A_, 1
@@ -2099,93 +2833,93 @@ Music_Mewtwo01_Ch3:
 	note_type 4, 1, 2
 	rest 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note_type 3, 3, 4
 	rest 2
 	volume_envelope 1, 2
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note G_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note A#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note G_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A#, 1
 	octave 5
 	note D_, 1
 	note C_, 1
 	note_type 6, 1, 2
 	octave 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note G_, 1
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	octave 3
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note A#, 1
 	note G_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note_type 6, 3, 4
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note G_, 1
 	note F_, 1
 	note D#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note F_, 1
 	note G_, 1
 	note C_, 1
@@ -2199,51 +2933,51 @@ Music_Mewtwo01_Ch3:
 	note G_, 1
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note C_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	octave 2
 	note A#, 1
 	octave 3
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	octave 2
 	note A#, 1
 	octave 3
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	octave 2
 	note A#, 1
 	octave 3
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	octave 2
 	note A#, 1
 	note_type 6, 1, 2
 	octave 3
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	octave 2
 	note A#, 1
@@ -2251,7 +2985,7 @@ Music_Mewtwo01_Ch3:
 	note D_, 1
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note F_, 1
 	note D_, 1
@@ -2287,14 +3021,14 @@ Music_Mewtwo01_Ch3:
 	rest 1
 	note F#, 1
 	note_type 12, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note F_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A_, 1
 	note F_, 1
 	note A_, 1
@@ -2321,7 +3055,7 @@ Music_Mewtwo01_Ch3:
 	octave 4
 	note D#, 1
 	note_type 4, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note D#, 1
 	note D_, 1
@@ -2329,7 +3063,7 @@ Music_Mewtwo01_Ch3:
 	note D_, 1
 	note D#, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note C_, 1
 	octave 3
@@ -2346,7 +3080,7 @@ Music_Mewtwo01_Ch3:
 	note D#, 1
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D#, 1
 	note G_, 1
 	octave 2
@@ -2370,10 +3104,10 @@ Music_Mewtwo01_Ch3:
 	note D_, 1
 	note C_, 1
 	note_type 12, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note D_, 1
 	note_type 6, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note C_, 1
 	octave 2
 	note A_, 1
@@ -2445,7 +3179,7 @@ Music_Mewtwo01_Ch3:
 	octave 3
 	note A#, 1
 	note_type 4, 1, 2
-	volume_envelope 3, 3
+	volume_envelope 2, 3
 	note A#, 1
 	octave 4
 	note C_, 1
@@ -2454,18 +3188,159 @@ Music_Mewtwo01_Ch3:
 	note F_, 1
 	note G_, 1
 	note_type 12, 1, 2
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	rest 16
+	volume_envelope 2, 4
+	octave 5
+	note A_, 16
+	note A_, 14
+	note_type 4, 1, 4
+	volume_envelope 2, 4
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note A#, 1
+	note_type 12, 1, 4
+	volume_envelope 2, 4
+	note A_, 16
+	note A_, 16
+	note_type 1, 1, 2
+	rest 12
+	note_type 12, 1, 2
+	rest 5
+	volume_envelope 1, 1
+	octave 5
+	note D_, 2
+	volume_envelope 2, 1
+	note D_, 2
+	volume_envelope 3, 1
+	note D_, 2
+	rest 2
+	volume_envelope 1, 1
+	octave 4
+	note B_, 2
+	volume_envelope 2, 1
+	note B_, 2
+	volume_envelope 3, 1
+	note B_, 2
+	rest 2
+	volume_envelope 1, 1
+	octave 5
+	note D_, 2
+	volume_envelope 2, 1
+	note D_, 2
+	volume_envelope 3, 1
+	note D_, 2
+	rest 1
+	volume_envelope 1, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 2
+	volume_envelope 2, 1
+	note D_, 2
+	volume_envelope 3, 1
+	note D_, 2
+	rest 8
+	octave 3
+	volume_envelope 1, 1
+	note B_, 2
+	note B_, 2
+	note B_, 1
+	octave 4
+	note E_, 3
+	note B_, 2
+	volume_envelope 2, 1
+	note B_, 2
+	volume_envelope 3, 1
+	note B_, 2
+	octave 3
+	rest 6
+	volume_envelope 1, 1
+	note A_, 2
+	octave 4
+	note C_, 2
+	note E_, 2
+	note D_, 4
+	note_type 6, 1, 2
+	volume_envelope 1, 1
+	octave 5
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	octave 5
+	volume_envelope 2, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	octave 3
+	note_type 12, 1, 2
+	volume_envelope 1, 1
+	note A_, 4
+	note_type 6, 1, 2
+	volume_envelope 1, 1
+	octave 4
+	note C_, 4
+	note E_, 4
+	note_type 12, 1, 2
+	volume_envelope 1, 1
+	note D_, 3
+	octave 3
+	note A_, 1
+	note_type 6, 1, 2
+	volume_envelope 1, 1
+	octave 5
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	volume_envelope 2, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note_type 12, 1, 2
+	volume_envelope 1, 1
+	note C_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note C_, 2
+	note E_, 2
+	note D_, 4
+	note_type 6, 1, 2
+	volume_envelope 1, 1
+	octave 5
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	octave 5
+	volume_envelope 2, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note_type 12, 1, 2
+	volume_envelope 1, 1
+	note E_, 4
+	note C_, 2
+	note E_, 2
+	note F#, 8
 	octave 8
 	sound_loop 0, .mainLoop
 
diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm
index 5b155f72..dc48c341 100644
--- a/data/maps/headers/CeladonMansionRoofHouse.asm
+++ b/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
diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm
index c5111a76..4de4cce4 100644
--- a/data/maps/objects/CeladonMansionRoofHouse.asm
+++ b/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
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
index 55b9c066..3d1b7ea6 100644
--- a/data/tilesets/collision_tile_ids.asm
+++ b/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, 
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index a76dadea..4342b619 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/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
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index 005228c9..a5ef8c16 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/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
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
index 6b9da65c..bc0309e7 100644
--- a/data/trainers/names.asm
+++ b/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
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index f110feb8..f74d1b88 100644
--- a/data/trainers/parties.asm
+++ b/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
diff --git a/gfx/blocksets/jacky.bst b/gfx/blocksets/jacky.bst
new file mode 100644
index 0000000000000000000000000000000000000000..365c473d2ccb4a773228950f95ec24c05c09afad
GIT binary patch
literal 256
zcmZvW%?g7+41}i;^lBjJy@iFnDipfyA^x<x`u-1O=&}cGzXS$`A(^H*q9-mVz+hYa
zDiK4Z_(Wh4Mpdh}ooamN!{b!d^U`*o7-M$8stnbv&O3j-<>`lh*tT(6*Lkt{H(%<I
ZAx8P<Qc8CKuMon&e#u+%!3fV|{~h+u8=?RJ

literal 0
HcmV?d00001

diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index c37b32b8..92e5df93 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -77,4 +77,8 @@ BetaMart_GFX::		INCBIN "gfx/tilesets/betamart.2bpp"
 BetaMart_Block::		INCBIN "gfx/blocksets/betamart.bst"
 
 House_GFX::         INCBIN "gfx/tilesets/house.2bpp"
-House_Block::       INCBIN "gfx/blocksets/house.bst"
\ No newline at end of file
+House_Block::       INCBIN "gfx/blocksets/house.bst"
+
+SECTION "Tilesets 5", ROMX
+Jacky_GFX::         INCBIN "gfx/tilesets/jacky.2bpp"
+Jacky_Block::       INCBIN "gfx/blocksets/jacky.bst"
diff --git a/gfx/tilesets/jacky.png b/gfx/tilesets/jacky.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb8bdc7b07cad92a9207987b9c6a5644970843b
GIT binary patch
literal 1743
zcmV;=1~B=FP)<h;3K|Lk000e1NJLTq004jh001Zm1^@s6HgWPu00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf24qP@K~#8N?VF2H
z97zyF;X;Oi2l50=0Z;Hi@{H44HZSr@UDdxCSjF9o=-B!6w=%0|c7^U=US8hsIy^l+
zU60zlzP?_M{*Bu8?pNI3-(Qc;;r;z%`LpAwT?Kts^?GB{_VMxYde-L0j~`nx>KXu%
z5HJ%<_oB#tt-AmA_IAC}=I76!-C!%wag2)R=jY2O?RrAB7!kME_sF=^=|LYeYj=hW
z01TjGM+1)v9*=t<R23xpk(evENTYLtYF^$SYt4l2jjOf~4-a?Wzkk18{TQ2TpafAL
zBeD3U`SobR0H6gqK6%}%76g8OcL!JzPe{a-J~9Ke`jU{bes5ff84Um~wEEzhjM0Kv
z3YlPf2hgYR$@`=#+<~`ZfED7rs=2gGFk%4BPcie@gZEJxfH->GrPb0qfS+sfn(PR^
zpd$=WxxPYuuk;b;<w9gc6ZG16Oue1see?|A_hg7~*Ygw?TSQavDMvxJAn!+g90d!S
zp%o}?v%VH5Gwq1@z<ugvVpgb~jx(}2F!$EF{<?mqxM+?9ToqDnM_}PuaR|&vsmR2K
z);;DxpQACL9_EX4A3^ia)(`aU1!UZK9lliyhDxMS0Y4M}-pqGokT|pRRp7E1&5GZm
zXN1=804`uF<NbwE_t~{tb-O!2k5(pg-YO2~BY~6aTcrh}tL%dCRe~@F1dMB&A+E^_
zAX-&sk*R^Tb>9I-kdQN(u#+_v)h}mcLC+Z3vl2Xb0-<Jh0%fAwG2i$V&r!D1#>dYx
zI^yf`_BuYq08W)L&<f(wWC4vYZyB?595sQ9KZ-=&iCfin`w`H>UpBn_31DD1vCiZ5
zh)j?@4pzhm>QmxlbfvErrx>7>fmv2^y(%*x0D+03sc?@vXOWp;Rs0t8&03D=3y4P9
zQ*R))JSOFVCEF2CTds}?f}mg8s!m4r%+{E`yD&z!+r)bkg??sts7g@!^YvwQHEw3~
zD74lauW2lxO%H!0Y#X4rh>X#!(4x;m!5ayjLl9%8JBmxsC{^rQNfU_%nB`)Coel_`
z7CM94@VUbgU-x!cjhl;G#Xs(@Gth6Z?QaH{-9p>|y3V!u=IPhG&5C&hZ85-VfOgqQ
zoKXW1tCewNoT!7){q!Y};KtH}PPHxSxOJ_CCdwxZ&Wh>?7SXEr8Re^tcO=an0I^$H
zsp~F)*QXzlD2`v_SZ%VgM(}Z0GjSDVaF$^`W_ExxDZd7?IF%6)R#~Cr*0mNIgHHmI
z71h}x2KDS9?}E`+O0O+64WP`#r7E1SX6gtMfloJ1EUL2#Z84IM=jXQ$8dPPL^rzt2
z&StX`Q#rIp1U|F(1i%EUJ4>&P#=kXOiz+@mMrPyk+dIH48ju}g^tS+i{_X56YCAH2
z=1D#6B7O{<gACR~YhVs5#5HIAs2+1-%wCLDXVeH6101o4**?@(A}XsZhlB3`YCCFR
z4~qJTM&SAgZsN1)#iYgPZg4Tc$Klr?5m%TofW!tDT#O1Yc6R{Kx~o2@vul7VK8O8d
z5QBISIrbtrmJp8W=zdmIXBCOBz5oG6vZVzAtro4Rbx-ANE-!&uKoykU{UcCceD?ZX
z8J9Kq<3rbgY+hw_2S7}(8^w+Hbbf>hT05RN{0~CJOi)LIxQoOm>wHVpixu}WvuDf*
z<S%fs9Y1MnPTV^}cu~doutxwc^UTyD;$o;%Ir2{f!;F+!R@=>Tm;rFvO!+DZDhBkI
zD!tI19dOLA5>W!R?w!fyTR^sOO{RB$hg~xuT-?$}h;yG6U#9Vw$uqzh%<Z(Vfxi~;
zo&}FVkJzqR0F$Z2Rt84XRqqmdwCtFu_xA)nWA%dEGsssz4ln;V5TWBjb&UmT5!Ga~
zh0;a>Nw5~w@r;u5M_ha+GGfMTW=3wp035gp{1^cw1R}LEhQDoB21nFhTV^X;_0uKd
z(-&i?&nmlRsH#qn-5sDu&mcEr0MKN8(a`{i<=e8(dj^Qdz`1DcAfFMO)|`*z)(tTI
zEdbFFTg64}AtR|M_{w|=5EM!!j%WSO4)9;+9|LIHr(~{WyF{#5dfTXjs46Wad?o(>
z9LLa0AY$-|*kq~yqQ&-)0kVwsOwUl?5c@g%TY#_S3~v1qF!VLh4Un;80H7Yky1ITA
ly}4Begr0$J+W>cWe*=0Pc$YU~7vlf`002ovPDHLkV1i;sKYIWG

literal 0
HcmV?d00001

diff --git a/maps.asm b/maps.asm
index dc5023ac..1a6047e5 100644
--- a/maps.asm
+++ b/maps.asm
@@ -98,7 +98,6 @@ PewterNidoranHouse_Blocks:
 PewterSpeechHouse_Blocks:
 ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk"
 
-CeladonMansionRoofHouse_Blocks:
 ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk"
 
 CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk"
@@ -173,10 +172,6 @@ INCLUDE "scripts/VermilionDock.asm"
 INCLUDE "data/maps/objects/VermilionDock.asm"
 VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
 
-INCLUDE "data/maps/headers/CeladonMansionRoofHouse.asm"
-INCLUDE "scripts/CeladonMansionRoofHouse.asm"
-INCLUDE "data/maps/objects/CeladonMansionRoofHouse.asm"
-
 INCLUDE "data/maps/headers/FuchsiaMart.asm"
 INCLUDE "scripts/FuchsiaMart.asm"
 INCLUDE "data/maps/objects/FuchsiaMart.asm"
@@ -1401,3 +1396,8 @@ INCLUDE "data/maps/headers/BrunswickGlade.asm"
 INCLUDE "scripts/BrunswickGlade.asm"
 INCLUDE "data/maps/objects/BrunswickGlade.asm"
 BrunswickGlade_Blocks: INCBIN "maps/BrunswickGlade.blk"
+
+INCLUDE "data/maps/headers/CeladonMansionRoofHouse.asm"
+INCLUDE "scripts/CeladonMansionRoofHouse.asm"
+INCLUDE "data/maps/objects/CeladonMansionRoofHouse.asm"
+CeladonMansionRoofHouse_Blocks: INCBIN "maps/CeladonMansionRoofHouse.blk"
diff --git a/maps/CeladonMansionRoofHouse.blk b/maps/CeladonMansionRoofHouse.blk
index 51bf8401..f63a864e 100644
--- a/maps/CeladonMansionRoofHouse.blk
+++ b/maps/CeladonMansionRoofHouse.blk
@@ -1 +1,2 @@
-	
\ No newline at end of file
+				
+

\ No newline at end of file
diff --git a/ram/wram.asm b/ram/wram.asm
index 0d450eed..1e66f48f 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -1992,7 +1992,7 @@ wCitrineRocketHouseCurScript:: db
 wBluesHouseCurScript:: db
 wViridianCityCurScript:: db
 wRedsHouse1FCurScript:: db
-	ds 1
+wCeladonMansionRoofHouseCurScript:: db
 wPewterCityCurScript:: db
 wRoute3CurScript:: db
 wRoute4CurScript:: db
diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm
index 175b5421..dc7f45b3 100644
--- a/scripts/CeladonMansionRoofHouse.asm
+++ b/scripts/CeladonMansionRoofHouse.asm
@@ -1,16 +1,109 @@
+; The Hiker in the Roof House is now Shinjuku Jacky. He was a famous Virtua Fighter player and the source of the famous "Jack" sprite.
+; Shinjuku Jack wrote the book "Virtua Fighter Maniax", the first to feature frame data for Virtua Fighter 1 and thus a very notable resource.
+; At the time, many Virtua Fighter players had "geographical names", representing their residences. Shinjuku is notably within Tokyo, near to Shibuya. 
+; Because Celadon City is based on Tokyo Metropolis, specifically Shinjuku and Shibuya, and there's a map called JISAN.MAP that featured N64s, I'm placing Jacky here.
+
+; This also means you actually have to beat a trainer to get the Eevee/Pikachu, so you have to work for that massive power spike.
+
+; It's a lot, but I hope this is the best restoration Jacky can receive.
+
 CeladonMansionRoofHouse_Script:
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ld hl, CeladonMansionRoofHouse_ScriptPointers
+	ld a, [wCeladonMansionRoofHouseCurScript]
+	jp CallFunctionInTable
+
+CeladonMansionRoofHouse_ScriptPointers:
+	dw TheRetONator
+	dw JackyBeat
+
+JackyBeat:
+	SetEvent EVENT_BEAT_JACKY
+	ld a, EEVEE ; Getting the Pokemon the player needs before printing the text
+	ld a, [wPlayerStarter] ; Load the player's starter after Eevee loads.
+	cp EEVEE ; Was your starter Eevee?
+	jr nz, .skip ; If not, skip this.
+	ld a, PIKACHU ; Load in Pikachu if true
+.skip
+	ld [wd11e], a
+	call GetMonName
+	ld a, $1 ; Load Jacky's NPC ID
+	ldh [hSpriteIndex], a ; Slap it in the index
+	call DisplayTextID
+	ld a, $0
+	ld [wCeladonMansionRoofHouseCurScript], a ; kick the player back downstairs
+TheRetONator: ; fallthrough
+	ret
 
 CeladonMansionRoofHouse_TextPointers:
 	dw CeladonMansion5Text1
 	dw CeladonMansion5Text2
+	dw JackyN64
+	dw JackyTVMario
+	dw JackyTVWaveRace
 
 CeladonMansion5Text1:
-	text_far _CeladonMansion5Text1
-	text_end
+	text_asm
+	CheckEvent EVENT_GOT_MANSION_GIFT
+	jr nz, .gotGift
+	CheckEvent EVENT_BEAT_JACKY
+	jr nz, .skip
+	
+	ld hl, JackyText1
+	call PrintText
+	ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip.
+	and a ; yep, here too.
+	call z, WaitForTextScrollButtonPress ; and here.
+	call EnableAutoTextBoxDrawing ; and here. annoying.
+
+	call YesNoChoice ; Do they want in?
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .refused
+	
+	ld hl, JackyYes
+	call PrintText
+	ld c, BANK(Music_MeetMaleTrainer)
+	ld a, MUSIC_MEET_MALE_TRAINER
+	call PlayMusic
+	ld hl, wd72d
+	set 6, [hl]
+	set 7, [hl]
+	
+	call Delay3
+	ld a, OPP_JACK
+	ld [wCurOpponent], a
+	
+	ld a, 1
+	ld [wTrainerNo], a
+	ld [wIsTrainerBattle], a
+	
+	ld hl, JackyLossText
+	ld de, JackyWinText
+	call SaveEndBattleTextPointers
+
+	ld a, $1
+	ld [wCeladonMansionRoofHouseCurScript], a
+	jr .done
+.gotGift
+	ld hl, JackyGift
+	call PrintText
+	jr .done
+.skip
+	ld hl, JackyPostBeatText
+	call PrintText
+	jr .done
+.refused
+	ld hl, JackyNo
+	call PrintText
+	; fallthrough
+.done
+	jp TextScriptEnd
 
 CeladonMansion5Text2:
 	text_asm
+	CheckEvent EVENT_BEAT_JACKY
+	jr z, .notBeatenJacky
 	lb bc, EEVEE, 25
 	
 	; Because Eevee is a starter, we don't want it to be rendered redundant by this.
@@ -28,5 +121,60 @@ CeladonMansion5Text2:
 	ld a, HS_CELADON_MANSION_EEVEE_GIFT
 	ld [wMissableObjectIndex], a
 	predef HideObject
+	SetEvent EVENT_GOT_MANSION_GIFT
+	jr .party_full
+.notBeatenJacky
+	ld hl, JackyThief
+	call PrintText
+	; fallthrough
 .party_full
 	jp TextScriptEnd
+
+JackyText1:
+	text_far _CeladonMansion5Text1
+	text_end
+
+; Unused functionality for a rematch, didn't seem worth it
+;JackyPreBeatText:
+;	text_far _JackyPreBeatText
+;	text_end
+
+JackyPostBeatText:
+	text_far _JackyAfterBattle ; using this for now, a rematch for the sake of a rematch seems iffy.
+	text_end
+
+JackyYes:
+	text_far _JackyYes
+	text_end
+
+JackyNo:
+	text_far _JackyNo
+	text_end
+
+JackyWinText:
+	text_far _JackyWinText
+	text_end
+
+JackyLossText:
+	text_far _JackyLossText
+	text_end
+
+JackyThief:
+	text_far _JackyThief
+	text_end
+
+JackyTVMario:
+	text_far _JackyTVMario
+	text_end
+
+JackyTVWaveRace:
+	text_far _JackyTVWaveRace
+	text_end
+
+JackyN64:
+	text_far _JackyN64
+	text_end
+
+JackyGift:
+	text_far _JackyGift
+	text_end
diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm
index dab81a8d..99ec671b 100644
--- a/text/CeladonMansionRoofHouse.asm
+++ b/text/CeladonMansionRoofHouse.asm
@@ -1,10 +1,99 @@
 _CeladonMansion5Text1::
-	text "I know everything"
-	line "about the world"
-	cont "of #MON in"
-	cont "your GAME BOY!"
+	text "I am SHINJUKU"
+	line "JACKY!"
 
-	para "Get together with"
-	line "your friends and"
-	cont "trade #MON!"
+	para "I know everything"
+	line "about the world"
+	cont "of #MON!"
+	
+	para "Hm? You think you" ; if making rematches, use this for prebeat
+	line "can take me?"
 	done
+
+; Unused for now. Doesn't make much sense.
+_JackyPostBeatText::
+	text "Wanna fight again?"
+	line "I'm out of your"
+	cont "league!"
+	prompt
+
+_JackyYes::
+	text "Let's see if you"
+	line "can walk the"
+	cont "walk! Come on!"
+	done
+
+_JackyNo::
+	text "Maybe another"
+	line "time..."
+	done
+
+_JackyWinText::
+	text "I'm"
+	line "faster than"
+	cont "lightning!"
+	prompt
+
+_JackyLossText::
+	text "I can't"
+	line "believe I lost!"
+	prompt
+
+_JackyThief::
+	text "Hey, what do you"
+	line "think you're"
+	cont "doing?!"
+	done
+
+_JackyAfterBattle::
+	text "It was like you"
+	line "were fighting in"
+	cont "slow motion..."
+	
+	para "Ok! I will give"
+	line "you a #MON"
+	cont "to help you on"
+	cont "your quest!"
+	
+	para "Over there is a"
+	line "@"
+	text_ram wcd6d
+	text "!"
+	
+	para "Go, go, take it!"
+	
+;	para "I look forward"
+;	line "to our next bout!"
+	done
+
+_JackyGift::
+	text_ram wcd6d
+	text " has"
+	line "incredibly good"
+	cont "evolutionary"
+	cont "potential!"
+	
+	para "It will help"
+	line "you greatly in"
+	cont "your next bout!"
+	done
+
+_JackyN64::
+	text "It's a NINTENDO"
+	line "64! The latest"
+	cont "game console!"
+	done
+
+_JackyTVMario::
+	text "A plumber is"
+	line "jumping around"
+	cont "in 3D! Wow!"
+	done
+
+_JackyTVWaveRace::
+	text "Some guys in"
+	line "helmets are"
+	cont "racing on the"
+	cont "waves!"
+	done
+