Fix Sailboat disappearing under textbox

Resolves #1010
Rangi42 · Feb 9, 2025 · 2ac7793 · 2ac7793
1 parent 414122f
commit 2ac7793
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
@@ -142,6 +142,7 @@ DEF BGEVENT_ITEM EQU NUM_BGEVENTS
 	const OBJECTTYPE_GENERICTRAINER
 	const OBJECTTYPE_POKEMON
 	const OBJECTTYPE_COMMAND
+	const OBJECTTYPE_SCRIPT_NOCLICKSFX ; does not play click sound
 	const OBJECTTYPE_DONOTHING ; does not play click sound
 DEF NUM_OBJECT_TYPES EQU const_value
 

diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
@@ -560,9 +560,13 @@ TryObjectEvent:
 	cp NUM_OBJECT_TYPES - 1
 	ret nc
 
+	cp OBJECTTYPE_SCRIPT_NOCLICKSFX
+	jr z, .skip_click_sfx
+
 	push af
 	call PlayTalkObject
 	pop af
+.skip_click_sfx
 	call StackJumpTable
 
 ObjectEventTypeArray:
@@ -573,6 +577,7 @@ ObjectEventTypeArray:
 	dw .trainer  ; OBJECTTYPE_GENERICTRAINER
 	dw .pokemon  ; OBJECTTYPE_POKEMON
 	dw .command  ; OBJECTTYPE_COMMAND
+	dw .script   ; OBJECTTYPE_SCRIPT_NOCLICKSFX
 	assert_table_length NUM_OBJECT_TYPES - 1
 
 .script:

diff --git a/maps/GoldenrodHarbor.asm b/maps/GoldenrodHarbor.asm
@@ -28,8 +28,8 @@ GoldenrodHarbor_MapScriptHeader:
 	object_event  6, 14, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 5, GenericTrainerSwimmerfKatie, -1
 	object_event 23, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, GenericTrainerSwimmermJames, -1
 	object_event 23, 19, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_COMMAND, jumptextfaceplayer, GoldenrodHarborLass2Text, -1
-	object_event  6, 26, SPRITE_SAILBOAT, SPRITEMOVEDATA_SAILBOAT_TOP, 0, 0, -1, -1, 0, OBJECTTYPE_COMMAND, jumptext, GoldenrodHarborSailboatText, -1
-	object_event  6, 26, SPRITE_SAILBOAT, SPRITEMOVEDATA_SAILBOAT_BOTTOM, 0, 0, -1, -1, 0, OBJECTTYPE_COMMAND, jumptext, GoldenrodHarborSailboatText, -1
+	object_event  6, 26, SPRITE_SAILBOAT, SPRITEMOVEDATA_SAILBOAT_TOP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT_NOCLICKSFX, 0, GoldenrodHarborSailboatScript, -1
+	object_event  6, 26, SPRITE_SAILBOAT, SPRITEMOVEDATA_SAILBOAT_BOTTOM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT_NOCLICKSFX, 0, GoldenrodHarborSailboatScript, -1
 
 GoldenrodHarborFisherScript:
 	faceplayer
@@ -266,6 +266,15 @@ GoldenrodHarborYoungsterScript:
 	db "Jumbo P.   ¥12800@"
 	db "Cancel@"
 
+GoldenrodHarborSailboatScript:
+	readvar VAR_FACING
+	ifnotequal DOWN, .show_text
+	end
+.show_text
+	playsound SFX_READ_TEXT_2
+	waitsfx
+	jumptext GoldenrodHarborSailboatText
+
 GoldenrodHarborFisherText:
 	text "If you're fishing,"
 	line "you have to be"