summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route104_MrBrineysHouse.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route104_MrBrineysHouse.inc')
-rw-r--r--data/scripts/maps/Route104_MrBrineysHouse.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index a4c360bc0..9369f7573 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -3,15 +3,15 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
.byte 0
Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
- setflag 2109
+ setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare 0x4090, 1
call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4
- checkflag 188
+ checkflag FLAG_RECEIVED_POKENAV
call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0
end
Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0
- setflag 814
+ setflag FLAG_HIDE_RIVAL_RUSTBORO
return
Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
@@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
lock
faceplayer
- checkflag 147
+ checkflag FLAG_MR_BRINEY_SAILING_INTRO
call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E
- checkflag 189
+ checkflag FLAG_DELIVERED_STEVEN_LETTER
goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65
- checkflag 149
+ checkflag FLAG_DELIVERED_DEVON_GOODS
goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E
goto Route104_MrBrineysHouse_EventScript_15BD32
end
Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E
- setflag 147
+ setflag FLAG_MR_BRINEY_SAILING_INTRO
msgbox Route104_MrBrineysHouse_Text_191A82, 4
msgbox Route104_MrBrineysHouse_Text_191AAD, 5
compare RESULT, 0
@@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB
msgbox Route104_MrBrineysHouse_Text_191BFD, 4
call Route104_MrBrineysHouse_EventScript_1A010C
setvar 0x408e, 1
- clearflag 738
- setflag 739
- setflag 881
+ clearflag FLAG_HIDE_MR_BRINEY_ROUTE104
+ setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+ setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
warp MAP_ROUTE104, 255, 13, 51
waitstate
releaseall