diff options
Diffstat (limited to 'data/maps/MtPyre_2F')
| -rw-r--r-- | data/maps/MtPyre_2F/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/MtPyre_2F/scripts.inc | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index c025089e3..f9fad9f46 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,6 +1,6 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index de8520954..830ed5cf7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -10,36 +10,36 @@ MtPyre_2F_MapScript1_23110B: @ 823110B end MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, 2 + msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC end MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, 2 + msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC end MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, 6 + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 + msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 + msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, 6 + trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, 6 + trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end MtPyre_2F_Text_2311A3: @ 82311A3 |