summaryrefslogtreecommitdiff
path: root/data/maps/VictoryRoad_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/VictoryRoad_1F/scripts.inc')
-rw-r--r--data/maps/VictoryRoad_1F/scripts.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 79d01278f..5bdc91202 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05
VictoryRoad_1F_OnLoad:: @ 8160F10
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
- call_if_ne EventScript_160F1C
+ call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier
end
-EventScript_160F1C:: @ 8160F1C
- setmetatile 12, 14, 775, 1
- setmetatile 12, 15, 791, 1
+VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C
+ setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1
+ setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1
return
VictoryRoad_1F_OnTransition:: @ 8160F2F
setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F
end
-VictoryRoad_1F_EventScript_160F33:: @ 8160F33
+VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
- goto_if_eq EventScript_160F62
- setmetatile 12, 14, 721, 0
- setmetatile 12, 15, 737, 0
+ goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
+ setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0
+ setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0
playse SE_RU_GASYAN
special DrawWholeMapView
waitse
@@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33
releaseall
end
-EventScript_160F62:: @ 8160F62
+VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62
releaseall
end
-VictoryRoad_1F_EventScript_160F64:: @ 8160F64
- trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738
- msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Naomi:: @ 8160F64
+ trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat
+ msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
end
-VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B
- trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8
- msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B
+ trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat
+ msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE
end