From c3534e7b0e2df48fe989deb74c26f98e1fe759b8 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 16:46:54 -0600
Subject: add more debug code

---
 src/field/fldeff_flash.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src/field/fldeff_flash.c')

diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c
index 22f170184..d8f70200c 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
@@ -71,6 +71,36 @@ static const u16 gUnknown_083F809C[] = INCBIN_U16("graphics/misc/83F809C.gbapal"
 static const u16 gCaveTransitionTilemap[] = INCBIN_U16("graphics/misc/cave_transition_map.bin.lz");
 static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transition.4bpp.lz");
 
+#if DEBUG
+__attribute__((naked))
+void debug_sub_8122080(void)
+{
+    asm("\
+	push	{lr}\n\
+	ldr	r0, ._4\n\
+	ldrb	r0, [r0, #0x15]\n\
+	cmp	r0, #0x1\n\
+	bne	._2	@cond_branch\n\
+	ldr	r0, ._4 + 4\n\
+	bl	FlagGet\n\
+	lsl	r0, r0, #0x18\n\
+	cmp	r0, #0\n\
+	bne	._2	@cond_branch\n\
+	bl	sub_810CBFC\n\
+	b	._3\n\
+._5:\n\
+	.align	2, 0\n\
+._4:\n\
+	.word	gMapHeader\n\
+	.word	0x828\n\
+._2:\n\
+	bl	ScriptContext2_Disable\n\
+._3:\n\
+	pop	{r0}\n\
+	bx	r0");
+}
+#endif
+
 bool8 SetUpFieldMove_Flash(void)
 {
     if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH))
-- 
cgit v1.2.3


From fe400f60b6609d37d2b8a0c2aec75321adc3e95f Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Sat, 27 Jan 2018 17:03:40 -0600
Subject: add comments for pool loads in C files

---
 src/field/fldeff_flash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/field/fldeff_flash.c')

diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c
index d8f70200c..8c0f09bd9 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
@@ -77,11 +77,11 @@ void debug_sub_8122080(void)
 {
     asm("\
 	push	{lr}\n\
-	ldr	r0, ._4\n\
+	ldr	r0, ._4         @ gMapHeader\n\
 	ldrb	r0, [r0, #0x15]\n\
 	cmp	r0, #0x1\n\
 	bne	._2	@cond_branch\n\
-	ldr	r0, ._4 + 4\n\
+	ldr	r0, ._4 + 4     @ 0x828\n\
 	bl	FlagGet\n\
 	lsl	r0, r0, #0x18\n\
 	cmp	r0, #0\n\
-- 
cgit v1.2.3