summaryrefslogtreecommitdiff
path: root/data/maps/RusturfTunnel
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/RusturfTunnel
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/RusturfTunnel')
-rw-r--r--data/maps/RusturfTunnel/events.inc18
-rw-r--r--data/maps/RusturfTunnel/scripts.inc34
2 files changed, 26 insertions, 26 deletions
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
index 5d3f3c8be..292bda57d 100644
--- a/data/maps/RusturfTunnel/events.inc
+++ b/data/maps/RusturfTunnel/events.inc
@@ -1,14 +1,14 @@
RusturfTunnel_EventObjects: @ 85341C4
- object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807
- object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048
- object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049
- object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879
- object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878
- object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880
- object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932
+ object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
+ object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1
+ object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL
+ object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER
+ object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+ object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+ object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+ object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2
object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
- object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983
+ object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
RusturfTunnel_MapWarps: @ 85342B4
warp_def 4, 10, 3, 0, MAP_ROUTE116
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 33e87bda5..c93f7d5c4 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -21,7 +21,7 @@ RusturfTunnel_EventScript_22CE50:: @ 822CE50
RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
lock
faceplayer
- msgbox RusturfTunnel_Text_22D7A3, 4
+ msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
waitmovement 0
@@ -31,10 +31,10 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
RusturfTunnel_EventScript_22CE76:: @ 822CE76
lock
faceplayer
- checkflag FLAG_0x001
+ checkflag FLAG_TEMP_1
goto_eq RusturfTunnel_EventScript_22CE99
- setflag FLAG_0x001
- msgbox RusturfTunnel_Text_22D510, 4
+ setflag FLAG_TEMP_1
+ msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
waitmovement 0
@@ -42,7 +42,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
end
RusturfTunnel_EventScript_22CE99:: @ 822CE99
- msgbox RusturfTunnel_Text_22D5F3, 4
+ msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
waitmovement 0
@@ -58,14 +58,14 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
compare VAR_TEMP_1, 3
call_if 1, RusturfTunnel_EventScript_22CFC7
call RusturfTunnel_EventScript_22CFFF
- msgbox RusturfTunnel_Text_22D65C, 4
+ msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT
compare VAR_TEMP_1, 2
call_if 1, RusturfTunnel_EventScript_22CFC8
compare VAR_TEMP_1, 3
call_if 1, RusturfTunnel_EventScript_22CFC8
giveitem_std ITEM_HM04
setflag FLAG_0x06A
- msgbox RusturfTunnel_Text_22D6D2, 4
+ msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT
closemessage
compare VAR_TEMP_1, 1
call_if 1, RusturfTunnel_EventScript_22CF5D
@@ -73,7 +73,7 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
call_if 1, RusturfTunnel_EventScript_22CF6F
compare VAR_TEMP_1, 3
call_if 1, RusturfTunnel_EventScript_22CF8B
- msgbox RusturfTunnel_Text_22D745, 4
+ msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT
closemessage
compare VAR_TEMP_1, 1
call_if 1, RusturfTunnel_EventScript_22CFD4
@@ -281,7 +281,7 @@ RusturfTunnel_EventScript_22D07D:: @ 822D07D
RusturfTunnel_EventScript_22D083:: @ 822D083
lockall
- msgbox RusturfTunnel_Text_22D1C8, 4
+ msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT
closemessage
applymovement 6, RusturfTunnel_Movement_22D0AB
applymovement 7, RusturfTunnel_Movement_22D0AB
@@ -303,7 +303,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
faceplayer
waitse
playmoncry SPECIES_WINGULL, 0
- msgbox RusturfTunnel_Text_22D1F7, 4
+ msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -312,9 +312,9 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
lock
faceplayer
playbgm MUS_AQA_0, 0
- msgbox RusturfTunnel_Text_22D20A, 4
- trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0
- msgbox RusturfTunnel_Text_22D2E1, 4
+ msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
+ trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0
+ msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_GOODS
closemessage
applymovement 255, RusturfTunnel_Movement_22D178
@@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
applymovement 255, RusturfTunnel_Movement_22D17E
applymovement 5, RusturfTunnel_Movement_22D1A4
waitmovement 0
- msgbox RusturfTunnel_Text_22D395, 4
+ msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
applymovement 5, RusturfTunnel_Movement_27259E
waitmovement 0
message RusturfTunnel_Text_22D3BA
@@ -348,7 +348,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
setflag FLAG_0x08F
setvar VAR_0x405A, 4
setvar VAR_0x4090, 1
- setflag FLAG_0x37B
+ setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
release
end
@@ -426,8 +426,8 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7
step_end
RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
- trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
- msgbox RusturfTunnel_Text_22D8F9, 6
+ trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
+ msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE
end
RusturfTunnel_Text_22D1C8: @ 822D1C8