summaryrefslogtreecommitdiff
path: root/engine/std_scripts.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-08-17 11:58:57 -0400
committeryenatch <yenatch@gmail.com>2015-08-17 11:58:57 -0400
commit3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch)
tree32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /engine/std_scripts.asm
parent9974a2c7014cbe7db3d0e516580fea48001ab3df (diff)
parent4831b4429eab57f56cce4736b6930a54f07314f7 (diff)
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
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 7656cf184..95c91b647 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST
- domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
+ domaptrigger MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
- warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
+ warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
BugContestResults_CleanUp
loadmovesprites
dotrigger $0
- domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
+ domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A