From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 8 Jan 2018 23:16:13 -0600
Subject: re-label some window and text code

---
 src/field/start_menu.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index dccf1714e..6c2812039 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -193,8 +193,8 @@ static void BuildStartMenuActions_Link(void)
 static void DisplaySafariBallsWindow(void)
 {
     sub_8072C44(gStringVar1, gNumSafariBalls, 12, 1);
-    MenuDrawTextWindow(0, 0, 10, 5);
-    MenuPrint(gOtherText_SafariStock, 1, 1);
+    Menu_DrawStdWindowFrame(0, 0, 10, 5);
+    Menu_PrintText(gOtherText_SafariStock, 1, 1);
 }
 
 //Prints n menu items starting at *index
@@ -204,7 +204,7 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)
 
     do
     {
-        MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2);
+        Menu_PrintText(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2);
         _index++;
         if (_index >= sNumStartMenuActions)
         {
@@ -226,7 +226,7 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index)
         (*step)++;
         break;
     case 2:
-        MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3);
+        Menu_DrawStdWindowFrame(22, 0, 29, sNumStartMenuActions * 2 + 3);
         *index = 0;
         (*step)++;
         break;
@@ -310,12 +310,12 @@ static u8 StartMenu_InputProcessCallback(void)
     if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
-        sStartMenuCursorPos = MoveMenuCursor(-1);
+        sStartMenuCursorPos = Menu_MoveCursor(-1);
     }
     if (gMain.newKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
-        sStartMenuCursorPos = MoveMenuCursor(1);
+        sStartMenuCursorPos = Menu_MoveCursor(1);
     }
     if (gMain.newKeys & A_BUTTON)
     {
@@ -473,13 +473,13 @@ static u8 SaveCallback2(void)
         return FALSE;
     case SAVE_CANCELED:
         //Go back to start menu
-        MenuZeroFillScreen();
+        Menu_EraseScreen();
         InitStartMenu();
         gCallback_03004AE8 = StartMenu_InputProcessCallback;
         return FALSE;
     case SAVE_SUCCESS:
     case SAVE_ERROR:
-        MenuZeroFillScreen();
+        Menu_EraseScreen();
         sub_8064E2C();
         ScriptContext2_Disable();
         return TRUE;
@@ -498,7 +498,7 @@ static u8 RunSaveDialogCallback(void)
 {
     if (savingComplete)
     {
-        if (!MenuUpdateWindowText())
+        if (!Menu_UpdateWindowText())
             return 0;
     }
     savingComplete = FALSE;
@@ -514,7 +514,7 @@ void ScrSpecial_DoSaveDialog(void)
 static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void))
 {
     StringExpandPlaceholders(gStringVar4, ptr);
-    MenuDisplayMessageBox();
+    Menu_DisplayDialogueFrame();
     MenuPrintMessageDefaultCoords(gStringVar4);
     savingComplete = TRUE;
     saveDialogCallback = func;
@@ -547,7 +547,7 @@ static void sub_8071700(void)
 
 static void HideSaveDialog(void)
 {
-    MenuZeroFillWindowRect(20, 8, 26, 13);
+    Menu_EraseWindowRect(20, 8, 26, 13);
 }
 
 static void SaveDialogStartTimeout(void)
@@ -579,7 +579,7 @@ static bool8 SaveDialogCheckForTimeoutAndKeypress(void)
 
 static u8 SaveDialogCB_DisplayConfirmMessage(void)
 {
-    MenuZeroFillScreen();
+    Menu_EraseScreen();
     HandleDrawSaveWindowInfo(0, 0);
     DisplaySaveMessageWithCallback(gSaveText_WouldYouLikeToSave, SaveDialogCB_DisplayConfirmYesNoMenu);
     return SAVE_IN_PROGRESS;
@@ -694,7 +694,7 @@ static u8 SaveDialogCB_DoSave(void)
 
 static u8 SaveDialogCB_SaveSuccess(void)
 {
-    if (MenuUpdateWindowText())
+    if (Menu_UpdateWindowText())
     {
         PlaySE(SE_SAVE);
         saveDialogCallback = SaveDialogCB_ReturnSuccess;
@@ -715,7 +715,7 @@ static u8 SaveDialogCB_ReturnSuccess(void)
 
 static u8 SaveDialogCB_SaveError(void)
 {
-    if (MenuUpdateWindowText())
+    if (Menu_UpdateWindowText())
     {
         PlaySE(SE_BOO);
         saveDialogCallback = SaveDialogCB_ReturnError;
@@ -821,8 +821,8 @@ static void Task_8071B64(u8 taskId)
         switch (*step)
         {
         case 0:
-            MenuDisplayMessageBox();
-            MenuPrint(gSystemText_Saving, 2, 15);
+            Menu_DisplayDialogueFrame();
+            Menu_PrintText(gSystemText_Saving, 2, 15);
             BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
             (*step)++;
             break;
-- 
cgit v1.2.3


From 8869cbc98e2f8e761e9ff89182933643992e2bd7 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 00:16:15 -0600
Subject: s/gWindowConfig/gWindowTemplate/g

---
 src/field/start_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 6c2812039..8131e2511 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -271,7 +271,7 @@ void CreateStartMenuTask(void (*func)(u8))
 {
     u8 taskId;
 
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     taskId = CreateTask(Task_StartMenu, 0x50);
     SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func);
 }
@@ -774,8 +774,8 @@ static bool32 sub_80719FC(u8 *step)
         dp12_8087EA4();
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E6CE4);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
         break;
     case 3:
-- 
cgit v1.2.3


From 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 14:26:15 -0600
Subject: more text/menu renaming

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

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 8131e2511..5b2276d1b 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -404,7 +404,7 @@ static u8 StartMenu_PlayerCallback(void)
 //When player selects SAVE
 static u8 StartMenu_SaveCallback(void)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     gCallback_03004AE8 = SaveCallback1;
     return 0;
 }
@@ -594,7 +594,7 @@ static u8 SaveDialogCB_DisplayConfirmYesNoMenu(void)
 
 static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void)
 {
-    switch (ProcessMenuInputNoWrap_())
+    switch (Menu_ProcessInputNoWrap_())
     {
     case 0:     //YES
         HideSaveDialog();
@@ -640,7 +640,7 @@ static u8 SaveDialogCB_DisplayOverwriteYesNoMenu(void)
 
 static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void)
 {
-    switch (ProcessMenuInputNoWrap_())
+    switch (Menu_ProcessInputNoWrap_())
     {
     case 0:     //YES
         HideSaveDialog();
@@ -774,7 +774,7 @@ static bool32 sub_80719FC(u8 *step)
         dp12_8087EA4();
         break;
     case 2:
-        SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
         InitMenuWindow(&gWindowTemplate_81E6CE4);
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
         break;
-- 
cgit v1.2.3


From cf7ffa568a2a09c761bae6aa4c70b8d8913c3e81 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 23:37:26 -0600
Subject: rename unknown_task to scanline_effect

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 5b2276d1b..d7d0282c6 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -28,7 +28,7 @@
 #include "strings2.h"
 #include "task.h"
 #include "trainer_card.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 
 //Menu actions
 enum {
-- 
cgit v1.2.3


From f9f0e84b70f1b313200acd6f0d180413e34517da Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 9 Jan 2018 23:55:03 -0600
Subject: label some scanline_effect functions

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index d7d0282c6..6017f56bf 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -750,7 +750,7 @@ static bool32 sub_80719FC(u8 *step)
 
         REG_DISPCNT = 0;
         SetVBlankCallback(NULL);
-        remove_some_task();
+        ScanlineEffect_Stop();
         DmaClear16(3, PLTT, PLTT_SIZE);
         addr = (void *)VRAM;
         size = 0x18000;
-- 
cgit v1.2.3


From bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Wed, 10 Jan 2018 13:18:31 -0600
Subject: finish labeling scanline_effect.c

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 6017f56bf..d6881cb01 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -771,7 +771,7 @@ static bool32 sub_80719FC(u8 *step)
         ResetSpriteData();
         ResetTasks();
         ResetPaletteFade();
-        dp12_8087EA4();
+        ScanlineEffect_Clear();
         break;
     case 2:
         Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
-- 
cgit v1.2.3


From af5da267ee02fcc5b6cdd8ef0fac880b7487cc56 Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Fri, 12 Jan 2018 22:15:01 +0200
Subject: Labeled most of trainer_card.c

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

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index d6881cb01..2f6f1e7dd 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -395,7 +395,7 @@ static u8 StartMenu_PlayerCallback(void)
     if (!gPaletteFade.active)
     {
         PlayRainSoundEffect();
-        sub_8093110(sub_805469C);
+        TrainerCard_ShowPlayerCard(sub_805469C);
         return 1;
     }
     return 0;
@@ -443,7 +443,7 @@ static u8 StartMenu_PlayerLinkCallback(void)
     if (!gPaletteFade.active)
     {
         PlayRainSoundEffect();
-        sub_8093130(gUnknown_03004860, sub_805469C);
+        TrainerCard_ShowLinkCard(gUnknown_03004860, sub_805469C);
         return 1;
     }
     return 0;
-- 
cgit v1.2.3


From 71848fc5fe7185dfcd3e048dee34d9a682b9ead5 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 13 Jan 2018 18:13:53 -0600
Subject: clean up save.c

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

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 2f6f1e7dd..87597eb6a 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -664,20 +664,20 @@ static u8 SaveDialogCB_DisplaySavingMessage(void)
 
 static u8 SaveDialogCB_DoSave(void)
 {
-    bool8 saveSucceeded;
+    u8 saveStatus;
 
     IncrementGameStat(0);
     if (gDifferentSaveFile == TRUE)
     {
-        saveSucceeded = TrySavingData(DIFFERENT_FILE_SAVE);
+        saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE);
         gDifferentSaveFile = FALSE;
     }
     else
     {
-        saveSucceeded = TrySavingData(NORMAL_SAVE);
+        saveStatus = Save_WriteData(SAVE_NORMAL);
     }
 
-    if (saveSucceeded == TRUE)
+    if (saveStatus == SAVE_STATUS_OK)
     {
         //"(Player) saved the game."
         DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess);
-- 
cgit v1.2.3


From 31a322fdc589c381af6ec4b4c4781d28cb394cc1 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 16 Jan 2018 19:14:14 -0500
Subject: use game stat defines

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

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 87597eb6a..110351016 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -345,7 +345,7 @@ static u8 StartMenu_PokedexCallback(void)
 {
     if (!gPaletteFade.active)
     {
-        IncrementGameStat(0x29);
+        IncrementGameStat(GAME_STAT_CHECKED_POKEDEX);
         PlayRainSoundEffect();
         SetMainCallback2(CB2_InitPokedex);
         return 1;
@@ -666,7 +666,7 @@ static u8 SaveDialogCB_DoSave(void)
 {
     u8 saveStatus;
 
-    IncrementGameStat(0);
+    IncrementGameStat(GAME_STAT_SAVED_GAME);
     if (gDifferentSaveFile == TRUE)
     {
         saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE);
-- 
cgit v1.2.3


From 91cfb6a564f73f02eb57792f8a0f4aa82e1867d1 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Tue, 16 Jan 2018 22:25:35 -0600
Subject: add debug ifdefs

---
 src/field/start_menu.c | 303 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 303 insertions(+)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 2f6f1e7dd..5e76d30a6 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -44,6 +44,11 @@ enum {
     MENU_ACTION_PLAYER_LINK
 };
 
+#ifdef DEBUG
+static u32 _debugStartMenu_0  __attribute__((unused));
+static u32 _debugStartMenu_1 __attribute__((unused));
+#endif
+
 static u8 (*saveDialogCallback)(void);
 static u8 saveDialogTimer;    //Number of frames to keep the window on screen after save was completed
 static bool8 savingComplete;
@@ -132,6 +137,304 @@ static bool32 sub_80719FC(u8 *ptr);
 static void sub_8071B54(void);
 static void Task_8071B64(u8 taskId);
 
+#ifdef DEBUG
+__attribute__((naked))
+void debug_sub_8075C30()
+{
+    asm(
+        "	push	{lr}\n"
+        "	bl	CloseMenu\n"
+        "	bl	debug_sub_8075D9C\n"
+        "	mov	r0, #0x1\n"
+        "	pop	{r1}\n"
+        "	bx	r1\n"
+        "\n"
+    );
+}
+
+__attribute__((naked))
+void debug_sub_8075C40()
+{
+    asm(
+        "	push	{r4, r5, r6, r7, lr}\n"
+        "	mov	r7, sl\n"
+        "	mov	r6, r9\n"
+        "	mov	r5, r8\n"
+        "	push	{r5, r6, r7}\n"
+        "	lsl	r0, r0, #0x18\n"
+        "	lsr	r4, r0, #0x18\n"
+        "	lsl	r0, r4, #0x2\n"
+        "	add	r0, r0, r4\n"
+        "	lsl	r0, r0, #0x3\n"
+        "	ldr	r1, ._5\n"
+        "	add	r5, r0, r1\n"
+        "	mov	r1, #0x0\n"
+        "	ldsh	r0, [r5, r1]\n"
+        "	cmp	r0, #0x1\n"
+        "	beq	._1	@cond_branch\n"
+        "	cmp	r0, #0x1\n"
+        "	bgt	._2	@cond_branch\n"
+        "	cmp	r0, #0\n"
+        "	beq	._3	@cond_branch\n"
+        "	b	._18\n"
+        "._6:\n"
+        "	.align	2, 0\n"
+        "._5:\n"
+        "	.word	gTasks+0x8\n"
+        "._2:\n"
+        "	cmp	r0, #0x2\n"
+        "	beq	._7	@cond_branch\n"
+        "	cmp	r0, #0x3\n"
+        "	beq	._8	@cond_branch\n"
+        "	b	._18\n"
+        "._3:\n"
+        "	bl	m4aSoundVSyncOff\n"
+        "	b	._12\n"
+        "._1:\n"
+        "	ldr	r1, ._13\n"
+        "	ldrh	r0, [r1]\n"
+        "	mov	sl, r0\n"
+        "	mov	r0, #0x0\n"
+        "	strh	r0, [r1]\n"
+        "	ldr	r1, ._13 + 4\n"
+        "	strh	r0, [r1]\n"
+        "	mov	r0, #0x83\n"
+        "	lsl	r0, r0, #0x10\n"
+        "	str	r0, [r1]\n"
+        "	ldr	r4, ._13 + 8\n"
+        "	mov	r9, r4\n"
+        "	ldr	r2, ._13 + 12\n"
+        "	ldr	r0, ._13 + 16\n"
+        "	mov	ip, r0\n"
+        "	ldr	r1, ._13 + 20\n"
+        "	mov	r8, r1\n"
+        "	ldr	r7, ._13 + 24\n"
+        "	mov	r3, r9\n"
+        "	add	r3, r3, #0x1\n"
+        "	ldr	r6, ._13 + 28\n"
+        "	ldr	r4, ._13 + 32\n"
+        "._11:\n"
+        "	mov	r0, ip\n"
+        "	str	r0, [r2]\n"
+        "	str	r6, [r2, #0x4]\n"
+        "	str	r4, [r2, #0x8]\n"
+        "	ldr	r0, [r2, #0x8]\n"
+        "	ldrh	r1, [r2, #0xa]\n"
+        "	mov	r0, r8\n"
+        "	and	r0, r0, r1\n"
+        "	strh	r0, [r2, #0xa]\n"
+        "	ldrh	r1, [r2, #0xa]\n"
+        "	add	r0, r7, #0\n"
+        "	and	r0, r0, r1\n"
+        "	strh	r0, [r2, #0xa]\n"
+        "	ldrh	r0, [r2, #0xa]\n"
+        "	sub	r3, r3, #0x1\n"
+        "	cmp	r3, #0\n"
+        "	bne	._11	@cond_branch\n"
+        "	mov	r3, r9\n"
+        "	add	r3, r3, #0x1\n"
+        "	ldr	r0, ._13 + 36\n"
+        "	mov	r2, #0x0\n"
+        "	strh	r2, [r0]\n"
+        "	ldr	r1, ._13 + 4\n"
+        "	ldrh	r0, [r1]\n"
+        "	ldr	r4, ._13 + 40\n"
+        "	str	r0, [r4]\n"
+        "	strh	r2, [r1]\n"
+        "	ldr	r0, ._13\n"
+        "	mov	r1, sl\n"
+        "	strh	r1, [r0]\n"
+        "	ldr	r4, ._13 + 44\n"
+        "	str	r3, [r4]\n"
+        "	bl	m4aSoundVSyncOn\n"
+        "	b	._12\n"
+        "._14:\n"
+        "	.align	2, 0\n"
+        "._13:\n"
+        "	.word	0x4000208\n"
+        "	.word	0x4000108\n"
+        "	.word	0xc34f\n"
+        "	.word	0x40000b0\n"
+        "	.word	gUnknown_03004DE0\n"
+        "	.word	0xc5ff\n"
+        "	.word	0x7fff\n"
+        "	.word	0x4000040\n"
+        "	.word	0xa2600001\n"
+        "	.word	0x400010a\n"
+        "	.word	_debugStartMenu_0\n"
+        "	.word	_debugStartMenu_1\n"
+        "._7:\n"
+        "	mov	r0, #0x15\n"
+        "	bl	PlaySE\n"
+        "	ldr	r0, ._16\n"
+        "	ldr	r1, ._16 + 4\n"
+        "	ldr	r1, [r1]\n"
+        "	mov	r2, #0x1\n"
+        "	mov	r3, #0x8\n"
+        "	bl	ConvertIntToDecimalStringN\n"
+        "	ldr	r0, ._16 + 8\n"
+        "	ldr	r1, ._16 + 12\n"
+        "	ldr	r1, [r1]\n"
+        "	mov	r2, #0x1\n"
+        "	mov	r3, #0x8\n"
+        "	bl	ConvertIntToDecimalStringN\n"
+        "	bl	MenuDisplayMessageBox\n"
+        "	ldr	r0, ._16 + 16\n"
+        "	mov	r1, #0x2\n"
+        "	mov	r2, #0xf\n"
+        "	bl	MenuPrint\n"
+        "._12:\n"
+        "	ldrh	r0, [r5]\n"
+        "	add	r0, r0, #0x1\n"
+        "	strh	r0, [r5]\n"
+        "	b	._18\n"
+        "._17:\n"
+        "	.align	2, 0\n"
+        "._16:\n"
+        "	.word	gStringVar1\n"
+        "	.word	_debugStartMenu_1\n"
+        "	.word	gStringVar2\n"
+        "	.word	_debugStartMenu_0\n"
+        "	.word	gUnknown_Debug_839B6D8\n"
+        "._8:\n"
+        "	ldr	r0, ._19\n"
+        "	ldrh	r1, [r0, #0x2e]\n"
+        "	mov	r0, #0x1\n"
+        "	and	r0, r0, r1\n"
+        "	cmp	r0, #0\n"
+        "	beq	._18	@cond_branch\n"
+        "	bl	MenuZeroFillScreen\n"
+        "	bl	ScriptContext2_Disable\n"
+        "	add	r0, r4, #0\n"
+        "	bl	DestroyTask\n"
+        "._18:\n"
+        "	pop	{r3, r4, r5}\n"
+        "	mov	r8, r3\n"
+        "	mov	r9, r4\n"
+        "	mov	sl, r5\n"
+        "	pop	{r4, r5, r6, r7}\n"
+        "	pop	{r0}\n"
+        "	bx	r0\n"
+        "._20:\n"
+        "	.align	2, 0\n"
+        "._19:\n"
+        "	.word	gMain\n"
+        "\n"
+    );
+}
+
+__attribute__((naked))
+void debug_sub_8075D9C()
+{
+    asm(
+        "	push	{lr}\n"
+        "	ldr	r0, ._21\n"
+        "	mov	r1, #0xa\n"
+        "	bl	CreateTask\n"
+        "	bl	ScriptContext2_Enable\n"
+        "	pop	{r0}\n"
+        "	bx	r0\n"
+        "._22:\n"
+        "	.align	2, 0\n"
+        "._21:\n"
+        "	.word	debug_sub_8075C40+1\n"
+        "\n"
+    );
+}
+
+__attribute__((naked))
+void debug_sub_8075DB4()
+{
+    asm(
+        "	push	{r4, r5, r6, lr}\n"
+        "	add	r6, r0, #0\n"
+        "	add	r5, r1, #0\n"
+        "	add	r4, r2, #0\n"
+        "	add	r0, r4, #0\n"
+        "	mov	r1, #0x4d\n"
+        "	bl	__umodsi3\n"
+        "	strb	r0, [r6, #0x1]\n"
+        "	add	r1, r6, #0\n"
+        "	add	r1, r1, #0xc\n"
+        "	add	r0, r4, #0\n"
+        "	bl	write_word_to_mem\n"
+        "	add	r0, r6, #4\n"
+        "	add	r1, r5, #0\n"
+        "	bl	StringCopy8\n"
+        "	mov	r3, #0x7\n"
+        "	mov	r4, #0x0\n"
+        "	ldr	r0, ._25\n"
+        "	ldr	r1, ._25 + 4\n"
+        "	add	r5, r0, r1\n"
+        "	add	r2, r6, #0\n"
+        "	add	r2, r2, #0x10\n"
+        "	add	r1, r6, #0\n"
+        "	add	r1, r1, #0x1c\n"
+        "._23:\n"
+        "	ldrh	r0, [r5]\n"
+        "	strh	r0, [r2]\n"
+        "	strh	r3, [r1]\n"
+        "	add	r0, r3, #6\n"
+        "	strh	r0, [r1, #0xc]\n"
+        "	add	r3, r3, #0x1\n"
+        "	add	r5, r5, #0x2\n"
+        "	add	r2, r2, #0x2\n"
+        "	add	r1, r1, #0x2\n"
+        "	add	r4, r4, #0x1\n"
+        "	cmp	r4, #0x5\n"
+        "	ble	._23	@cond_branch\n"
+        "	mov	r4, #0x0\n"
+        "._24:\n"
+        "	mov	r0, #0x64\n"
+        "	mul	r0, r0, r4\n"
+        "	ldr	r1, ._25 + 8\n"
+        "	add	r0, r0, r1\n"
+        "	mov	r1, #0x2c\n"
+        "	mul	r1, r1, r4\n"
+        "	add	r1, r1, #0x34\n"
+        "	add	r1, r6, r1\n"
+        "	bl	sub_803AF78\n"
+        "	add	r4, r4, #0x1\n"
+        "	cmp	r4, #0x2\n"
+        "	ble	._24	@cond_branch\n"
+        "	add	r0, r6, #0\n"
+        "	bl	sub_8136088\n"
+        "	pop	{r4, r5, r6}\n"
+        "	pop	{r0}\n"
+        "	bx	r0\n"
+        "._26:\n"
+        "	.align	2, 0\n"
+        "._25:\n"
+        "	.word	gSaveBlock1\n"
+        "	.word	0x2b28\n"
+        "	.word	gPlayerParty\n"
+        "\n"
+    );
+}
+
+__attribute__((naked))
+void unref_sub_8070F90()
+{
+    asm(
+        "	push	{lr}\n"
+        "	ldr	r0, ._27\n"
+        "	bl	FlagSet\n"
+        "	mov	r0, #0x80\n"
+        "	lsl	r0, r0, #0x4\n"
+        "	bl	FlagSet\n"
+        "	ldr	r0, ._27 + 4\n"
+        "	bl	FlagSet\n"
+        "	pop	{r0}\n"
+        "	bx	r0\n"
+        "._28:\n"
+        "	.align	2, 0\n"
+        "._27:\n"
+        "	.word	0x801\n"
+        "	.word	0x802\n"
+        "\n"
+    );
+}
+#endif
 
 static void BuildStartMenuActions(void)
 {
-- 
cgit v1.2.3


From d79f440b8d4c5af26a98011719807b05745533e1 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 12:10:41 -0600
Subject: use 'if DEBUG' instead of 'ifdef DEBUG'

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

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 105ef1756..36295b3f8 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -44,7 +44,7 @@ enum {
     MENU_ACTION_PLAYER_LINK
 };
 
-#ifdef DEBUG
+#if DEBUG
 static u32 _debugStartMenu_0  __attribute__((unused));
 static u32 _debugStartMenu_1 __attribute__((unused));
 #endif
@@ -137,7 +137,7 @@ static bool32 sub_80719FC(u8 *ptr);
 static void sub_8071B54(void);
 static void Task_8071B64(u8 taskId);
 
-#ifdef DEBUG
+#if DEBUG
 __attribute__((naked))
 void debug_sub_8075C30()
 {
-- 
cgit v1.2.3


From 05d18468a4b817c0976b16017ef7b6044befed7f Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 13:18:23 -0500
Subject: Dma macro cleanup and cleanup sub_8076034 and sub_8076464

---
 src/field/start_menu.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 110351016..95aa9c79e 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -54,7 +54,7 @@ extern u16 gSpecialVar_Result;
 
 extern u8 gUnknown_03004860;
 
-u8 (*gCallback_03004AE8)(void);
+u8 (*gMenuCallback)(void);
 
 EWRAM_DATA static u8 sStartMenuCursorPos = 0;
 EWRAM_DATA static u8 sNumStartMenuActions = 0;
@@ -283,11 +283,11 @@ void sub_80712B4(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        gMenuCallback = StartMenu_InputProcessCallback;
         task->data[0]++;
         break;
     case 1:
-        if (gCallback_03004AE8() == 1)
+        if (gMenuCallback() == 1)
             DestroyTask(taskId);
         break;
     }
@@ -325,10 +325,10 @@ static u8 StartMenu_InputProcessCallback(void)
             if (GetNationalPokedexCount(0) == 0)
                 return 0;
         }
-        gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func;
-        if (gCallback_03004AE8 != StartMenu_SaveCallback &&
-           gCallback_03004AE8 != StartMenu_ExitCallback &&
-           gCallback_03004AE8 != StartMenu_RetireCallback)
+        gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func;
+        if (gMenuCallback != StartMenu_SaveCallback &&
+           gMenuCallback != StartMenu_ExitCallback &&
+           gMenuCallback != StartMenu_RetireCallback)
             fade_screen(1, 0);
         return 0;
     }
@@ -405,7 +405,7 @@ static u8 StartMenu_PlayerCallback(void)
 static u8 StartMenu_SaveCallback(void)
 {
     Menu_DestroyCursor();
-    gCallback_03004AE8 = SaveCallback1;
+    gMenuCallback = SaveCallback1;
     return 0;
 }
 
@@ -461,7 +461,7 @@ enum
 static u8 SaveCallback1(void)
 {
     sub_807160C();
-    gCallback_03004AE8 = SaveCallback2;
+    gMenuCallback = SaveCallback2;
     return FALSE;
 }
 
@@ -475,7 +475,7 @@ static u8 SaveCallback2(void)
         //Go back to start menu
         Menu_EraseScreen();
         InitStartMenu();
-        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        gMenuCallback = StartMenu_InputProcessCallback;
         return FALSE;
     case SAVE_SUCCESS:
     case SAVE_ERROR:
-- 
cgit v1.2.3


From 6903b3626aed4e5521243b4517c43fed3c4d0ff5 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 13:11:10 -0600
Subject: resolve some undefined references

---
 src/field/start_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 36295b3f8..1e4eace87 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -278,11 +278,11 @@ void debug_sub_8075C40()
         "	mov	r2, #0x1\n"
         "	mov	r3, #0x8\n"
         "	bl	ConvertIntToDecimalStringN\n"
-        "	bl	MenuDisplayMessageBox\n"
+        "	bl	Menu_DisplayDialogueFrame\n"
         "	ldr	r0, ._16 + 16\n"
         "	mov	r1, #0x2\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "._12:\n"
         "	ldrh	r0, [r5]\n"
         "	add	r0, r0, #0x1\n"
@@ -303,7 +303,7 @@ void debug_sub_8075C40()
         "	and	r0, r0, r1\n"
         "	cmp	r0, #0\n"
         "	beq	._18	@cond_branch\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	bl	ScriptContext2_Disable\n"
         "	add	r0, r4, #0\n"
         "	bl	DestroyTask\n"
-- 
cgit v1.2.3


From 233654746815b884d303cc3416c3fe6c377b4a73 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 17:30:45 -0600
Subject: resolve more undefined references

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 1e4eace87..17aeb8242 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -255,7 +255,7 @@ void debug_sub_8075C40()
         "	.word	0x4000108\n"
         "	.word	0xc34f\n"
         "	.word	0x40000b0\n"
-        "	.word	gUnknown_03004DE0\n"
+        "	.word	gScanlineEffectRegBuffers\n"
         "	.word	0xc5ff\n"
         "	.word	0x7fff\n"
         "	.word	0x4000040\n"
-- 
cgit v1.2.3


From 73392181fe47fd0fe5ac3702978307926a442ef4 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 18:08:02 -0600
Subject: resolve more undefined references

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 17aeb8242..47c7fca05 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -398,7 +398,7 @@ void debug_sub_8075DB4()
         "	cmp	r4, #0x2\n"
         "	ble	._24	@cond_branch\n"
         "	add	r0, r6, #0\n"
-        "	bl	sub_8136088\n"
+        "	bl	SetEReaderTrainerChecksum\n"
         "	pop	{r4, r5, r6}\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
-- 
cgit v1.2.3


From 2869160d630f569110ca895ff924070d626fd54b Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 19:31:23 -0500
Subject: use Defvars instead of some Dma macros and hopefully last while(1)s

---
 src/field/start_menu.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 95aa9c79e..db41919be 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -744,29 +744,12 @@ static bool32 sub_80719FC(u8 *step)
     switch (*step)
     {
     case 0:
-    {
-        u8 *addr;
-        u32 size;
-
         REG_DISPCNT = 0;
         SetVBlankCallback(NULL);
         ScanlineEffect_Stop();
         DmaClear16(3, PLTT, PLTT_SIZE);
-        addr = (void *)VRAM;
-        size = 0x18000;
-        while (1)
-        {
-            DmaFill16(3, 0, addr, 0x1000);
-            addr += 0x1000;
-            size -= 0x1000;
-            if (size <= 0x1000)
-            {
-                DmaFill16(3, 0, addr, size);
-                break;
-            }
-        }
-        break;
-    }
+        DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000);
+		break;
     case 1:
         ResetSpriteData();
         ResetTasks();
-- 
cgit v1.2.3


From b8b4a11a032d7fb21ae14c5372a266509d2f918b Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 18 Jan 2018 01:12:45 -0500
Subject: formatting

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index db41919be..89cd404e9 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -749,7 +749,7 @@ static bool32 sub_80719FC(u8 *step)
         ScanlineEffect_Stop();
         DmaClear16(3, PLTT, PLTT_SIZE);
         DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000);
-		break;
+        break;
     case 1:
         ResetSpriteData();
         ResetTasks();
-- 
cgit v1.2.3


From 003ed9293b2c51f0481ed31f0e0459cbecbf757e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sat, 20 Jan 2018 14:17:03 -0800
Subject: More documentation of field_weather

---
 src/field/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 89cd404e9..381c19bb7 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -329,7 +329,7 @@ static u8 StartMenu_InputProcessCallback(void)
         if (gMenuCallback != StartMenu_SaveCallback &&
            gMenuCallback != StartMenu_ExitCallback &&
            gMenuCallback != StartMenu_RetireCallback)
-            fade_screen(1, 0);
+            FadeScreen(1, 0);
         return 0;
     }
     if (gMain.newKeys & (START_BUTTON | B_BUTTON))
-- 
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/start_menu.c | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

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

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 1b01bf7a8..4904f4a80 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -166,7 +166,7 @@ void debug_sub_8075C40()
         "	lsl	r0, r4, #0x2\n"
         "	add	r0, r0, r4\n"
         "	lsl	r0, r0, #0x3\n"
-        "	ldr	r1, ._5\n"
+        "	ldr	r1, ._5         @ gTasks\n"
         "	add	r5, r0, r1\n"
         "	mov	r1, #0x0\n"
         "	ldsh	r0, [r5, r1]\n"
@@ -191,28 +191,28 @@ void debug_sub_8075C40()
         "	bl	m4aSoundVSyncOff\n"
         "	b	._12\n"
         "._1:\n"
-        "	ldr	r1, ._13\n"
+        "	ldr	r1, ._13        @ 0x4000208\n"
         "	ldrh	r0, [r1]\n"
         "	mov	sl, r0\n"
         "	mov	r0, #0x0\n"
         "	strh	r0, [r1]\n"
-        "	ldr	r1, ._13 + 4\n"
+        "	ldr	r1, ._13 + 4    @ 0x4000108\n"
         "	strh	r0, [r1]\n"
         "	mov	r0, #0x83\n"
         "	lsl	r0, r0, #0x10\n"
         "	str	r0, [r1]\n"
-        "	ldr	r4, ._13 + 8\n"
+        "	ldr	r4, ._13 + 8    @ 0xc34f\n"
         "	mov	r9, r4\n"
-        "	ldr	r2, ._13 + 12\n"
-        "	ldr	r0, ._13 + 16\n"
+        "	ldr	r2, ._13 + 12   @ 0x40000b0\n"
+        "	ldr	r0, ._13 + 16   @ gScanlineEffectRegBuffers\n"
         "	mov	ip, r0\n"
-        "	ldr	r1, ._13 + 20\n"
+        "	ldr	r1, ._13 + 20   @ 0xc5ff\n"
         "	mov	r8, r1\n"
-        "	ldr	r7, ._13 + 24\n"
+        "	ldr	r7, ._13 + 24   @ 0x7fff\n"
         "	mov	r3, r9\n"
         "	add	r3, r3, #0x1\n"
-        "	ldr	r6, ._13 + 28\n"
-        "	ldr	r4, ._13 + 32\n"
+        "	ldr	r6, ._13 + 28   @ 0x4000040\n"
+        "	ldr	r4, ._13 + 32   @ 0xa2600001\n"
         "._11:\n"
         "	mov	r0, ip\n"
         "	str	r0, [r2]\n"
@@ -233,18 +233,18 @@ void debug_sub_8075C40()
         "	bne	._11	@cond_branch\n"
         "	mov	r3, r9\n"
         "	add	r3, r3, #0x1\n"
-        "	ldr	r0, ._13 + 36\n"
+        "	ldr	r0, ._13 + 36   @ 0x400010a\n"
         "	mov	r2, #0x0\n"
         "	strh	r2, [r0]\n"
-        "	ldr	r1, ._13 + 4\n"
+        "	ldr	r1, ._13 + 4    @ 0x4000108\n"
         "	ldrh	r0, [r1]\n"
-        "	ldr	r4, ._13 + 40\n"
+        "	ldr	r4, ._13 + 40   @ _debugStartMenu_0\n"
         "	str	r0, [r4]\n"
         "	strh	r2, [r1]\n"
-        "	ldr	r0, ._13\n"
+        "	ldr	r0, ._13        @ 0x4000208\n"
         "	mov	r1, sl\n"
         "	strh	r1, [r0]\n"
-        "	ldr	r4, ._13 + 44\n"
+        "	ldr	r4, ._13 + 44   @ _debugStartMenu_1\n"
         "	str	r3, [r4]\n"
         "	bl	m4aSoundVSyncOn\n"
         "	b	._12\n"
@@ -266,20 +266,20 @@ void debug_sub_8075C40()
         "._7:\n"
         "	mov	r0, #0x15\n"
         "	bl	PlaySE\n"
-        "	ldr	r0, ._16\n"
-        "	ldr	r1, ._16 + 4\n"
+        "	ldr	r0, ._16        @ gStringVar1\n"
+        "	ldr	r1, ._16 + 4    @ _debugStartMenu_1\n"
         "	ldr	r1, [r1]\n"
         "	mov	r2, #0x1\n"
         "	mov	r3, #0x8\n"
         "	bl	ConvertIntToDecimalStringN\n"
-        "	ldr	r0, ._16 + 8\n"
-        "	ldr	r1, ._16 + 12\n"
+        "	ldr	r0, ._16 + 8    @ gStringVar2\n"
+        "	ldr	r1, ._16 + 12   @ _debugStartMenu_0\n"
         "	ldr	r1, [r1]\n"
         "	mov	r2, #0x1\n"
         "	mov	r3, #0x8\n"
         "	bl	ConvertIntToDecimalStringN\n"
         "	bl	Menu_DisplayDialogueFrame\n"
-        "	ldr	r0, ._16 + 16\n"
+        "	ldr	r0, ._16 + 16   @ gUnknown_Debug_839B6D8\n"
         "	mov	r1, #0x2\n"
         "	mov	r2, #0xf\n"
         "	bl	Menu_PrintText\n"
@@ -297,7 +297,7 @@ void debug_sub_8075C40()
         "	.word	_debugStartMenu_0\n"
         "	.word	gUnknown_Debug_839B6D8\n"
         "._8:\n"
-        "	ldr	r0, ._19\n"
+        "	ldr	r0, ._19        @ gMain\n"
         "	ldrh	r1, [r0, #0x2e]\n"
         "	mov	r0, #0x1\n"
         "	and	r0, r0, r1\n"
@@ -328,7 +328,7 @@ void debug_sub_8075D9C()
 {
     asm(
         "	push	{lr}\n"
-        "	ldr	r0, ._21\n"
+        "	ldr	r0, ._21        @ debug_sub_8075C40\n"
         "	mov	r1, #0xa\n"
         "	bl	CreateTask\n"
         "	bl	ScriptContext2_Enable\n"
@@ -363,8 +363,8 @@ void debug_sub_8075DB4()
         "	bl	StringCopy8\n"
         "	mov	r3, #0x7\n"
         "	mov	r4, #0x0\n"
-        "	ldr	r0, ._25\n"
-        "	ldr	r1, ._25 + 4\n"
+        "	ldr	r0, ._25        @ gSaveBlock1\n"
+        "	ldr	r1, ._25 + 4    @ 0x2b28\n"
         "	add	r5, r0, r1\n"
         "	add	r2, r6, #0\n"
         "	add	r2, r2, #0x10\n"
@@ -387,7 +387,7 @@ void debug_sub_8075DB4()
         "._24:\n"
         "	mov	r0, #0x64\n"
         "	mul	r0, r0, r4\n"
-        "	ldr	r1, ._25 + 8\n"
+        "	ldr	r1, ._25 + 8    @ gPlayerParty\n"
         "	add	r0, r0, r1\n"
         "	mov	r1, #0x2c\n"
         "	mul	r1, r1, r4\n"
@@ -417,12 +417,12 @@ void unref_sub_8070F90()
 {
     asm(
         "	push	{lr}\n"
-        "	ldr	r0, ._27\n"
+        "	ldr	r0, ._27        @ 0x801\n"
         "	bl	FlagSet\n"
         "	mov	r0, #0x80\n"
         "	lsl	r0, r0, #0x4\n"
         "	bl	FlagSet\n"
-        "	ldr	r0, ._27 + 4\n"
+        "	ldr	r0, ._27 + 4    @ 0x802\n"
         "	bl	FlagSet\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
-- 
cgit v1.2.3