Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly

11 files changed, 15 insertions, 14 deletions

diff --git a/include/blend_palette.h b/include/blend_palette.h
deleted file mode 100644
index a00847bc3..000000000
--- a/include/blend_palette.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_BLEND_PALETTE_H
-#define GUARD_BLEND_PALETTE_H
-
-void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
-
-#endif // GUARD_BLEND_PALETTE_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index d43dd78ea..80b9f3fc0 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -80,6 +80,7 @@ struct LockedAnimEventObjects
 };
 
 extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
+extern const u8 gReflectionEffectPaletteMap[];
 
 void sub_808D438(void);
 u8 GetMoveDirectionAnimNum(u8);
@@ -189,6 +190,10 @@ u8 GetMoveDirectionFasterAnimNum(u8);
 u8 GetMoveDirectionFastestAnimNum(u8);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8 objectId);
+u16 GetObjectPaletteTag(u8 palSlot);
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+s16 sub_809773C(s16 a1);
+s16 sub_8097728(s16 a1);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
@@ -249,6 +254,7 @@ u8 GetSlideMovementAction(u32);
 u8 GetJumpInPlaceMovementAction(u32);
 u8 GetJumpMovementAction(u32);
 u8 GetJump2MovementAction(u32);
+u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
 
 u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
 u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);
diff --git a/include/field_weather.h b/include/field_weather.h
index 7ad8d21e7..a48361b8a 100644
--- a/include/field_weather.h
+++ b/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);
diff --git a/include/global.h b/include/global.h
index 9ae892b5c..3dab84a3a 100644
--- a/include/global.h
+++ b/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[];
diff --git a/include/malloc.h b/include/malloc.h
index 6efa8fbef..c215f56c0 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -13,6 +13,7 @@
 }
 
 extern u8 gHeap[];
+
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);
 void Free(void *pointer);
diff --git a/include/palette.h b/include/palette.h
index d14fa1fcd..c14e9f453 100644
--- a/include/palette.h
+++ b/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);
diff --git a/include/party_menu.h b/include/party_menu.h
index b93b78544..170fcafc1 100644
--- a/include/party_menu.h
+++ b/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));
diff --git a/include/rotating_gate.h b/include/rotating_gate.h
index 2ae26aa5b..fd86a6b04 100644
--- a/include/rotating_gate.h
+++ b/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);
 
diff --git a/include/string_util.h b/include/string_util.h
index f26646082..7b685fcea 100644
--- a/include/string_util.h
+++ b/include/string_util.h
@@ -24,7 +24,7 @@ u8 *ConvertUIntToDecimalStringN(u8 *dest, u32 value, enum StringConvertMode mode
 u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n);
 u8 *StringExpandPlaceholders(u8 *dest, const u8 *src);
 u8 *StringBraille(u8 *dest, const u8 *src);
-u8 *GetExpandedPlaceholder(u32 id);
+const u8 *GetExpandedPlaceholder(u32 id);
 u8 *StringFill(u8 *dest, u8 c, u16 n);
 u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n);
 u8 *StringFillWithTerminator(u8 *dest, u16 n);
diff --git a/include/text.h b/include/text.h
index e2120efa3..f677f2ced 100644
--- a/include/text.h
+++ b/include/text.h
@@ -76,6 +76,7 @@
 #define CHAR_y              0xED
 #define CHAR_z              0xEE
 #define CHAR_SPECIAL_F7     0xF7
+#define CHAR_SPECIAL_F8     0xF8
 #define CHAR_SPECIAL_F9     0xF9
 #define CHAR_COLON          0xF0
 #define CHAR_PROMPT_SCROLL  0xFA // waits for button press and scrolls dialog
diff --git a/include/util.h b/include/util.h
index 63887b13f..997c8f713 100644
--- a/include/util.h
+++ b/include/util.h
@@ -13,5 +13,6 @@ int CountTrailingZeroBits(u32 value);
 u16 CalcCRC16(u8 *data, s32 length);
 u16 CalcCRC16WithTable(u8 *data, u32 length);
 u32 CalcByteArraySum(const u8* data, u32 length);
+void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
 
 #endif // GUARD_UTIL_H