Decoration shop import

Unsure where to place these yet, made something on the spreadsheet to find my bearings. All I know is I want it!

I had to change `endtext` to an sjump as we don't actually have that script in our ROM. Polished is very different to pokecrystal. Luckily, everything else went off without a hitch.

README.md

@@ -62,6 +62,7 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration.
 - Poke Balls now all have unique palettes.
 - The high friendship evolution threshold is now 170, making Friend Balls sufficient for instant evolution and hatching from Eggs takes minimal effort.
 - Items previously only obtainable via the Time Capsule are now distributed to specific Pokemon (5%: Polkadot Bow Snubbull, TwistedSpoon Kadabra, Metal Powder Ditto/Mimmeo, Light Ball Pikachu; 50%: Lucky Punch Chansey)
+- During the intro, when knowing the PokeGear instructions, you now immediately skip some of the text relating to it, making starting the game slightly less agonising.
 
 ## Map Changes
 Numerous new maps are available, featuring new locations, the iconic Sevii Islands, and the Nihon region!
@@ -128,6 +129,7 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 - Minamitoku (SW97 demo translation commentary [here](https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku))
 - ZoomTen - Honey Pot & Honey Grandma features from Pokemon October, commits [here](https://github.com/pokeachromicdevs/pokeoctober/commit/d00cd6fafdbe5069d2cc452a154942f82f7fceb6), [here](https://github.com/pokeachromicdevs/pokeoctober/commit/1a6f3e4f0307656018f02d4981c973efa814a248), and [here](https://github.com/pokeachromicdevs/pokeoctober/commit/8114fead91828dd6d986fe120d6c5cd5e3c6cbf6). Safari Game restoration [here](https://github.com/pokeachromicdevs/pokeoctober/commit/2ff835730b2a61a757ad67f13e50480c965d2a0c}.
 - Ferropexola/aforward9600: Time of day-based tileset palette code
+- Rangi42/polishedcrystal: [Decoration shop script](https://github.com/Rangi42/polishedcrystal/blob/master/maps/GoldenrodHarbor.asm)
 
 Original readme proceeding...
 # 16-bit index expansion for Crystal

maps/DebugRoom.asm

@@ -226,6 +226,144 @@ TrainerTestScript_BeatenText:
 	text "Test complete!"
 	done
 
+; Decoration shop scripts from Polished Crystal, tweaked and adapted.
+; https://github.com/Rangi42/polishedcrystal/blob/master/maps/GoldenrodHarbor.asm
+DebugDollShopScript:
+	faceplayer
+	opentext
+	writetext DebugDollShopDollVendorText
+.Start:
+	special PlaceMoneyTopRight
+	loadmenu .MenuData
+	verticalmenu
+	closewindow
+	ifequal $1, .MagikarpDoll
+	ifequal $2, .TentacoolDoll
+	ifequal $3, .UnownDoll
+	sjump DebugDollShop_CancelPurchaseScript ; We don't have "endtext" like polishedcrystal, so we use this.
+
+.MagikarpDoll:
+	checkmoney $0, 1400
+	ifequal $2, .NotEnoughMoney
+	checkevent EVENT_DECO_MAGIKARP_DOLL
+	iftrue .AlreadyBought
+	takemoney $0, 1400
+	setevent EVENT_DECO_MAGIKARP_DOLL
+	writetext DebugDollShopMagikarpDollText
+	playsound SFX_TRANSACTION
+	waitbutton
+	writetext DebugDollShopMagikarpDollSentText
+	waitbutton
+	sjump .Start
+
+.TentacoolDoll:
+	checkmoney $0, 5600
+	ifequal $2, .NotEnoughMoney
+	checkevent EVENT_DECO_TENTACOOL_DOLL
+	iftrue .AlreadyBought
+	takemoney $0, 5600
+	setevent EVENT_DECO_TENTACOOL_DOLL
+	playsound SFX_TRANSACTION
+	waitbutton
+	writetext DebugDollShopTentacoolDollSentText
+	waitbutton
+	sjump .Start
+
+.UnownDoll:
+	checkmoney $0, 11200
+	ifequal $2, .NotEnoughMoney
+	checkevent EVENT_DECO_UNOWN_DOLL
+	iftrue .AlreadyBought
+	takemoney $0, 11200
+	setevent EVENT_DECO_UNOWN_DOLL
+	writetext DebugDollShopUnownDollText
+	playsound SFX_TRANSACTION
+	waitbutton
+	writetext DebugDollShopUnownDollSentText
+	waitbutton
+	sjump .Start
+
+.NotEnoughMoney:
+	writetext DebugDollShopNoMoneyText
+	waitbutton
+	sjump .Start
+
+.AlreadyBought:
+	writetext DebugDollShopAlreadyBoughtText
+	waitbutton
+	sjump .Start
+
+.MenuData:
+	db $40 ; flags
+	db 02, 00 ; start coords
+	db 11, 19 ; end coords
+	dw .MenuData2
+	db 1 ; default option
+
+.MenuData2:
+	db $80 ; flags
+	db 4 ; items
+	db "MAGIKARP    ¥1400@"
+	db "TENTACOOL   ¥5600@"
+	db "UNOWN      ¥11200@"
+	db "CANCEL@"
+
+DebugDollShop_CancelPurchaseScript:
+	writetext DebugDollShopQuitText
+	waitbutton
+	closetext
+	end
+
+DebugDollShopQuitText:
+	text "Come again!"
+	done
+
+DebugDollShopDollVendorText:
+	text "Welcome! I have"
+	line "adorable dolls for"
+	cont "sale."
+	done
+
+DebugDollShopMagikarpDollText:
+	text "<PLAYER> bought"
+	line "MAGIKARP DOLL."
+	done
+
+DebugDollShopMagikarpDollSentText:
+	text "MAGIKARP DOLL"
+	line "was sent home."
+	done
+
+DebugDollShopTentacoolDollText:
+	text "<PLAYER> bought"
+	line "TENTACOOL DOLL."
+	done
+
+DebugDollShopTentacoolDollSentText:
+	text "TENTACOOL DOLL"
+	line "was sent home."
+	done
+
+DebugDollShopUnownDollText:
+	text "<PLAYER> bought"
+	line "UNOWN DOLL."
+	done
+
+DebugDollShopUnownDollSentText:
+	text "UNOWN DOLL"
+	line "was sent home."
+	done
+
+DebugDollShopNoMoneyText:
+	text "You can't afford"
+	line "that!"
+	done
+
+DebugDollShopAlreadyBoughtText:
+	text "You already have"
+	line "that!"
+	done
+
 DebugRoom_MapEvents:
 	db 0, 0 ; filler
 
@@ -256,4 +394,5 @@ DebugRoom_MapEvents:
 	object_event 17, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugFlyScript, -1
 	object_event 16, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugDexScript, -1
 	object_event 19, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugItemScript, -1
-	object_event 18, 13, SPRITE_SAFARI_ZONE_WORKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerTestScript, -1
+	object_event 18, 13, SPRITE_SAFARI_ZONE_WORKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerTestScript, -1
+	object_event 20, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugDollShopScript, -1

maps/PlayersHouse1F.asm

@@ -64,11 +64,6 @@ MeetMomScript:
 	writetext ComeHomeForDSTText
 	yesorno
 	iffalse .ExplainPhone
-	sjump .KnowPhone
-
-.KnowPhone:
-	writetext KnowTheInstructionsText
-	promptbutton
 	sjump .FinishPhone
 
 .ExplainPhone:
@@ -262,14 +257,7 @@ ComeHomeForDSTText:
 	cont "the PHONE?"
 	done
 
-KnowTheInstructionsText:
+; Shifted these around so the initial tutorial isn't so agonising and...kind of weird.
-	text "Don't you just"
-	line "turn the #GEAR"
-
-	para "on and select the"
-	line "PHONE icon?"
-	done
-
 DontKnowTheInstructionsText:
 	text "I'll read the"
 	line "instructions."
@@ -277,17 +265,20 @@ DontKnowTheInstructionsText:
 	para "Turn the #GEAR"
 	line "on and select the"
 	cont "PHONE icon."
-	done
 	
-InstructionsNextText:
+	para "Phone numbers are"
-	text "Phone numbers are"
 	line "stored in memory."
 
 	para "Just choose a name"
 	line "you want to call."
 	
-	para "Gee, isn't that"
+	done
+
+InstructionsNextText:
+	text "Gee, aren't these"
 	line "convenient?"
+	
+	para "Have fun, sweetie!"
 	done
 
 HurryUpElmIsWaitingText:

maps/RuinsOfAlphResearchCenter.asm

@@ -106,8 +106,7 @@ RuinsOfAlphResearchCenterScientist1Script:
 	clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
 	
 	; This will be replaced with something in Sinjoh Ruins (eventually)
-	ld c, DECOFLAG_UNOWN_DOLL
+	setevent EVENT_DECO_UNOWN_DOLL
-	farcall SetSpecificDecorationFlag
 	opentext
 	writetext RoAGotUnownDoll
 	waitbutton