summaryrefslogtreecommitdiff
path: root/data/maps/Route104/scripts.inc
diff options
context:
space:
mode:
authorGriffinR <25753467+GriffinRichards@users.noreply.github.com>2019-08-03 14:12:48 -0400
committerGitHub <noreply@github.com>2019-08-03 14:12:48 -0400
commit0f5d96e5f57801137bae8d3cdf3825d0fcd007f1 (patch)
tree09540974b2b34f53b60f64a4163a6f0850afdea4 /data/maps/Route104/scripts.inc
parentce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff)
name used and unnamed vars
Diffstat (limited to 'data/maps/Route104/scripts.inc')
-rw-r--r--data/maps/Route104/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 33200b800..5c8bf68ff 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -4,7 +4,7 @@ Route104_MapScripts:: @ 81ECC32
.byte 0
Route104_MapScript2_1ECC3D: @ 81ECC3D
- map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47
+ map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_1ECC47
.2byte 0
Route104_EventScript_1ECC47:: @ 81ECC47
@@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74
return
Route104_EventScript_1ECC78:: @ 81ECC78
- compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
+ compare VAR_BOARD_BRINEY_BOAT_STATE, 1
goto_if_ge Route104_EventScript_1ECC9D
goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
@@ -50,7 +50,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
lockall
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setvar VAR_RUSTBORO_STATE, 8
- setvar VAR_0x4063, 2
+ setvar VAR_ROUTE104_STATE, 2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 10
@@ -417,7 +417,7 @@ Route104_EventScript_1ED139:: @ 81ED139
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
- setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
+ setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
end