summaryrefslogtreecommitdiff
path: root/data/maps/RockTunnel_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RockTunnel_1F/scripts.inc')
-rw-r--r--data/maps/RockTunnel_1F/scripts.inc34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc
index c2bb38afc..49daa21a7 100644
--- a/data/maps/RockTunnel_1F/scripts.inc
+++ b/data/maps/RockTunnel_1F/scripts.inc
@@ -1,46 +1,46 @@
RockTunnel_1F_MapScripts:: @ 8162DD6
- map_script 3, RockTunnel_1F_MapScript1_162DDC
+ map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition
.byte 0
-RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC
+RockTunnel_1F_OnTransition:: @ 8162DDC
setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F
end
RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
- msgbox gUnknown_817962D, 3
+ msgbox gUnknown_817962D, MSGBOX_SIGN
end
RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388
- msgbox gUnknown_8179396, 6
+ trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388
+ msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E00:: @ 8162E00
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E
- msgbox gUnknown_817943A, 6
+ trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E
+ msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E17:: @ 8162E17
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC
- msgbox gUnknown_81794B4, 6
+ trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC
+ msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE
- msgbox gUnknown_81794F9, 6
+ trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE
+ msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E45:: @ 8162E45
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547
- msgbox gUnknown_8179558, 6
+ trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547
+ msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604
- msgbox gUnknown_8179613, 6
+ trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604
+ msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE
end
RockTunnel_1F_EventScript_162E73:: @ 8162E73
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1
- msgbox gUnknown_81795B5, 6
+ trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1
+ msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE
end