diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/Route18/scripts.inc | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/Route18/scripts.inc')
| -rw-r--r-- | data/maps/Route18/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index cc6d11221..25fda03c2 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,18 +1,18 @@ Route18_MapScripts:: @ 81681F6 - map_script 3, Route18_MapScript1_168201 - map_script 4, Route18_MapScript2_168211 + map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp .byte 0 -Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16820D +Route18_OnTransition:: @ 8168201 + compare VAR_MAP_SCENE_ROUTE16, 1 + call_if_eq EventScript_16820D end EventScript_16820D:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return -Route18_MapScript2_168211:: @ 8168211 +Route18_OnWarp:: @ 8168211 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 @@ -21,9 +21,9 @@ EventScript_16821B:: @ 816821B end Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, 3 + msgbox gUnknown_8187757, MSGBOX_SIGN end Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, 3 + msgbox gUnknown_818777C, MSGBOX_SIGN end |