summaryrefslogtreecommitdiff
path: root/data/maps/Route127
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/Route127
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route127')
-rw-r--r--data/maps/Route127/events.inc6
-rw-r--r--data/maps/Route127/scripts.inc43
2 files changed, 23 insertions, 26 deletions
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
index bb434202b..78dc26899 100644
--- a/data/maps/Route127/events.inc
+++ b/data/maps/Route127/events.inc
@@ -1,15 +1,15 @@
Route127_EventObjects: @ 852C734
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034
- object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035
+ object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC
+ object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS
object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
- object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
+ object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY
Route127_MapBGEvents: @ 852C83C
bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 12e5bf127..f9c3290b9 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -27,62 +27,59 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B
.2byte 0
Route127_EventScript_1F6A35:: @ 81F6A35
- trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
- msgbox Route127_Text_2A22A1, 6
+ trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
+ msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A4C:: @ 81F6A4C
- trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
- msgbox Route127_Text_2A232C, 6
+ trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
+ msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A63:: @ 81F6A63
- trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
- msgbox Route127_Text_2A240C, 6
+ trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
+ msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A7A:: @ 81F6A7A
- trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
- msgbox Route127_Text_2A2494, 6
+ trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
+ msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A91:: @ 81F6A91
- trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
- msgbox Route127_Text_2A2538, 6
+ trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
+ msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AA8:: @ 81F6AA8
- trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
- msgbox Route127_Text_2A25D2, 6
+ trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
+ msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6ABF:: @ 81F6ABF
- trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
- msgbox Route127_Text_2A2832, 6
+ trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
+ msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AD6:: @ 81F6AD6
- trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+ trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route127_EventScript_1F6B21
- msgbox Route127_Text_2A26AC, 4
+ msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
release
end
Route127_EventScript_1F6B02:: @ 81F6B02
special sub_80B4808
waitmovement 0
- msgbox Route127_Text_2A26EE, 4
- setvar VAR_0x8004, 672
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 672
- callstd 8
+ msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
+ register_matchcall TRAINER_KOJI_1
release
end
Route127_EventScript_1F6B21:: @ 81F6B21
- trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
- msgbox Route127_Text_2A278E, 6
+ trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
+ msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
end