Merge branch 'marijnvdwerf-clean/warnings-1'

10 files changed, 66 insertions, 65 deletions

diff --git a/src/battle_ai.c b/src/battle_ai.c
index a2db200ac..d11e4a118 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -7,6 +7,7 @@
 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
 #define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
 #define AIScriptRead8(ptr) ((ptr)[0])
+#define AIScriptReadPtr(ptr) (u8*) AIScriptRead32(ptr)
 
 /* 
 this file is a mess. I stopped part way because it starts to involve a huge struct that begins at 0x2000000 and goes
@@ -327,7 +328,7 @@ void BattleAICmd_if_random(void)
 	u16 random = Random();
 	
 	if (!(random % 256 >= gAIScriptPtr[1])) // roll a random value. is it less than the parameter of the if_random call? (96 on if_random 80 will return true)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;	
 }
@@ -337,7 +338,7 @@ void BattleAICmd_if_not_random(void)
 	u16 random = Random();
 	
 	if (!(random % 256 <= gAIScriptPtr[1])) // roll a random value. is it greater than the parameter of the if_random call? (96 on if_random 80 will return true)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -347,7 +348,7 @@ void BattleAICmd_if_random_1(void) // if RNG Value equal to
 	u16 random = Random();
 	
 	if (random % 256 == gAIScriptPtr[1]) // roll a random value. is it greater than the parameter of the if_random call? (96 on if_random 80 will return true)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -357,7 +358,7 @@ void BattleAICmd_if_not_random_1(void) // if RNG value not equal to
 	u16 random = Random();
 	
 	if (random % 256 != gAIScriptPtr[1]) // roll a random value. is it greater than the parameter of the if_random call? (96 on if_random 80 will return true)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -382,7 +383,7 @@ void BattleAICmd_if_hp_less_than(void)
 		var = gUnknown_02024C08;
 	
 	if ((u32)(100 * gBattleMons[var].hp / gBattleMons[var].maxHP) < gAIScriptPtr[2])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
@@ -397,7 +398,7 @@ void BattleAICmd_if_hp_more_than(void)
 		var = gUnknown_02024C08;
 	
 	if ((u32)(100 * gBattleMons[var].hp / gBattleMons[var].maxHP) > gAIScriptPtr[2])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
@@ -412,7 +413,7 @@ void BattleAICmd_if_hp_equal(void)
 		var = gUnknown_02024C08;
 	
 	if ((u32)(100 * gBattleMons[var].hp / gBattleMons[var].maxHP) == gAIScriptPtr[2])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
@@ -427,7 +428,7 @@ void BattleAICmd_if_hp_not_equal(void)
 		var = gUnknown_02024C08;
 	
 	if ((u32)(100 * gBattleMons[var].hp / gBattleMons[var].maxHP) != gAIScriptPtr[2])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
@@ -445,7 +446,7 @@ void BattleAICmd_if_status(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (gBattleMons[var].status1 & temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -463,7 +464,7 @@ void BattleAICmd_if_not_status(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (!(gBattleMons[var].status1 & temp))
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -481,7 +482,7 @@ void BattleAICmd_if_status2(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (gBattleMons[var].status2 & temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -499,7 +500,7 @@ void BattleAICmd_if_not_status2(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (!(gBattleMons[var].status2 & temp))
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -517,7 +518,7 @@ void BattleAICmd_if_status3(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if ( gUnknown_02024C98[var] & temp )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -535,7 +536,7 @@ void BattleAICmd_if_not_status3(void)
 	temp = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (!(gUnknown_02024C98[var] & temp))
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -555,7 +556,7 @@ void BattleAICmd_if_status4(void)
 	temp2 = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if ( gUnknown_02024C7A[temp] & temp2 )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -575,7 +576,7 @@ void BattleAICmd_if_not_status4(void)
 	temp2 = AIScriptRead32(gAIScriptPtr + 2);
 	
 	if (!(gUnknown_02024C7A[temp] & temp2))
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 6);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
 	else
 		gAIScriptPtr += 10;
 }
@@ -583,7 +584,7 @@ void BattleAICmd_if_not_status4(void)
 void BattleAICmd_if_less_than(void)
 {
 	if (unk_2016800.unk8 < gAIScriptPtr[1])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -591,7 +592,7 @@ void BattleAICmd_if_less_than(void)
 void BattleAICmd_if_more_than(void)
 {
 	if (unk_2016800.unk8 > gAIScriptPtr[1])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -599,7 +600,7 @@ void BattleAICmd_if_more_than(void)
 void BattleAICmd_if_equal(void)
 {
 	if (unk_2016800.unk8 == gAIScriptPtr[1])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -607,47 +608,47 @@ void BattleAICmd_if_equal(void)
 void BattleAICmd_if_not_equal(void)
 {
 	if (unk_2016800.unk8 != gAIScriptPtr[1])
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
 
 void BattleAICmd_if_less_than_32(void)
 {
-	u8 *temp = AIScriptRead32(gAIScriptPtr + 1);
+	u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk8 < *temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 	else
 		gAIScriptPtr += 9;
 }
 
 void BattleAICmd_if_more_than_32(void)
 {
-	u8 *temp = AIScriptRead32(gAIScriptPtr + 1);
+	u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk8 > *temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 	else
 		gAIScriptPtr += 9;
 }
 
 void BattleAICmd_if_equal_32(void)
 {
-	u8 *temp = AIScriptRead32(gAIScriptPtr + 1);
+	u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk8 == *temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 	else
 		gAIScriptPtr += 9;
 }
 
 void BattleAICmd_if_not_equal_32(void)
 {
-	u8 *temp = AIScriptRead32(gAIScriptPtr + 1);
+	u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk8 != *temp)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 	else
 		gAIScriptPtr += 9;
 }
@@ -657,7 +658,7 @@ void BattleAICmd_if_move(void)
 	u16 move = AIScriptRead16(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk2 == move)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
@@ -667,20 +668,20 @@ void BattleAICmd_if_not_move(void)
 	u16 move = AIScriptRead16(gAIScriptPtr + 1);
 
 	if (unk_2016800.unk2 != move)
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 3);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
 	else
 		gAIScriptPtr += 7;
 }
 
 void BattleAICmd_if_in_bytes(void)
 {
-    u8 *ptr = AIScriptRead32(gAIScriptPtr + 1);
+    u8 *ptr = AIScriptReadPtr(gAIScriptPtr + 1);
    
    while(*ptr != 0xFF)
    {
        if(unk_2016800.unk8 == *ptr)
        {
-           gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+           gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
            return;
        }
        ptr++;
@@ -690,7 +691,7 @@ void BattleAICmd_if_in_bytes(void)
 
 void BattleAICmd_if_not_in_bytes(void)
 {
-    u8 *ptr = AIScriptRead32(gAIScriptPtr + 1);
+    u8 *ptr = AIScriptReadPtr(gAIScriptPtr + 1);
    
    while(*ptr != 0xFF)
    {
@@ -701,18 +702,18 @@ void BattleAICmd_if_not_in_bytes(void)
        }
        ptr++;
    }
-   gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+   gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 }
 
 void BattleAICmd_if_in_words(void)
 {
-    u16 *ptr = AIScriptRead32(gAIScriptPtr + 1);
+    u16 *ptr = (u16 *)AIScriptReadPtr(gAIScriptPtr + 1);
    
    while(*ptr != 0xFFFF)
    {
        if(unk_2016800.unk8 == *ptr)
        {
-           gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+           gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
            return;
        }
        ptr++;
@@ -722,7 +723,7 @@ void BattleAICmd_if_in_words(void)
 
 void BattleAICmd_if_not_in_words(void)
 {
-    u16 *ptr = AIScriptRead32(gAIScriptPtr + 1);
+    u16 *ptr = (u16 *)AIScriptReadPtr(gAIScriptPtr + 1);
    
    while(*ptr != 0xFFFF)
    {
@@ -733,7 +734,7 @@ void BattleAICmd_if_not_in_words(void)
        }
        ptr++;
    }
-   gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 5);
+   gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 }
 
 void BattleAICmd_if_user_can_damage(void)
@@ -749,7 +750,7 @@ void BattleAICmd_if_user_can_damage(void)
    if(i == 4)
        gAIScriptPtr += 5;
    else
-       gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 1);
+       gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
 }
 
 void BattleAICmd_if_user_cant_damage(void)
@@ -765,7 +766,7 @@ void BattleAICmd_if_user_cant_damage(void)
    if(i != 4)
        gAIScriptPtr += 5;
    else
-       gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 1);
+       gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
 }
 
 void BattleAICmd_unk_21(void)
@@ -1062,7 +1063,7 @@ void BattleAICmd_get_move(void)
 void BattleAICmd_if_type(void)
 {
 	if ( gAIScriptPtr[1] == unk_2016800.unk8 )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -1070,7 +1071,7 @@ void BattleAICmd_if_type(void)
 void BattleAICmd_unk_27(void) // if_not_type
 {
 	if ( gAIScriptPtr[1] != unk_2016800.unk8 )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -1078,7 +1079,7 @@ void BattleAICmd_unk_27(void) // if_not_type
 void BattleAICmd_if_would_go_first(void)
 {
 	if ( b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) == gAIScriptPtr[1] )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
@@ -1086,7 +1087,7 @@ void BattleAICmd_if_would_go_first(void)
 void BattleAICmd_if_would_not_go_first(void)
 {
 	if ( b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) != gAIScriptPtr[1] )
-		gAIScriptPtr = AIScriptRead32(gAIScriptPtr + 2);
+		gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
 	else
 		gAIScriptPtr += 6;
 }
diff --git a/src/field_message_box.c b/src/field_message_box.c
index f42541c49..a7d1a2fd8 100644
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -22,7 +22,7 @@ void InitFieldMessageBox(void)
 {
     sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
     SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset);
-    InitWindowFromConfig(&gFieldMessageBoxWindow, (struct WindowConfig *)&gWindowConfig_81E6CE4);
+    InitWindowFromConfig(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4);
 }
 
 static void Task_FieldMessageBox(u8 taskId)
diff --git a/src/main.c b/src/main.c
index a14663d32..ad131547b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,7 +65,7 @@ bool8 gLinkVSyncDisabled;
 u32 IntrMain_Buffer[0x200];
 u8 gPcmDmaCounter;
 
-EWRAM_DATA void (*gFlashTimerIntrFunc)(void) = NULL;
+EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL;
 
 static void UpdateLinkAndCallCallbacks(void);
 static void InitMainCallbacks(void);
diff --git a/src/menu.c b/src/menu.c
index 62237794b..ae0dca058 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -20,8 +20,8 @@ struct Menu
     u8 columnXCoords[8];
 };
 
-static void MultistepInitMenuWindowInternal(struct WindowConfig *, u16);
-static void InitMenuWindowInternal(struct WindowConfig *, u16);
+static void MultistepInitMenuWindowInternal(const struct WindowConfig *, u16);
+static void InitMenuWindowInternal(const struct WindowConfig *, u16);
 static bool8 sub_80723D4(void);
 static u8 sub_8072484(u8, u8, u8, u8, u8, u8, u32);
 static u8 sub_80724F4(u8, u8, u8, u8 * const [][2], u8);
@@ -46,12 +46,12 @@ void InitMenuWindow(const struct WindowConfig *winConfig)
     InitMenuWindowInternal(winConfig, 1);
 }
 
-void MultistepInitMenuWindowBegin(struct WindowConfig *winConfig)
+void MultistepInitMenuWindowBegin(const struct WindowConfig *winConfig)
 {
     MultistepInitMenuWindowInternal(winConfig, 1);
 }
 
-static void MultistepInitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset)
+static void MultistepInitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset)
 {
     gMenuMultistepInitState = 0;
     gMenuTextTileOffset = tileOffset;
@@ -88,7 +88,7 @@ bool32 MultistepInitMenuWindowContinue(void)
     }
 }
 
-static void InitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset)
+static void InitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset)
 {
     gMenuWindowPtr = &gMenuWindow;
     InitWindowFromConfig(&gMenuWindow, winConfig);
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index fd253d0a6..fbb796ca4 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -105,7 +105,7 @@ s8 MoriDebugMenu_BreedEgg(void)
 
 s8 MoriDebugMenu_LongName(void)
 {
-    SetMonData(gPlayerParty, 2, &gUnknown_0839B257);
+    SetMonData(gPlayerParty, MON_DATA_NICKNAME, gUnknown_0839B257);
     sub_8071C20();
     return 1;
 }
diff --git a/src/rom4.c b/src/rom4.c
index ce6bc2e0b..a3b0b221d 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1410,7 +1410,7 @@ bool32 sub_805493C(u8 *a1, u32 a2)
         sub_8054814();
         sub_8054C54();
         SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow((u8 *)&gWindowConfig_81E6CE4);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
         (*a1)++;
         break;
     case 5:
diff --git a/src/save.c b/src/save.c
index 80e913794..a26e0da98 100644
--- a/src/save.c
+++ b/src/save.c
@@ -522,7 +522,7 @@ u8 sub_8125B88(u8 a1, u8 *data, u16 size)
 
 u8 sub_8125BF8(u8 sector, struct SaveSection *section)
 {
-    ReadFlash(sector, 0, section, 0x1000);
+    ReadFlash(sector, 0, section->data, 0x1000);
     return 1;
 }
 
@@ -691,7 +691,7 @@ bool8 unref_sub_8125F4C(struct UnkSaveSection *a1)
     for (i = 0; i < 0x1000; i++)
         raw[i] = 0;
 
-    ReadFlash(gUnknown_08401E24[0], 0, a1, 4096);
+    ReadFlash(gUnknown_08401E24[0], 0, a1->data, 4096);
 
     if (a1->unknown != 0x8012025)
         return FALSE;
diff --git a/src/text.c b/src/text.c
index 885fb7547..d64d5db15 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1922,10 +1922,10 @@ static void EmptyFunc(void)
 {
 }
 
-void InitWindowFromConfig(struct Window *win, struct WindowConfig *winConfig)
+void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConfig)
 {
     *win = sDefaultWindow;
-    win->config = winConfig;
+    win->config = (struct WindowConfig *)winConfig;
     win->textMode = winConfig->textMode;
     win->spacing = winConfig->spacing;
     win->fontNum = winConfig->fontNum;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index ed0b5caf4..969bc94c1 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -65,14 +65,14 @@ bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
     if ( trainerObj->trainerType == 1 ) // trainers that don't spin
     {
         playerCoord = gIsTrainerInRange[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer(trainerObj, playerCoord, trainerObj->mapobj_unk_18);
+        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, trainerObj->mapobj_unk_18);
     }
     else // spinners
     {
         for(i = 0; i < 4; i++)
         {
             playerCoord = gIsTrainerInRange[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-            if ( CheckPathBetweenTrainerAndPlayer(trainerObj, playerCoord, i + 1) ) // directions are 1-4 instead of 0-3. south north west east
+            if ( CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, i + 1) ) // directions are 1-4 instead of 0-3. south north west east
                 return playerCoord;
         }
         return FALSE;
@@ -135,7 +135,7 @@ bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerC
 
     for(i = 0; i <= playerCoord - 1;)
     {
-        var = sub_8060024(trainerObj, x, y, direction);
+        var = sub_8060024((struct MapObject *)trainerObj, x, y, direction);
 
         if (var != 0 && (var & 1) != 0 )
             return FALSE;
@@ -150,7 +150,7 @@ bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerC
     trainerObj->mapobj_unk_19 = 0;
     trainerObj->mapobj_unk_19b = 0;
 
-    var = npc_block_way(trainerObj, x, y, direction);
+    var = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
 
     trainerObj->mapobj_unk_19 = unk19_temp;
     trainerObj->mapobj_unk_19b = unk19b_temp;
@@ -182,7 +182,7 @@ void sub_80842FC(TaskFunc func)
 void RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *trainerObj = (task->data[1] << 16) | (task->data[2]);
+    struct MapObject *trainerObj = (struct MapObject *)((task->data[1] << 16) | (task->data[2]));
 
     if (!trainerObj->active)
         SwitchTaskToFollowupFunc(taskId);
@@ -199,7 +199,7 @@ s8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     u8 direction;
 
-    FieldObjectGetLocalIdAndMap(trainerObj, &gUnknown_0202FF84[0], &gUnknown_0202FF84[1], &gUnknown_0202FF84[2]);
+    FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
     FieldEffectStart(0);
     
     direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
@@ -351,7 +351,7 @@ void sub_80846E4(u8 taskId)
     struct MapObject *mapObj;
 
     // another mapObj loaded into by loadword?
-    LoadWordFromTwoHalfwords(&task->data[1], &mapObj);
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
     if(!task->data[7])
     {
         FieldObjectClearAnim(mapObj);
diff --git a/src/weather.c b/src/weather.c
index 90831f014..5cd8257e5 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -67,7 +67,7 @@ void sub_807C828(void) {
 		index = AllocSpritePalette(0x1200);
 		CpuSet(&gUnknown_083970E8,
 			&gPlttBufferUnfaded[0x100 + index * 16],
-			&REG_BG0CNT);
+			CPU_SET_32BIT | 8);
 		sub_807CB10();
 		gWeather.unknown_6D5 = index;
 		gWeather.unknown_6D4 = AllocSpritePalette(0x1201);