Makefile and Install.md Revamp (#41)

* Makefile: move over to gcc for preproc and ditch cpp

* INSTALL: rewrite INSTALL

* README: add CI badge

* Makefile: make tools build before anything else

8 files changed, 62 insertions, 50 deletions

diff --git a/src/felicity_bank_1.c b/src/felicity_bank_1.c
index be46eb1..fc769cb 100644
--- a/src/felicity_bank_1.c
+++ b/src/felicity_bank_1.c
@@ -140,7 +140,7 @@ void CreateFelicityMoneySavingsHeader(u32 param_1)
   sub_80073E0(param_1);
 }
 
-void sub_8016C40(u32 param_1)
+void DrawTeamMoneyBox(u32 param_1)
 { 
   sub_8008C54(param_1);
   sub_80073B8(param_1);
diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c
index 43dc94b..0600bef 100644
--- a/src/gulpin_shop.c
+++ b/src/gulpin_shop.c
@@ -57,7 +57,7 @@ u32 DisplayGulpinDialogueSprite(s32 param_1,s16 param_2,struct unkStruct_Gulpin
 
   param2_32 = param_2; // dumb cast needed to get lsr/asr combo
   
-  gUnknown_203B26C = MemoryAlloc(0x18c,8);
+  gUnknown_203B26C = MemoryAlloc(sizeof(struct unkStruct_203B26C),8);
   gUnknown_203B26C->unk0 = param_1;
   gUnknown_203B26C->unkC = param2_32;
   gUnknown_203B26C->unk10 = param_3;
diff --git a/src/kangaskhan_storage.c b/src/kangaskhan_storage.c
index 28ab5c9..33f609a 100644
--- a/src/kangaskhan_storage.c
+++ b/src/kangaskhan_storage.c
@@ -40,7 +40,7 @@ u32 DisplayKangaskhanDialogueSprite(s32 param_1)
   
   ResetUnusedInputStruct();
   sub_800641C(0,1,1);
-  gUnknown_203B208 = MemoryAlloc(0x14c,8);
+  gUnknown_203B208 = MemoryAlloc(sizeof(struct unkStruct_203B208),8);
   gUnknown_203B208->unk18 = 0;
   gUnknown_203B208->unk1C = 0;
   gUnknown_203B208->unk20 = 0;
diff --git a/src/kangaskhan_storage_2.c b/src/kangaskhan_storage_2.c
index 6b30882..02059d1 100644
--- a/src/kangaskhan_storage_2.c
+++ b/src/kangaskhan_storage_2.c
@@ -21,8 +21,7 @@ struct unkStruct_203B20C
     u32 unk1C;
     u32 unk20;
     u8 fill24[0x60 - 0x24];
-    u32 unk60;
-    u8 fill64[0x70 - 0x64];
+    u16 unk60[8];
     u32 unk70;
     u8 fill74[0xC0 - 0x74];
     u32 unkC0;
@@ -77,6 +76,13 @@ extern u32 sub_801A8AC(void);
 extern void sub_801A928(void);
 extern void sub_8012CAC(struct UnkTextStruct2 *, u32 *);
 extern void sub_80182E4(void);
+extern void sub_8008C54(u32);
+extern void sub_80073B8(u32);
+extern void sub_8013C68(u32 *);
+extern void sub_80073E0(u32);
+extern void sub_8012EA4(u32 *, u32);
+extern void xxx_call_draw_string(u32 x, u32 y, u8 *, u32, u32);
+
 
 extern void sub_801A9E0();
 extern void sub_801841C();
@@ -87,7 +93,7 @@ extern void sub_8013AA0(u32 *);
 extern void sub_801B3C0(struct ItemStruct_203B460 *);
 extern void sub_801A5D8(u32, u32, u32, u32);
 extern void sub_801C8C4(u32, u32, u32, u32);
-extern void sub_8012D60(u32 *, u32 *, u32, u32 *, u32, u32);
+extern void sub_8012D60(u32 *, u32 *, u32, u16 *, u32, u32);
 extern void sub_801CB5C(u32);
 extern void sub_801A8D0(u32);
 
@@ -96,6 +102,7 @@ extern struct UnkTextStruct2 gUnknown_80DB7E8;
 extern struct UnkTextStruct2 gUnknown_80DB7D0;
 extern struct UnkTextStruct2 gUnknown_80DB800;
 extern struct UnkTextStruct2 gUnknown_80DB818;
+extern u8 gUnknown_80DB830[];
 
 void sub_8017AF8(void)
 {
@@ -410,7 +417,7 @@ void sub_8018100(void)
     switch(gUnknown_203B20C->state)
     {
         case 1:
-            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, &gUnknown_203B20C->unk60, gUnknown_203B20C->unk14, 2);
+            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, gUnknown_203B20C->unk60, gUnknown_203B20C->unk14, 2);
             break;
         case 4:
             sub_801A5D8(3, 3, 0, 0xA);
@@ -421,7 +428,7 @@ void sub_8018100(void)
         case 6:
             sub_801A9E0();
             sub_801841C();
-            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, &gUnknown_203B20C->unk60, gUnknown_203B20C->unk18, 2);
+            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, gUnknown_203B20C->unk60, gUnknown_203B20C->unk18, 2);
             break;
         case 7:
             sub_801B3C0(&gUnknown_203B20C->unk8);
@@ -453,7 +460,7 @@ void sub_8018100(void)
             sub_801CCD8();
             sub_801AD34(0);
             sub_80184D4();
-            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, &gUnknown_203B20C->unk60, gUnknown_203B20C->unk1C, 2);
+            sub_8012D60(&gUnknown_203B20C->unk70, &gUnknown_203B20C->unk20, 0, gUnknown_203B20C->unk60, gUnknown_203B20C->unk1C, 2);
             break;
         case 14:
             sub_801B3C0(&gUnknown_203B20C->unk8);
@@ -463,3 +470,15 @@ void sub_8018100(void)
             break;
     }
 }
+
+void sub_8018280(void)
+{
+    sub_8008C54(gUnknown_203B20C->unkD4);
+    sub_80073B8(gUnknown_203B20C->unkD4);
+    xxx_call_draw_string(4, 0, gUnknown_80DB830, gUnknown_203B20C->unkD4, 0); // Number?
+    sub_8013C68(&gUnknown_203B20C->unkC0);
+    sub_80073E0(gUnknown_203B20C->unkD4);
+    sub_801CCD8();
+    sub_801AD34(0);
+    sub_8012EA4(&gUnknown_203B20C->unk70,0);
+}
diff --git a/src/kecleon_items.c b/src/kecleon_items.c
index 58fead3..967d148 100644
--- a/src/kecleon_items.c
+++ b/src/kecleon_items.c
@@ -35,7 +35,7 @@ u32 DisplayKeckleonDialogueSprite(u32 param_1)
   char *monName;
   struct OpenedFile *faceFile;
   
-  gUnknown_203B210 = MemoryAlloc(0x148,8);
+  gUnknown_203B210 = MemoryAlloc(sizeof(struct unkStruct_203B210),8);
   gUnknown_203B210->unk28 = 0;
   gUnknown_203B210->unk2C = 0;
   gUnknown_203B210->unk30 = 0;
diff --git a/src/kecleon_items_1.c b/src/kecleon_items_1.c
index c05e8b9..faa8c6b 100644
--- a/src/kecleon_items_1.c
+++ b/src/kecleon_items_1.c
@@ -26,7 +26,7 @@ extern void sub_801A2A8(u32);
 extern s32 sub_801A8AC(void);
 extern u32 sub_801A6E8(u32);
 extern void sub_801A928(void);
-extern void sub_8016C40(u32);
+extern void DrawTeamMoneyBox(u32);
 
 void sub_8019B08(void)
 {
@@ -53,7 +53,7 @@ void sub_8019B08(void)
         break;
     case 1:
     default:
-        sub_8016C40(1);
+        DrawTeamMoneyBox(1);
         break;
   }
 }
@@ -168,13 +168,9 @@ void sub_8019D68(void)
 u32 sub_8019D8C(void)
 {
     if(gUnknown_203B210->unk4)
-    {
         return sub_8091814();
-    }
     else
-    {
         return sub_8091A48();
-    }
 }
 
 void sub_8019DAC(void)
@@ -195,7 +191,7 @@ void sub_8019DAC(void)
   }
 }
 
-void sub_8019E04(int param_1)
+void sub_8019E04(s32 param_1)
 {
   
   if (gUnknown_203B210->unk4) {
diff --git a/src/post_office_guide.c b/src/post_office_guide.c
index 8fbfe56..063d0fa 100644
--- a/src/post_office_guide.c
+++ b/src/post_office_guide.c
@@ -33,7 +33,7 @@ struct unkStruct_203B330
     u8 fillE[2];
     u32 unk10;
     struct UnkTextStruct2 *unk14;
-    struct UnkTextStruct2 unk18[3];
+    struct UnkTextStruct2 unk18[4];
 };
 extern struct unkStruct_203B330 *gUnknown_203B330;
 
@@ -536,7 +536,7 @@ void ReturnToGetHelpMenu(void)
 u32 sub_80319A4(u8 param_1,u8 param_2,int param_3)
 {
   
-  gUnknown_203B330 = MemoryAlloc(0x78,8);
+  gUnknown_203B330 = MemoryAlloc(sizeof(struct unkStruct_203B330),8);
   gUnknown_203B330->unkC = param_1;
   gUnknown_203B330->unkD = param_2;
   sub_801317C(&gUnknown_203B330->unk0);
diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c
index 8d20d6c..57dd99f 100644
--- a/src/trade_items_menu.c
+++ b/src/trade_items_menu.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "input.h"
-#include "trade_items_menu.h"
 #include "item.h"
+#include "trade_items_menu.h"
 #include "gUnknown_203B460.h"
 #include "memory.h"
 #include "save.h"
@@ -44,7 +44,7 @@ extern s32 sub_80144A4(s32 *);
 extern u32 sub_801CA08(u32);
 extern void sub_801CBB8();
 extern u8 sub_801CB24();
-extern void sub_801B3C0(u8 *);
+extern void sub_801B3C0(struct ItemStruct_203B460 *);
 extern u8 sub_8012FD8(u32 *);
 extern void sub_8013114(u32 *, s32 *);
 extern void sub_8035CC0(struct UnkTextStruct2 *, u32);
@@ -54,8 +54,6 @@ extern void sub_801B450();
 extern void sub_801CB5C(u32); 
 extern void sub_8035CF4(u32 *, u32, u32); 
 extern u32 sub_8013BBC(u32 *);
-void sub_8036F30();
-extern void TradeItem_AddItem();
 extern void sub_80141B4(u32 *, u32, u32, u32);
 
 extern void sub_8008C54(u32);
@@ -68,9 +66,8 @@ extern u32 sub_801D008();
 extern void sub_8090DC4(u32 *, u8, u32);
 extern void sub_801C8C4(u32, u32, s32 *, u32);
 
-
-
-
+void sub_8036F30();
+void TradeItem_AddItem();
 void SetTradeItemMenu(u32);
 void PrintTradeItemsLinkError(u32);
 void TradeItem_MainMenu();
@@ -230,9 +227,9 @@ void sub_8036590(void)
 
 void sub_80365AC(void)
 { 
-  gTradeItemsMenu->chosenItem = 0;
-  gTradeItemsMenu->chosenNum = 1;
-  gTradeItemsMenu->unk25C = 0;
+  gTradeItemsMenu->itemToSend.itemIndex = 0;
+  gTradeItemsMenu->itemToSend.numItems = 1;
+  gTradeItemsMenu->itemToSend.unk0 = 0;
   switch(sub_801CA08(1)){
     case 2:
         // Cancel
@@ -241,18 +238,18 @@ void sub_80365AC(void)
         break;
     case 3:
         // Pop up menu with Confirm, Info, Cancel
-        gTradeItemsMenu->chosenItem = sub_801CB24();
-        gTradeItemsMenu->chosenNum = 1;
+        gTradeItemsMenu->itemToSend.itemIndex = sub_801CB24();
+        gTradeItemsMenu->itemToSend.numItems = 1;
         SetTradeItemMenu(TRADE_ITEMS_SEND_ITEM_POPUP_MENU);
         break;
     case 4:
         gTradeItemsMenu->unk4 = 2;
-        gTradeItemsMenu->chosenItem = sub_801CB24();
-        gTradeItemsMenu->chosenNum = 1;
+        gTradeItemsMenu->itemToSend.itemIndex = sub_801CB24();
+        gTradeItemsMenu->itemToSend.numItems = 1;
         sub_8006518(gTradeItemsMenu->unk1E4);
         ResetUnusedInputStruct();
         sub_800641C(0,1,1);
-        sub_801B3C0(&gTradeItemsMenu->unk25C);
+        sub_801B3C0(&gTradeItemsMenu->itemToSend);
         SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO);
         break;
   }
@@ -276,7 +273,7 @@ void sub_8036674(void)
         sub_8006518(gTradeItemsMenu->unk1E4);
         ResetUnusedInputStruct();
         sub_800641C(0,1,1);
-        sub_801B3C0(&gTradeItemsMenu->unk25C);
+        sub_801B3C0(&gTradeItemsMenu->itemToSend);
         SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO);
         break;
     case 7:
@@ -332,9 +329,9 @@ void sub_8036788(void)
         break;
     case 3:
         // Confirm # of item
-        gTradeItemsMenu->chosenNum = gTradeItemsMenu->numItemsToSend;
-        gTradeItemsMenu->unk254.itemIndex = gTradeItemsMenu->chosenItem;
-        gTradeItemsMenu->unk254.numItems = gTradeItemsMenu->numItemsToSend;
+        gTradeItemsMenu->itemToSend.numItems = gTradeItemsMenu->numItemsToSend;
+        gTradeItemsMenu->sentItem.itemIndex = gTradeItemsMenu->itemToSend.itemIndex;
+        gTradeItemsMenu->sentItem.numItems = gTradeItemsMenu->numItemsToSend;
         sub_801CBB8();
         SetTradeItemMenu(TRADE_ITEMS_SEND_ITEM_CONFIRM);
         break;
@@ -354,9 +351,9 @@ void TradeItem_SendItemConfirm(void)
         case 5:
             sub_801CBB8();
             // Used temp var to get correct statements
-            load = gUnknown_203B460->unk50[gTradeItemsMenu->chosenItem];
+            load = gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex];
             load -= gTradeItemsMenu->numItemsToSend;
-            gUnknown_203B460->unk50[gTradeItemsMenu->chosenItem] = load;
+            gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load;
             SetTradeItemMenu(TRADE_ITEMS_PREPARE_TRADE_SAVING);
             PrepareSavePakWrite(SPECIES_NONE);
             break;
@@ -396,7 +393,7 @@ void sub_80368D4(void)
             break;
         case 7:
         case 0:
-            if ((gTradeItemsMenu->unk254.itemIndex != 0) && (gTradeItemsMenu->unk254.numItems != 0))
+            if ((gTradeItemsMenu->sentItem.itemIndex != 0) && (gTradeItemsMenu->sentItem.numItems != 0))
             {
                 TradeItem_AddItem();
                 SetTradeItemMenu(0x11);
@@ -434,8 +431,8 @@ void sub_8036950(void)
       }
     }
     else {
-      if (((gTradeItemsMenu->itemMode == TRADE_ITEMS_SEND_ITEM_MODE) && (gTradeItemsMenu->unk254.itemIndex != 0))
-         && (gTradeItemsMenu->unk254.numItems != 0)) {
+      if (((gTradeItemsMenu->itemMode == TRADE_ITEMS_SEND_ITEM_MODE) && (gTradeItemsMenu->sentItem.itemIndex != 0))
+         && (gTradeItemsMenu->sentItem.numItems != 0)) {
           // Link Failure
         TradeItem_AddItem(); // Add back the item
         SetTradeItemMenu(0xb);
@@ -453,9 +450,9 @@ void TradeItem_AddItem(void)
 {
     // Use temp var to get correct statements 
     u16 load;
-    load = gUnknown_203B460->unk50[gTradeItemsMenu->unk254.itemIndex];
-    load += gTradeItemsMenu->unk254.numItems;
-    gUnknown_203B460->unk50[gTradeItemsMenu->unk254.itemIndex] = load;
+    load = gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex];
+    load += gTradeItemsMenu->sentItem.numItems;
+    gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load;
 }
 
 void sub_80369FC(void)
@@ -597,7 +594,7 @@ void sub_8036B28(void)
         break;
     case 6:
         gUnknown_202DE30 = gTradeItemsMenu->numItemsToSend;
-        sub_8090DC4(&gUnknown_202DE58,gTradeItemsMenu->chosenItem,0);
+        sub_8090DC4(&gUnknown_202DE58,gTradeItemsMenu->itemToSend.itemIndex,0);
         sub_8014248(&gUnknown_80E61E4,0,5, &gUnknown_80E6154,0,4,0,0,0x101);
         break;
     case 7:
@@ -634,7 +631,7 @@ void sub_8036B28(void)
             // Fallthrough needed on each case
             case TRADE_ITEMS_SEND_ITEM_MODE:
                 temp = &gTradeItemsMenu->unk244;
-                temp2 = &gTradeItemsMenu->unk254;
+                temp2 = &gTradeItemsMenu->sentItem;
                 load_2 = temp2->numItems;
                 temp->itemIndex = temp2->itemIndex;
                 temp->numItems = load_2;
@@ -665,7 +662,7 @@ void sub_8036B28(void)
         break;
     case 0xd:
         gUnknown_202DE30 = gTradeItemsMenu->numItemsToSend;
-        sub_8090DC4(&gUnknown_202DE58,gTradeItemsMenu->chosenItem,0);
+        sub_8090DC4(&gUnknown_202DE58,gTradeItemsMenu->itemToSend.itemIndex,0);
         sub_80141B4(&gUnknown_80E6358,0,0,0x101);
         break;
     case 0xB:
@@ -1085,7 +1082,7 @@ void sub_8036F30(void)
 void sub_8036F74(void)
 {
   sub_8006518(gTradeItemsMenu->unk184);
-  sub_8036ECC(2, gUnknown_203B460->unk50[gTradeItemsMenu->chosenItem]);
+  sub_8036ECC(2, gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]);
   sub_801CCD8();
   sub_8035CF4(&gTradeItemsMenu->unk44, 3, 0);
   sub_8036F30();