Merge pull request #431 from PikalaxALT/sync_bery_crush

Sync berry crush from Emerald

12 files changed, 62 insertions, 29 deletions

diff --git a/include/berry.h b/include/berry.h
index abbd20fc7..d1efa0abf 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -68,10 +68,10 @@ const struct Berry * GetBerryInfo(u8 berryIdx);
 extern const struct Berry gBerries[];
 
 struct BerryCrushStats {
-    u8 unk0;
+    u8 difficulty;
     u16 powder;
 };
 
-extern const struct BerryCrushStats gBerryCrushStats[];
+extern const struct BerryCrushStats gBerryCrush_BerryData[];
 
 #endif // GUARD_BERRY_H
diff --git a/include/berry_crush.h b/include/berry_crush.h
index a08f1f699..c87029003 100644
--- a/include/berry_crush.h
+++ b/include/berry_crush.h
@@ -4,5 +4,6 @@
 #include "main.h"
 
 void StartBerryCrush(MainCallback callback);
+void ShowBerryCrushRankings(void);
 
 #endif // GUARD_BERRY_CRUSH_H
diff --git a/include/digit_obj_util.h b/include/digit_obj_util.h
index 1db775d26..5674f201f 100644
--- a/include/digit_obj_util.h
+++ b/include/digit_obj_util.h
@@ -24,7 +24,7 @@ extern const u32 gUnknown_8479688[];
 extern const u32 gUnknown_8479748[];
 
 bool32 DigitObjUtil_Init(u32 count);
-void DigitObjUtil_Teardown(void);
+void DigitObjUtil_Free(void);
 bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template);
 void DigitObjUtil_PrintNumOn(u32 id, s32 num);
 void DigitObjUtil_DeletePrinter(u32 id);
diff --git a/include/global.h b/include/global.h
index 04adc82cb..1d12fdae9 100644
--- a/include/global.h
+++ b/include/global.h
@@ -45,9 +45,27 @@
 // Converts a number to Q8.8 fixed-point format
 #define Q_8_8(n) ((s16)((n) * 256))
 
+// Converts a number from Q8.8 fixed-point format
+#define Q_8_8_TO_INT(n) ((s16)((n) >> 8))
+
 // Converts a number to Q4.12 fixed-point format
 #define Q_4_12(n)  ((s16)((n) * 4096))
 
+// Converts a number from Q4.12 fixed-point format
+#define Q_4_12_TO_INT(n) ((s16)((n) >> 12))
+
+// Converts a number to QN.S fixed-point format (16-bits)
+#define Q_N_S(s, n) ((s16)((n) * (1 << (s))))
+
+// converts a number from QN.S fixed-point format (16-bits)
+#define Q_N_S_TO_INT(s, n) ((s16)((n) >> (s)))
+
+// Converts a number to Q24.8 fixed-point format
+#define Q_24_8(n) ((s32)((n) << 8))
+
+// Converts a number from Q24.8 fixed-point format
+#define Q_24_8_TO_INT(n) ((s32)((n) >> 8))
+
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) >= (b) ? (a) : (b))
 
diff --git a/include/graphics.h b/include/graphics.h
index 6b2c87bad..a92b798ae 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4888,9 +4888,9 @@ extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[];
 extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[];
 
 // berry_crush
-extern const u16 gUnknown_8EAFEA0[];
-extern const u32 gUnknown_8EAFFC0[];
-extern const u32 gUnknown_8EB0ADC[];
+extern const u16 gBerryCrush_Crusher_Pal[];
+extern const u32 gBerryCrush_Crusher_Gfx[];
+extern const u32 gBerryCrush_Crusher_Tilemap[];
 
 // easy_chat_3
 extern const u32 gEasyChatWindow_Gfx[];
diff --git a/include/item.h b/include/item.h
index 2c5852617..92a057f7e 100644
--- a/include/item.h
+++ b/include/item.h
@@ -79,6 +79,6 @@ void RemovePCItem(u16 itemId, u16 quantity);
 void SortAndCompactBagPocket(struct BagPocket * pocket);
 u8 CountItemsInPC(void);
 void ApplyNewEncryptionKeyToBagItems_(u32 newKey);
-bool8 CheckHasAtLeastOneBerry(void);
+bool8 HasAtLeastOneBerry(void);
 
 #endif // GUARD_ITEM_H
diff --git a/include/link.h b/include/link.h
index 5ca2297cd..766bba919 100644
--- a/include/link.h
+++ b/include/link.h
@@ -274,7 +274,7 @@ void LoadWirelessStatusIndicatorSpriteGfx(void);
 void CreateWirelessStatusIndicatorSprite(u8, u8);
 void sub_8009FE8(void);
 void ClearLinkCallback_2(void);
-void LinkRfu_SetRfuFuncToSend6600(void);
+void Rfu_SetLinkStandbyCallback(void);
 void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
 bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 550b8225c..7d40776f3 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -5,17 +5,17 @@
 #include "librfu.h"
 #include "AgbRfu_LinkManager.h"
 
-#define RFU_COMMAND_0x8800 0x8800
-#define RFU_COMMAND_0x8900 0x8900
-#define RFU_COMMAND_0xa100 0xa100
-#define RFU_COMMAND_0x7700 0x7700
-#define RFU_COMMAND_0x7800 0x7800
-#define RFU_COMMAND_0x6600 0x6600
-#define RFU_COMMAND_0x5f00 0x5f00
-#define RFU_COMMAND_0x2f00 0x2f00
-#define RFU_COMMAND_0xbe00 0xbe00
-#define RFU_COMMAND_0xee00 0xee00
-#define RFU_COMMAND_0xed00 0xed00
+#define RFUCMD_SEND_PACKET        0x2F00
+#define RFUCMD_READY_CLOSE_LINK   0x5f00
+#define RFUCMD_READY_EXIT_STANDBY 0x6600
+#define RFUCMD_0x7700             0x7700
+#define RFUCMD_0x7800             0x7800
+#define RFUCMD_0x8800             0x8800
+#define RFUCMD_0x8900             0x8900
+#define RFUCMD_SEND_BLOCK_REQ     0xa100
+#define RFUCMD_SEND_HELD_KEYS     0xbe00
+#define RFUCMD_0xED00             0xed00
+#define RFUCMD_0xEE00             0xee00
 
 // RfuTgtData.gname is read as these structs.
 struct GFtgtGnameSub
@@ -196,7 +196,7 @@ void DestroyWirelessStatusIndicatorSprite(void);
 void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
 void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
 void MEvent_CreateTask_Leader(u32 arg0);
-void RfuPrepareSend0x2f00(void * data);
+void Rfu_SendPacket(void * data);
 u8 CreateTask_ListenToWireless(void);
 void LinkRfu_DestroyIdleTask(void);
 void sub_80F86F4(void);
@@ -275,7 +275,7 @@ bool32 GetRfuUnkCE8(void);
 void sub_80FA4A8(void);
 void sub_80FB9D0(void);
 void sub_80FB030(u32 a0);
-void sub_80FBA44(void);
+void ClearRecvCommands(void);
 
 #include "mevent_server.h"
 extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/math_util.h b/include/math_util.h
index 9f9677463..1f8edc5d9 100644
--- a/include/math_util.h
+++ b/include/math_util.h
@@ -1,11 +1,21 @@
 #ifndef GUARD_MATH_UTIL_H
 #define GUARD_MATH_UTIL_H
 
-s16 MathUtil_Inv16(s16 y);
-s16 MathUtil_Mul16(s16 x, s16 y);
-s32 MathUtil_Div32(s32 x, s32 y);
-s32 MathUtil_Mul32(s32 x, s32 y);
-s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y);
-s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y);
+// Fixed-point arithmetic library.
+
+// x * y
+s16 Q_8_8_mul(s16 x, s16 y);
+s16 Q_N_S_mul(u8 s, s16 x, s16 y);
+s32 Q_24_8_mul(s32 x, s32 y);
+
+// x / y
+s16 Q_8_8_div(s16 x, s16 y);
+s16 Q_N_S_div(u8 s, s16 x, s16 y);
+s32 Q_24_8_div(s32 x, s32 y);
+
+// 1.0 / y
+s16 Q_8_8_inv(s16 y);
+s16 Q_N_S_inv(u8 s, s16 y);
+s32 Q_24_8_inv(s32 y);
 
 #endif //GUARD_MATH_UTIL_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index eab3c0830..79bff207a 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -20,7 +20,7 @@ void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8
 void ResetBgPositions(void);
 void InitStandardTextBoxWindows(void);
 void FreeAllOverworldWindowBuffers(void);
-void ResetBg0(void);
+void InitTextBoxGfxAndPrinters(void);
 u16 RunTextPrinters_CheckPrinter0Active(void);
 u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress);
diff --git a/include/palette.h b/include/palette.h
index 145d6e6b6..55054b63d 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -16,6 +16,10 @@
 #define PALETTE_FADE_STATUS_DONE 0
 #define PALETTE_FADE_STATUS_LOADING 0xFF
 
+#define PALETTES_BG      0x0000FFFF
+#define PALETTES_OBJECTS 0xFFFF0000
+#define PALETTES_ALL     (PALETTES_BG | PALETTES_OBJECTS)
+
 enum
 {
     FAST_FADE_IN_FROM_WHITE,
diff --git a/include/save.h b/include/save.h
index 3c1962f28..b49442193 100644
--- a/include/save.h
+++ b/include/save.h
@@ -114,6 +114,6 @@ bool8 sub_80DA4A0(void);
 u8 Save_LoadGameData(u8 saveType);
 u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
 u32 TryWriteSpecialSaveSection(u8 sector, u8* src);
-void Task_SaveGame_UpdatedLinkRecords(u8 taskId);
+void Task_LinkSave(u8 taskId);
 
 #endif // GUARD_SAVE_H