diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-22 20:50:41 -0400 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2019-10-30 17:51:35 -0500 |
commit | 93e2851fc187499259affb1ee32c845a7e9f9023 (patch) | |
tree | ea5d9e7071896a7ba1514ac9a556dbdebbe7bce7 /data/scripts | |
parent | ff0109e0fda22e4893dc748d59d8c8e57abd3b9b (diff) |
Document players_house.inc and Littleroot house scripts
Diffstat (limited to 'data/scripts')
-rw-r--r-- | data/scripts/new_game.inc | 2 | ||||
-rw-r--r-- | data/scripts/players_house.inc | 455 | ||||
-rw-r--r-- | data/scripts/tv.inc | 4 |
3 files changed, 225 insertions, 236 deletions
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index ea1b21ac7..f053b3299 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -117,7 +117,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_PLAYERS_HOUSE_DAD diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f88d3af6c..acb1536e8 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,67 +1,63 @@ -LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE -LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE +PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: @ 82926FE setvar VAR_LITTLEROOT_INTRO_STATE, 5 return -LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 -LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704 + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x8005, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D - compare VAR_0x8005, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT + compare VAR_0x8005, MALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale + compare VAR_0x8005, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale + msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D +PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 +PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 +PlayersHouse_1F_Movement_PlayerWalkIn: @ 8292763 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 -LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765 + msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292781:: @ 8292781 +LittlerootTown_BrendansHouse_2F_EventScript_WallClock:: @ 8292781 lockall - setvar VAR_0x8004, 0 - goto LittlerootTown_BrendansHouse_2F_EventScript_292799 + setvar VAR_0x8004, MALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D +LittlerootTown_MaysHouse_2F_EventScript_WallClock:: @ 829278D lockall - setvar VAR_0x8004, 1 - goto LittlerootTown_MaysHouse_2F_EventScript_292799 + setvar VAR_0x8004, FEMALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 -LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT - call LittlerootTown_BrendansHouse_2F_EventScript_292849 +PlayersHouse_2F_EventScript_WallClock:: @ 8292799 + goto_if_set FLAG_SET_WALL_CLOCK, PlayersHouse_2F_EventScript_CheckWallClock + msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT + call PlayersHouse_2F_EventScript_SetWallClock delay 30 setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK @@ -69,41 +65,41 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale playse SE_KAIDAN removeobject VAR_0x8008 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF +PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F +PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F +PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special Special_ViewWallClock @@ -111,13 +107,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 +PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 fadescreen 1 special StartWallClock waitstate return -LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 +PlayersHouse_2F_Movement_MomEntersMale: @ 8292850 delay_8 walk_down walk_in_place_fastest_left @@ -126,13 +122,13 @@ LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 +PlayersHouse_2F_Movement_MomExitsMale: @ 8292857 walk_right walk_up delay_8 step_end -LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B +PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B delay_8 walk_down walk_in_place_fastest_right @@ -141,91 +137,88 @@ LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B walk_right step_end -LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 +PlayersHouse_2F_Movement_MomExitsFemale: @ 8292862 walk_left walk_up delay_8 step_end -LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 -LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 +PlayersHouse_1F_EventScript_SetWatchedBroadcast:: @ 8292866 setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D +PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29296C + call PlayersHouse_1F_EventScript_WatchGymBroadcast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC +PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29296C + call PlayersHouse_1F_EventScript_WatchGymBroadcast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B -LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B +PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B playse SE_PIN applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT closemessage return -LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C -LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C +PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME delay 35 return -LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 +PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989 walk_up walk_right walk_right @@ -235,7 +228,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 +PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991 walk_up walk_left walk_left @@ -245,15 +238,15 @@ LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 +PlayersHouse_1F_Movement_MomApproachPlayerMale: @ 8292999 walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B +PlayersHouse_1F_Movement_MomApproachPlayerFemale: @ 829299B walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D walk_in_place_fastest_left delay_16 delay_16 @@ -264,7 +257,7 @@ LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6 walk_in_place_fastest_right delay_16 delay_16 @@ -275,70 +268,69 @@ LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale: @ 82929AF walk_up walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale: @ 82929B3 walk_up walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale: @ 82929B7 walk_left walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale: @ 82929BA walk_right walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD +PlayersHouse_1F_Movement_MomReturnToSeatMale: @ 82929BD walk_left walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 +PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 walk_right walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 -LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 +PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer compare VAR_LITTLEROOT_HOUSES_STATE, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard + goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom + goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty compare VAR_TEMP_1, 1 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 + goto_if_eq PlayersHouse_1F_EventScript_SeeYouHoney compare VAR_LITTLEROOT_INTRO_STATE, 7 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT + goto_if_eq PlayersHouse_1F_EventScript_DidYouMeetProfBirch + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DontPushYourselfTooHard:: @ 8292A0F + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19 + goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, PlayersHouse_1F_EventScript_CheckGiveAmuletCoin + msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -346,67 +338,65 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 release end -LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 - goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51 - goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 +PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43 + goto_if_set FLAG_BADGE05_GET, PlayersHouse_1F_EventScript_TryGiveAmuletCoin + goto PlayersHouse_1F_EventScript_MomHealsParty -LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 + goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty + msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT - setflag FLAG_MOM_SAYS_GOODBYE + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_AMULET_COIN release end -LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT - goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E +PlayersHouse_1F_EventScript_MomHealsParty:: @ 8292A86 + msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT + goto PlayersHouse_1F_EventScript_HealParty end -LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_SeeYouHoney:: @ 8292A94 + msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E +PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E closemessage call Common_EventScript_OutOfCenterPartyHeal incrementgamestat GAME_STAT_RESTED_AT_HOME - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DidYouMeetProfBirch:: @ 8292AB0 + msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292ABA:: @ 8292ABA -LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA +PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_EventScript_292ACD:: @ 8292ACD -LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD +PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 +PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0 walk_down walk_down walk_left @@ -414,11 +404,11 @@ LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 +PlayersHouse_1F_Movement_PlayerMoveToTVMale: @ 8292AE6 walk_left step_end -LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 +PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8 walk_down walk_down walk_right @@ -426,26 +416,25 @@ LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 walk_right step_end -LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE +PlayersHouse_1F_Movement_PlayerMoveToTVFemale: @ 8292AEE walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 +PlayersHouse_1F_Movement_MovePlayerAwayFromDoor: @ 8292AF0 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 -LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 +PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomFemale applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -454,64 +443,64 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale + msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadFemale + msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsFemale playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_RECEIVED_SS_TICKET delay 30 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerFemale delay 20 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_TV_LATIAS_LATIOS special TurnOnTVScreen delay 60 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale + msgbox PlayersHouse_1F_Text_IsThatABreakingStory, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale + msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT multichoice 22, 8, MULTI_TV_LATI, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_ROAMER_POKEMON, VAR_RESULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -519,155 +508,155 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 end @ Never called. -LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 +PlayersHouse_1F_EventScript_AirLatiBroadcast:: @ 8292C72 setflag FLAG_SYS_TV_LATIAS_LATIOS return -LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76 - setvar VAR_0x8008, 0 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale:: @ 8292C76 + setvar VAR_0x8008, MALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C86:: @ 8292C86 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: @ 8292C86 + setvar VAR_0x8008, FEMALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C96:: @ 8292C96 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB2 +PlayersHouse_1F_EventScript_DadApproachPlayerMale:: @ 8292C96 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CA1:: @ 8292CA1 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB5 +PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: @ 8292CA1 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CAC:: @ 8292CAC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292989 +PlayersHouse_1F_EventScript_MomApproachDadMale:: @ 8292CAC + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB8 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292991 +PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBA + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC +PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1 +PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6 +PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1 +PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 +PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B +PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D72:: @ 8292D72 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299D +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: @ 8292D72 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929A6 +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 +PlayersHouse_1F_Movement_DadApproachPlayerMale: @ 8292DB2 walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 +PlayersHouse_1F_Movement_DadApproachPlayerFemale: @ 8292DB5 walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 +PlayersHouse_1F_Movement_DadFaceMomMale: @ 8292DB8 face_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA +PlayersHouse_1F_Movement_DadFaceMomFemale: @ 8292DBA face_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC +PlayersHouse_1F_Movement_DadExitsMale: @ 8292DBC walk_down walk_right walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 +PlayersHouse_1F_Movement_DadExitsFemale: @ 8292DC1 walk_down walk_left walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 +PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6 delay_16 walk_down walk_down @@ -675,14 +664,14 @@ LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC +PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit: @ 8292DCC delay_8 delay_16 delay_16 walk_in_place_fastest_down step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 +PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1 delay_16 walk_down walk_down @@ -690,7 +679,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 +PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7 walk_up walk_left walk_left @@ -699,7 +688,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE +PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE walk_up walk_right walk_right @@ -709,5 +698,5 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE step_end EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN + msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index ed279d478..67141d7a1 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -36,12 +36,12 @@ EventScript_27EE8A:: @ 827EE8A end EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ It's called again when Mom actually asks for the color, overwriting @ whatever it does here. |