diff options
Diffstat (limited to 'data/maps/Route104')
| -rw-r--r-- | data/maps/Route104/map.json | 4 | ||||
| -rw-r--r-- | data/maps/Route104/scripts.inc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index d2c7cc146..a02a1e170 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -537,7 +537,7 @@ "x": 17, "y": 51, "elevation": 3, - "var": "VAR_0x4063", + "var": "VAR_ROUTE104_STATE", "var_value": "1", "script": "Route104_EventScript_1ECCB3" } @@ -624,4 +624,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 33200b800..1a677001d 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 @@ -49,8 +49,8 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_RUSTBORO_STATE, 8 - setvar VAR_0x4063, 2 + setvar VAR_RUSTBORO_CITY_STATE, 8 + 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 |