summaryrefslogtreecommitdiff
path: root/data/maps/VictoryRoad_3F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/VictoryRoad_3F/scripts.inc')
-rw-r--r--data/maps/VictoryRoad_3F/scripts.inc36
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc
index fe77da24d..4cd011f92 100644
--- a/data/maps/VictoryRoad_3F/scripts.inc
+++ b/data/maps/VictoryRoad_3F/scripts.inc
@@ -1,10 +1,10 @@
VictoryRoad_3F_MapScripts:: @ 81610AA
- map_script 1, VictoryRoad_3F_MapScript1_1610B0
+ map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad
.byte 0
-VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0
- compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
- call_if ne, EventScript_1610BC
+VictoryRoad_3F_OnLoad:: @ 81610B0
+ compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
+ call_if_ne EventScript_1610BC
end
EventScript_1610BC:: @ 81610BC
@@ -14,8 +14,8 @@ EventScript_1610BC:: @ 81610BC
VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
lockall
- compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
- goto_if eq, EventScript_161101
+ compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
+ goto_if_eq EventScript_161101
setmetatile 12, 12, 721, 0
setmetatile 12, 13, 737, 0
playse SE_RU_GASYAN
@@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101
end
VictoryRoad_3F_EventScript_161103:: @ 8161103
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83
- msgbox gUnknown_8174B99, 6
+ trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83
+ msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE
end
VictoryRoad_3F_EventScript_16111A:: @ 816111A
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9
- msgbox gUnknown_8174CBD, 6
+ trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9
+ msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE
end
VictoryRoad_3F_EventScript_161131:: @ 8161131
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A
- msgbox gUnknown_8174C67, 6
+ trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A
+ msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE
end
VictoryRoad_3F_EventScript_161148:: @ 8161148
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4
- msgbox gUnknown_8174C03, 6
+ trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4
+ msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE
end
VictoryRoad_3F_EventScript_16115F:: @ 816115F
- trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96
- msgbox gUnknown_8174D64, 6
+ trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96
+ msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE
end
VictoryRoad_3F_EventScript_16117A:: @ 816117A
- trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D
- msgbox gUnknown_8174E48, 6
+ trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D
+ msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE
end