summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/battle_pike.inc18
-rw-r--r--data/scripts/berry_blender.inc2
-rw-r--r--data/scripts/berry_tree.inc32
-rw-r--r--data/scripts/cable_club.inc52
-rw-r--r--data/scripts/cave_hole.inc4
-rw-r--r--data/scripts/contest_hall.inc2
-rw-r--r--data/scripts/elite_four.inc4
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/players_house.inc46
-rw-r--r--data/scripts/rival_graphics.inc12
-rw-r--r--data/scripts/secret_base.inc2
11 files changed, 89 insertions, 89 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index dd730a644..83cc6ec61 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -46,8 +46,8 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
.2byte 0
BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
- setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
- setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
+ setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
+ setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
pike_getroomtype
compare VAR_RESULT, PIKE_ROOM_STATUS
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
@@ -59,17 +59,17 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
setvar VAR_TEMP_4, 1
- turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+ turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35
setvar VAR_TEMP_4, 1
- turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+ turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F
setvar VAR_TEMP_4, 1
- turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+ turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially
end
@@ -110,7 +110,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 255, 4, 7
@@ -118,7 +118,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 255, 4, 19
@@ -180,14 +180,14 @@ BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 1d0862a65..eecd08273 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -682,7 +682,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
- special SpawnLinkPartnerEventObject
+ special SpawnLinkPartnerObjectEvent
goto BerryBlender_EventScript_LinkPlayersArrived
end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 6b2da5ccb..354aa045e 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
BerryTreeScript:: @ 82742F9
- special EventObjectInteractionGetBerryTreeData
+ special ObjectEventInteractionGetBerryTreeData
switch VAR_0x8004
case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling
case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil
@@ -54,7 +54,7 @@ BerryTree_EventScript_CancelPlanting:: @ 82743AF
BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
lockall
- special EventObjectInteractionGetBerryCountString
+ special ObjectEventInteractionGetBerryCountString
message BerryTree_Text_BerryGrowthStage1
waitmessage
waitbuttonpress
@@ -62,7 +62,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
lockall
- special EventObjectInteractionGetBerryName
+ special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage2
waitmessage
waitbuttonpress
@@ -70,7 +70,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
lockall
- special EventObjectInteractionGetBerryName
+ special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage3
waitmessage
waitbuttonpress
@@ -79,14 +79,14 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
call BerryTree_EventScript_GetCareAdverb
lockall
- special EventObjectInteractionGetBerryName
+ special ObjectEventInteractionGetBerryName
message BerryTree_Text_BerryGrowthStage4
waitmessage
waitbuttonpress
goto BerryTree_EventScript_WantToWater
@ VAR_0x8005 here is the number of times watered
-@ Buffered by EventObjectInteractionGetBerryTreeData
+@ Buffered by ObjectEventInteractionGetBerryTreeData
BerryTree_EventScript_GetCareAdverb:: @ 82743F6
compare VAR_0x8005, 0
goto_if_eq BerryTree_EventScript_SetAdverbPoor
@@ -108,7 +108,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
buffernumberstring 1, VAR_0x8006
lock
faceplayer
- special EventObjectInteractionGetBerryCountString
+ special ObjectEventInteractionGetBerryCountString
msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_PickBerry
@@ -116,11 +116,11 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
goto_if_eq BerryTree_EventScript_CancelPickingBerry
BerryTree_EventScript_PickBerry:: @ 8274448
- special EventObjectInteractionPickBerryTree
+ special ObjectEventInteractionPickBerryTree
compare VAR_0x8004, 0
goto_if_eq BerryTree_EventScript_BerryPocketFull
special IncrementDailyPickedBerries
- special EventObjectInteractionRemoveBerryTree
+ special ObjectEventInteractionRemoveBerryTree
message BerryTree_Text_PickedTheBerry
playfanfare MUS_ME_KINOMI
waitmessage
@@ -148,7 +148,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479
BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482
lockall
- special EventObjectInteractionGetBerryTreeData
+ special ObjectEventInteractionGetBerryTreeData
call BerryTree_EventScript_PlantBerry
releaseall
end
@@ -157,7 +157,7 @@ BerryTree_EventScript_WantToWater:: @ 827448D
checkitem ITEM_WAILMER_PAIL, 1
compare VAR_RESULT, 0
goto_if_eq BerryTree_EventScript_DontWater
- special EventObjectInteractionGetBerryName
+ special ObjectEventInteractionGetBerryName
msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryTree_EventScript_WaterBerry
@@ -169,13 +169,13 @@ BerryTree_EventScript_DontWater:: @ 82744BE
end
BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0
- special EventObjectInteractionGetBerryTreeData
+ special ObjectEventInteractionGetBerryTreeData
lockall
BerryTree_EventScript_WaterBerry:: @ 82744C4
- special EventObjectInteractionGetBerryName
+ special ObjectEventInteractionGetBerryName
message BerryTree_Text_WateredTheBerry
waitmessage
- special EventObjectInteractionWaterBerryTree
+ special ObjectEventInteractionWaterBerryTree
special DoWateringBerryTreeAnim
waitstate
message BerryTree_Text_PlantIsDelighted
@@ -185,10 +185,10 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4
end
BerryTree_EventScript_PlantBerry:: @ 82744DD
- special EventObjectInteractionPlantBerryTree
+ special ObjectEventInteractionPlantBerryTree
incrementgamestat GAME_STAT_PLANTED_BERRIES
special IncrementDailyPlantedBerries
- special EventObjectInteractionGetBerryCountString
+ special ObjectEventInteractionGetBerryCountString
message BerryTree_Text_PlantedOneBerry
waitmessage
waitbuttonpress
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f37596961..e4e0f0ffd 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -154,7 +154,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
@@ -175,7 +175,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -195,7 +195,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_ExitRecordCornerRet
@@ -218,7 +218,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -232,24 +232,24 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE
delay 60
message CableClub_Text_HopeToSeeYouAgain
waitmessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
return
CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
return
CableClub_EventScript_Tutorial:: @ 8276DE0
lockall
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter
+ applymovement OBJ_EVENT_ID_PLAYER, CableClub_Movement_PlayerApproachCounter
waitmovement 0
delay 30
msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT
@@ -377,13 +377,13 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -397,7 +397,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
@ Unused
CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
waitmovement 0
return
@@ -482,13 +482,13 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -557,13 +557,13 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -959,13 +959,13 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 5, 1
waitdooranim
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
@@ -1290,13 +1290,13 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -1486,9 +1486,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
- hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
release
waitstate
end
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index 7f0dd5534..b55c932ee 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -9,7 +9,7 @@ CaveHole_FixCrackedGround: @ 82A8331
EventScript_FallDownHole:: @ 82A8337
lockall
delay 20
- applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 82A8337
EventScript_FallDownHoleMtPyre:: @ 82A8350
lockall
delay 20
- applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
+ applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index cabf923b6..586f5af83 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -490,7 +490,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
@ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience
@ The number of hearts to try to display is based on the condition of the presented pokemon and the rank
@ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart
-@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects
+@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events
@ and are set to 9 if they havent displayed a heart yet, and 1 if they have
ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
special GetContestMonCondition
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index e7aada698..3b395de21 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -1,5 +1,5 @@
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
return
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 456f56f45..98faa4748 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -210,7 +210,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToEventObjectLocalIds
+ special GabbyAndTySetScriptVarsToObjectEventLocalIds
compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH
@@ -241,7 +241,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToEventObjectLocalIds
+ special GabbyAndTySetScriptVarsToObjectEventLocalIds
compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 1b706e603..9e9b23c04 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -13,19 +13,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -37,7 +37,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
waitmovement 0
releaseall
end
@@ -78,7 +78,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -91,7 +91,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -152,17 +152,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -177,17 +177,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -209,7 +209,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B
return
PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
@@ -549,38 +549,38 @@ PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1
return
PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+ applymovement OBJ_EVENT_ID_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:: @ 8292CEF
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+ applymovement OBJ_EVENT_ID_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:: @ 8292D08
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
- applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
+ applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
@@ -589,14 +589,14 @@ PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -613,14 +613,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc
index 60bd1a337..a8ead6497 100644
--- a/data/scripts/rival_graphics.inc
+++ b/data/scripts/rival_graphics.inc
@@ -7,11 +7,11 @@ Common_EventScript_SetupRivalGfxId:: @ 8271ED7
end
EventScript_SetupRivalGfxIdFemale:: @ 8271EEF
- setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+ setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
EventScript_SetupRivalGfxIdMale:: @ 8271EF5
- setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+ setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
@@ -23,11 +23,11 @@ Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
end
EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13
- setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
+ setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE
return
EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19
- setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
+ setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE
return
@ Unused
@@ -40,9 +40,9 @@ Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F
end
EventScript_SetupRivalGfxIdMale2:: @ 8271F37
- setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+ setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D
- setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+ setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 617b19b42..e92c419dc 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B
end
SecretBase_EventScript_FirstEntrance:: @ 8275B81
- applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4
+ applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 13:30:19 +0000