From aa939e0955ec683efb5dd963430eace695a26af9 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 6 Mar 2022 14:41:40 -0600
Subject: All saving functions decomped

- poke_sub_4 was determined to be Dungeon Index/Floor
- Clean up code that references these functions
---
 src/friend_list_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/friend_list_menu.c')

diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c
index 9310665..142aeca 100644
--- a/src/friend_list_menu.c
+++ b/src/friend_list_menu.c
@@ -113,7 +113,7 @@ void sub_8026A94(void)
 
 
 static inline bool8 sub_8026AB0_sub(void) {
-    if (gUnknown_203B2B8->unk18->unk4.unk4 == 0x44 || gUnknown_203B2B8->unk18->unk4.unk4 == 0x45)
+    if (gUnknown_203B2B8->unk18->unk4.dungeonIndex == 0x44 || gUnknown_203B2B8->unk18->unk4.dungeonIndex == 0x45)
         return TRUE;
     else
         return FALSE;
@@ -344,7 +344,7 @@ u32 sub_8026E88(struct PokemonStruct *r0)
     u8 iVar3;
     if(r0->unk2 == 0)
     {
-        iVar3 = (r0->unk4.unk4 == 0x41);
+        iVar3 = (r0->unk4.dungeonIndex == 0x41);
         if(iVar3 != 0)
             if(sub_80023E4(0x8) == 0)
                 return 0;
@@ -361,7 +361,7 @@ u32 sub_8026EB8(struct PokemonStruct *r0)
         if(sub_808D3F8() != r0)
             if(r0->unk2 == 0)
             {
-                iVar3 = (r0->unk4.unk4 == 0x41);
+                iVar3 = (r0->unk4.dungeonIndex == 0x41);
                 if(iVar3 != 0)
                 {
                     if(sub_80023E4(0x8) != 0)
-- 
cgit v1.2.3


From 3477f61cf2f983e5851f720386128a4410d9e131 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 13 Mar 2022 17:48:04 -0700
Subject: continue doing some more decomp

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

(limited to 'src/friend_list_menu.c')

diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c
index 142aeca..fe9de8c 100644
--- a/src/friend_list_menu.c
+++ b/src/friend_list_menu.c
@@ -222,7 +222,7 @@ void sub_8026C14(void)
         ShiftItemsDownFrom(gUnknown_203B2B8->unkC);
         FillInventoryGaps();
         if (gUnknown_203B2B8->unk14.itemIndex != '\0') {
-          sub_8091274(&gUnknown_203B2B8->unk14);
+          AddHeldItemToInventory(&gUnknown_203B2B8->unk14);
           nextState = 0x10;
         }
         HeldItemToSlot(&slot,&gUnknown_203B2B8->unk10);
@@ -342,7 +342,7 @@ void sub_8026E08(u32 r0)
 u32 sub_8026E88(struct PokemonStruct *r0)
 {
     u8 iVar3;
-    if(r0->unk2 == 0)
+    if(r0->isLeader == 0)
     {
         iVar3 = (r0->unk4.dungeonIndex == 0x41);
         if(iVar3 != 0)
@@ -359,7 +359,7 @@ u32 sub_8026EB8(struct PokemonStruct *r0)
     u8 iVar3;
     if(sub_808D3BC() != r0)
         if(sub_808D3F8() != r0)
-            if(r0->unk2 == 0)
+            if(r0->isLeader == 0)
             {
                 iVar3 = (r0->unk4.dungeonIndex == 0x41);
                 if(iVar3 != 0)
@@ -414,7 +414,7 @@ void sub_8026FA4(void)
     {
         case 1:
             PlaySound(0x14d);
-            sub_8091274(&gUnknown_203B2B8->unk14);
+            AddHeldItemToInventory(&gUnknown_203B2B8->unk14);
             FillInventoryGaps();
             gUnknown_203B2B8->unk14.itemIndex = 0;
             gUnknown_203B2B8->unk14.numItems = 0;
-- 
cgit v1.2.3