2 files changed, 17 insertions, 73 deletions

diff --git a/asm/secret_base.s b/asm/secret_base.s
index 33d23502d..6be32732e 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -6,78 +6,6 @@
 
 	.section .text_b
 
-	thumb_func_start sub_80BB8CC
-sub_80BB8CC: @ 80BB8CC
-	push {r4-r6,lr}
-	ldr r2, _080BB948 @ =gSaveBlock1
-	ldr r0, _080BB94C @ =gUnknown_020387DC
-	ldrb r1, [r0]
-	ldr r3, _080BB950 @ =0x00001a08
-	adds r0, r2, r3
-	strb r1, [r0]
-	movs r3, 0
-	ldr r0, _080BB954 @ =0x00001a11
-	adds r2, r0
-	ldr r4, _080BB958 @ =gSaveBlock2 + 0xA
-_080BB8E2:
-	adds r1, r3, r2
-	adds r0, r3, r4
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	cmp r3, 0x3
-	bls _080BB8E2
-	ldr r0, _080BB95C @ =0x00004054
-	movs r1, 0
-	bl VarSet
-	ldr r6, _080BB960 @ =gSaveBlock2
-	adds r0, r6, 0
-	bl sub_80BB8A8
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, _080BB964 @ =gSaveBlock1 + 0x1A0A
-	adds r0, r5, 0
-	movs r1, 0xFF
-	movs r2, 0x7
-	bl memset
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl StringCopyN
-	ldrb r0, [r6, 0x8]
-	subs r5, 0x1
-	movs r1, 0x1
-	ands r1, r0
-	lsls r1, 4
-	ldrb r2, [r5]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5]
-	ldr r0, _080BB968 @ =0x00004026
-	ldr r1, _080BB96C @ =gMapHeader
-	ldrb r1, [r1, 0x14]
-	bl VarSet
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BB948: .4byte gSaveBlock1
-_080BB94C: .4byte gUnknown_020387DC
-_080BB950: .4byte 0x00001a08
-_080BB954: .4byte 0x00001a11
-_080BB958: .4byte gSaveBlock2 + 0xA
-_080BB95C: .4byte 0x00004054
-_080BB960: .4byte gSaveBlock2
-_080BB964: .4byte gSaveBlock1 + 0x1A0A
-_080BB968: .4byte 0x00004026
-_080BB96C: .4byte gMapHeader
-	thumb_func_end sub_80BB8CC
-
 	thumb_func_start sub_80BB970
 sub_80BB970: @ 80BB970
 	push {r4-r7,lr}
diff --git a/src/secret_base_80bb4ac.c b/src/secret_base_80bb4ac.c
index 2842add3c..9dcd74781 100755
--- a/src/secret_base_80bb4ac.c
+++ b/src/secret_base_80bb4ac.c
@@ -5,12 +5,13 @@
 #include "text.h"
 #include "field_player_avatar.h"
 #include "field_camera.h"
+#include "string_util.h"
 
 extern u8 gUnknown_020387DC;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8007;
 extern u16 gScriptResult;
-extern struct {
+extern const struct {
     u16 unk_083D1358_0;
     u16 unk_083D1358_1;
 } gUnknown_083D1358[7];
@@ -155,3 +156,18 @@ u8 sub_80BB8A8(u8 *arg1) {
     }
     return 7;
 }
+
+void sub_80BB8CC(void) {
+    u8 nameLength;
+    u16 idx;
+    gSaveBlock1.secretBases[0].sbr_field_0 = gUnknown_020387DC;
+    for (idx=0; idx<4; idx++) {
+        gSaveBlock1.secretBases[0].trainerId[idx] = gSaveBlock2.playerTrainerId[idx];
+    }
+    VarSet(VAR_0x4054, 0);
+    nameLength = sub_80BB8A8(gSaveBlock2.playerName);
+    memset(gSaveBlock1.secretBases[0].sbr_field_2, 0xFF, 7);
+    StringCopyN(gSaveBlock1.secretBases[0].sbr_field_2, gSaveBlock2.playerName, nameLength);
+    gSaveBlock1.secretBases[0].gender = gSaveBlock2.playerGender;
+    VarSet(VAR_SECRET_BASE_MAP, gMapHeader.name);
+}