Use MainCallback wherever posible (#2184)

include/battle.h

@@ -12,6 +12,7 @@
 #include "battle_util2.h"
 #include "battle_bg.h"
 #include "pokeball.h"
+#include "main.h"
 
 #define GET_BATTLER_SIDE(battler)         (GetBattlerPosition(battler) & BIT_SIDE)
 #define GET_BATTLER_SIDE2(battler)        (gBattlerPositions[battler] & BIT_SIDE)
@@ -716,7 +717,7 @@ extern u16 gBattleMovePower;
 extern u16 gMoveToLearn;
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 
-extern void (*gPreBattleCallback1)(void);
+extern MainCallback gPreBattleCallback1;
 extern void (*gBattleMainFunc)(void);
 extern struct BattleResults gBattleResults;
 extern u8 gLeveledUpInBattle;

include/battle_pyramid_bag.h

@@ -2,6 +2,7 @@
 #define GUARD_BATTLE_PYRAMID_BAG_H
 
 #include "list_menu.h"
+#include "main.h"
 
 enum {
     PYRAMIDBAG_LOC_FIELD,
@@ -29,7 +30,7 @@ enum {
 
 struct PyramidBagMenu
 {
-    void (*newScreenCallback)(void);
+    MainCallback newScreenCallback;
     u8 tilemapBuffer[BG_SCREEN_SIZE];
     u8 spriteIds[PBAG_SPRITE_COUNT];
     u8 windowIds[5];
@@ -49,7 +50,7 @@ struct PyramidBagMenu
 
 struct PyramidBagMenuState
 {
-    void (*exitCallback)(void);
+    MainCallback exitCallback;
     u8 location;
     u16 cursorPosition;
     u16 scrollPosition;
@@ -63,7 +64,7 @@ void CB2_PyramidBagMenuFromStartMenu(void);
 void CB2_ReturnToPyramidBagMenu(void);
 void UpdatePyramidBagList(void);
 void UpdatePyramidBagCursorPos(void);
-void GoToBattlePyramidBagMenu(u8 location, void (*exitCallback)(void));
+void GoToBattlePyramidBagMenu(u8 location, MainCallback exitCallback);
 void Task_CloseBattlePyramidBagMessage(u8 taskId);
 void TryStoreHeldItemsInPyramidBag(void);
 void ChooseItemsToTossFromPyramidBag(void);

include/dodrio_berry_picking.h

@@ -1,7 +1,9 @@
 #ifndef GUARD_DODRIO_BERRY_PICKING_H
 #define GUARD_DODRIO_BERRY_PICKING_H
 
-void StartDodrioBerryPicking(u16 partyId, void (*exitCallback)(void));
+#include "main.h"
+
+void StartDodrioBerryPicking(u16 partyId, MainCallback exitCallback);
 void IsDodrioInParty(void);
 void ShowDodrioBerryPickingRecords(void);
 

include/item_menu.h

@@ -2,6 +2,7 @@
 #define GUARD_ITEM_MENU_H
 
 #include "item.h"
+#include "main.h"
 #include "menu_helpers.h"
 
 enum {
@@ -47,7 +48,7 @@ enum {
 
 struct BagPosition
 {
-    void (*exitCallback)(void);
+    MainCallback exitCallback;
     u8 location;
     u8 pocket;
     u16 pocketSwitchArrowPos;
@@ -59,7 +60,7 @@ extern struct BagPosition gBagPosition;
 
 struct BagMenu
 {
-    void (*newScreenCallback)(void);
+    MainCallback newScreenCallback;
     u8 tilemapBuffer[BG_SCREEN_SIZE];
     u8 spriteIds[ITEMMENUSPRITE_COUNT];
     u8 windowIds[ITEMWIN_COUNT];
@@ -96,10 +97,10 @@ void CB2_BagMenuFromStartMenu(void);
 u8 GetItemListPosition(u8 pocketId);
 bool8 UseRegisteredKeyItemOnField(void);
 void CB2_GoToSellMenu(void);
-void GoToBagMenu(u8 location, u8 pocket, void ( *exitCallback)());
+void GoToBagMenu(u8 location, u8 pocket, MainCallback exitCallback);
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
-void ChooseBerryForMachine(void (*exitCallback)(void));
+void ChooseBerryForMachine(MainCallback exitCallback);
 void CB2_ChooseBerry(void);
 void Task_FadeAndCloseBagMenu(u8 taskId);
 void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable);

include/mail.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_MAIL_H
 #define GUARD_MAIL_H
 
+#include "main.h"
+
 #define IS_ITEM_MAIL(itemId) ((itemId == ITEM_ORANGE_MAIL           \
                               || itemId == ITEM_HARBOR_MAIL         \
                               || itemId == ITEM_GLITTER_MAIL        \
@@ -15,7 +17,7 @@
                               || itemId == ITEM_RETRO_MAIL))
 
 // mail.h
-void ReadMail(struct Mail *mail, void (*exitCallback)(void), bool8 hasText);
+void ReadMail(struct Mail *mail, MainCallback exitCallback, bool8 hasText);
 
 // mail_data.h
 void ClearAllMail(void);

include/rayquaza_scene.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_RAYQUAZA_SCENE_H
 #define GUARD_RAYQUAZA_SCENE_H
 
-void DoRayquazaScene(u8 animId, bool8 endEarly, void (*exitCallback)(void));
+#include "main.h"
+
+void DoRayquazaScene(u8 animId, bool8 endEarly, MainCallback exitCallback);
 
 #endif // GUARD_RAYQUAZA_SCENE_H

include/save.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_SAVE_H
 #define GUARD_SAVE_H
 
+#include "main.h"
+
 // Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer.
 // Only 12 bytes of the footer are used.
 #define SECTOR_DATA_SIZE 3968
@@ -87,7 +89,7 @@ extern u32 gSaveCounter;
 extern struct SaveSector *gFastSaveSector;
 extern u16 gIncrementalSectorId;
 extern u16 gSaveFileStatus;
-extern void (*gGameContinueCallback)(void);
+extern MainCallback gGameContinueCallback;
 extern struct SaveSectorLocation gRamSaveSectorLocations[];
 
 extern struct SaveSector gSaveDataBuffer;