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/Route4 | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/Route4')
| -rw-r--r-- | data/maps/Route4/map.json | 6 | ||||
| -rw-r--r-- | data/maps/Route4/scripts.inc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b628beefc..1e1dba0c7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1BE637", + "script": "Route4_EventScript_ItemTM05", "flag": "FLAG_HIDE_ROUTE4_TM05" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C494E", + "script": "Route4_EventScript_MegaPunchTutor", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C49B6", + "script": "Route4_EventScript_MegaKickTutor", "flag": "0" }, { diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 230c13d3b..9055722eb 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -5,13 +5,13 @@ Route4_EventScript_167F8B:: @ 8167F8B end Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, 2 + msgbox gUnknown_81838D7, MSGBOX_NPC end Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, 3 + msgbox gUnknown_818399B, MSGBOX_SIGN end Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, 3 + msgbox gUnknown_81839B4, MSGBOX_SIGN end |