Modified bugfix in previous commit to apply to other cases

Author: voloved

README.md

@@ -10,6 +10,7 @@ To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your l
  ![Example](https://i.imgur.com/KSMvc0h.png)  
 ## Not Yet Versioned
  - Fly Will Only Be Displayed by Pokémon Who Cannot Learn iit If Flying Is Currently Allowed.
+ - Bugfix where Dad giving SS Ticket causes him to not move.
 
 ## v2.3.0
  - Now Able to Access PC from PokéNav in caves, houses, and gyms after receiving Balance Badge.

data/scripts/obtain_item.inc

@@ -90,7 +90,9 @@ EventScript_ObtainedItemMessage:
 	message gText_ObtainedTheItem
 EventScript_ContinueObtainedItem:
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitfanfare
 	call EventScript_PutItemMsg
 	setvar VAR_RESULT, TRUE
@@ -176,7 +178,9 @@ EventScript_PickUpItemContinueAdd::
 	call_if_eq VAR_0x8008, TRUE, EventScript_FoundTMHM
 	call_if_eq VAR_0x8008, FALSE, EventScript_FoundItem
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitfanfare
 	waitmessage
 	bufferitemnameplural STR_VAR_2, VAR_0x8004, VAR_0x8005
@@ -249,7 +253,9 @@ EventScript_FoundHiddenItem::
 
 EventScript_PutHiddenItemInPocket::
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitmessage
 	waitfanfare
 	bufferitemnameplural STR_VAR_2, VAR_0x8004, 1

data/scripts/players_house.inc

@@ -422,7 +422,9 @@ PlayersHouse_1F_Movement_MovePlayerAwayFromDoor:
 
 PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
 	lockall
-	call PlayersHouse_1F_EventScript_SetUpObjectEventVars
+	checkplayergender
+	call_if_eq VAR_RESULT, MALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale
+	call_if_eq VAR_RESULT, FEMALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale
 	call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_PlayerEnterRoomMale
 	call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_PlayerEnterRoomFemale
 	applymovement VAR_0x8009, Common_Movement_FacePlayer
@@ -437,7 +439,6 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
 	call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_DadApproachPlayerFemale
 	msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT
 	giveitem ITEM_SS_TICKET
-	call PlayersHouse_1F_EventScript_SetUpObjectEventVars @ giveItem with description reset VAR_0x8009
 	msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT
 	closemessage
 	delay 20
@@ -510,12 +511,6 @@ PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale::
 	setvar VAR_0x800A, LOCALID_MOM
 	return
 
-PlayersHouse_1F_EventScript_SetUpObjectEventVars::
-	checkplayergender
-	call_if_eq VAR_RESULT, MALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale
-	call_if_eq VAR_RESULT, FEMALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale
-	return
-
 PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale::
 	setvar VAR_0x8008, FEMALE
 	setvar VAR_0x8009, LOCALID_DAD