From 6558af388b547adf730eacdab4e2fba31e1d548c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 24 Oct 2017 21:10:58 -0400
Subject: [PATCH] sub_80E8F9C

---
 asm/secret_base.s   | 25 -------------------------
 include/overworld.h |  1 +
 src/secret_base.c   | 12 ++++++++++++
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/asm/secret_base.s b/asm/secret_base.s
index a5a6c43f2d..8c24bc72dc 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -5,31 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80E8F9C
-sub_80E8F9C: @ 80E8F9C
-	push {lr}
-	ldr r0, =sCurSecretBaseId
-	ldrb r0, [r0]
-	movs r1, 0xA
-	bl __udivsi3
-	ldr r2, =gUnknown_0858CFE8
-	lsls r0, 26
-	asrs r0, 24
-	adds r1, r0, r2
-	ldrb r1, [r1]
-	lsls r1, 24
-	asrs r1, 24
-	adds r0, 0x1
-	adds r0, r2
-	movs r2, 0
-	ldrsb r2, [r0, r2]
-	movs r0, 0x19
-	bl warp1_set_2
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E8F9C
-
 	thumb_func_start sub_80E8FD0
 sub_80E8FD0: @ 80E8FD0
 	push {r4,lr}
diff --git a/include/overworld.h b/include/overworld.h
index 5ac4cad29a..0929aaee89 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -59,5 +59,6 @@ void c2_exit_to_overworld_2_switch(void);
 bool32 sub_8087598(void);
 void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
 void warp_in(void);
+void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum);
 
 #endif //GUARD_ROM4_H
diff --git a/src/secret_base.c b/src/secret_base.c
index dee2a32163..2da00067ba 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -2,8 +2,10 @@
 // Includes
 #include "global.h"
 #include "list_menu.h"
+#include "map_constants.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
+#include "overworld.h"
 #include "fieldmap.h"
 #include "field_camera.h"
 #include "field_player_avatar.h"
@@ -33,6 +35,8 @@ extern const struct {
     u16 tile2;
 } gUnknown_0858CFCC[7];
 
+extern const u8 gUnknown_0858CFE8[];
+
 // .text
 
 void sub_80E8AF0(struct SecretBaseRecord *sbr)
@@ -244,3 +248,11 @@ void sub_80E8EE0(struct MapEvents *events)
         }
     }
 }
+
+void sub_80E8F9C(void)
+{
+    s8 idx;
+
+    idx = sCurSecretBaseId / 10 * 4;
+    warp1_set_2(MAP_GROUP_SECRET_BASE_RED_CAVE1, gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]);
+}