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/Route9 | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/Route9')
| -rw-r--r-- | data/maps/Route9/map.json | 4 | ||||
| -rw-r--r-- | data/maps/Route9/scripts.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index b8e4aef83..c130136b9 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BE6B9", + "script": "Route9_EventScript_ItemTM40", "flag": "FLAG_HIDE_ROUTE9_TM40" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BEAFD", + "script": "Route9_EventScript_ItemBurnHeal", "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" } ], diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 6c3b7927b..1b48cd68e 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -2,5 +2,5 @@ Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, 3 + msgbox gUnknown_8184B66, MSGBOX_SIGN end |