2 files changed, 36 insertions, 140 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 48b70d1c5..c0d7a0974 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -6,146 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80BB66C
-sub_80BB66C: @ 80BB66C
-	push {r4,lr}
-	sub sp, 0x4
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	adds r1, r0, 0
-	ldr r2, _080BB6A4 @ =0x00000fff
-	adds r0, r2, 0
-	ands r1, r0
-	adds r0, r1, 0
-	subs r0, 0x90
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _080BB6A8
-	movs r0, 0x1
-	b _080BB702
-	.align 2, 0
-_080BB6A4: .4byte 0x00000fff
-_080BB6A8:
-	adds r0, r1, 0
-	subs r0, 0x92
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _080BB6B8
-	movs r0, 0x2
-	b _080BB702
-_080BB6B8:
-	adds r0, r1, 0
-	subs r0, 0x9A
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _080BB6C8
-	movs r0, 0x3
-	b _080BB702
-_080BB6C8:
-	adds r0, r1, 0
-	subs r0, 0x94
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _080BB6D8
-	movs r0, 0x4
-	b _080BB702
-_080BB6D8:
-	adds r0, r1, 0
-	subs r0, 0x96
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bls _080BB6EC
-	cmp r1, 0x9C
-	beq _080BB6EC
-	cmp r1, 0x9D
-	bne _080BB6F0
-_080BB6EC:
-	movs r0, 0x5
-	b _080BB702
-_080BB6F0:
-	adds r0, r1, 0
-	subs r0, 0x98
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bls _080BB700
-	movs r0, 0
-	b _080BB702
-_080BB700:
-	movs r0, 0x6
-_080BB702:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80BB66C
-
-	thumb_func_start sub_80BB70C
-sub_80BB70C: @ 80BB70C
-	push {r4,lr}
-	ldr r4, _080BB720 @ =gSpecialVar_0x8007
-	bl sub_80BB66C
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BB720: .4byte gSpecialVar_0x8007
-	thumb_func_end sub_80BB70C
-
-	thumb_func_start unref_sub_80BB724
-unref_sub_80BB724: @ 80BB724
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	movs r2, 0
-	ldr r6, _080BB748 @ =0x00000fff
-	lsrs r3, r1, 24
-	ldr r5, _080BB74C @ =0x000001ff
-_080BB732:
-	lsls r0, r2, 1
-	adds r0, r4
-	ldrh r1, [r0]
-	adds r0, r6, 0
-	ands r0, r1
-	cmp r0, r3
-	bne _080BB750
-	lsls r0, r2, 16
-	asrs r0, 16
-	b _080BB75E
-	.align 2, 0
-_080BB748: .4byte 0x00000fff
-_080BB74C: .4byte 0x000001ff
-_080BB750:
-	adds r0, r2, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, r5
-	bls _080BB732
-	movs r0, 0x1
-	negs r0, r0
-_080BB75E:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end unref_sub_80BB724
-
 	thumb_func_start sub_80BB764
 sub_80BB764: @ 80BB764
 	push {r4-r7,lr}
diff --git a/src/secret_base_80bb4ac.c b/src/secret_base_80bb4ac.c
index a73a197cc..8955441eb 100755
--- a/src/secret_base_80bb4ac.c
+++ b/src/secret_base_80bb4ac.c
@@ -1,8 +1,11 @@
 #include "global.h"
 #include "event_data.h"
+#include "asm.h"
+#include "field_player_avatar.h"
 
 extern u8 gUnknown_020387DC;
 extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8007;
 extern u16 gScriptResult;
 
 void sub_80BB4AC(struct SecretBaseRecord *record) { // 080bb4ac
@@ -68,3 +71,36 @@ void sub_80BB63C(void) { // 80bb63c
     else
         gScriptResult = 0;
 }
+
+u8 sub_80BB66C(void) { // 80bb66c
+    s16 x, y;
+    u16 v0;
+    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+    v0 = MapGridGetMetatileBehaviorAt(x, y) & 0xFFF;
+    if (v0 == 0x90 || v0 == 0x91)
+        return 1;
+    else if (v0 == 0x92 || v0 == 0x93)
+        return 2;
+    else if (v0 == 0x9a || v0 == 0x9b)
+        return 3;
+    else if (v0 == 0x94 || v0 == 0x95)
+        return 4;
+    else if (v0 == 0x96 || v0 == 0x97 || v0 == 0x9c || v0 == 0x9d)
+        return 5;
+    else if (v0 == 0x98 || v0 == 0x99)
+        return 6;
+    return 0;
+}
+
+void sub_80BB70C(void) { // 80bb70c
+    gSpecialVar_0x8007 = sub_80BB66C();
+}
+
+s16 unref_sub_80BB724(u16 *a0, u8 a1) {
+    u16 v2;
+    for (v2=0; v2<0x200; v2++) {
+        if ((a0[v2] & 0xFFF) == a1)
+            return (s16)v2;
+    }
+    return -1;
+}