diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-22 04:01:38 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-22 04:01:38 -0500 |
| commit | e12a7790cf294db7fd656eba85ec4bbfb3bc211e (patch) | |
| tree | 59b0ad9cdc8312bedc6d874d4048e730c2309ad5 /data/maps/Route104/scripts.inc | |
| parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) | |
Start porting pokeruby vars to pokeemerald
Diffstat (limited to 'data/maps/Route104/scripts.inc')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b7..525b7d327 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_0x408E, 1, Route104_EventScript_1ECC47 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_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_0x408E, 1 + compare VAR_BOARD_BRINEY_BOAT_ROUTE104_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,7 +49,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 waitmovement 0 @@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139 call Route104_EventScript_2720A8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar VAR_0x408E, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end |