diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/berry_tree.inc | 14 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 17897223a..1a72316bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ S_BerryTree:: @ 81A14DD - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case 255, BerryTree_EventScript_1A1533 case 0, BerryTree_EventScript_1A153D @@ -107,10 +107,10 @@ BerryTree_EventScript_1A15F9:: @ 81A15F9 goto_if_eq BerryTree_EventScript_1A164B BerryTree_EventScript_1A161D:: @ 81A161D - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_1A1642 - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare MUS_ME_KINOMI waitmessage @@ -138,7 +138,7 @@ BerryTree_EventScript_1A164B:: @ 81A164B S_PlantBerryTreeFromBag:: @ 81A1654 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call S_PlantBerryTree releaseall end @@ -157,12 +157,12 @@ BerryTree_EventScript_1A168D:: @ 81A168D end S_WaterBerryTreeFromBag:: @ 81A168F - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall S_WaterBerryTree:: @ 81A1693 message Route102_Text_1A1912 waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 @@ -172,7 +172,7 @@ S_WaterBerryTree:: @ 81A1693 end S_PlantBerryTree:: @ 81A16A9 - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 29e05c513..f8d57f084 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 @@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 |