Merge pull request #357 from DizzyEggg/move_heap

Move HEAP_SIZE to malloc and use void instead of empty argument list

include/field_weather.h

@@ -155,7 +155,7 @@ void sub_80AEDBC(void);
 void SetSav1WeatherFromCurrMapHeader(void);
 // ...
 void DoCurrentWeather(void);
-void sub_8080750();
+void sub_8080750(void);
 
 bool8 IsWeatherNotFadingIn(void);
 bool8 IsWeatherChangeComplete(void);

include/global.h

@@ -61,8 +61,6 @@
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) >= (b) ? (a) : (b))
 
-#define HEAP_SIZE 0x1C000
-
 extern u8 gStringVar1[];
 extern u8 gStringVar2[];
 extern u8 gStringVar3[];

include/malloc.h

@@ -13,6 +13,7 @@
 }
 
 extern u8 gHeap[];
+
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);
 void Free(void *pointer);

include/palette.h

@@ -55,7 +55,7 @@ bool8 unref_sub_8073D3C(u32, u8, u8, u8, u16);
 void unref_sub_8073D84(u8, u32 *);
 void ResetPaletteStructByUid(u16);
 void ResetPaletteStruct(u8);
-void ResetPaletteFadeControl();
+void ResetPaletteFadeControl(void);
 void unref_sub_8074168(u16);
 void unref_sub_8074194(u16);
 void InvertPlttBuffer(u32);

include/party_menu.h

@@ -50,8 +50,8 @@ void sub_81B1370(u8 taskId);
 void display_pokemon_menu_message(u8 windowId);
 void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
 void sub_81B1B5C(void *a, u8 b);
-u8 sub_81B1BD4();
-void sub_81B8448();
+u8 sub_81B1BD4(void);
+void sub_81B8448(void);
 void sub_81B8518(u8 unused);
 u8 sub_81B1360(void);
 void sub_81B8904(u8 arg0, void (*callback)(void));

include/rotating_gate.h

@@ -2,7 +2,7 @@
 #define GUARD_ROTATING_GATE_H
 
 void RotatingGatePuzzleCameraUpdate(s16, s16);
-void RotatingGate_InitPuzzleAndGraphics();
+void RotatingGate_InitPuzzleAndGraphics(void);
 u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16);
 bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16);