summaryrefslogtreecommitdiff
path: root/data/maps/Route126
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/Route126
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route126')
-rw-r--r--data/maps/Route126/events.inc2
-rw-r--r--data/maps/Route126/scripts.inc43
2 files changed, 21 insertions, 24 deletions
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
index 0c3180a79..8754a0006 100644
--- a/data/maps/Route126/events.inc
+++ b/data/maps/Route126/events.inc
@@ -3,7 +3,7 @@ Route126_EventObjects: @ 852C648
object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
- object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105
+ object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD
object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 3ea9ba786..0be11144a 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -8,62 +8,59 @@ Route126_MapScript1_1F68CC: @ 81F68CC
end
Route126_EventScript_1F68D6:: @ 81F68D6
- trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8
- msgbox Route126_Text_2A1CDD, 6
+ trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
+ msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F68ED:: @ 81F68ED
- trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63
- msgbox Route126_Text_2A1D72, 6
+ trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
+ msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6904:: @ 81F6904
- trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8
- msgbox Route126_Text_2A1E03, 6
+ trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
+ msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F691B:: @ 81F691B
- trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63
- msgbox Route126_Text_2A1E70, 6
+ trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
+ msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6932:: @ 81F6932
- trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6
- msgbox Route126_Text_2A20F7, 6
+ trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
+ msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6949:: @ 81F6949
- trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3
- msgbox Route126_Text_2A21B8, 6
+ trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
+ msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6960:: @ 81F6960
- trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216
- msgbox Route126_Text_2A222A, 6
+ trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
+ msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6977:: @ 81F6977
- trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+ trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route126_EventScript_1F69C2
- msgbox Route126_Text_2A1F10, 4
+ msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT
release
end
Route126_EventScript_1F69A3:: @ 81F69A3
special sub_80B4808
waitmovement 0
- msgbox Route126_Text_2A1F5A, 4
- setvar VAR_0x8004, 377
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 377
- callstd 8
+ msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT
+ register_matchcall TRAINER_PABLO_1
release
end
Route126_EventScript_1F69C2:: @ 81F69C2
- trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8
- msgbox Route126_Text_2A200C, 6
+ trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
+ msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
end