diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/berry_blender.inc | 2 | ||||
| -rw-r--r-- | data/scripts/berry_tree.inc | 32 | ||||
| -rw-r--r-- | data/scripts/contest_hall.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 4 |
4 files changed, 20 insertions, 20 deletions
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/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/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 |