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/Route2 | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/Route2')
| -rw-r--r-- | data/maps/Route2/map.json | 4 | ||||
| -rw-r--r-- | data/maps/Route2/scripts.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index aecf7a7de..d7cd6f16b 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE58E", + "script": "Route2_EventScript_ItemEther", "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE59B", + "script": "Route2_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 67ba5729e..75a3dd87b 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -2,9 +2,9 @@ Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 - msgbox gUnknown_818345E, 3 + msgbox gUnknown_818345E, MSGBOX_SIGN end Route2_EventScript_167F6E:: @ 8167F6E - msgbox gUnknown_8183482, 3 + msgbox gUnknown_8183482, MSGBOX_SIGN end |