summaryrefslogtreecommitdiff
path: root/engine/std_scripts.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 13:46:34 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 14:33:17 -0500
commitc05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch)
tree0c1995c8a928a297f842a75c2e009003534b3ec8 /engine/std_scripts.asm
parent20d6c1d876cde19061c458761c7283163e316d8a (diff)
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'engine/std_scripts.asm')
-rw-r--r--engine/std_scripts.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 020875ff7..b31f7a415 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -297,7 +297,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
- domaptrigger MAHOGANY_TOWN, $1
+ setmapscene MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
@@ -354,8 +354,8 @@ BugContestResults_DidNotLeaveMons
waitbutton
BugContestResults_CleanUp
closetext
- dotrigger $0
- domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
+ setscene $0
+ setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A