From 7b142311a7294c4c7a943870fa5f24f0fbea604a Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Fri, 12 Mar 2021 15:39:07 -0600
Subject: Miscellaneous Work (Again) (#30)

* work on debug menu and document that and main menu

* split, decomp, label more funcs

* split exclusive pokemon data out into C

* macro-ize exlusive pokemon data

* decomp 2 more funcs

* decomp a few more

* finally match PromptNewQuestion

* woot 7% aka more debug menu stuff
---
 src/code_2.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/code_2.c')

diff --git a/src/code_2.c b/src/code_2.c
index 6b0b46b..2b42b58 100644
--- a/src/code_2.c
+++ b/src/code_2.c
@@ -17,8 +17,8 @@ extern void LoadMonsterParameters(void);
 extern void sub_8097670(void);
 extern void sub_8094980(void);
 extern void sub_8094C14(void);
-extern void sub_8097F5C(void);
-extern void sub_8090998(void);
+extern void LoadExclusivePokemon(void);
+extern void LoadItemParameters(void);
 extern void sub_809207C(void);
 extern void LoadWazaParameters(void);
 extern void sub_80950BC(void);
@@ -81,7 +81,7 @@ void GameLoop(void)
 {
     u32 tmp;
     u8 tmp3 = 1;
-    u32 tmp4;
+    u32 nextMenu;
     u32 flag;
 
     InitHeap();
@@ -94,9 +94,9 @@ void GameLoop(void)
     InitializePlayTime();
     sub_8094980();
     sub_8094C14();
-    sub_8097F5C();
+    LoadExclusivePokemon();
     LoadFriendAreas();
-    sub_8090998();
+    LoadItemParameters();
     sub_809207C();
     LoadWazaParameters();
     sub_80950BC();
@@ -164,11 +164,11 @@ void GameLoop(void)
             }
             SetUpMenu();
             xxx_update_stuff(0);
-            tmp4 = UpdateMenu();
+            nextMenu = UpdateMenu();
             CleanUpMenu();
-            if (tmp4 == 2) break;
-            if (tmp4 == 4) break;
-            if (tmp4 == 3) break;
+            if (nextMenu == 2) break;
+            if (nextMenu == 4) break;
+            if (nextMenu == 3) break;
         }
         DeleteMainMenu();
         while (gUnknown_2000A80 > 0) {
@@ -179,7 +179,7 @@ void GameLoop(void)
             xxx_update_stuff(0);
         }
         CloseFile(gTitlePaletteFile);
-        switch (tmp4) {
+        switch (nextMenu) {
             case 2: {
                 s32 tmp5 = sub_80953D4(7);
                 if (tmp5 != -1) {
-- 
cgit v1.2.3