summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_2F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MtPyre_2F/scripts.inc')
-rw-r--r--data/maps/MtPyre_2F/scripts.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index d2ef2894e..3a42c7d0d 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -1,7 +1,7 @@
MtPyre_2F_MapScripts:: @ 815D36E
- map_script 2, MtPyre_2F_MapScript2_1C6BB5
- map_script 3, MtPyre_2F_MapScript1_1C6BBF
- map_script 5, MtPyre_2F_MapScript1_15D37E
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+ map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+ map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_15D37E
.byte 0
MtPyre_2F_MapScript1_15D37E:: @ 815D37E
@@ -10,24 +10,24 @@ MtPyre_2F_MapScript1_15D37E:: @ 815D37E
end
MtPyre_2F_EventScript_15D389:: @ 815D389
- msgbox MtPyre_2F_Text_1965BB, 2
+ msgbox MtPyre_2F_Text_1965BB, MSGBOX_NPC
end
MtPyre_2F_EventScript_15D392:: @ 815D392
- msgbox MtPyre_2F_Text_196600, 2
+ msgbox MtPyre_2F_Text_196600, MSGBOX_NPC
end
MtPyre_2F_EventScript_15D39B:: @ 815D39B
- trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE
- msgbox MtPyre_2F_Text_1966E7, 6
+ trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE
+ msgbox MtPyre_2F_Text_1966E7, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_15D3B2:: @ 815D3B2
- trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB
- msgbox MtPyre_2F_Text_196368, 6
+ trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB
+ msgbox MtPyre_2F_Text_196368, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_15D3CD:: @ 815D3CD
- trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539
- msgbox MtPyre_2F_Text_196504, 6
+ trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539
+ msgbox MtPyre_2F_Text_196504, MSGBOX_AUTOCLOSE
end