Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-26 11:57:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '678fdf9' into pret-merge

Browse Source 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
This commit is contained in:
Hedara
2025-05-27 19:22:40 +02:00
parent 5e9b8cdbad 678fdf9979
commit c27930eabf
405 changed files with 3210 additions and 3273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/apprentice.inc
View File

@@ -1,5 +1,3 @@
.set LOCALID_APPRENTICE, 6
BattleFrontier_BattleTowerLobby_EventScript_Apprentice::
lock
faceplayer

39
data/scripts/battle_pike.inc
View File

@@ -1,4 +1,3 @@
@ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal
BattleFrontier_BattlePikeRoom_MapScripts:
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
@@ -18,28 +17,28 @@ BattleFrontier_BattlePikeRoom_OnTransition:
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos::
setobjectxyperm LOCALID_OBJ_0, 2, 5
setobjectxyperm LOCALID_OBJ_1, 6, 5
setobjectxyperm LOCALID_PIKE_ROOM_NPC_1, 2, 5
setobjectxyperm LOCALID_PIKE_ROOM_NPC_2, 6, 5
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos::
setobjectxyperm LOCALID_OBJ_0, 4, 4
setobjectxyperm LOCALID_OBJ_1, 3, 4
setobjectxyperm LOCALID_PIKE_ROOM_NPC_1, 4, 4
setobjectxyperm LOCALID_PIKE_ROOM_NPC_2, 3, 4
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos::
setobjectxyperm LOCALID_OBJ_0, 4, 4
setobjectxyperm LOCALID_OBJ_1, 0, 0
setobjectxyperm LOCALID_PIKE_ROOM_NPC_1, 4, 4
setobjectxyperm LOCALID_PIKE_ROOM_NPC_2, 0, 0
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos::
setobjectxyperm LOCALID_OBJ_0, 5, 5
setobjectxyperm LOCALID_OBJ_1, 0, 0
setobjectxyperm LOCALID_PIKE_ROOM_NPC_1, 5, 5
setobjectxyperm LOCALID_PIKE_ROOM_NPC_2, 0, 0
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos::
setobjectxyperm LOCALID_OBJ_0, 4, 3
setobjectxyperm LOCALID_OBJ_1, 4, 4
setobjectxyperm LOCALID_PIKE_ROOM_NPC_1, 4, 3
setobjectxyperm LOCALID_PIKE_ROOM_NPC_2, 4, 4
end
BattleFrontier_BattlePikeRoom_OnWarp:
@@ -54,20 +53,20 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects::
goto_if_eq VAR_RESULT, PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
goto_if_eq VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
goto_if_eq VAR_RESULT, PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects
hideobjectat LOCALID_OBJ_1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
hideobjectat LOCALID_PIKE_ROOM_NPC_2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
setvar VAR_TEMP_4, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom::
setvar VAR_TEMP_4, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects::
setvar VAR_TEMP_4, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
hideobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially
turnobject LOCALID_PLAYER, DIR_NORTH
hideobjectat LOCALID_PIKE_ROOM_NPC_1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp::
@@ -107,7 +106,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp::
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 4, 7
@@ -115,7 +114,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom::
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 4, 19
@@ -175,14 +174,14 @@ BattleFrontier_BattlePikeRoom_EventScript_EnableHealing::
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 2, 7
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10

20
data/scripts/berry_blender.inc
View File

@@ -1,11 +1,3 @@
@ Note: local IDs shared with scripts.inc for LilycoveCity_ContestLobby
.set LOCALID_MAN, 3
.set LOCALID_BOY, 9
.set LOCALID_TWIN, 10
.set LOCALID_POKEFAN_F, 15
.set LOCALID_EXPERT_M, 16
.set LOCALID_GIRL, 17
.set NUM_OPPONENTS, VAR_0x8009
BerryBlender_Text_WantToMakePokeblocks:
@@ -246,7 +238,7 @@ BerryBlender_EventScript_BerryBlender1::
lockall
goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
setvar NUM_OPPONENTS, 1
applymovement LOCALID_EXPERT_M, BerryBlender_Movement_BlendLeaderWalkInPlace
applymovement LOCALID_BLEND_MASTER, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender1
@@ -325,8 +317,8 @@ BerryBlender_EventScript_Blender1NoCase:
BerryBlender_EventScript_BerryBlender2::
lockall
setvar NUM_OPPONENTS, 2
applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MAN, BerryBlender_Movement_BlendLeaderWalkInPlace
applymovement LOCALID_CONTEST_LOBBY_BLENDER_2_PARTICIPANT, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_2_LEADER, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender2
@@ -382,10 +374,10 @@ BerryBlender_EventScript_Blender2NoCase:
BerryBlender_EventScript_BerryBlender3::
lockall
setvar VAR_0x8008, LOCALID_POKEFAN_F
setvar VAR_0x8008, LOCALID_CONTEST_LOBBY_BLENDER_3_LEADER
setvar NUM_OPPONENTS, 3
applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_3_PARTICIPANT_1, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_3_PARTICIPANT_2, Common_Movement_FaceOriginalDirection
applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO

52
data/scripts/cable_club.inc
View File

@@ -138,7 +138,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom::
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
@@ -158,7 +158,7 @@ CableClub_EventScript_PlayerExitTradeCenter::
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -178,7 +178,7 @@ CableClub_EventScript_ExitRecordCorner::
CableClub_EventScript_PlayerExitRecordCorner::
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_ExitRecordCornerRet
applymovement VAR_0x8007, Movement_AttendantFaceDown
@@ -199,7 +199,7 @@ CableClub_EventScript_ExitUnionRoom::
CableClub_EventScript_PlayerExitUnionRoom::
setvar VAR_CABLE_CLUB_STATE, 0
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -213,24 +213,24 @@ CableClub_EventScript_TrainerCardDataOverwritten::
delay 60
message CableClub_Text_HopeToSeeYouAgain
waitmessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
return
CableClub_EventScript_PlayerExitLinkRoom::
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
return
CableClub_EventScript_Tutorial::
lockall
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, CableClub_Movement_PlayerApproachCounter
applymovement LOCALID_PLAYER, CableClub_Movement_PlayerApproachCounter
waitmovement 0
delay 30
msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT
@@ -350,13 +350,13 @@ CableClub_EventScript_EnterColosseum::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -369,7 +369,7 @@ CableClub_EventScript_EnterColosseum::
@ Unused
CableClub_EventScript_PlayerApproachLinkRoomRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomRight
waitmovement 0
return
@@ -444,13 +444,13 @@ CableClub_EventScript_EnterTradeCenter::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -509,13 +509,13 @@ CableClub_EventScript_EnterRecordCorner::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -896,13 +896,13 @@ CableClub_EventScript_EnterUnionRoom::
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
@@ -1196,13 +1196,13 @@ CableClub_EventScript_EnterWirelessLinkRoom::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -1382,9 +1382,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
release
waitstate
end

4
data/scripts/cave_hole.inc
View File

@@ -9,7 +9,7 @@ CaveHole_FixCrackedGround:
EventScript_FallDownHole::
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60
@@ -20,7 +20,7 @@ EventScript_FallDownHole::
EventScript_FallDownHoleMtPyre::
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60

100
data/scripts/contest_hall.inc
View File

@@ -1,19 +1,3 @@
.set LOCALID_MC, 1
.set LOCALID_JUDGE, 2
.set LOCALID_CONTESTANT_1, 3
.set LOCALID_CONTESTANT_2, 4
.set LOCALID_CONTESTANT_3, 5
.set LOCALID_AUDIENCE_1, 6
.set LOCALID_AUDIENCE_3, 7
.set LOCALID_AUDIENCE_4, 8
.set LOCALID_AUDIENCE_5, 9
.set LOCALID_AUDIENCE_6, 10
.set LOCALID_AUDIENCE_7, 11
.set LOCALID_AUDIENCE_2, 12
.set LOCALID_POKEBALL, 13
.set LOCALID_CONTESTANT_4, 14
.set LOCALID_ARTIST, 15
@ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry
LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist::
lock
@@ -204,7 +188,7 @@ ContestHall_EventScript_DoContest::
lockall
applymovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4FaceUp
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCWalkDown
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkDown
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -280,7 +264,7 @@ ContestHall_EventScript_ContestGettingStarted::
bufferstdstring STR_VAR_3, VAR_0x8009
call ContestHall_EventScript_GettingStarted
lockall
applymovement LOCALID_MC, ContestHall_Movement_MCBackUp
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCBackUp
waitmovement 0
releaseall
return
@@ -385,7 +369,7 @@ ContestHall_EventScript_ShowContestMonPic::
releaseall
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_CheckIfContestWithRSPlayer
addobject LOCALID_POKEBALL
addobject LOCALID_CONTEST_POKEBALL
playse SE_LEDGE
lockall
applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
@@ -414,13 +398,13 @@ ContestHall_EventScript_AudienceVote::
playse SE_M_ENCORE2
waitmessage
call ContestHall_EventScript_AudienceLookAround
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge2
waitmovement 0
applymovement LOCALID_JUDGE, ContestHall_Movement_JudgeFaceMC
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeFaceMC
waitmovement 0
delay 20
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_JUDGE, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_FaceContestants
waitmovement 0
return
@@ -460,25 +444,25 @@ ContestHall_EventScript_VotingUnderWayLink::
ContestHall_EventScript_AudienceReactToContestant::
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
playse SE_M_ENCORE2
call ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookRight
waitmovement 0
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCLookAtJudge
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCLookAtJudge
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCWalkInPlaceDown
applymovement LOCALID_JUDGE, ContestHall_Movement_JudgeLookAtMC
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkInPlaceDown
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeLookAtMC
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -624,7 +608,7 @@ ContestHall_EventScript_Set8Hearts::
ContestHall_EventScript_TryDisplayHeartAudienceMember1::
goto_if_eq VAR_TEMP_1, 1, ContestHall_EventScript_AudienceMember1AlreadyEmoted
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_1, 1
@@ -636,7 +620,7 @@ ContestHall_EventScript_AudienceMember1AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember2::
goto_if_eq VAR_TEMP_2, 1, ContestHall_EventScript_AudienceMember2AlreadyEmoted
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_2, 1
@@ -648,7 +632,7 @@ ContestHall_EventScript_AudienceMember2AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember3::
goto_if_eq VAR_TEMP_3, 1, ContestHall_EventScript_AudienceMember3AlreadyEmoted
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_3, 1
@@ -660,7 +644,7 @@ ContestHall_EventScript_AudienceMember3AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember4::
goto_if_eq VAR_TEMP_4, 1, ContestHall_EventScript_Audience4MemberAlreadyEmoted
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_4, 1
@@ -672,7 +656,7 @@ ContestHall_EventScript_Audience4MemberAlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember5::
goto_if_eq VAR_TEMP_5, 1, ContestHall_EventScript_AudienceMember5AlreadyEmoted
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_5, 1
@@ -684,7 +668,7 @@ ContestHall_EventScript_AudienceMember5AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember6::
goto_if_eq VAR_TEMP_6, 1, ContestHall_EventScript_AudienceMember6AlreadyEmoted
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_6, 1
@@ -696,7 +680,7 @@ ContestHall_EventScript_AudienceMember6AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember7::
goto_if_eq VAR_TEMP_7, 1, ContestHall_EventScript_AudienceMember7AlreadyEmoted
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_7, 1
@@ -708,7 +692,7 @@ ContestHall_EventScript_AudienceMember7AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember8::
goto_if_eq VAR_TEMP_8, 1, ContestHall_EventScript_AudienceMember8AlreadyEmoted
applymovement LOCALID_ARTIST, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_ARTIST, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_8, 1
@@ -721,7 +705,7 @@ ContestHall_EventScript_AudienceMember8AlreadyEmoted::
ContestHall_EventScript_ContestantReturn::
closemessage
release
removeobject LOCALID_POKEBALL
removeobject LOCALID_CONTEST_POKEBALL
special HideContestEntryMonPic
call ContestHall_EventScript_TryWaitForLink
switch VAR_0x8006
@@ -765,13 +749,13 @@ ContestHall_EventScript_Player4WalkBack::
ContestHall_EventScript_DoContestAppeals::
lockall
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants2
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants2
waitmovement 0
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_LetsAppeal
waitmessage
applymovement LOCALID_MC, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_JUDGE, ContestHall_Movement_WalkStageRight
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_WalkStageRight
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -781,8 +765,8 @@ ContestHall_EventScript_DoContestAppeals::
special LinkContestTryShowWirelessIndicator
setvar VAR_TEMP_9, 0
lockall
applymovement LOCALID_MC, ContestHall_Movement_WalkStageRight
applymovement LOCALID_JUDGE, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_WalkStageRight
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_WalkStageLeft
waitmovement 0
releaseall
return
@@ -818,13 +802,13 @@ ContestHall_EventScript_ContestResults::
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_ThankYouForAppeals
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge
waitmovement 0
call ContestHall_EventScript_JudgeLooksReady
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_WeWillDeclareWinner
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants
waitmovement 0
closemessage
releaseall
@@ -935,14 +919,14 @@ ContestHall_EventScript_AudienceLookAround::
addvar VAR_TEMP_1, 1
lockall
call_if_gt VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
delay 30
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
goto_if_ne VAR_TEMP_1, 4, ContestHall_EventScript_AudienceLookAround
delay 30
return

2
data/scripts/day_care.inc
View File

@@ -1,5 +1,3 @@
.set LOCALID_DAYCARE_LADY, 1
Route117_EventScript_DaycareMan::
lock
faceplayer

4
data/scripts/elite_four.inc
View File

@@ -1,5 +1,5 @@
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
applymovement LOCALID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, FALSE
@@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles::
return
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
applymovement LOCALID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRUCK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE

39
data/scripts/gabby_and_ty.inc
View File

@@ -1,8 +1,15 @@
@ Gabby and Ty always move to the same spots for the first 5 battles
@ From the 6th battle onwards, they move randomly between locations 6-8
@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
@ Gabby and Ty can appear in a fixed location on 3 different routes.
@ Each time they are battled they will disappear from the route they're on
@ and relocate to the next one, in the order Route 111 -> Route 118 -> Route 120.
@ Gabby and Ty have 6 different parties which will get cycled on each appearance.
@ After they're defeated 6 times they will stick to their 6th party but continue
@ cycling between the 3 routes. To determine which trainer party gets used GF created
@ multiple object events for Gabby and Ty on each of the 3 routes. The scripts below
@ handle hiding and showing these objects so the correct party appears on the correct route.
@ Route 111 and Route 118 have 3 object events each (parties 1,4,6 and 2,5,6 respectively)
@ and Route 120 has 2 object events each (parties 3 and 6).
GabbyAndTy_EventScript_UpdateLocation::
cleartrainerflag TRAINER_GABBY_AND_TY_6
cleartrainerflag TRAINER_GABBY_AND_TY_6 @ Clear flag for their final party to allow infinite rematches.
specialvar VAR_RESULT, GabbyAndTyGetBattleNum
switch VAR_RESULT
case 0, GabbyAndTy_EventScript_MoveForBattle1
@@ -31,13 +38,13 @@ GabbyAndTy_EventScript_MoveForBattle3::
return
GabbyAndTy_EventScript_MoveForBattle4::
call GabbyAndTy_EventScript_ShowAtRoute111_3
call GabbyAndTy_EventScript_ShowAtRoute111_2
call GabbyAndTy_EventScript_HideAtRoute120_1
return
GabbyAndTy_EventScript_MoveForBattle5::
call GabbyAndTy_EventScript_ShowAtRoute118_2
call GabbyAndTy_EventScript_HideAtRoute111_3
call GabbyAndTy_EventScript_HideAtRoute111_2
return
GabbyAndTy_EventScript_MoveForBattle6::
@@ -46,13 +53,13 @@ GabbyAndTy_EventScript_MoveForBattle6::
return
GabbyAndTy_EventScript_MoveForBattle7::
call GabbyAndTy_EventScript_ShowAtRoute111_2
call GabbyAndTy_EventScript_ShowAtRoute111_3
call GabbyAndTy_EventScript_HideAtRoute120_2
return
GabbyAndTy_EventScript_MoveForBattle8::
call GabbyAndTy_EventScript_ShowAtRoute118_3
call GabbyAndTy_EventScript_HideAtRoute111_2
call GabbyAndTy_EventScript_HideAtRoute111_3
return
GabbyAndTy_EventScript_MoveForBattle9::
@@ -84,12 +91,12 @@ GabbyAndTy_EventScript_ShowAtRoute120_1::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_HideAtRoute111_3::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
GabbyAndTy_EventScript_HideAtRoute111_2::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_ShowAtRoute111_3::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
GabbyAndTy_EventScript_ShowAtRoute111_2::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute118_2::
@@ -108,12 +115,12 @@ GabbyAndTy_EventScript_ShowAtRoute120_2::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute111_2::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
GabbyAndTy_EventScript_HideAtRoute111_3::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_ShowAtRoute111_2::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
GabbyAndTy_EventScript_ShowAtRoute111_3::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_HideAtRoute118_3::

7
data/scripts/lilycove_lady.inc
View File

@@ -1,6 +1,3 @@
.set LOCALID_LILYCOVE_LADY, 4
.set LOCALID_LADYS_MON, 5
LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady::
special Script_GetLilycoveLadyId
switch VAR_RESULT
@@ -390,7 +387,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon
waitmovement 0
delay 60
applymovement LOCALID_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady
applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady
waitmovement 0
delay 60
waitse
@@ -403,7 +400,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
@ VAR_0x8004 here is the return value from GivePokeblockToContestLady
LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock::
applymovement LOCALID_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump
applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump
waitmovement 0
delay 60
LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock::

4
data/scripts/new_game.inc
View File

@@ -161,10 +161,10 @@ EventScript_ResetAllMapFlags::
setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER

63
data/scripts/players_house.inc
View File

@@ -1,8 +1,3 @@
@ Local IDs are the same for both players houses
.set LOCALID_MOM, 1
.set LOCALID_DAD, 5
.set LOCALID_MOM_2F, 14
PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet::
setvar VAR_LITTLEROOT_INTRO_STATE, 5
return
@@ -16,19 +11,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn::
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
releaseall
end
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -40,7 +35,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom::
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
waitmovement 0
releaseall
end
@@ -75,11 +70,11 @@ PlayersHouse_2F_EventScript_WallClock::
end
PlayersHouse_2F_EventScript_MomComesUpstairsMale::
setvar VAR_0x8008, LOCALID_MOM_2F
setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -88,11 +83,11 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale::
return
PlayersHouse_2F_EventScript_MomComesUpstairsFemale::
setvar VAR_0x8008, LOCALID_MOM_2F
setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -153,17 +148,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale::
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -178,17 +173,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale::
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -210,7 +205,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast::
return
PlayersHouse_1F_EventScript_WatchGymBroadcast::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
@@ -492,14 +487,14 @@ PlayersHouse_1F_EventScript_AirLatiBroadcast::
PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale::
setvar VAR_0x8008, MALE
setvar VAR_0x8009, LOCALID_DAD
setvar VAR_0x800A, LOCALID_MOM
setvar VAR_0x8009, LOCALID_PLAYERS_HOUSE_1F_DAD
setvar VAR_0x800A, LOCALID_PLAYERS_HOUSE_1F_MOM
return
PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale::
setvar VAR_0x8008, FEMALE
setvar VAR_0x8009, LOCALID_DAD
setvar VAR_0x800A, LOCALID_MOM
setvar VAR_0x8009, LOCALID_PLAYERS_HOUSE_1F_DAD
setvar VAR_0x800A, LOCALID_PLAYERS_HOUSE_1F_MOM
return
PlayersHouse_1F_EventScript_DadApproachPlayerMale::
@@ -527,38 +522,38 @@ PlayersHouse_1F_EventScript_MomApproachDadFemale::
return
PlayersHouse_1F_EventScript_DadExitsMale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale
waitmovement 0
return
PlayersHouse_1F_EventScript_DadExitsFemale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerEnterRoomMale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerEnterRoomFemale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -567,14 +562,14 @@ PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale::
PlayersHouse_1F_EventScript_MomApproachPlayerMale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerFemale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -591,14 +586,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale::
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return

2
data/scripts/secret_base.inc
View File

@@ -144,7 +144,7 @@ SecretBase_EventScript_InitSecretBase::
end
SecretBase_EventScript_FirstEntrance::
applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_EnterBase
applymovement LOCALID_PLAYER, SecretBase_Movement_EnterBase
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO