summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-15 18:59:30 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-15 18:59:30 -0500
commitce391ed0696c22e8fa1f33430b4025a08a3bc360 (patch)
treedbdd06262cd738bb682d8a9304293ac5d944a071 /data/maps
parentbdb0628c913fe7f2e77598d6390f8f7d951b1703 (diff)
parented152b1566fa5c39ee72ca190c49fbfe30708036 (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/events/Route113.inc2
-rw-r--r--[-rwxr-xr-x]data/maps/events/Route124_DivingTreasureHuntersHouse.inc0
2 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
index dccaf6e82..1b895d571 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -42,7 +42,7 @@ Route113_MapBGEvents:: @ 8382BE0
bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629
bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3
bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3
- bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E
+ bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E
Route113_MapEvents:: @ 8382C34
map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
index 17ec713de..17ec713de 100755..100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc