diff --git a/README.md b/README.md
index 355c4bb0..187d61cb 100644
--- a/README.md
+++ b/README.md
@@ -381,7 +381,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 * Chatot4444 - Assisting with gym scaling code.
 * Enigami - Reworking the Battle Tent's RestoreTeam code to make it work properly.
 * LadyMisticus - Made a well-documented spreadsheet for the hack that details every Pokemon's stats, movepools and locations, plus more! 
-* Ness the Unexplained - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin.
+* HeadBoiSkye - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin.
 * ZumiIsawhat? - Restorations of prototype OST.
 * FrenchOrange - Reconstructions of various overworld prototype sprites.
 * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png).
diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
index ad25c7ed..a5e2c584 100644
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -73,17 +73,27 @@
 	const CRED_ALBA
 	const CRED_HELIX
 	const CRED_FO
+	const CRED_ZETA
 	const CRED_PS_DEVS
 	const CRED_AUS
 	const CRED_PAUL
 	const CRED_DUO
+	const CRED_KEP_MUSIC
+	const CRED_LUCI
+	const CRED_ZUMI
+	const CRED_BGVC
 	const CRED_KEP_THANKS
 	const CRED_FRRF
+	const CRED_MISTY
+	const CRED_THORNAVERY
 	const CRED_DANNYE
 	const CRED_EROSUNICA
+	const CRED_BLUEZANGOOSE
+	const CRED_SKYE
 	const CRED_CHATOT
 	const CRED_ENI
 	const CRED_VORT
+	const CRED_PRET
 DEF NUM_CRED_STRINGS EQU const_value
 
 	const_def -1, -1
diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm
index 5abc11a3..2578b6c8 100644
--- a/crysaudio/music/RBY/credits.asm
+++ b/crysaudio/music/RBY/credits.asm
@@ -1,10 +1,10 @@
-Music_RBYCredits::
+Music_RBYCredits:
 	channel_count 3
 	channel 1, Music_RBYCredits_Ch1
 	channel 2, Music_RBYCredits_Ch2
 	channel 3, Music_RBYCredits_Ch3
 
-Music_RBYCredits_Ch1::
+Music_RBYCredits_Ch1:
 	tempo 140
 	volume 7, 7
 	duty_cycle 3
@@ -163,7 +163,7 @@ Music_RBYCredits_Ch1::
 	note F#, 2
 	note G_, 2
 	note A_, 2
-	note_type 12, 9, 0
+	note_type 12, 9, 8
 	note G_, 8
 	note F#, 8
 	note E_, 8
@@ -175,7 +175,7 @@ Music_RBYCredits_Ch1::
 	note E_, 6
 	note D#, 1
 	note D_, 1
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note C#, 8
 	note_type 12, 10, 7
 	note C#, 8
@@ -185,7 +185,7 @@ Music_RBYCredits_Ch1::
 	note E_, 6
 	note C#, 1
 	note E_, 1
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note A_, 8
 	note_type 12, 10, 7
 	note A_, 8
@@ -198,7 +198,7 @@ Music_RBYCredits_Ch1::
 	note G_, 8
 	note F#, 4
 	note G#, 4
-	note_type 12, 9, 0
+	note_type 12, 9, 8
 	note A_, 8
 	note F#, 8
 	note E_, 8
@@ -210,12 +210,12 @@ Music_RBYCredits_Ch1::
 	note B_, 8
 	octave 3
 	note D_, 8
-	note_type 12, 9, 0
+	note_type 12, 9, 8
 	note E_, 8
 	note D_, 8
 	note F#, 8
 	note E_, 8
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note D_, 8
 	note E_, 8
 	note D_, 8
@@ -224,7 +224,6 @@ Music_RBYCredits_Ch1::
 	note F_, 8
 	note E_, 8
 	note D_, 8
-	note_type 12, 10, 0
 	note C#, 6
 	note_type 12, 10, 7
 	note C#, 6
@@ -234,13 +233,13 @@ Music_RBYCredits_Ch1::
 	note G_, 6
 	note F#, 1
 	note F_, 1
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note E_, 6
 	note_type 12, 10, 7
 	note E_, 6
 	note_type 12, 11, 7
 	note D_, 4
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note C#, 8
 	note_type 12, 10, 7
 	note C#, 8
@@ -261,7 +260,7 @@ Music_RBYCredits_Ch1::
 	note C#, 4
 	note E_, 4
 	note F#, 4
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note E_, 6
 	note_type 12, 11, 7
 	note D_, 2
@@ -271,7 +270,7 @@ Music_RBYCredits_Ch1::
 	note F#, 4
 	note A_, 4
 	note B_, 4
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	octave 4
 	note C#, 16
 	note C#, 8
@@ -286,11 +285,184 @@ Music_RBYCredits_Ch1::
 	note A_, 1
 	note A_, 1
 	note_type 12, 11, 1
-	note A_, 8
+	note A_, 4
+	note D_, 1
+	rest 3
+	note_type 12, 12, 3
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 3
+	note E_, 1
+	rest 5
+	note E_, 1
+	rest 5
+	note E_, 1
+	rest 3
+	note F#, 1
+	rest 5
+	note F#, 1
+	rest 5
+	note F#, 1
+	rest 3
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 5
+	note F#, 4
+	octave 4
+	note D_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note E_, 6
+	note C_, 1
+	note E_, 1
+	note F_, 6
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	rest 3
+	note A#, 1
+	rest 2
+	note A#, 1
+	note B_, 16
+	note G_, 1
+	rest 15
 	sound_ret
 
-
-Music_RBYCredits_Ch2::
+Music_RBYCredits_Ch2:
 	duty_cycle 3
 	vibrato 10, 2, 5
 	note_type 12, 12, 5
@@ -365,7 +537,7 @@ Music_RBYCredits_Ch2::
 	octave 3
 	note A_, 6
 	note E_, 2
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	octave 4
 	note C#, 8
 	note_type 12, 12, 7
@@ -378,13 +550,13 @@ Music_RBYCredits_Ch2::
 	note G_, 6
 	note D_, 2
 	note B_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	octave 4
 	note C#, 6
 	note_type 12, 11, 7
 	note C#, 6
 	note D_, 4
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note E_, 8
 	note_type 12, 10, 7
 	note E_, 8
@@ -398,7 +570,7 @@ Music_RBYCredits_Ch2::
 	note G_, 6
 	note D_, 2
 	note B_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	octave 4
 	note E_, 7
 	note_type 12, 11, 7
@@ -406,7 +578,7 @@ Music_RBYCredits_Ch2::
 	note_type 12, 12, 3
 	note E_, 1
 	note G#, 1
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note A_, 8
 	note_type 12, 11, 7
 	note A_, 8
@@ -415,16 +587,16 @@ Music_RBYCredits_Ch2::
 	note F#, 4
 	note E_, 4
 	note D_, 4
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note C#, 8
 	note_type 12, 10, 7
 	note C#, 8
-	note_type 12, 9, 0
+	note_type 12, 9, 8
 	octave 3
 	note A_, 8
 	note_type 12, 9, 7
 	note A_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note E_, 8
 	note_type 12, 11, 7
 	note E_, 8
@@ -438,11 +610,11 @@ Music_RBYCredits_Ch2::
 	note G_, 6
 	note F#, 1
 	note F_, 1
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note E_, 8
 	note_type 12, 11, 7
 	note E_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note D_, 8
 	note_type 12, 11, 7
 	note D_, 8
@@ -457,12 +629,12 @@ Music_RBYCredits_Ch2::
 	note B_, 6
 	note G_, 1
 	note B_, 1
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	octave 4
 	note C#, 8
 	note_type 12, 11, 7
 	note C#, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note D_, 8
 	note_type 12, 11, 7
 	note D_, 8
@@ -475,18 +647,18 @@ Music_RBYCredits_Ch2::
 	note B_, 1
 	octave 4
 	note D_, 1
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note C#, 6
 	note_type 12, 11, 7
 	note C#, 6
 	note_type 12, 12, 7
 	octave 3
 	note B_, 4
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note A_, 8
 	note_type 12, 11, 7
 	note A_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note F#, 6
 	note_type 12, 11, 7
 	note F#, 6
@@ -494,7 +666,7 @@ Music_RBYCredits_Ch2::
 	note G#, 4
 	note A_, 8
 	note F#, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note G#, 6
 	note_type 12, 11, 7
 	note G#, 6
@@ -502,7 +674,7 @@ Music_RBYCredits_Ch2::
 	note A_, 4
 	note B_, 8
 	note G#, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note A_, 6
 	note_type 12, 11, 7
 	note A_, 6
@@ -512,24 +684,23 @@ Music_RBYCredits_Ch2::
 	note C_, 8
 	octave 3
 	note A_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note B_, 6
 	note_type 12, 11, 7
 	note B_, 6
 	note_type 12, 12, 7
 	octave 4
 	note C_, 4
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note D_, 8
 	octave 3
 	note B_, 8
-	note_type 12, 11, 0
 	octave 4
 	note C#, 16
 	note C#, 8
 	note_type 12, 11, 7
 	note C#, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	octave 3
 	note A_, 16
 	note A_, 8
@@ -564,9 +735,9 @@ Music_RBYCredits_Ch2::
 	octave 4
 	note D_, 2
 	note G_, 8
-	note_type 12, 11, 0
+	note_type 12, 11, 8
 	note A_, 16
-	note_type 12, 10, 0
+	note_type 12, 10, 8
 	note A_, 8
 	note_type 12, 10, 7
 	note A_, 8
@@ -575,12 +746,101 @@ Music_RBYCredits_Ch2::
 	note A_, 4
 	note A_, 1
 	note A_, 1
-	note_type 12, 12, 1
+	note A_, 4
+	octave 3
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note_type 12, 13, 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 2
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 12
+	rest 3
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 6
+	rest 1
+	octave 4
+	note C_, 1
+	note D_, 6
+	rest 1
+	note C_, 1
+	note D_, 12
+	rest 3
+	note C_, 1
+	note E_, 12
+	rest 3
+	note E_, 1
+	note F#, 12
+	rest 3
+	note E_, 1
+	note F#, 6
+	rest 1
+	note G_, 1
 	note A_, 8
+	octave 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	octave 4
+	note G_, 6
+	note D_, 1
+	note G_, 1
+	note A_, 6
+	note F_, 1
+	note A_, 1
+	note A#, 6
+	note G_, 1
+	note A#, 1
+	octave 5
+	note C_, 1
+	rest 3
+	note D#, 1
+	rest 2
+	note D#, 1
+	note G_, 16
+	note G_, 1
+	rest 11
+	octave 3
 	sound_ret
 
-
-Music_RBYCredits_Ch3::
+Music_RBYCredits_Ch3:
 	note_type 12, 1, 0
 	octave 5
 	note C#, 6
@@ -721,9 +981,107 @@ Music_RBYCredits_Ch3::
 	note A_, 1
 	note A_, 1
 	rest 7
+	note_type 12, 1, 0
+	octave 4
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+	note_type 12, 1, 0
+	octave 4
+	note B_, 6
+	note G_, 1
+	note B_, 1
+	octave 5
+	note C_, 6
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	note D_, 6
+	octave 4
+	note A#, 1
+	octave 5
+	note D_, 1
+	note E_, 1
+	rest 3
+	note G_, 1
+	rest 2
+	note G_, 1
+	note G_, 16
+	note G_, 1
+	rest 15
 	sound_ret
 
-Music_RBYCredits_branch_7ffa4::
+Music_RBYCredits_branch_7ffa4:
 	octave 4
 	note E_, 2
 	note A_, 2
@@ -735,7 +1093,7 @@ Music_RBYCredits_branch_7ffa4::
 	note A_, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffae::
+Music_RBYCredits_branch_7ffae:
 	octave 4
 	note D_, 2
 	note G_, 2
@@ -747,7 +1105,7 @@ Music_RBYCredits_branch_7ffae::
 	note G_, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffb8::
+Music_RBYCredits_branch_7ffb8:
 	note G_, 2
 	note B_, 2
 	note G_, 2
@@ -758,7 +1116,7 @@ Music_RBYCredits_branch_7ffb8::
 	note B_, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffc1::
+Music_RBYCredits_branch_7ffc1:
 	octave 4
 	note A_, 2
 	octave 5
@@ -777,7 +1135,7 @@ Music_RBYCredits_branch_7ffc1::
 	note C#, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffd2::
+Music_RBYCredits_branch_7ffd2:
 	note D_, 2
 	note A_, 2
 	note D_, 2
@@ -788,7 +1146,7 @@ Music_RBYCredits_branch_7ffd2::
 	note A_, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffdb::
+Music_RBYCredits_branch_7ffdb:
 	note E_, 2
 	note G#, 2
 	note E_, 2
@@ -799,7 +1157,7 @@ Music_RBYCredits_branch_7ffdb::
 	note G#, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffe4::
+Music_RBYCredits_branch_7ffe4:
 	note E_, 2
 	note B_, 2
 	note E_, 2
@@ -810,7 +1168,7 @@ Music_RBYCredits_branch_7ffe4::
 	note B_, 2
 	sound_ret
 
-Music_RBYCredits_branch_7ffed::
+Music_RBYCredits_branch_7ffed:
 	note A_, 1
 	rest 1
 	note A_, 1
diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm
index bbee279e..8eee261f 100644
--- a/data/credits/credits_mons.asm
+++ b/data/credits/credits_mons.asm
@@ -15,6 +15,7 @@ CreditsMons:
 	db VENUSAUR
 	db CHARIZARD
 	db TOTARTLE
+	db UMBREON
 	db OMEGADGE
 	db ARTICUNO_G
 	db ZAPDOS_G
diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm
index 5111e50d..1ef3f2f1 100644
--- a/data/credits/credits_order.asm
+++ b/data/credits/credits_order.asm
@@ -38,9 +38,13 @@ CreditsOrder:
 	db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON
 	db CRED_KEP_STAFF, CRED_TEXT_FADE
 	db CRED_KEP_DEVS, CRED_PVK, CRED_MAH, CRED_EMA, CRED_TEXT_FADE_MON
-	db CRED_KEP_SPRITES, CRED_ALBA, CRED_HELIX, CRED_FO, CRED_TEXT_FADE_MON
+	db CRED_KEP_SPRITES, CRED_ALBA, CRED_HELIX, CRED_FO, CRED_TEXT_FADE
+	db CRED_KEP_SPRITES, CRED_ZETA, CRED_PVK, CRED_MAH, CRED_TEXT_FADE_MON
 	db CRED_PS_DEVS, CRED_AUS, CRED_PAUL, CRED_DUO, CRED_TEXT_FADE_MON
-	db CRED_KEP_THANKS, CRED_FRRF, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE
-	db CRED_KEP_THANKS, CRED_CHATOT, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON
+	db CRED_KEP_MUSIC, CRED_LUCI, CRED_ZUMI, CRED_BGVC, CRED_TEXT_FADE_MON
+	db CRED_KEP_THANKS, CRED_FRRF, CRED_MISTY, CRED_THORNAVERY, CRED_TEXT_FADE
+	db CRED_KEP_THANKS, CRED_PRET, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE
+	db CRED_KEP_THANKS, CRED_SKYE, CRED_BLUEZANGOOSE, CRED_CHATOT, CRED_TEXT_FADE
+	db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON
 	db CRED_COPYRIGHT, CRED_TEXT_FADE_MON
 	db CRED_THE_END
diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm
index 1f0e4dd3..248f00e0 100644
--- a/data/credits/credits_text.asm
+++ b/data/credits/credits_text.asm
@@ -74,17 +74,27 @@ CreditsTextPointers:
 	dw CredAlba
 	dw CredHelix
 	dw CredFO
+	dw CredZetaNull
 	dw CredPSDevs
 	dw CredAus
 	dw CredPaul
 	dw CredDuo
+	dw CredKEPMusic
+	dw CredLuci
+	dw CredZumi
+	dw CredBGVC
 	dw CredKEPThanks
 	dw CredFrrf
+	dw CredMisty
+	dw CredThornAvery
 	dw CredDannye
 	dw CredEro
+	dw CredBlueZangoose
+	dw CredSkye
 	dw CredChatot
 	dw CredEni
 	dw CredVort
+	dw CredPret
 	assert_table_length NUM_CRED_STRINGS
 
 CredVersion:
@@ -233,6 +243,8 @@ CredHelix:
 	db -6, "HELIX CHAMBER@"
 CredFO:
 	db -6, "FRENCH ORANGE@"
+CredZetaNull:
+	db -4, "ZETA-NULL@"
 CredPSDevs:
 	db -5, "SHOWDOWN MOD@"
 CredAus:
@@ -241,17 +253,35 @@ CredPaul:
 	db -4, "PAULLUXX@"
 CredDuo:
 	db -2, "DUOM2@"
+CredKEPMusic:
+	db -4, "KEP MUSIC@"
+CredLuci:
+	db -4, "LUCISHRIMP@"
+CredZumi:
+	db -5, "ZUMIISAWHAT?@"
+CredBGVC:
+	db -2, "BGVC@"
 CredKEPThanks:
 	db -6, "SPECIAL THANKS@"
 CredFrrf:
 	db -2, "FRRF@"
+CredMisty:
+	db -5, "LADYMISTICUS@"
+CredThornAvery:
+	db -4, "THORNAVERY@"
 CredDannye:
 	db -4, "DANNYE33@"
 CredEro:
 	db -4, "EROSUNICA@"
+CredBlueZangoose:
+	db -5, "BLUEZANGOOSE@"
+CredSkye:
+	db -5, "HEADBOISKYE@"
 CredChatot:
 	db -4, "CHATOT4444@"
 CredEni:
 	db -3, "ENIGAMI@"
 CredVort:
 	db -3, "VORTIENE@"
+CredPret:
+	db -4, "PRET ET AL@"
diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index ffe0315a..de0c4f76 100644
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -8,11 +8,11 @@ RedsHouse2F_Object:
 	;warp_event  5,  1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
 	;warp_event  5,  1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
 	;warp_event  5,  1, CELESTE_HILL, 1 ; - Test GMolt
-	;warp_event	 5,  1, HALL_OF_FAME, 1 ; Test post-game setup
+	warp_event	 5,  1, HALL_OF_FAME, 1 ; Test post-game setup
 	;warp_event	 5,  1, GARNET_CAVERN_B1F, 1 ; Test GCuno
 	;warp_event	 5,  1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
 	;warp_event	 5,  1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
-	warp_event	 5,  1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils
+	;warp_event	 5,  1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils
 
 	def_bg_events
 
diff --git a/layout.link b/layout.link
index 4c70ee45..70f04037 100644
--- a/layout.link
+++ b/layout.link
@@ -140,12 +140,12 @@ ROMX $1D
 	"Maps 19"
 	"Itemfinder 1"
 	"Maps 20"
-	"Vending Machine"
 	"Maps 21"
 	"Itemfinder 2"
 ROMX $1E
 	"bank1E"
 ROMX $1F
+	"Vending Machine"
 	"Sound Effect Headers 3"
 ;	"Music Headers 3"
 	"Sound Effects 3"