summaryrefslogtreecommitdiff
path: root/data/maps/MtMoon_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MtMoon_1F/scripts.inc')
-rw-r--r--data/maps/MtMoon_1F/scripts.inc34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc
index 28bc65ec9..4c80943d1 100644
--- a/data/maps/MtMoon_1F/scripts.inc
+++ b/data/maps/MtMoon_1F/scripts.inc
@@ -1,46 +1,46 @@
MtMoon_1F_MapScripts:: @ 81605E4
- map_script 3, MtMoon_1F_MapScript1_1605EA
+ map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_1F_OnTransition
.byte 0
-MtMoon_1F_MapScript1_1605EA:: @ 81605EA
+MtMoon_1F_OnTransition:: @ 81605EA
setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F
end
MtMoon_1F_EventScript_1605EE:: @ 81605EE
- msgbox gUnknown_8172AE0, 3
+ msgbox gUnknown_8172AE0, MSGBOX_SIGN
end
MtMoon_1F_EventScript_1605F7:: @ 81605F7
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB
- msgbox gUnknown_81727DF, 6
+ trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB
+ msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_16060E:: @ 816060E
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844
- msgbox gUnknown_8172863, 6
+ trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844
+ msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_160625:: @ 8160625
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3
- msgbox gUnknown_81728D2, 6
+ trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3
+ msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_16063C:: @ 816063C
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4
- msgbox gUnknown_81729AC, 6
+ trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4
+ msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_160653:: @ 8160653
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927
- msgbox gUnknown_817293C, 6
+ trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927
+ msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_16066A:: @ 816066A
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A
- msgbox gUnknown_8172A26, 6
+ trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A
+ msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE
end
MtMoon_1F_EventScript_160681:: @ 8160681
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F
- msgbox gUnknown_8172A97, 6
+ trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F
+ msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE
end