From 1681f5def408b8dca3d37225577f9f68e4e4d476 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Mon, 1 Jul 2024 19:44:40 +0100
Subject: [PATCH] Shuckie changes + Lapras wild encounter buff

Kirk now takes back Shuckie after a day again. Also buffed the Union Cave Lapras 15 levels.
---
 constants/script_constants.asm |  8 ++---
 engine/events/shuckle.asm      |  5 +++-
 maps/ManiasHouse.asm           | 55 ++++++++++++++++++++++------------
 maps/UnionCaveB2F.asm          |  2 +-
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index d931e45..4b909d9 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -280,10 +280,10 @@ DEF NUM_DECODESCS EQU const_value
 	const_def
 	const SHUCKIE_WRONG_MON ; 0
 	const SHUCKIE_REFUSED   ; 1
-	const SHUCKIE_HAPPY     ; 2
-	const SHUCKIE_EVOLVED   ; 3
-	const SHUCKIE_FAINTED   ; 4
-	const SHUCKIE_OKAY      ; 5
+	const SHUCKIE_RETURNED  ; 2
+	const SHUCKIE_HAPPY     ; 3
+	const SHUCKIE_EVOLVED   ; 4
+	const SHUCKIE_FAINTED   ; 5
 
 ; CheckPartyFullAfterContest return values
 	const_def
diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm
index 4511f88..84880fc 100644
--- a/engine/events/shuckle.asm
+++ b/engine/events/shuckle.asm
@@ -135,7 +135,10 @@ ReturnShuckie:
 	cp 150
 	ld a, SHUCKIE_HAPPY
 	jr nc, .HappyToStayWithYou
-	ld a, SHUCKIE_OKAY
+	xor a ; REMOVE_PARTY
+	ld [wPokemonWithdrawDepositParameter], a
+	callfar RemoveMonFromPartyOrBox
+	ld a, SHUCKIE_RETURNED
 .HappyToStayWithYou:
 	ld [wScriptVar], a
 	ret
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index ca61de9..87ac3f6 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -59,7 +59,11 @@ ManiaScript:
 	ifequal SHUCKIE_EVOLVED, .evolved
 	ifequal SHUCKIE_HAPPY, .superhappy
 	writetext ManiaText_ThankYou
-	waitbutton
+	promptbutton
+	verbosegiveitem ANTIQUE_POT
+	iffalse .NoRoom0
+	setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
+.NoRoom0:
 	closetext
 	end
 
@@ -84,6 +88,10 @@ ManiaScript:
 	waitbutton
 	closetext
 	end
+	
+.nothingleft ; unreferenced
+	writetext ManiaText_ShuckleIsYourLastMon
+	waitbutton
 
 .evolved
 	writetext ManiaText_Pockle
@@ -153,16 +161,19 @@ ManiaText_CanIHaveMyMonBack:
 	text "Hi! How's my"
 	line "SHUCKIE?"
 
-	para "If you have them"
-	line "with you, may I"
-	cont "see them?"
+	para "I think I'm safe"
+	line "now, so may I have"
+	cont "them back?"
 	done
 
 ManiaText_ThankYou:
-	text "SHUCKIE seems to"
-	line "want to spend a"
-	cont "little more time"
-	cont "with you."
+	text "Thank you for"
+	line "keeping SHUCKIE"
+	cont "safe!"
+	
+	para "Here, you can"
+	line "have this as a"
+	cont "reward!"
 	done
 
 ManiaText_ShuckleNotThere:
@@ -174,6 +185,10 @@ ManiaText_ShuckleNotThere:
 ManiaText_ShuckleLikesYou:
 	text "Looks like SHUCKIE"
 	line "really likes you!"
+	
+	para "I think that they"
+	line "would rather stay"
+	cont "with you."
 
 	para "If you're going"
 	line "to keep SHUCKIE,"
@@ -182,20 +197,16 @@ ManiaText_ShuckleLikesYou:
 	done
 
 ManiaText_SameAsBeingRobbed:
-	text "Come back with"
-	line "SHUCKIE sometime!"
+	text "Oh, no, no… That's"
+	line "the same as being"
+	cont "robbed."
 	done
 
 ManiaText_HappinessSpeech:
-	text "SHUCKIE loves that"
-	line "ANTIQUE POT, so"
-	cont "I'm sure it'll"
-	cont "appreciate you"
-	cont "keeping it safe."
-
-	para "Promise to be good"
-	line "to SHUCKIE, won't"
-	cont "you?"
+	text "For #MON, hap-"
+	line "piness is being"
+	cont "with a person who"
+	cont "treats them well."
 	done
 
 ManiaText_Pockle:
@@ -212,6 +223,12 @@ ManiaText_Pockle:
 	cont "evolved SHUCKIE,"
 	cont "but have this!"
 	done
+	
+ManiaText_ShuckleIsYourLastMon:
+	text "If I take SHUCKIE"
+	line "back, what are"
+	cont "you going to use"
+	cont "in battle?"
 
 ManiasHouse_MapEvents:
 	db 0, 0 ; filler
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 567dfc9..69cd71e 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -28,7 +28,7 @@ UnionCaveB2FLaprasCallback:
 UnionCaveLapras:
 	faceplayer
 	cry LAPRAS
-	loadwildmon LAPRAS, 20
+	loadwildmon LAPRAS, 35
 	startbattle
 	disappear UNIONCAVEB2F_LAPRAS
 	setflag ENGINE_UNION_CAVE_LAPRAS