Make rom build again

11 files changed, 25 insertions, 27 deletions

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index e269cd924..977183beb 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -9,7 +9,6 @@ typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
 extern u32 gUnknown_0202FF84[];
 
-extern struct UCoords16 gDirectionToVector[];
 extern s16 gUnknown_08376194[];
 extern SpriteStepFunc *gUnknown_08376180[];
 extern s8 *gUnknown_083761D0[];
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 287fef572..6e932d1e5 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "hall_of_fame.h"
 #include "main.h"
 #include "palette.h"
 #include "rom4.h"
diff --git a/src/item_use.c b/src/item_use.c
index 8139114ba..6e7ccfae0 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -38,7 +38,7 @@
 
 extern void (* gUnknown_03005D00)(u8);
 extern void (* gUnknown_0300485C)(void);
-extern void (* gUnknown_03004AE4)(u8);
+extern void (* gUnknown_03004AE4)(u8, u16, TaskFunc);
 
 extern u8 gUnknown_02038561;
 extern u8 gLastFieldPokeMenuOpened;
diff --git a/src/link.c b/src/link.c
index 6ad5a8fb7..5f6c32370 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1,7 +1,9 @@
 #include "global.h"
 #include "link.h"
 #include "battle.h"
+#include "berry.h"
 #include "berry_blender.h"
+#include "hall_of_fame.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
@@ -76,11 +78,6 @@ static void sub_8008454(void);
 static void sub_80084C8(void);
 static void sub_80084F4(void);
 
-extern void *species_and_otid_get_pal(/*TODO: arg types*/);
-extern void sub_8143680(int, u8);
-extern void sub_81428CC(void);
-
-extern struct Berry *GetBerryInfo(u8 berry);
 static void CheckErrorStatus(void);
 static void CB2_PrintErrorMessage(void);
 static u8 IsSioMultiMaster(void);
diff --git a/src/mail.c b/src/mail.c
index 6b26bafe9..658d37976 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -88,7 +88,7 @@ static void sub_80F8FB4(void);
 void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 {
     u16 mailDesign;
-    u8 buffer[4];
+    u16 buffer[2];
 
     ewram0.varFF = GAME_LANGUAGE;
     ewram0.var100 = 1;
diff --git a/src/party_menu.c b/src/party_menu.c
index 7d21de63c..3ea191eb3 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -97,6 +97,8 @@ extern void (*const gUnknown_08376B54[])(u8);
 extern const u8 *const gUnknown_08376D04[DATA_COUNT];
 extern const struct UnknownStruct5 gUnknown_08376BB4[][6];
 
+static void sub_806E884(u8 taskId);
+
 /*
 void sub_806AEDC(void)
 {
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 98fa68302..c942dff03 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -124,7 +124,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
     offset = 6;
 
-    temp = gItemEffectTable[itemId - 13];
+    temp = (u8 *) gItemEffectTable[itemId - 13];
 
     if (!temp && itemId != ITEM_ENIGMA_BERRY)
         return 0;
@@ -252,7 +252,7 @@ u8 *sub_803F378(u16 itemId)
     }
     else
     {
-        itemEffect = gItemEffectTable[itemId - 13];
+        itemEffect = (u8 *) gItemEffectTable[itemId - 13];
     }
 
     gUnknown_02024C0B = gUnknown_02024E6C;
@@ -1198,18 +1198,18 @@ const u16 *pokemon_get_pal(struct Pokemon *mon)
 //Extracts the lower 16 bits of a 32-bit number
 #define LOHALF(n) ((n) & 0xFFFF)
 
-const u16 *species_and_otid_get_pal(u16 species, u32 otId , u32 personality)
+void *species_and_otid_get_pal(u16 species, u32 otId , u32 personality)
 {
     u32 shinyValue;
 
     if (species > SPECIES_EGG)
-        return gMonPaletteTable[0].data;
+        return (void *) gMonPaletteTable[0].data;
 
     shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
     if (shinyValue < 8)
-        return gMonShinyPaletteTable[species].data;
+        return (void *) gMonShinyPaletteTable[species].data;
     else
-        return gMonPaletteTable[species].data;
+        return (void *) gMonPaletteTable[species].data;
 }
 
 const struct SpritePalette *sub_8040990(struct Pokemon *mon)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f309b4f93..d24417a74 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1418,7 +1418,7 @@ bool8 ScrCmd_bufferstd(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index]);
+    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index].text);
     return FALSE;
 }
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 8edae138a..5fa657190 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -27,7 +27,6 @@
 #define CONTEST_ENTRY_PIC_TOP 3
 
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern struct SpritePalette *sub_80409C8(u16, u32, u32);
 
 extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
@@ -429,7 +428,7 @@ void ShowContestEntryMonPic(void)
         HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data,
         gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset,
         (u32)gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], species, var1);
-        paletteData = sub_80409C8(species, var2, var1);
+        paletteData = (struct SpritePalette *) sub_80409C8(species, var2, var1);
         LoadCompressedObjectPalette(paletteData);
         GetMonSpriteTemplate_803C56C(species, 1);
         gUnknown_02024E8C.paletteTag = paletteData->tag;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 0e3c6ad16..a025c9386 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -23,7 +23,7 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 // Graphics Data
 //--------------------------------------------------
 
-const u16 gBirchBagGrassPal[][16] =
+const u16 gBirchBagGrassPal[2][16] =
 {
     INCBIN_U16("graphics/misc/birch_bag.gbapal"),
     INCBIN_U16("graphics/misc/birch_grass.gbapal"),
diff --git a/src/tv.c b/src/tv.c
index 0881a2d2b..2f2cf6d56 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1065,16 +1065,16 @@ void sub_80BEF10(u8 strvaridx, u8 rank)
     switch (rank)
     {
     case NORMAL_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5].text);
         break;
     case SUPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5].text);
         break;
     case HYPER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5].text);
         break;
     case MASTER_RANK:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5].text);
         break;
     }
 }
@@ -1084,19 +1084,19 @@ void CopyContestCategoryToStringVar(u8 strvaridx, u8 category)
     switch (category)
     {
     case CONTEST_COOL:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL].text);
         break;
     case CONTEST_BEAUTY:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY].text);
         break;
     case CONTEST_CUTE:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE].text);
         break;
     case CONTEST_SMART:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART].text);
         break;
     case CONTEST_TOUGH:
-        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]);
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH].text);
         break;
     }
 }