Merge branch 'master' of https://github.com/ShiraTheMogul/jep-hack

2025-11-04 21:01:01 +13:00 · 2025-09-14 00:09:28 +01:00 · 2025-09-14 00:09:28 +01:00 · 0628c76640
parent 3bc47cf6bf b632b469c2
commit 0628c76640
65 changed files with 1929 additions and 443 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,7 @@
+# BGB
+
+bgb
+
 # compiled objects
 *.o

--- a/README.md
+++ b/README.md
@ -174,6 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com

 ### Unaffiliated
 - FroggestSpirit: HGSS Poke Mart Demix
+- TempoQuill: Gen 1 Style Remixes of Lake of Rage, Azalea Town, and Violet City (used in the Sevii Islands)

 ## Other Sources
 - Nob Ogasawara (Many prototype Pokemon names)
--- a/audio.asm
+++ b/audio.asm
@ -176,6 +176,9 @@ INCLUDE "audio/music/FloodedShrine.asm"
 INCLUDE "audio/music/AlphalithBattle.asm"
 INCLUDE "audio/music/FortunaSF.asm"
 INCLUDE "audio/music/JasperForest.asm"
+INCLUDE "audio/music/sevii.asm"
+INCLUDE "audio/music/FourIsland.asm"
+INCLUDE "audio/music/SixIsland.asm"

 SECTION "Sound Effects", ROMX

--- a/audio/music/FourIsland.asm
+++ b/audio/music/FourIsland.asm
@ -0,0 +1,343 @@
+; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/azalea.asm
+Music_FourIsland:
+	channel_count 4
+	channel 1, Music_FourIsland_Ch1
+	channel 2, Music_FourIsland_Ch2
+	channel 3, Music_FourIsland_Ch3
+	channel 4, Music_FourIsland_Ch4
+
+Music_FourIsland_Ch1:
+	tempo 149
+	volume 7, 7
+	pitch_offset 1
+	duty_cycle 3
+.mainloop:
+	note_type 12, 11, 3
+	sound_call .sub1
+	note A_, 8
+	note B_, 8
+	sound_call .sub1
+	note F#, 8
+	note D#, 8
+	octave 2
+	note B_, 4
+	octave 3
+	note D#, 4
+	note F#, 4
+	note B_, 4
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 10
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 4
+	note D#, 4
+	note F#, 4
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 10
+	volume_envelope 10, 6
+	note A_, 8
+	note G#, 8
+	note F#, 8
+	note E_, 8
+	volume_envelope 10, 3
+	note D#, 6
+	note C#, 6
+	note F#, 4
+	note B_, 6
+	octave 4
+	note C#, 6
+	note D#, 4
+	sound_jump .mainloop
+
+.sub1:
+	rest 4
+	octave 3
+	note E_, 4
+	note G#, 12
+	note C#, 4
+	note E_, 4
+	note C#, 4
+	note A_, 8
+	note G#, 8
+	note A_, 8
+	octave 4
+	note C#, 8
+	octave 3
+	note E_, 8
+	note G#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 8
+	note B_, 4
+	note A_, 2
+	note G#, 2
+	note A_, 8
+	note G#, 8
+	sound_ret
+
+Music_FourIsland_Ch2:
+	duty_cycle 3
+.mainloop:
+	sound_call .sub1
+	note E_, 2
+	rest 2
+	note F#, 10
+	sound_call .sub1
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note B_, 10
+	duty_cycle 2
+	vibrato 0, 0, 0
+	volume_envelope 10, 5
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 10
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 4
+	note B_, 4
+	octave 4
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	octave 3
+	note G#, 10
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 4
+	note F#, 4
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 4
+	octave 4
+	note C#, 4
+	note D#, 2
+	octave 3
+	note B_, 16
+	duty_cycle 3
+	volume_envelope 10, 3
+	note D#, 6
+	note E_, 6
+	note F#, 4
+	sound_jump .mainloop
+
+.sub1:
+	vibrato 7, 2, 2
+	note_type 12, 12, 5
+	octave 4
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note D#, 2
+	note E_, 4
+	note F#, 4
+	note G#, 2
+	note B_, 6
+	note G#, 4
+	note F#, 4
+	note G#, 2
+	note E_, 12
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note E_, 4
+	note C#, 8
+	note E_, 8
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note A_, 8
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note C#, 4
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note G#, 2
+	note F#, 2
+	note E_, 8
+	vibrato 0, 0, 0
+	volume_envelope 11, 4
+	octave 3
+	note E_, 4
+	vibrato 7, 2, 2
+	volume_envelope 12, 5
+	octave 4
+	note D#, 2
+	note E_, 2
+	note F#, 16
+	volume_envelope 11, 4
+	octave 3
+	note D#, 2
+	sound_ret
+
+Music_FourIsland_Ch3:
+	note_type 12, 1, 0
+.mainloop:
+	sound_call .sub1
+	sound_call .sub1
+	sound_call .sub3
+.loop1:
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	sound_loop 4, .loop1
+	sound_call .sub3
+.loop2:
+	octave 4
+	note G#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_loop 4, .loop2
+.loop3:
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_loop 7, .loop3
+	octave 4
+	note A#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	sound_call .sub2
+	sound_jump .mainloop
+
+.sub1:
+	octave 4
+	note G#, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	sound_loop 4, .sub1
+	octave 4
+.sub1loop1:
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	sound_loop 3, .sub1loop1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+.sub1loop2:
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	sound_loop 2, .sub1loop2
+.sub2:
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_loop 5, .sub2
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_ret
+
+.sub3:
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	sound_loop 4, .sub3
+	octave 4
+	sound_ret
+
+Music_FourIsland_Ch4:
+	toggle_noise 0
+	drum_speed 12
+.mainloop:
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
+	drum_note 6, 6
+	drum_note 6, 4
+	drum_note 6, 2
+	drum_note 7, 2
+	drum_note 6, 2
+	sound_jump .mainloop
--- a/audio/music/SixIsland.asm
+++ b/audio/music/SixIsland.asm
@ -0,0 +1,577 @@
+; By TempoQuill, from https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/violet.asm
+; Minor tweaks by Zeta_Null to fix desync and one wrong note
+Music_SixIsland:
+	channel_count 4
+	channel 1, Music_SixIsland_Ch1
+	channel 2, Music_SixIsland_Ch2
+	channel 3, Music_SixIsland_Ch3
+	channel 4, Music_SixIsland_Ch4
+
+Music_SixIsland_Ch1:
+	tempo 156
+	volume 7, 7
+	vibrato 4, 3, 1
+	pitch_offset 1
+	duty_cycle 1
+	note_type 12, 6, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note G#, 4
+	volume_envelope 10, 3
+	note B_, 10
+	volume_envelope 6, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note F#, 4
+	volume_envelope 10, 3
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note D#, 2
+	volume_envelope 6, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	volume_envelope 10, 3
+	note B_, 10
+	volume_envelope 6, 4
+	note B_, 4
+	note B_, 2
+	volume_envelope 10, 5
+	note B_, 6
+	note A#, 4
+.mainloop:
+	note B_, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note D#, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note F#, 4
+	note C#, 2
+	note G#, 4
+	note B_, 4
+	note G#, 4
+	note E_, 1
+	note F#, 1
+	octave 2
+	note A#, 2
+	octave 3
+	note G#, 4
+	note A#, 2
+	note G#, 2
+	note F#, 4
+	note G#, 1
+	note A#, 1
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 4
+	note F#, 4
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 1
+	note E_, 1
+	note F#, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 4
+	note D#, 4
+	note F#, 2
+	note B_, 4
+	note A#, 4
+	note G#, 4
+	note E_, 2
+	note F#, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D#, 6
+	note E_, 6
+	note F#, 4
+	sound_call .sub1
+	note E_, 4
+	sound_call .sub1
+	note E_, 2
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 2
+	octave 3
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	octave 4
+	note D#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 4
+	note G#, 4
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 4
+	note F#, 4
+	sound_jump .mainloop
+
+.sub1:
+	note G_, 2
+	note D_, 4
+	octave 4
+	note D_, 2
+	note C#, 2
+	octave 3
+	note E_, 6
+	note F#, 6
+	note A_, 6
+	sound_ret
+
+Music_SixIsland_Ch2:
+	duty_cycle 3
+	vibrato 11, 2, 2
+	note_type 12, 10, 2
+	octave 3
+	note G#, 2
+	note A#, 2
+	note B_, 2
+	volume_envelope 13, 3
+	octave 4
+	note D#, 4
+	volume_envelope 10, 2
+	note C#, 2
+	octave 3
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A#, 2
+	volume_envelope 13, 3
+	octave 4
+	note C#, 4
+	volume_envelope 10, 2
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note G#, 2
+	note A#, 2
+	note B_, 2
+	volume_envelope 13, 3
+	note G#, 4
+	volume_envelope 10, 2
+	note A#, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	octave 3
+	note F#, 2
+	octave 4
+	note D#, 2
+	volume_envelope 13, 6
+	note C#, 8
+.mainloop:
+	volume_envelope 13, 4
+	octave 4
+	note D#, 1
+	note E_, 1
+	note F#, 6
+	note F#, 1
+	note G#, 1
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 2
+	volume_envelope 13, 5
+	note E_, 14
+	volume_envelope 13, 4
+	note C#, 1
+	note D#, 1
+	note E_, 6
+	note E_, 1
+	note F#, 1
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note E_, 2
+	volume_envelope 13, 5
+	note D#, 14
+	volume_envelope 13, 4
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 6
+	note D#, 1
+	note E_, 1
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 4
+	note G#, 4
+	note B_, 6
+	note C#, 1
+	note D#, 1
+	note E_, 2
+	octave 3
+	note G#, 2
+	note B_, 2
+	octave 4
+	note E_, 2
+	note D#, 4
+	note C#, 4
+	volume_envelope 13, 7
+	octave 3
+	note B_, 16
+	duty_cycle 2
+	sound_call .sub1
+	note D_, 6
+	duty_cycle 1
+	sound_call .sub1
+	note F#, 4
+	note D_, 1
+	note E_, 1
+	note F#, 14
+	note D_, 1
+	note E_, 1
+	note F#, 12
+	octave 3
+	note D#, 4
+	octave 4
+	note C#, 12
+	octave 3
+	note B_, 4
+	note A#, 14
+	duty_cycle 3
+	sound_jump .mainloop
+
+.sub1:
+	rest 2
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	octave 4
+	note E_, 4
+	sound_ret
+
+Music_SixIsland_Ch3:
+	note_type 12, 1, 1
+	rest 6
+	octave 4
+	note E_, 4
+	rest 12
+	note D#, 4
+	rest 10
+	octave 3
+	note G#, 2
+	octave 4
+	note D#, 4
+	note F#, 2
+	rest 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note F#, 2
+	rest 2
+.mainloop:
+	octave 3
+	note F#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	note B_, 1
+	rest 3
+	octave 5
+	note D#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	octave 3
+	note F#, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note A#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	note A#, 1
+	rest 3
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	note E_, 1
+	octave 5
+	note E_, 1
+	rest 3
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note A#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+.loop1:
+	octave 4
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	sound_loop 2, .loop1
+	note A_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 3
+	octave 4
+	note A_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 3
+	note D#, 1
+	rest 3
+	octave 4
+	note A_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note C#, 1
+	rest 1
+	sound_jump .mainloop
+
+Music_SixIsland_Ch4:
+	toggle_noise 1
+	drum_speed 12
+.loop1:
+	drum_note 5, 2
+	drum_note 5, 4
+	drum_note 6, 10
+	drum_note 5, 2
+	drum_note 5, 4
+	drum_note 6, 6
+	drum_note 5, 4
+	sound_loop 2, .loop1
+.mainloop:
+	drum_note 10, 6
+	drum_note 12, 4
+	drum_note 12, 2
+	drum_note 6, 4
+	drum_note 10, 2
+	drum_note 12, 4
+	drum_note 12, 4
+	drum_note 6, 2
+	drum_note 12, 4
+	sound_loop 7, .mainloop
+	drum_note 10, 6
+	drum_note 12, 4
+	drum_note 12, 2
+	drum_note 6, 4
+	drum_note 12, 2
+	drum_note 10, 4
+	drum_note 6, 6
+	drum_note 12, 4
+	sound_jump .mainloop
--- a/audio/music/sevii.asm
+++ b/audio/music/sevii.asm
@ -0,0 +1,318 @@
+; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/lakeofrage.asm
+Music_Sevii:
+	channel_count 4
+	channel 1, Music_Sevii_Ch1
+	channel 2, Music_Sevii_Ch2
+	channel 3, Music_Sevii_Ch3
+	channel 4, Music_Sevii_Ch4
+
+Music_Sevii_Ch1:
+	tempo 154
+	volume 7, 7
+	duty_cycle 2
+	pitch_offset 1
+	vibrato 8, 3, 2
+	note_type 12, 10, 7
+	octave 3
+.mainloop:
+	sound_call .sub1
+	note F_, 8
+	note F_, 4
+	note E_, 4
+	note D_, 8
+	note A#, 4
+	octave 4
+	note D_, 4
+	sound_call .sub1
+	note A_, 8
+	note F_, 4
+	note E_, 4
+	note D_, 8
+	note A#, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note C_, 2
+	octave 2
+	note A#, 8
+	octave 3
+	note D_, 8
+	note F_, 8
+	note A#, 4
+	note F_, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	octave 4
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note A#, 2
+	sound_jump .mainloop
+
+.sub1:
+	octave 3
+	note A_, 6
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 8
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	octave 3
+	note A#, 4
+	sound_ret
+
+Music_Sevii_Ch2:
+	duty_cycle 3
+	vibrato 20, 2, 4
+.mainloop:
+	note_type 12, 13, 0
+	octave 3
+	note F_, 8
+	volume_envelope 13, 7
+	note F_, 8
+	volume_envelope 13, 0
+	note G_, 8
+	volume_envelope 13, 7
+	note G_, 8
+	volume_envelope 13, 0
+	octave 4
+	note C_, 8
+	note_type 8, 13, 7
+	note C_, 4
+	octave 3
+	note G_, 4
+	octave 4
+	note C_, 4
+	volume_envelope 13, 0
+	note G_, 12
+	volume_envelope 13, 7
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note_type 12, 13, 0
+	note F_, 8
+	volume_envelope 13, 7
+	note F_, 4
+	note A_, 4
+	note G_, 3
+	note F_, 1
+	note E_, 12
+	note_type 8, 13, 7
+	octave 3
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 13, 7
+	note D_, 8
+	note F_, 2
+	note A#, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	note F_, 1
+	note A#, 8
+	octave 3
+	note C_, 2
+	octave 4
+	note G_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 2
+	note_type 8, 13, 7
+	note C_, 4
+	note D_, 4
+	note E_, 4
+	note G_, 12
+	octave 3
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	octave 4
+	note D_, 4
+	note C_, 4
+	octave 3
+	note A#, 4
+	octave 4
+	note F_, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 13, 0
+	note E_, 8
+	volume_envelope 13, 7
+	note E_, 6
+	note E_, 1
+	note F_, 1
+	volume_envelope 13, 0
+	note G_, 8
+	volume_envelope 13, 7
+	note G_, 8
+	sound_jump .mainloop
+
+Music_Sevii_Ch3:
+	note_type 12, 1, 4
+.mainloop:
+	sound_call .sub1
+	sound_call .sub1
+	sound_call .sub2
+.loop1:
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	sound_loop 2, .loop1
+	sound_call .sub2
+	sound_jump .mainloop
+
+.sub1:
+	octave 3
+	note F_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	sound_loop 2, .sub1
+	rest 2
+	note F_, 1
+	note C_, 1
+.sub1loop1:
+	octave 3
+	note E_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_loop 2, .sub1loop1
+	octave 3
+	note E_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	octave 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note F_, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+.sub1loop2:
+	octave 3
+	note A#, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	sound_loop 2, .sub1loop2
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_ret
+
+.sub2:
+	octave 4
+	note C_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_loop 2, .sub2
+	sound_ret
+
+Music_Sevii_Ch4:
+	toggle_noise 0
+	drum_speed 6
+.mainloop:
+	sound_call .sub1
+	drum_note 6, 4
+	drum_note 4, 4
+	sound_call .sub1
+	drum_note 7, 4
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	sound_jump .mainloop
+
+.sub1:
+	drum_note 2, 4
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 2, 4
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 2, 2
+	drum_note 4, 2
+	drum_note 2, 4
+	sound_ret
--- a/audio/music_pointers.asm
+++ b/audio/music_pointers.asm
@ -128,4 +128,7 @@ Music:
 	dba Music_AlphalithBattle
 	dba Music_FortunaSF
 	dba Music_JasperForest
+	dba Music_Sevii
+	dba Music_FourIsland
+	dba Music_SixIsland
 	assert_table_length NUM_MUSIC_SONGS
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@ -598,7 +598,7 @@ ENDM
 	endgroup
 	
 	newgroup FIVE_ISLAND ; 32
-	map_const FIVE_ISLAND,							10, 10 ; 1
+	map_const FIVE_ISLAND,							10, 9 ; 1
 	map_const FIVE_ISLAND_MEADOW,					10, 10 ; 2
 	map_const MEMORIAL_PILLAR,						10, 10 ; 3
 	map_const WATER_LABYRINTH,						10, 10 ; 4
@ -607,7 +607,7 @@ ENDM
 	endgroup
 	
 	newgroup SIX_ISLAND ; 33
-	map_const SIX_ISLAND,							10, 10 ; 1
+	map_const SIX_ISLAND,							10, 18 ; 1
 	map_const WATER_PATH,							10, 10 ; 2
 	map_const RUIN_VALLEY,							10, 10 ; 3
 	map_const DOTTED_HOLE,							10, 10 ; 4
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@ -126,15 +126,17 @@
 	const MUSIC_ALPHALITHBATTLE				 ; 79
 	const MUSIC_FORTUNASF					 ; 7a
 	const MUSIC_JASPERFOREST				 ; 7b
+	const MUSIC_SEVII						 ; 7c
+	const MUSIC_FOURISLAND					 ; 7d
+	const MUSIC_SIXISLAND					 ; 7e
 DEF NUM_MUSIC_SONGS EQU const_value

-; GetMapMusic picks music for this value (see home/map.asm)
-DEF MUSIC_MAHOGANY_MART EQU $64
+; GetMapMusic picks music for these values (see home/map.asm)
+DEF MUSIC_MAHOGANY_MART EQU $fc
+DEF MUSIC_RADIO_TOWER   EQU $fd

 ; ExitPokegearRadio_HandleMusic uses these values
 DEF RESTART_MAP_MUSIC EQU $fe
 DEF ENTER_MAP_MUSIC   EQU $ff

-; GetMapMusic picks music for this bit flag
-DEF RADIO_TOWER_MUSIC_F EQU 7
-DEF RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F
+assert NUM_MUSIC_SONGS <= MUSIC_MAHOGANY_MART, "song IDs overlap special values"
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@ -292,7 +292,7 @@ DEF JOHTO_POKEMON EQU const_value
 	const SUNFLORA   ; c0
 	const HIPPUNK
 	const AERCROW
-	const FOXFIRE
+	const ZORRIEGO
 	const YANMA      ; c1
 	const YANMEGA
 	const ONIYANMA
--- a/data/events/special_pointers.asm
+++ b/data/events/special_pointers.asm
@ -69,6 +69,7 @@ SpecialsPointers::
 	add_special UpdateSprites ; bank 0
 	add_special UpdatePlayerSprite ; bank 0
 	add_special GameCornerPrizeMonCheckDex
+	add_special GameCornerPrizeMonShowDex
 	add_special UnusedSetSeenMon ; unused
 	add_special WaitSFX ; bank 0
 	add_special PlayMapMusic ; bank 0
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -110,11 +110,11 @@ MapGroup_Dungeons:
 	map BurnedTowerB1F, TILESET_CAVE, CAVE, LANDMARK_BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
 	map NationalPark, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map NationalParkBugContest, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
 	map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@ -624,53 +624,53 @@ MapGroup_Citrine:		; 27

 MapGroup_OneIsland:	; 28
 	table_width MAP_LENGTH, MapGroup_OneIsland
-	map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_ONE_ISLAND_MAPS

 MapGroup_TwoIsland:	; 29
 	table_width MAP_LENGTH, MapGroup_TwoIsland
-	map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_TWO_ISLAND_MAPS

 MapGroup_ThreeIsland:	; 30
 	table_width MAP_LENGTH, MapGroup_ThreeIsland
-	map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map BerryForest, TILESET_FOREST_KANTO, FOREST, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	assert_table_length NUM_THREE_ISLAND_MAPS

 MapGroup_FourIsland:	; 31
 	table_width MAP_LENGTH, MapGroup_FourIsland
-	map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_FOUR_ISLAND_MAPS

 MapGroup_FiveIsland:	; 32
 	table_width MAP_LENGTH, MapGroup_FiveIsland
-	map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map FiveIsland, TILESET_SEVII, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_FIVE_ISLAND_MAPS

 MapGroup_SixIsland:	; 33
 	table_width MAP_LENGTH, MapGroup_SixIsland
-	map SixIsland, TILESET_CAVE, TOWN, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SixIsland, TILESET_SEVII, TOWN, LANDMARK_SIX_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map WaterPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map RuinValley, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map DottedHole, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -682,7 +682,7 @@ MapGroup_SixIsland:	; 33

 MapGroup_SevenIsland:	; 34
 	table_width MAP_LENGTH, MapGroup_SevenIsland
-	map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map CanyonEntrance, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map SevaultCanyon, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map TanobyRuins, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@ -299,7 +299,7 @@ INCLUDE "data/pokemon/base_stats/sunbud.asm"
 INCLUDE "data/pokemon/base_stats/sunflora.asm"
 INCLUDE "data/pokemon/base_stats/hippunk.asm"
 INCLUDE "data/pokemon/base_stats/aercrow.asm"
-INCLUDE "data/pokemon/base_stats/foxfire.asm"
+INCLUDE "data/pokemon/base_stats/zorriego.asm"
 INCLUDE "data/pokemon/base_stats/yanma.asm"
 INCLUDE "data/pokemon/base_stats/yanmega.asm"
 INCLUDE "data/pokemon/base_stats/oniyanma.asm"
--- a/data/pokemon/base_stats/zorriego.asm
+++ b/data/pokemon/base_stats/zorriego.asm
@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/foxfire/front.dimensions"
+	INCBIN "gfx/pokemon/zorriego/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@ -278,7 +278,7 @@ PokemonCries::
 	mon_cry CRY_SUNFLORA,    -32,  384 ; SUNFLORA
 	mon_cry CRY_NIDORAN_M,     0,    0 ; HIPPUNK	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; AERCROW	(incomplete)
-	mon_cry CRY_NIDORAN_M,     0,    0 ; FOXFIRE	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; ZORRIEGO	(incomplete)
 	mon_cry CRY_TOTODILE,     49,  200 ; YANMA
 	mon_cry CRY_NIDORAN_M,     0,    0 ; YANMEGA	(incomplete)
 	mon_cry CRY_NIDORAN_M,     0,    0 ; ONIYANMA	(incomplete)
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@ -268,7 +268,7 @@ SunbudPokedexEntry::     INCLUDE "data/pokemon/dex_entries/sunbud.asm"
 SunfloraPokedexEntry::   INCLUDE "data/pokemon/dex_entries/sunflora.asm"
 HippunkPokedexEntry::    INCLUDE "data/pokemon/dex_entries/hippunk.asm"
 AercrowPokedexEntry::    INCLUDE "data/pokemon/dex_entries/aercrow.asm"
-FoxfirePokedexEntry::    INCLUDE "data/pokemon/dex_entries/foxfire.asm"
+ZorriegoPokedexEntry::   INCLUDE "data/pokemon/dex_entries/zorriego.asm"


 SECTION "Pokedex Entries 193-251", ROMX
--- a/data/pokemon/dex_entries/zorriego.asm
+++ b/data/pokemon/dex_entries/zorriego.asm
--- a/data/pokemon/dex_entry_pointers.asm
+++ b/data/pokemon/dex_entry_pointers.asm
@ -273,7 +273,7 @@ PokedexDataPointerTable:
 	dba SunfloraPokedexEntry
 	dba HippunkPokedexEntry
 	dba AercrowPokedexEntry
-	dba FoxfirePokedexEntry
+	dba ZorriegoPokedexEntry
 	dba YanmaPokedexEntry
 	dba YanmegaPokedexEntry
 	dba OniyanmaPokedexEntry
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@ -107,7 +107,6 @@ AlphabeticalPokedexOrder:
 	dw FLUTTER_MANE
 	dw FOLAGE
 	dw FORRETRESS
-	dw FOXFIRE
 	dw FURRET
 	dw GASTLY
 	dw GAOTORA
@ -399,5 +398,6 @@ AlphabeticalPokedexOrder:
 	dw YANMA
 	dw YANMEGA
 	dw ZAPDOS
+	dw ZORRIEGO
 	dw ZUBAT
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/dex_order_new.asm
+++ b/data/pokemon/dex_order_new.asm
@ -225,7 +225,7 @@ NewPokedexOrder:
 	dw QATU
 	dw XATU
 	dw AERCROW
-	dw FOXFIRE
+	dw ZORRIEGO
 	dw QWILFISH
 	dw KAZAPPELIN
 	dw QWILFATHER
--- a/data/pokemon/egg_moves_johto.asm
+++ b/data/pokemon/egg_moves_johto.asm
@ -61,7 +61,7 @@ EggMovePointers2::
 	dw NoEggMoves2
 	dw HippunkEggMoves
 	dw AercrowEggMoves
-	dw FoxfireEggMoves
+	dw ZorriegoEggMoves
 	dw YanmaEggMoves
 	dw NoEggMoves2 ; Yanmega
 	dw NoEggMoves2 ; Oniyanma
@ -388,7 +388,7 @@ AercrowEggMoves:
 	dw WHIRLWIND
 	dw -1 ; end

-FoxfireEggMoves:
+ZorriegoEggMoves:
 	dw CONFUSE_RAY
 	dw DISABLE
 	dw FAINT_ATTACK
--- a/data/pokemon/evolution_moves.asm
+++ b/data/pokemon/evolution_moves.asm
@ -271,7 +271,7 @@ EvolutionMoves::
 	dw NO_MOVE ;SUNFLORA   ; c0
 	dw NO_MOVE ;HIPPUNK
 	dw NO_MOVE ;AERCROW
-	dw NO_MOVE ;FOXFIRE
+	dw NO_MOVE ;ZORRIEGO
 	dw NO_MOVE ;YANMA      ; c1
 	dw NO_MOVE ;YANMEGA
 	dw NO_MOVE ;ONIYANMA
--- a/data/pokemon/evos_attacks_johto.asm
+++ b/data/pokemon/evos_attacks_johto.asm
@ -61,7 +61,7 @@ EvosAttacksPointers2::
 	dw SunfloraEvosAttacks
 	dw HippunkEvosAttacks
 	dw AercrowEvosAttacks
-	dw FoxfireEvosAttacks
+	dw ZorriegoEvosAttacks
 	dw YanmaEvosAttacks
 	dw YanmegaEvosAttacks
 	dw OniyanmaEvosAttacks
@ -1165,7 +1165,7 @@ AercrowEvosAttacks:
 	dbw 50, RAZOR_WIND
 	db 0 ; no more level-up moves
 	
-FoxfireEvosAttacks:
+ZorriegoEvosAttacks:
 	db 0; no more evolutions
 	dbw 1, EMBER
 	dbw 1, LEER
--- a/data/pokemon/first_stages.asm
+++ b/data/pokemon/first_stages.asm
@ -273,7 +273,7 @@ FirstEvoStages::
 	dw SUNKERN    ;c0
 	dw HIPPUNK
 	dw AERCROW
-	dw FOXFIRE
+	dw ZORRIEGO
 	dw YANMA
 	dw YANMA
 	dw YANMA
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@ -274,7 +274,7 @@ MonMenuIcons:
 	db ICON_ODDISH      ; SUNFLORA
 	db ICON_SLOWPOKE    ; HIPPUNK
 	db ICON_BIRD        ; AERCROW
-	db ICON_FOX         ; FOXFIRE
+	db ICON_FOX         ; ZORRIEGO
 	db ICON_BUG         ; YANMA
 	db ICON_BUG         ; YANMEGA
 	db ICON_BUG         ; ONIYANMA
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@ -276,7 +276,7 @@ PokemonNames::
 	db "SUNFLORA@@"
 	db "TORPIR@@@@"
 	db "AERCROW@@@"
-	db "FOXFIRE@@@"
+	db "ZORRIEGO@@"
 	db "YANMA@@@@@"
 	db "YANMEGA@@@"
 	db "ONIYANMA@@"
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@ -577,8 +577,8 @@ INCBIN "gfx/pokemon/hippunk/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/hippunk/shiny.pal"
 INCBIN "gfx/pokemon/aercrow/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/aercrow/shiny.pal"
-INCBIN "gfx/pokemon/foxfire/front.gbcpal", middle_colors
-INCLUDE "gfx/pokemon/foxfire/shiny.pal"
+INCBIN "gfx/pokemon/zorriego/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/zorriego/shiny.pal"
 INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/yanma/shiny.pal"
 INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@ -557,8 +557,8 @@ PokemonPicPointers::
 	dba HippunkBackpic
 	dba AercrowFrontpic
 	dba AercrowBackpic
-	dba FoxfireFrontpic
-	dba FoxfireBackpic
+	dba ZorriegoFrontpic
+	dba ZorriegoBackpic
 	dba YanmaFrontpic
 	dba YanmaBackpic
 	dba YanmegaFrontpic
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
--- a/data/trainers/parties_new_classes.asm
+++ b/data/trainers/parties_new_classes.asm
@ -199,6 +199,8 @@ KabufossilGroup:
 LassGroup:
 	next_list_item ; LASS (1)
 	db "CARRIE@", TRAINERTYPE_NORMAL
+	db 16
+	dw CLEFFA
 	db 18
 	dw SNUBBULL
 	db -1 ; end
@ -206,11 +208,11 @@ LassGroup:
 	next_list_item ; LASS (2)
 	db "BRIDGET@", TRAINERTYPE_NORMAL
 	db 15
-	dw JIGGLYPUFF
+	dw AZURILL
 	db 15
-	dw JIGGLYPUFF
-	db 15
-	dw JIGGLYPUFF
+	dw HAPPINY
+	db 17
+	dw WIGGLYTUFF
 	db -1 ; end

 	next_list_item ; LASS (3)
@ -225,10 +227,10 @@ LassGroup:

 	next_list_item ; LASS (4)
 	db "KRISE@", TRAINERTYPE_NORMAL
-	db 12
-	dw ODDISH
 	db 15
-	dw CUBONE
+	dw SUNBUD
+	db 15
+	dw PHANPY
 	db -1 ; end

 	next_list_item ; LASS (5)
@ -279,12 +281,16 @@ LassGroup:

 	next_list_item ; LASS (10)
 	db "DANA@", TRAINERTYPE_MOVES
-	db 18
+	db 25
 	dw FLAAFFY
 	dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
-	db 18
-	dw PSYDUCK
+	db 24
+	dw WEIRDUCK
 	dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 25
+	dw RAITORA
+	dw QUICK_ATTACK, LEER, THUNDERSHOCK, ROAR
+	
 	db -1 ; end

 	next_list_item ; LASS (11)
@ -297,8 +303,12 @@ LassGroup:

 	next_list_item ; LASS (12)
 	db "CONNIE@", TRAINERTYPE_NORMAL
-	db 21
-	dw MARILL
+	db 25
+	dw MAGNETITE
+	db 25
+	dw ANGORE
+	db 26
+	dw FORRETRESS
 	db -1 ; end

 	next_list_item ; LASS (13) - originally Connie 3
@ -789,8 +799,8 @@ TwinsGroup:
 	next_list_item ; TWINS (2)
 	db "ANN & ANNE@", TRAINERTYPE_MOVES
 	db 16
-	dw CLEFAIRY
-	dw GROWL, ENCORE, DOUBLESLAP, METRONOME
+	dw TOGEPI
+	dw CHARM, POISON_STING, METRONOME, SWEET_KISS
 	db 16
 	dw JIGGLYPUFF
 	dw SING, DEFENSE_CURL, POUND, DISABLE
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@ -228,9 +228,9 @@ JohtoWaterWildMons:

 	def_water_wildmons CIANWOOD_CITY
 	db 6 percent ; encounter rate
-	dbw 30, TENTACOOL
-	dbw 35, CHINCHOU
-	dbw 30, TENTACRUEL
+	dbw 25, TENTACOOL
+	dbw 20, CHINCHOU
+	dbw 25, TENTACRUEL
 	end_water_wildmons

 	def_water_wildmons OLIVINE_CITY
--- a/data/wild/nihon_grass.asm
+++ b/data/wild/nihon_grass.asm
@ -220,7 +220,7 @@ NihonGrassWildMons:
 	dbw 35, WARUCHU
 	; nite
 	dbw 30, MURKROW
-	dbw 31, FOXFIRE
+	dbw 31, ZORRIEGO
 	dbw 30, MURKROW
 	dbw 31, SNEASEL
 	dbw 32, ARBOK
@ -250,7 +250,7 @@ NihonGrassWildMons:
 	dbw 35, WARUCHU
 	; nite
 	dbw 30, MURKROW
-	dbw 31, FOXFIRE
+	dbw 31, ZORRIEGO
 	dbw 30, MURKROW
 	dbw 31, SNEASEL
 	dbw 32, ARBOK
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@ -236,17 +236,26 @@ SetPlayerPalette:
 	ret

 GameCornerPrizeMonCheckDex:
+	xor a
+	ld [wPokedexShinyToggle], a
+	ld [wWasMonCaught], a
 	ld a, [wScriptVar]
 	call CheckCaughtMon
 	ret nz
-	ld a, [wScriptVar]
-	call SetSeenAndCaughtMon
+	ld a, 1
+	ld [wWasMonCaught], a
+	ret
+
+GameCornerPrizeMonShowDex:
+	ld a, [wWasMonCaught]
+	cp 0
+	ret z
 	call FadeToMenu
 	ld a, [wScriptVar]
 	ld [wNamedObjectIndex], a
 	farcall NewPokedexEntry
 	call ExitAllMenus
-	ret
+	ret	

 UnusedSetSeenMon:
 	ld a, [wScriptVar]
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@ -135,10 +135,25 @@ _CGB_FinishBattleScreenLayout:
 	lb bc, 5, 10
 	ld a, PAL_BATTLE_BG_PLAYER_HP
 	call FillBoxCGB
+; Zetacode, SGB mode should use hp color instead of XP
+	ld a, [wOptions2]
+	and 1 << MENU_ACCOUNT
+	jr z, .SGBxp
+; End Zetacode 1
 	hlcoord 10, 11, wAttrmap
 	lb bc, 1, 9
 	ld a, PAL_BATTLE_BG_EXP
 	call FillBoxCGB
+; Zetacode 2
+	jr .please_continue
+
+.SGBxp	
+	hlcoord 10, 11, wAttrmap
+	lb bc, 1, 9
+	ld a, PAL_BATTLE_BG_PLAYER_HP
+	call FillBoxCGB
+.please_continue
+; End Zetacode 2
 	hlcoord 0, 12, wAttrmap
 	ld bc, 6 * SCREEN_WIDTH
 	ld a, PAL_BATTLE_BG_TEXT
@ -237,6 +252,9 @@ _CGB_PokegearPals:
 	ret

 _CGB_StatsScreenHPPals:
+	ld a, [wOptions2]
+	and 1 << MENU_ACCOUNT
+	jr z, .SGBStats
 	ld de, wBGPals1
 	ld a, [wCurHPPal]
 	ld l, a
@ -258,7 +276,28 @@ _CGB_StatsScreenHPPals:
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call WipeAttrmap
+	jr .contattrmap
+	
+.SGBStats
+	ld de, wBGPals1
+	ld a, [wCurHPPal]
+	ld l, a
+	ld h, 0
+	add hl, hl
+	add hl, hl
+	ld bc, HPBarPals
+	add hl, bc
+	call LoadPalette_White_Col1_Col2_Black ; hp palette
+	ld a, [wCurPartySpecies]
+	ld bc, wTempMonDVs
+	call GetPlayerOrMonPalettePointer
+	call LoadPalette_White_Col1_Col2_Black ; mon palette
+	;ld a, BANK(wBGPals1)
+	;call FarCopyWRAM
+	call WipeAttrmap
+	jr .contattrmapSGB

+.contattrmap
 	hlcoord 0, 0, wAttrmap
 	lb bc, 8, SCREEN_WIDTH
 	ld a, $1 ; mon palette
@ -295,6 +334,18 @@ _CGB_StatsScreenHPPals:
 	ldh [hCGBPalUpdate], a
 	ret

+.contattrmapSGB
+	hlcoord 0, 0, wAttrmap
+	lb bc, 8, 9
+	ld a, $1 ; mon palette
+	call FillBoxCGB
+
+	call ApplyAttrmap
+	call ApplyPals
+	ld a, TRUE
+	ldh [hCGBPalUpdate], a
+	ret
+	
 StatsScreenPagePals:
 INCLUDE "gfx/stats/pages.pal"

@ -960,6 +1011,9 @@ INCLUDE "gfx/trainer_card/badges.pal"
 	call LoadHLOBPaletteIntoDE
 	dec b
 	jr nz, .ob_loop
+	; Fix Attribute map
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret

 _CGB_TrainerCardKanto:
@ -1119,6 +1173,9 @@ INCLUDE "gfx/trainer_card/kanto_badges.pal"
 	call LoadHLOBPaletteIntoDE
 	dec b
 	jr nz, .ob_loop
+	; Fix Attribute map
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret

 _CGB_MoveList:
@ -1252,6 +1309,9 @@ INCLUDE "gfx/pack/pack_nb.pal"
 	call LoadHLOBPaletteIntoDE
 	dec b
 	jr nz, .ob_loop
+	; Fix Attribute map
+	call WipeAttrmap
+	call ApplyAttrmap
 	ret

 _CGB_Pokepic:
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@ -370,8 +370,10 @@ ApplyHPBarPals:
 	call FillBoxCGB
 	ret

-LoadStatsScreenPals:
-	call CheckCGB
+LoadStatsScreenPals:	; This bit of code colorizes the stats screen with the page colors. 
+	;call CheckCGB		; This was a check for if this is running on GBC, and fortunately I can very easily replace it with the SGB Color Mode check for similar results
+	ld a, [wOptions2]
+	and 1 << MENU_ACCOUNT
 	ret z
 	ld hl, StatsScreenPals
 	ld b, 0
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@ -239,10 +239,12 @@ PokeBallEffect:
 	ld [wWildMon], a
 	ld a, [wBattleType]
 	cp BATTLETYPE_CONTEST	; Fixes the Park Ball corrupting graphics when used outside of a Contest
-	call nz, ReturnToBattle_UseBall
+	jp z, .skip_return_to_battle
 	cp BATTLETYPE_SAFARI
-	call nz, ReturnToBattle_UseBall
+	jp z, .skip_return_to_battle
+	call ReturnToBattle_UseBall

+.skip_return_to_battle
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
 	ld hl, ItemUsedText
@ -530,6 +532,15 @@ PokeBallEffect:

 	ld a, [wEnemyMonSpecies]
 	ld [wTempSpecies], a
+	farcall BattleCheckEnemyShininess
+	jp c, .shiny
+	xor a
+	jp .shinycont
+.shiny
+	xor a
+	inc a
+.shinycont
+	ld [wPokedexShinyToggle], a
 	predef NewPokedexEntry

 .skip_pokedex
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@ -114,9 +114,9 @@ GetOptionPointer:
 Options_TextSpeed:
 	call GetTextSpeed
 	ldh a, [hJoyPressed]
-	bit D_LEFT_F, a
-	jr nz, .LeftPressed
 	bit D_RIGHT_F, a
+	jr nz, .RightPressed
+	bit D_LEFT_F, a
 	jr z, .NonePressed
 	ld a, c ; right pressed
 	cp OPT_TEXT_SPEED_NONE
@ -128,7 +128,7 @@ Options_TextSpeed:
 	ld a, e
 	jr .Save

-.LeftPressed:
+.RightPressed:
 	ld a, c
 	and a
 	jr nz, .Decrease
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@ -210,8 +210,24 @@ endr
 	inc de
 	ld a, c
 	ld [de], a
-	inc de

+	; Set Shininess for New Dex Entry
+	dec de
+	ld b, d
+	ld c, e
+	farcall CheckShininess
+	jp c, .shiny
+	xor a
+	jp .shinycont
+.shiny
+	xor a
+	inc a
+.shinycont
+	ld [wPokedexShinyToggle], a
+	; Unclobber de
+	inc de
+	inc de
+	
 	; Initialize PP.
 	push hl
 	push de
--- a/gfx/footprints/zorriego.png
+++ b/gfx/footprints/zorriego.png
--- a/gfx/footprints_johto.asm
+++ b/gfx/footprints_johto.asm
@ -61,7 +61,7 @@ INCBIN "gfx/footprints/sunbud.1bpp"
 INCBIN "gfx/footprints/sunflora.1bpp"
 INCBIN "gfx/footprints/hippunk.1bpp"
 INCBIN "gfx/footprints/aercrow.1bpp"
-INCBIN "gfx/footprints/foxfire.1bpp"
+INCBIN "gfx/footprints/zorriego.1bpp"
 INCBIN "gfx/footprints/yanma.1bpp"
 INCBIN "gfx/footprints/yanmega.1bpp"
 INCBIN "gfx/footprints/oniyanma.1bpp"
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@ -850,8 +850,8 @@ SunbudFrontpic:      INCBIN "gfx/pokemon/sunbud/front.animated.2bpp.lz"
 SunbudBackpic:       INCBIN "gfx/pokemon/sunbud/back.2bpp.lz"
 HippunkFrontpic:     INCBIN "gfx/pokemon/hippunk/front.animated.2bpp.lz"
 HippunkBackpic:      INCBIN "gfx/pokemon/hippunk/back.2bpp.lz"
-FoxfireFrontpic:     INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
-FoxfireBackpic:      INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
+ZorriegoFrontpic:    INCBIN "gfx/pokemon/zorriego/front.animated.2bpp.lz"
+ZorriegoBackpic:     INCBIN "gfx/pokemon/zorriego/back.2bpp.lz"
 YanmegaFrontpic:     INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
 YanmegaBackpic:      INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
 OniyanmaFrontpic:    INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz"
--- a/gfx/pokemon/anim_pointers.asm
+++ b/gfx/pokemon/anim_pointers.asm
@ -272,7 +272,7 @@ AnimationPointers:
 	dw SunfloraAnimation
 	dw HippunkAnimation
 	dw AercrowAnimation
-	dw FoxfireAnimation
+	dw ZorriegoAnimation
 	dw YanmaAnimation
 	dw YanmegaAnimation
 	dw OniyanmaAnimation
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@ -270,7 +270,7 @@ SunbudAnimation:     INCLUDE "gfx/pokemon/sunbud/anim.asm"
 SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim.asm"
 HippunkAnimation:    INCLUDE "gfx/pokemon/hippunk/anim.asm"
 AercrowAnimation:    INCLUDE "gfx/pokemon/aercrow/anim.asm"
-FoxfireAnimation:    INCLUDE "gfx/pokemon/magneton/anim.asm"
+ZorriegoAnimation:   INCLUDE "gfx/pokemon/zorriego/anim.asm"
 YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
 YanmegaAnimation:    INCLUDE "gfx/pokemon/yanmega/anim.asm"
 OniyanmaAnimation:   INCLUDE "gfx/pokemon/oniyanma/anim.asm"
--- a/gfx/pokemon/bitmask_pointers.asm
+++ b/gfx/pokemon/bitmask_pointers.asm
@ -272,7 +272,7 @@ BitmasksPointers:
 	dw SunfloraBitmasks
 	dw HippunkBitmasks
 	dw AercrowBitmasks
-	dw FoxfireBitmasks
+	dw ZorriegoBitmasks
 	dw YanmaBitmasks
 	dw YanmegaBitmasks
 	dw OniyanmaBitmasks
--- a/gfx/pokemon/bitmasks.asm
+++ b/gfx/pokemon/bitmasks.asm
@ -270,7 +270,7 @@ SunbudBitmasks:     INCLUDE "gfx/pokemon/sunbud/bitmask.asm"
 SunfloraBitmasks:   INCLUDE "gfx/pokemon/sunflora/bitmask.asm"
 HippunkBitmasks:    INCLUDE "gfx/pokemon/hippunk/bitmask.asm"
 AercrowBitmasks:    INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
-FoxfireBitmasks:    INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
+ZorriegoBitmasks:    INCLUDE "gfx/pokemon/zorriego/bitmask.asm"
 YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
 YanmegaBitmasks:    INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
 OniyanmaBitmasks:   INCLUDE "gfx/pokemon/oniyanma/bitmask.asm"
--- a/gfx/pokemon/frame_pointers.asm
+++ b/gfx/pokemon/frame_pointers.asm
@ -272,7 +272,7 @@ FramesPointers:
 	dba SunfloraFrames
 	dba HippunkFrames
 	dba AercrowFrames
-	dba FoxfireFrames
+	dba ZorriegoFrames
 	dba YanmaFrames
 	dba YanmegaFrames
 	dba OniyanmaFrames
--- a/gfx/pokemon/idle_pointers.asm
+++ b/gfx/pokemon/idle_pointers.asm
@ -272,7 +272,7 @@ AnimationIdlePointers:
 	dw SunfloraAnimationIdle
 	dw HippunkAnimationIdle
 	dw AercrowAnimationIdle
-	dw FoxfireAnimationIdle
+	dw ZorriegoAnimationIdle
 	dw YanmaAnimationIdle
 	dw YanmegaAnimationIdle
 	dw OniyanmaAnimationIdle
--- a/gfx/pokemon/idles.asm
+++ b/gfx/pokemon/idles.asm
@ -270,7 +270,7 @@ SunbudAnimationIdle:     INCLUDE "gfx/pokemon/sunbud/anim_idle.asm"
 SunfloraAnimationIdle:   INCLUDE "gfx/pokemon/sunflora/anim_idle.asm"
 HippunkAnimationIdle:    INCLUDE "gfx/pokemon/hippunk/anim_idle.asm"
 AercrowAnimationIdle:    INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
-FoxfireAnimationIdle:    INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
+ZorriegoAnimationIdle:   INCLUDE "gfx/pokemon/zorriego/anim_idle.asm"
 YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
 YanmegaAnimationIdle:    INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
 OniyanmaAnimationIdle:   INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm"
--- a/gfx/pokemon/johto_frames.asm
+++ b/gfx/pokemon/johto_frames.asm
@ -60,7 +60,7 @@ SunbudFrames:     INCLUDE "gfx/pokemon/sunbud/frames.asm"
 SunfloraFrames:   INCLUDE "gfx/pokemon/sunflora/frames.asm"
 HippunkFrames:    INCLUDE "gfx/pokemon/hippunk/frames.asm"
 AercrowFrames:    INCLUDE "gfx/pokemon/aercrow/frames.asm"
-FoxfireFrames:    INCLUDE "gfx/pokemon/foxfire/frames.asm"
+ZorriegoFrames:   INCLUDE "gfx/pokemon/zorriego/frames.asm"
 YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
 YanmegaFrames:    INCLUDE "gfx/pokemon/yanmega/frames.asm"
 OniyanmaFrames:   INCLUDE "gfx/pokemon/oniyanma/frames.asm"
--- a/gfx/pokemon/zorriego/anim.asm
+++ b/gfx/pokemon/zorriego/anim.asm
--- a/gfx/pokemon/zorriego/anim_idle.asm
+++ b/gfx/pokemon/zorriego/anim_idle.asm
--- a/gfx/pokemon/zorriego/back.png
+++ b/gfx/pokemon/zorriego/back.png
--- a/gfx/pokemon/zorriego/front.png
+++ b/gfx/pokemon/zorriego/front.png
--- a/gfx/pokemon/zorriego/shiny.pal
+++ b/gfx/pokemon/zorriego/shiny.pal
--- a/gfx/trainers/soldier.png
+++ b/gfx/trainers/soldier.png
--- a/gfx/trainers/yujirou.png
+++ b/gfx/trainers/yujirou.png
--- a/home/map.asm
+++ b/home/map.asm
@ -2192,8 +2192,8 @@ GetMapMusic::
 	ld a, c
 	cp MUSIC_MAHOGANY_MART
 	jr z, .mahoganymart
-	bit RADIO_TOWER_MUSIC_F, c
-	jr nz, .radiotower
+	cp MUSIC_RADIO_TOWER
+	jr z, .radiotower
 	farcall Function8b342
 	ld e, c
 	ld d, 0
@ -2210,11 +2210,7 @@ GetMapMusic::
 	jr .done

 .clearedradiotower
-	; the rest of the byte
-	ld a, c
-	and RADIO_TOWER_MUSIC - 1
-	ld e, a
-	ld d, 0
+	ld de, MUSIC_GOLDENROD_CITY
 	jr .done

 .mahoganymart
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@ -154,6 +154,8 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	loadmonindex 1, PIKACHU
 	special GameCornerPrizeMonCheckDex
 	givepoke PIKACHU, 25
+	loadmonindex 1, PIKACHU
+	special GameCornerPrizeMonShowDex
 	takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
 	sjump .loop

@ -172,6 +174,8 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	loadmonindex 2, PORYGON
 	special GameCornerPrizeMonCheckDex
 	givepoke PORYGON, 15
+	loadmonindex 2, PORYGON
+	special GameCornerPrizeMonShowDex
 	takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
 	sjump .loop

@ -190,6 +194,8 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	loadmonindex 3, LARVITAR
 	special GameCornerPrizeMonCheckDex
 	givepoke LARVITAR, 40
+	loadmonindex 3, LARVITAR
+	special GameCornerPrizeMonShowDex
 	takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
 	sjump .loop

--- a/maps/DebugRoom.asm
+++ b/maps/DebugRoom.asm
@ -418,7 +418,7 @@ DebugRoom_MapEvents:
 	warp_event 35, 17, SUNGLOW_CITY, 1 ; east warp
 	warp_event  5, 35, LAVENDER_TOWN, 1 ; southwest warp
 	warp_event 19, 34, KANTO_SAFARI_ZONE_CENTER, 1 ; southern warp
-	warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp
+	warp_event 33, 33, SIX_ISLAND, 1 ; southeast warp
 	warp_event  5,  3, HAUNTED_HOUSE_FOYER, 1
 	warp_event 34, 11, WINNERS_PATH, 3

--- a/maps/FiveIsland.ablk
+++ b/maps/FiveIsland.ablk
--- a/maps/FiveIsland.asm
+++ b/maps/FiveIsland.asm
@ -14,7 +14,8 @@ FiveIsland_MapEvents:
 	db 0, 0 ; filler

 	def_warp_events
-
+	warp_event 8, 11, DEBUG_ROOM, 1
+	warp_event 9, 11, DEBUG_ROOM, 1
 	def_coord_events

 	def_bg_events
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@ -190,6 +190,8 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	loadmonindex 1, ABRA
 	special GameCornerPrizeMonCheckDex
 	givepoke ABRA, 5
+	loadmonindex 1, ABRA
+	special GameCornerPrizeMonShowDex
 	takecoins GOLDENRODGAMECORNER_ABRA_COINS
 	sjump .loop

@ -208,6 +210,8 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	loadmonindex 2, CUBONE
 	special GameCornerPrizeMonCheckDex
 	givepoke CUBONE, 15
+	loadmonindex 2, CUBONE
+	special GameCornerPrizeMonShowDex
 	takecoins GOLDENRODGAMECORNER_CUBONE_COINS
 	sjump .loop

@ -226,6 +230,8 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	loadmonindex 3, WOBBUFFET
 	special GameCornerPrizeMonCheckDex
 	givepoke WOBBUFFET, 15
+	loadmonindex 3, WOBBUFFET
+	special GameCornerPrizeMonShowDex
 	takecoins GOLDENRODGAMECORNER_WOBBUFFET_COINS
 	sjump .loop

--- a/maps/SixIsland.ablk
+++ b/maps/SixIsland.ablk
--- a/maps/SixIsland.asm
+++ b/maps/SixIsland.asm
@ -14,7 +14,9 @@ SixIsland_MapEvents:
 	db 0, 0 ; filler

 	def_warp_events
-
+	warp_event 6, 27, DEBUG_ROOM, 1
+	warp_event 7, 27, DEBUG_ROOM, 1
+	
 	def_coord_events

 	def_bg_events
--- a/ram/wram.asm
+++ b/ram/wram.asm
@ -739,6 +739,7 @@ wPokedexDisplayNumber:: dw
 wDexLastSeenIndex:: db ; index into wPokedexSeen containing the last non-zero value
 wDexLastSeenValue:: db ; value at index
 wDexTempCounter:: dw
+wWasMonCaught:: db ; for use with givepoke
 wPokedexDataEnd::

 wPrevDexEntry:: dw