summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-07-02 12:53:12 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2021-07-02 12:53:12 -0400
commitb3d66f5528ccfc8b8a3f6c0d46444ad5943364f4 (patch)
tree9917de58912d28e884871cb7efc5b4d291ec4e78 /data/maps
parent9fd27fe8552eb0716222e72bc92ffa7f7334c68d (diff)
parent3964820a84e4819bb807d601d2c3c7b196f764e8 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/MagmaHideout_2F_2R/map.json2
-rw-r--r--data/maps/MagmaHideout_4F/map.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
index 4aa6896f6..968c07fb7 100644
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
+ "script": "MagmaHideout_2F_2R_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
index 94cf295e0..67c11481f 100644
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_4F_EventScript_MaxRevive",
+ "script": "MagmaHideout_4F_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],