get nonmatching debug rom to build

1 files changed, 5 insertions, 200 deletions

diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index 565a9861b..6e03958e6 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -68,6 +68,11 @@ struct MailGraphics
     u16 color12;
 };
 
+#if DEBUG
+// should be static
+__attribute__((section(".bss"))) u8 unk_debug_bss_2;
+#endif
+
 const u16 gUnknown_083E562C[][2] =
 {
     {0x6ACD, 0x51A5},
@@ -322,205 +327,6 @@ static void sub_80F8F58(void);
 static void sub_80F8F78(void);
 static void sub_80F8FB4(void);
 
-
-#if DEBUG
-
-// should be static
-__attribute__((section(".bss"))) u8 unk_debug_bss_2;
-
-__attribute__((naked))
-void HandleReadMail(struct MailStruct *aStruct, MainCallback callback, bool8 bool81)
-{
-    asm(
-        "	push	{r4, r5, r6, lr}\n"
-        "	add	sp, sp, #0xfffffffc\n"
-        "	add	r4, r0, #0\n"
-        "	add	r6, r1, #0\n"
-        "	lsl	r2, r2, #0x18\n"
-        "	lsr	r5, r2, #0x18\n"
-        "	ldr	r0, ._3\n"
-        "	ldrb	r3, [r0]\n"
-        "	cmp	r3, #0\n"
-        "	beq	._1	@cond_branch\n"
-        "	ldr	r2, ._3 + 4\n"
-        "	add	r1, r2, #0\n"
-        "	add	r1, r1, #0xff\n"
-        "	mov	r0, #0x5\n"
-        "	strb	r0, [r1]\n"
-        "	ldr	r0, ._3 + 8\n"
-        "	ldrh	r1, [r0]\n"
-        "	mov	r3, #0x80\n"
-        "	lsl	r3, r3, #0x1\n"
-        "	add	r0, r2, r3\n"
-        "	strb	r1, [r0]\n"
-        "	mov	r0, #0x82\n"
-        "	lsl	r0, r0, #0x1\n"
-        "	add	r1, r2, r0\n"
-        "	ldr	r0, ._3 + 12\n"
-        "	str	r0, [r1]\n"
-        "	add	r3, r3, #0x8\n"
-        "	add	r1, r2, r3\n"
-        "	ldr	r0, ._3 + 16\n"
-        "	str	r0, [r1]\n"
-        "	ldr	r0, ._3 + 20\n"
-        "	ldrh	r1, [r0]\n"
-        "	b	._2\n"
-        "._4:\n"
-        "	.align	2, 0\n"
-        "._3:\n"
-        "	.word	gUnknown_03000748+0x4\n"
-        "	.word	+0x2000000\n"
-        "	.word	gSpecialVar_0x8004\n"
-        "	.word	EasyChat_GetWordText+1\n"
-        "	.word	ConvertEasyChatWordsToString+1\n"
-        "	.word	gSpecialVar_0x8006\n"
-        "._1:\n"
-        "	ldr	r2, ._7\n"
-        "	add	r1, r2, #0\n"
-        "	add	r1, r1, #0xff\n"
-        "	mov	r0, #0x5\n"
-        "	strb	r0, [r1]\n"
-        "	add	r0, r0, #0xfb\n"
-        "	add	r1, r2, r0\n"
-        "	mov	r0, #0x1\n"
-        "	strb	r0, [r1]\n"
-        "	mov	r0, #0x82\n"
-        "	lsl	r0, r0, #0x1\n"
-        "	add	r1, r2, r0\n"
-        "	ldr	r0, ._7 + 4\n"
-        "	str	r0, [r1]\n"
-        "	mov	r0, #0x84\n"
-        "	lsl	r0, r0, #0x1\n"
-        "	add	r1, r2, r0\n"
-        "	ldr	r0, ._7 + 8\n"
-        "	str	r0, [r1]\n"
-        "	ldrh	r1, [r4, #0x20]\n"
-        "	add	r0, r1, #0\n"
-        "	sub	r0, r0, #0x79\n"
-        "	lsl	r0, r0, #0x10\n"
-        "	lsr	r0, r0, #0x10\n"
-        "	cmp	r0, #0xb\n"
-        "	bhi	._5	@cond_branch\n"
-        "	sub	r1, r1, #0x79\n"
-        "._2:\n"
-        "	add	r0, r2, #0\n"
-        "	add	r0, r0, #0xfa\n"
-        "	strb	r1, [r0]\n"
-        "	b	._6\n"
-        "._8:\n"
-        "	.align	2, 0\n"
-        "._7:\n"
-        "	.word	+0x2000000\n"
-        "	.word	EasyChat_GetWordText+1\n"
-        "	.word	ConvertEasyChatWordsToString+1\n"
-        "._5:\n"
-        "	add	r0, r2, #0\n"
-        "	add	r0, r0, #0xfa\n"
-        "	strb	r3, [r0]\n"
-        "	mov	r5, #0x0\n"
-        "._6:\n"
-        "	ldr	r1, ._12\n"
-        "	mov	r2, #0x80\n"
-        "	lsl	r2, r2, #0x1\n"
-        "	add	r0, r1, r2\n"
-        "	ldrb	r0, [r0]\n"
-        "	cmp	r0, #0\n"
-        "	beq	._9	@cond_branch\n"
-        "	cmp	r0, #0x1\n"
-        "	beq	._10	@cond_branch\n"
-        "._9:\n"
-        "	mov	r3, #0x86\n"
-        "	lsl	r3, r3, #0x1\n"
-        "	add	r2, r1, r3\n"
-        "	add	r0, r1, #0\n"
-        "	add	r0, r0, #0xfa\n"
-        "	ldrb	r0, [r0]\n"
-        "	lsl	r0, r0, #0x3\n"
-        "	ldr	r1, ._12 + 4\n"
-        "	b	._11\n"
-        "._13:\n"
-        "	.align	2, 0\n"
-        "._12:\n"
-        "	.word	+0x2000000\n"
-        "	.word	gUnknown_083E5730\n"
-        "._10:\n"
-        "	mov	r0, #0x86\n"
-        "	lsl	r0, r0, #0x1\n"
-        "	add	r2, r1, r0\n"
-        "	add	r0, r1, #0\n"
-        "	add	r0, r0, #0xfa\n"
-        "	ldrb	r0, [r0]\n"
-        "	lsl	r0, r0, #0x3\n"
-        "	ldr	r1, ._18\n"
-        "._11:\n"
-        "	add	r0, r0, r1\n"
-        "	str	r0, [r2]\n"
-        "	ldrh	r0, [r4, #0x1e]\n"
-        "	mov	r1, sp\n"
-        "	bl	MailSpeciesToSpecies\n"
-        "	lsl	r0, r0, #0x10\n"
-        "	ldr	r1, ._18 + 4\n"
-        "	add	r0, r0, r1\n"
-        "	mov	r1, #0xcd\n"
-        "	lsl	r1, r1, #0x11\n"
-        "	cmp	r0, r1\n"
-        "	bhi	._14	@cond_branch\n"
-        "	ldr	r0, ._18 + 8\n"
-        "	add	r1, r0, #0\n"
-        "	add	r1, r1, #0xfa\n"
-        "	ldrb	r2, [r1]\n"
-        "	add	r1, r0, #0\n"
-        "	cmp	r2, #0x6\n"
-        "	beq	._15	@cond_branch\n"
-        "	cmp	r2, #0x9\n"
-        "	beq	._16	@cond_branch\n"
-        "	b	._17\n"
-        "._19:\n"
-        "	.align	2, 0\n"
-        "._18:\n"
-        "	.word	gUnknown_083E57A4\n"
-        "	.word	0xffff0000\n"
-        "	.word	+0x2000000\n"
-        "._15:\n"
-        "	add	r2, r1, #0\n"
-        "	add	r2, r2, #0xfb\n"
-        "	mov	r0, #0x1\n"
-        "	b	._21\n"
-        "._16:\n"
-        "	add	r2, r1, #0\n"
-        "	add	r2, r2, #0xfb\n"
-        "	mov	r0, #0x2\n"
-        "	b	._21\n"
-        "._14:\n"
-        "	ldr	r1, ._22\n"
-        "._17:\n"
-        "	add	r2, r1, #0\n"
-        "	add	r2, r2, #0xfb\n"
-        "	mov	r0, #0x0\n"
-        "._21:\n"
-        "	strb	r0, [r2]\n"
-        "	add	r0, r1, #0\n"
-        "	add	r0, r0, #0xf4\n"
-        "	str	r4, [r0]\n"
-        "	sub	r0, r0, #0x8\n"
-        "	str	r6, [r0]\n"
-        "	add	r0, r0, #0xc\n"
-        "	strb	r5, [r0]\n"
-        "	ldr	r0, ._22 + 4\n"
-        "	bl	SetMainCallback2\n"
-        "	add	sp, sp, #0x4\n"
-        "	pop	{r4, r5, r6}\n"
-        "	pop	{r0}\n"
-        "	bx	r0\n"
-        "._23:\n"
-        "	.align	2, 0\n"
-        "._22:\n"
-        "	.word	+0x2000000\n"
-        "	.word	sub_80F8D50+1\n"
-        "\n"
-    );
-}
-#else
 void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 {
     u16 mailDesign;
@@ -584,7 +390,6 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 
     SetMainCallback2(sub_80F8D50);
 }
-#endif
 
 #define RETURN_UP_STATE break
 #define RETURN_SKIP_STATE return FALSE