through sub_80E9BA8

2 files changed, 27 insertions, 54 deletions

diff --git a/asm/secret_base.s b/asm/secret_base.s
index 58fe224ae..c3b7446dc 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -5,60 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80E9B70
-sub_80E9B70: @ 80E9B70
-	push {r4-r6,lr}
-	bl sub_80E9AD0
-	movs r0, 0x14
-	bl IncrementGameStat
-	ldr r5, =gSaveBlock1Ptr
-	ldr r0, [r5]
-	ldr r4, =0x00001aaa
-	adds r1, r0, r4
-	ldrh r6, [r1]
-	ldr r1, =0x00001a9c
-	adds r0, r1
-	bl sub_80E8AF0
-	ldr r0, [r5]
-	adds r0, r4
-	strh r6, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E9B70
-
-	thumb_func_start sub_80E9BA8
-sub_80E9BA8: @ 80E9BA8
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0x1
-_080E9BAE:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80E9878
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080E9BC4
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_080E9BC4:
-	lsls r0, r4, 16
-	movs r1, 0x80
-	lsls r1, 9
-	adds r0, r1
-	lsrs r4, r0, 16
-	asrs r0, 16
-	cmp r0, 0x13
-	ble _080E9BAE
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80E9BA8
-
 	thumb_func_start sub_80E9BDC
 sub_80E9BDC: @ 80E9BDC
 	push {lr}
diff --git a/src/secret_base.c b/src/secret_base.c
index 60e29fa1e..741f04bb0 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -893,3 +893,30 @@ void sub_80E9AD0(void)
         }
     }
 }
+
+void sub_80E9B70(void)
+{
+    u16 sbr_e;
+
+    sub_80E9AD0();
+    IncrementGameStat(GAME_STAT_MOVED_SECRET_BASE);
+    sbr_e = gSaveBlock1Ptr->secretBases[0].sbr_field_e;
+    sub_80E8AF0(&gSaveBlock1Ptr->secretBases[0]);
+    gSaveBlock1Ptr->secretBases[0].sbr_field_e = sbr_e;
+}
+
+u8 sub_80E9BA8(void)
+{
+    u8 tot;
+    s16 i;
+
+    tot = 0;
+    for (i = 1; i < 20; i ++)
+    {
+        if (sub_80E9878(i) == TRUE)
+        {
+            tot ++;
+        }
+    }
+    return tot;
+}