From 02e6aa7bb0dc79859072d58596e4a77a5d920312 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Wed, 29 Nov 2023 23:09:20 +0000
Subject: [PATCH] Updating the credits

Added a few more names from the README into the in-game credits, and used the original draft of the ending theme to extend the music.
---
 README.md                         |   2 +-
 constants/credits_constants.asm   |  10 +
 crysaudio/music/RBY/credits.asm   | 408 ++++++++++++++++++++++++++++++
 data/credits/credits_mons.asm     |   1 +
 data/credits/credits_order.asm    |  10 +-
 data/credits/credits_text.asm     |  30 +++
 data/maps/objects/RedsHouse2F.asm |   4 +-
 layout.link                       |   2 +-
 8 files changed, 460 insertions(+), 7 deletions(-)

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..79b1bfd6 100644
--- a/crysaudio/music/RBY/credits.asm
+++ b/crysaudio/music/RBY/credits.asm
@@ -287,6 +287,196 @@ Music_RBYCredits_Ch1::
 	note A_, 1
 	note_type 12, 11, 1
 	note A_, 8
+;; P1-5
+	note_type 12, 12, 3
+	octave 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
+;; P1-6
+	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
+;; P1-7
+	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
+;; P1-8
+	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
+;; P1-9
+	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
+;; P1-10
+	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
+;; P1-11
+	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
+;; P1-12
+	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
+;; P1-13
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 3
+;; P1-14
+	note E_, 1
+	rest 5
+	note E_, 1
+	rest 5
+	note E_, 1
+	rest 3
+;; P1-15
+	note F#, 1
+	rest 5
+	note F#, 1
+	rest 5
+	note F#, 1
+	rest 3
+;; P1-16
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 5
+	note F#, 4
+;; P1-1
+	note_type 12, 12, 3
+	octave 4
+	note D_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note E_, 6
+	note C_, 1
+	note E_, 1
+;; P1-2
+	note F_, 6
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	rest 3
+	note A#, 1
+	rest 2
+	note A#, 1
+;; P1-3
+	note B_, 16
+;; P1-4
+	note G_, 1
+	rest 15
 	sound_ret
 
 
@@ -577,6 +767,110 @@ Music_RBYCredits_Ch2::
 	note A_, 1
 	note_type 12, 12, 1
 	note A_, 8
+;; P2-5
+	note_type 12, 13, 3
+	octave 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+;; P2-6
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 2
+	octave 4
+	note C_, 1
+;; P2-7
+	octave 3
+	note B_, 12
+	rest 3
+	octave 4
+	note C_, 1
+;; P2-8
+	octave 3
+	note B_, 6
+	rest 1
+	octave 4
+	note C_, 1
+	note D_, 6
+	rest 1
+	note C_, 1
+;; P2-9
+	note D_, 12
+	rest 3
+	note C_, 1
+;; P2-10
+	note E_, 12
+	rest 3
+	note E_, 1
+;; P2-11
+	note F#, 12
+	rest 3
+	note E_, 1
+;; P2-12
+	note F#, 6
+	rest 1
+	note G_, 1
+	note A_, 8
+;; P2-13
+	octave 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+;; P2-14
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P2-15
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+;; P2-16
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P2-1
+	note_type 12, 13, 3
+	octave 4
+	note G_, 6
+	note D_, 1
+	note G_, 1
+	note A_, 6
+	note F_, 1
+	note A_, 1
+;; P2-2
+	note A#, 6
+	note G_, 1
+	note A#, 1
+	octave 5
+	note C_, 1
+	rest 3
+	note D#, 1
+	rest 2
+	note D#, 1
+;; P2-3
+	note G_, 16
+;; P2-4
+	note G_, 1
+	rest 11
+	octave 3
 	sound_ret
 
 
@@ -721,6 +1015,120 @@ Music_RBYCredits_Ch3::
 	note A_, 1
 	note A_, 1
 	rest 7
+;; P3-5
+	note_type 12, 1, 0
+	octave 4
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+;; P3-6
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-7
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+;; P3-8
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-9
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+;; P3-10
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-11
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+;; P3-12
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-13
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 5
+	note G_, 1
+	rest 3
+;; P3-14
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-15
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 3
+;; P3-16
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 3
+;; P3-1
+	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
+;; P3-2
+	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
+;; P3-3
+	note G_, 16
+;; P3-4
+	note G_, 1
+	rest 15
 	sound_ret
 
 Music_RBYCredits_branch_7ffa4::
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"