diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/Route134 | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps/Route134')
| -rw-r--r-- | data/maps/Route134/events.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route134/scripts.inc | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 4201b8068..8caf4da1e 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98 object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index bdec88c42..f6f4feee3 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 + trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB + msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 + trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 + msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 + trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE + msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 + trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 + msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 + trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 + msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 + trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 + trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 + msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 + trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B + msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 + trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B + msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end |