Move some data and Splitting (#32)

* move friend area settings to src

* split out playtime into different C file and decomp a few more funcs

* time -> play_time

* fix include

* split out more wonder mail stuff

* unify 203B2C0 and unkDungeon structs. snuck in a decomp func too

* split out more menu screens

* work some more on trade items

* doc a few more things

* add a close nonmatch and decomp nullsub and small func

* rollback struct attempt since it causes nonmatchings

* only one func left in asm

* death to trade_item asm and unify into one C file

* more docing and cleanup

* label main menu and trade items menu global menu struct

* doc itemMode

1 files changed, 20 insertions, 40 deletions

diff --git a/src/code_8048480.c b/src/code_8048480.c
index 880bf05..64bf949 100644
--- a/src/code_8048480.c
+++ b/src/code_8048480.c
@@ -1,13 +1,8 @@
 #include "global.h"
-
-struct unkDungeon_8041D5C
-{
-    u8 padding[0x70];
-    u8 *unk70[100];
-};
+#include "code_8041D5C.h"
 
 extern u32 gUnknown_80F89F4;
-extern u32 gAvailablePokemonNames;
+extern u8 gAvailablePokemonNames[0x58];
 extern u32 gUnknown_80FB580;
 extern s16 gUnknown_80F4FB6;
 extern s16 gUnknown_80F4FB8;
@@ -22,7 +17,7 @@ extern void sub_8072008(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2, u8 r3, u3
 extern void sub_8076D10(u32 r0, struct unkDungeon_8041D5C *r1);
 extern void sub_807232C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2);
 
-extern void sub_8045B94(u32 *r0, struct unkDungeon_8041D5C *r1, u32);
+extern void sub_8045B94(u8 *r0, struct unkDungeon_8041D5C *r1, u32);
 extern void sub_807A290(u32, struct unkDungeon_8041D5C *r1);
 extern void sub_80522F4(u32 r0, struct unkDungeon_8041D5C *r1, u32);
 extern void sub_8079270(u32 r0, struct unkDungeon_8041D5C *r1);
@@ -32,19 +27,11 @@ extern void sub_8079140(u32, struct unkDungeon_8041D5C *r1);
 extern void sub_8077C44(u32, struct unkDungeon_8041D5C *r1, s16, s16, u32);
 extern void sub_80792F8(u32, struct unkDungeon_8041D5C *r1, u32);
 extern void sub_8079F20(u32, struct unkDungeon_8041D5C *r1, u32, u8);
-extern void sub_806F370(u32, struct unkDungeon_8041D5C *r1, u32, u32);
+extern void sub_806F370(u32, struct unkDungeon_8041D5C *r1, u32, u32, u32, u32, u32, u32, u32, u32);
 
 void sub_8048340(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2)
 {
-    u32 temp[6];
-
-    temp[0] = 0;
-    temp[1] = 0;
-    temp[2] = 528;
-    temp[3] = 0;
-    temp[4] = 0;
-    temp[5] = 0;
-    sub_806F370(r0, r1, r2, 1);
+    sub_806F370(r0, r1, r2, 1, 0, 0, 528, 0, 0, 0);
 }
 
 void sub_8048364(u32 r0, struct unkDungeon_8041D5C *r1, u8 r2)
@@ -63,7 +50,6 @@ void sub_804839C(u32 r0, struct unkDungeon_8041D5C *r1)
     sub_8077C44(r0, r1, gUnknown_80F4FBA, gUnknown_80F4FBC, 1);
 }
 
-
 void sub_80483C4(u32 r0, struct unkDungeon_8041D5C *r1)
 {
     sub_80792F8(r0, r1, 999);
@@ -96,26 +82,20 @@ void sub_804841C(u32 r0, struct unkDungeon_8041D5C *r1)
 
 void sub_8048428(u32 r0, struct unkDungeon_8041D5C *r1)
 {
-    u8 *temp;
-    temp = r1->unk70[0];
-    if(temp[0xAC] == 4)
-    {
+    if(r1->unk70->unkAC == 4)
         sub_807A290(r0, r1);
-        return;
-    }
-    sub_80522F4(r0, r1, gUnknown_80F89F4);
+    else
+        // Pointer to "But nothing happened!"
+        sub_80522F4(r0, r1, gUnknown_80F89F4);
 }
 
 void sub_8048450(u32 r0, struct unkDungeon_8041D5C *r1)
 {
-    u8 *temp;
-    temp = r1->unk70[0];
-    if((u8)(temp[0xAC] - 2) <= 1)
-    {
+    if((u8)(r1->unk70->unkAC - 2) <= 1)
         sub_807A290(r0, r1);
-        return;
-    }
-    sub_80522F4(r0, r1, gUnknown_80F89F4);
+    else
+        // Pointer to "But nothing happened!"
+        sub_80522F4(r0, r1, gUnknown_80F89F4);
 }
 
 void sub_8048480(u32 r0, struct unkDungeon_8041D5C *r1)
@@ -145,6 +125,7 @@ void sub_80484BC(u32 r0, struct unkDungeon_8041D5C *r1)
 
 void sub_80484C8(u32 r0, struct unkDungeon_8041D5C *r1)
 {
+    // Pointer to "But nothing happened!"
     sub_80522F4(r0, r1, gUnknown_80F89F4);
 }
 
@@ -155,13 +136,12 @@ void sub_80484DC(u32 r0, struct unkDungeon_8041D5C *r1)
 
 void sub_80484E8(u32 r0, struct unkDungeon_8041D5C *r1)
 {
-    u8 *temp;
-    temp = r1->unk70[0];
-    if(temp[0xAC] == 1)
-    {
+    if(r1->unk70->unkAC == 1)
         sub_807A290(r0, r1);
-        return;
+    else
+    {
+        sub_8045B94(gAvailablePokemonNames, r1, 0);
+        // Pointer to "But nothing happened!"
+        sub_80522F4(r0, r1, gUnknown_80FB580);
     }
-    sub_8045B94(&gAvailablePokemonNames, r1, 0);
-    sub_80522F4(r0, r1, gUnknown_80FB580);
 }