debug_sub_815FCB4

2 files changed, 24 insertions, 79 deletions

diff --git a/asm/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s
index 76db41a4d..d17caccb5 100644
--- a/asm/nakamura_debug_menu.s
+++ b/asm/nakamura_debug_menu.s
@@ -5,85 +5,6 @@
 
 	.text
 
-	thumb_func_start debug_sub_815FCB4
-debug_sub_815FCB4:
-	push	{r4, r5, r6, r7, lr}
-	mov	r7, r9
-	mov	r6, r8
-	push	{r6, r7}
-	add	r4, r0, #0
-	lsl	r4, r4, #0x18
-	lsr	r4, r4, #0x18
-	mov	r7, #0x0
-	ldr	r5, ._188       @ gMapHeader
-	ldr	r0, [r5]
-	ldr	r0, [r0, #0x4]
-	mov	r1, #0x3
-	bl	__divsi3
-	lsl	r0, r0, #0x10
-	lsr	r0, r0, #0x10
-	add	r1, r0, #0
-	mul	r1, r1, r4
-	lsl	r1, r1, #0x10
-	lsr	r6, r1, #0x10
-	add	r0, r6, r0
-	mov	r9, r5
-	cmp	r6, r0
-	bge	._183	@cond_branch
-	mov	r8, r0
-._187:
-	mov	r4, #0x0
-	mov	r1, r9
-	ldr	r0, [r1]
-	ldr	r0, [r0]
-	add	r5, r6, #1
-	cmp	r4, r0
-	bge	._184	@cond_branch
-	ldr	r0, ._188       @ gMapHeader
-	mov	r9, r0
-._186:
-	add	r0, r4, #7
-	add	r1, r6, #7
-	bl	MapGridGetMetatileBehaviorAt
-	lsl	r0, r0, #0x18
-	lsr	r0, r0, #0x18
-	bl	sub_805759C
-	lsl	r0, r0, #0x18
-	lsr	r0, r0, #0x18
-	cmp	r0, #0x1
-	bne	._185	@cond_branch
-	add	r0, r7, #1
-	lsl	r0, r0, #0x10
-	lsr	r7, r0, #0x10
-._185:
-	add	r0, r4, #1
-	lsl	r0, r0, #0x10
-	lsr	r4, r0, #0x10
-	ldr	r0, ._188       @ gMapHeader
-	ldr	r0, [r0]
-	ldr	r0, [r0]
-	cmp	r4, r0
-	blt	._186	@cond_branch
-._184:
-	lsl	r0, r5, #0x10
-	lsr	r6, r0, #0x10
-	cmp	r6, r8
-	blt	._187	@cond_branch
-._183:
-	add	r0, r7, #0
-	pop	{r3, r4}
-	mov	r8, r3
-	mov	r9, r4
-	pop	{r4, r5, r6, r7}
-	pop	{r1}
-	bx	r1
-._189:
-	.align	2, 0
-._188:
-	.word	gMapHeader
-
-	thumb_func_end debug_sub_815FCB4
-
 	thumb_func_start debug_sub_815FD40
 debug_sub_815FD40:
 	push	{r4, r5, r6, r7, lr}
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index e16f0332a..d4614416c 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -6,6 +6,8 @@
 #include "main.h"
 #include "string_util.h"
 #include "overworld.h"
+#include "fieldmap.h"
+#include "metatile_behavior.h"
 #include "start_menu.h"
 #include "party_menu.h"
 #include "choose_party.h"
@@ -731,4 +733,26 @@ bool8 debug_sub_815FC94(void)
     return TRUE;
 }
 
+u16 debug_sub_815FCB4(u8 a0)
+{
+    u16 retval = 0;
+    u16 height = gMapHeader.mapData->height / 3;
+    u16 r6;
+    u16 r4;
+    u16 start = height * a0;
+
+    for (r6 = start; r6 < start + height; r6++)
+    {
+        for (r4 = 0; r4 < gMapHeader.mapData->width; r4++)
+        {
+            if (sub_805759C(MapGridGetMetatileBehaviorAt(r4 + 7, r6 + 7)) == TRUE)
+            {
+                retval++;
+            }
+        }
+    }
+
+    return retval;
+}
+
 #endif // DEBUG