diff options
Diffstat (limited to 'data/maps/VictoryRoad_1F/scripts.inc')
| -rw-r--r-- | data/maps/VictoryRoad_1F/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20759c714..79d01278f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,11 +1,11 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 - map_script 1, VictoryRoad_1F_MapScript1_160F10 - map_script 3, VictoryRoad_1F_MapScript2_160F2F + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if ne, EventScript_160F1C +VictoryRoad_1F_OnLoad:: @ 8160F10 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + call_if_ne EventScript_160F1C end EventScript_160F1C:: @ 8160F1C @@ -13,14 +13,14 @@ EventScript_160F1C:: @ 8160F1C setmetatile 12, 15, 791, 1 return -VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F +VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if eq, EventScript_160F62 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 - msgbox gUnknown_8174744, 6 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 + msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, 6 + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 + msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE end |