From 14c92ac8551da416854c49e5ecc4c15c99861f14 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 5 Jun 2023 13:00:20 +0100
Subject: [PATCH] Mt Moon Rocket has Raticate again, Arbok in Game Corner

Minor upgrades in accordance with the recent KEP playtest.

The Mt. Moon Rocket with the Raticate is arguably one of the most iconic NPC trainers in Pokemon history and under no circumstances should it be cut. No matter what Yellow tells you.

Added a nice Arbok NPC to the Game Corner to make more use of the new overworld sprites I did. It's basically a guard for the attendant to its left - need some safety in casinos, y'know? Especially pachinko parlours...

I put the Arbok text in `text_2.asm` since it'll likely be used by other maps down the line. Or not, but it's good for architecture.
---
 data/maps/objects/GameCorner.asm | 1 +
 data/maps/objects/MtMoonB2F.asm  | 2 +-
 data/text/text_2.asm             | 4 ++++
 scripts/GameCorner.asm           | 9 +++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm
index 2b4c8f72..d84f5ab3 100644
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -21,5 +21,6 @@ GameCorner_Object:
 	object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
 	object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
 	object_event  9,  5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
+	object_event  6,  6, SPRITE_ARBOK, STAY, DOWN, 14 ; Arbok attendant
 
 	def_warps_to GAME_CORNER
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 632680a8..65ea685c 100644
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -15,7 +15,7 @@ MtMoonB2F_Object:
 	object_event  9,  3, SPRITE_JESSIE, STAY, LEFT, 2
 	object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
 	object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 3
-	object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1
+	object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 ; Raticate Boss
 	object_event  9,  4, SPRITE_JAMES, STAY, LEFT, 6
 	object_event 12,  6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
 	object_event 13,  6, SPRITE_FOSSIL, STAY, NONE, 8 ; person
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 43357054..dd5c830d 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -1846,3 +1846,7 @@ _MeltanIncrement::
 	text "<PLAYER> found"
 	line "10 MELTAN CANDY!"
 	prompt
+
+_GameCornerArbok:: ; Putting here to be potentially farcalled somewhere else.
+	text "ARBOK: Chaaarbok!"
+	done
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index 04c8504e..e14cb927 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -130,6 +130,7 @@ GameCorner_TextPointers:
 	dw CeladonGameCornerText11
 	dw CeladonGameCornerText12
 	dw CeladonGameCornerText13
+	dw GameCornerArbok
 
 CeladonGameCornerText1:
 	text_far _CeladonGameCornerText1
@@ -525,3 +526,11 @@ Has9990Coins:
 	ld a, $90
 	ldh [hCoins + 1], a
 	jp HasEnoughCoins
+
+GameCornerArbok:
+	text_far _GameCornerArbok
+	text_asm
+	ld a, ARBOK
+	call PlayCry
+	call WaitForSoundToFinish
+	jp TextScriptEnd