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/RocketHideout_B2F | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/RocketHideout_B2F')
| -rw-r--r-- | data/maps/RocketHideout_B2F/map.json | 8 | ||||
| -rw-r--r-- | data/maps/RocketHideout_B2F/scripts.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 4bdde29e9..63a051e5d 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6E0", + "script": "RocketHideout_B2F_EventScript_ItemXSpeed", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6ED", + "script": "RocketHideout_B2F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6FA", + "script": "RocketHideout_B2F_EventScript_ItemTM12", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE707", + "script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" } ], diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 6264371b7..07916ad03 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF + msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE end |