summaryrefslogtreecommitdiff
path: root/data/maps/Route132
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/Route132
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route132')
-rw-r--r--data/maps/Route132/events.inc4
-rw-r--r--data/maps/Route132/scripts.inc32
2 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
index 817d7b038..da648b925 100644
--- a/data/maps/Route132/events.inc
+++ b/data/maps/Route132/events.inc
@@ -1,14 +1,14 @@
Route132_EventObjects: @ 852CB90
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036
+ object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
- object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156
+ object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN
Route132_MapEvents:: @ 852CC80
map_events Route132_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index a4ae6f716..aed4d0673 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9
.byte 0
Route132_EventScript_1F74EA:: @ 81F74EA
- trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC
- msgbox Route132_Text_2A3BC0, 6
+ trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
+ msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7501:: @ 81F7501
- trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39
- msgbox Route132_Text_2A3C49, 6
+ trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
+ msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7518:: @ 81F7518
- trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD
- msgbox Route132_Text_2A3CC5, 6
+ trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
+ msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F752F:: @ 81F752F
- trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C
- msgbox Route132_Text_2A3D8B, 6
+ trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
+ msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7546:: @ 81F7546
- trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8
- msgbox Route132_Text_2A3FE5, 6
+ trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
+ msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F755D:: @ 81F755D
- trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E
- msgbox Route132_Text_2A40A4, 6
+ trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
+ msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7574:: @ 81F7574
- trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD
- msgbox Route132_Text_2A3F03, 6
+ trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
+ msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F758B:: @ 81F758B
- trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C
- msgbox Route132_Text_2A3E4E, 6
+ trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
+ msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
end