summaryrefslogtreecommitdiff
path: root/data/maps/VictoryRoad_2F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/VictoryRoad_2F/scripts.inc')
-rw-r--r--data/maps/VictoryRoad_2F/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc
index ee3367636..1e08d2265 100644
--- a/data/maps/VictoryRoad_2F/scripts.inc
+++ b/data/maps/VictoryRoad_2F/scripts.inc
@@ -4,9 +4,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92
VictoryRoad_2F_OnLoad:: @ 8160F98
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
- call_if ne, EventScript_160FAF
+ call_if_ne EventScript_160FAF
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
- call_if ne, EventScript_160FC2
+ call_if_ne EventScript_160FC2
end
EventScript_160FAF:: @ 8160FAF
@@ -22,7 +22,7 @@ EventScript_160FC2:: @ 8160FC2
VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
- goto_if eq, EventScript_161004
+ goto_if_eq EventScript_161004
setmetatile 13, 10, 721, 0
setmetatile 13, 11, 737, 0
playse SE_RU_GASYAN
@@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004
VictoryRoad_2F_EventScript_161006:: @ 8161006
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
- goto_if eq, EventScript_161035
+ goto_if_eq EventScript_161035
setmetatile 33, 16, 721, 0
setmetatile 33, 17, 737, 0
playse SE_RU_GASYAN
@@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035
end
VictoryRoad_2F_EventScript_161037:: @ 8161037
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C
+ trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C
msgbox gUnknown_817483E, 6
end
VictoryRoad_2F_EventScript_16104E:: @ 816104E
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4
+ trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4
msgbox gUnknown_81748BB, 6
end
VictoryRoad_2F_EventScript_161065:: @ 8161065
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B
+ trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B
msgbox gUnknown_8174927, 6
end
VictoryRoad_2F_EventScript_16107C:: @ 816107C
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0
+ trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0
msgbox gUnknown_81749BB, 6
end
VictoryRoad_2F_EventScript_161093:: @ 8161093
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A
+ trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A
msgbox gUnknown_8174969, 6
end