From d20207f012c14fda2208638a10ab75b57b6d317b Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Sat, 30 Dec 2023 20:10:11 +0000
Subject: [PATCH] Salesman 'Obtained item!' text

Yeah for some reason the salesman didn't actually tell you that you got the item. Meanie.
---
 scripts/CinnabarPokecenter.asm | 36 +++++++++++++++++++++++-----------
 scripts/FuchsiaCity.asm        | 23 +++++++++++++++++-----
 text/CinnabarPokecenter.asm    | 11 +++++++++--
 text/FuchsiaCity.asm           |  6 ++++++
 4 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm
index eddf5d55..f79cbd6a 100644
--- a/scripts/CinnabarPokecenter.asm
+++ b/scripts/CinnabarPokecenter.asm
@@ -40,7 +40,7 @@ PoryZSalesmanText:
 	jp nz, .choseNo
 	ldh [hMoney], a
 	ldh [hMoney + 2], a
-	ld a, $21
+	ld a, $30
 	ldh [hMoney + 1], a
 	call HasEnoughMoney
 	jr nc, .enoughMoney
@@ -49,11 +49,13 @@ PoryZSalesmanText:
 .enoughMoney
 	lb bc, DUBIOUS_DISC, 1
 	call GiveItem
-	jr nc, .done
+	jr nc, .BagFull
+	ld hl, ReceivedDubiousDiscText
+	call PrintText
 	xor a
 	ld [wPriceTemp], a
 	ld [wPriceTemp + 2], a
-	ld a, $21
+	ld a, $30
 	ld [wPriceTemp + 1], a
 	ld hl, wPriceTemp + 2
 	ld de, wPlayerMoney + 2
@@ -65,10 +67,17 @@ PoryZSalesmanText:
 	SetEvent EVENT_BOUGHT_DUBIOUS_DISC
 	jr .done
 .choseNo
-	ld hl, .RefuseText
-	jr .printText
+	ld hl, RefuseText2
+	call PrintText
+	jr .done
 .alreadyBoughtPoryZ
 	ld hl, .Text2
+	call PrintText
+	jr .done
+.BagFull
+	ld hl, PoryZBagFull
+	call PrintText
+	jr .done
 .printText
 	call PrintText
 .done
@@ -77,17 +86,22 @@ PoryZSalesmanText:
 .Text1
 	text_far _PoryZSalesmanText1
 	text_end
-
-.RefuseText
-	text_far _PoryZSalesmanNoText
+	
+.Text2
+	text_far _PoryZSalesmanText2
 	text_end
-
+	
 .NoMoneyText
 	text_far _PoryZSalesmanNoMoneyText
 	text_end
 
-.Text2
-	text_far _PoryZSalesmanText2
+RefuseText2:
+	text_far _PoryZSalesmanNoText
+	text_end
+
+ReceivedDubiousDiscText:
+	text_far _ReceivedDubiousDiscText
+	sound_get_item_1
 	text_end
 
 PoryZBagFull:
diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm
index 65d84811..bcf37a7d 100644
--- a/scripts/FuchsiaCity.asm
+++ b/scripts/FuchsiaCity.asm
@@ -190,7 +190,9 @@ SafariBallSalesman:
 .enoughMoney
 	lb bc, SAFARI_BALL, 3
 	call GiveItem
-	jr nc, .done
+	jr nc, .BagFull
+	ld hl, ReceivedSafariBallsText
+	call PrintText
 	xor a
 	ld [wPriceTemp], a
 	ld [wPriceTemp + 2], a
@@ -205,7 +207,13 @@ SafariBallSalesman:
 	call DisplayTextBoxID
 	jr .done
 .choseNo
-	ld hl, .RefuseText
+	ld hl, RefuseText
+	call PrintText
+	jr .done
+.BagFull
+	ld hl, SafariBallBagFull
+	call PrintText
+	jr .done
 .printText
 	call PrintText
 .done
@@ -214,13 +222,18 @@ SafariBallSalesman:
 .Text1
 	text_far _SafariBallSalesmanText1
 	text_end
+	
+.NoMoneyText
+	text_far _SafariBallSalesmanNoMoneyText
+	text_end
 
-.RefuseText
+RefuseText:
 	text_far _SafariBallSalesmanNoText
 	text_end
 
-.NoMoneyText
-	text_far _SafariBallSalesmanNoMoneyText
+ReceivedSafariBallsText:
+	text_far _ReceivedSafariBallsText
+	sound_get_item_1
 	text_end
 
 SafariBallBagFull:
diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm
index f56bfcb7..d8f99c91 100644
--- a/text/CinnabarPokecenter.asm
+++ b/text/CinnabarPokecenter.asm
@@ -33,7 +33,7 @@ _PoryZSalesmanText1::
 	
 	para "Tell you what."
 	line "You can get a"
-	cont "copy for ¥2100."
+	cont "copy for ¥3000."
 	cont "What do you say?"
 	
 	done
@@ -44,6 +44,11 @@ _PoryZSalesmanNoText::
 	cont "chance!"
 	done
 
+_ReceivedDubiousDiscText::
+	text "<PLAYER> received"
+	line "DUBIOUS DISC!@"
+	text_end
+
 _PoryZSalesmanNoMoneyText::
 	text "You'll need more"
 	line "money than that!"
@@ -59,4 +64,6 @@ _PoryZBagFull::
 	text "Hey, your bag's"
 	line "full! Can't sell"
 	cont "you anything like"
-	cont "that!"
\ No newline at end of file
+	cont "that!"
+	done
+	
\ No newline at end of file
diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm
index 7d04a0db..498d0277 100644
--- a/text/FuchsiaCity.asm
+++ b/text/FuchsiaCity.asm
@@ -145,6 +145,11 @@ _SafariBallSalesmanNoText::
 	cont "me?"
 	done
 
+_ReceivedSafariBallsText::
+	text "<PLAYER> received"
+	line "3 SAFARI BALLS!@"
+	text_end
+
 _SafariBallSalesmanNoMoneyText::
 	text "Not enough money?"
 	line "Sorry, kid! Paint"
@@ -160,6 +165,7 @@ _SafariBallBagFull::
 	line "give you these"
 	cont "when your bag's"
 	cont "that full!"
+	done
 
 _ReceivedTM50Text::
 	text "<PLAYER> received"