From 84e22a9ecf52bb73993feadce91524355f1bb70f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 3 Jan 2019 20:17:34 -0500
Subject: Merge Delta456/master.  Resolve #26; close #35

---
 include/region_map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/region_map.h b/include/region_map.h
index d54553869..12181ae5f 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -99,7 +99,7 @@ enum {
     MAPSEC_BERRY_FOREST,
     MAPSEC_ICEFALL_CAVE,
     MAPSEC_ROCKET_WAREHOUSE,
-    MAPSEC_TRAINER_TOWER,
+    MAPSEC_TRAINER_TOWER_2,
     MAPSEC_DOTTED_HOLE,
     MAPSEC_LOST_CAVE,
     MAPSEC_PATTERN_BUSH,
-- 
cgit v1.2.3