diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
| commit | 9d2ee97519aa8ee3c5e5c0d11f49f5a77e4f870e (patch) | |
| tree | 763431b9969206b11c5c42c7154c19ad5d21f421 /data/scripts/maps/Route104.inc | |
| parent | 857b166086756ccc92e58981493513a7f00920ff (diff) | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'data/scripts/maps/Route104.inc')
| -rw-r--r-- | data/scripts/maps/Route104.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..b97d92c7d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 814EE8C .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 - map_script_2 0x408e, 1, Route104_EventScript_14EEA1 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 .2byte 0 Route104_EventScript_14EEA1:: @ 814EEA1 @@ -153,11 +153,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar 0x408e, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B checkflag FLAG_DELIVERED_STEVEN_LETTER |