Fix C/C++ errors generated by CLion IDE

2018-11-09 12:33:20 -05:00
parent 6317f0180e
commit d6233c5b3b
146 changed files with 326 additions and 16 deletions
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_H
 #define GUARD_BATTLE_H

+#include "global.h"
+
 // should they be included here or included individually by every file?
 #include "constants/battle.h"
 #include "battle_util.h"
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_2_H
 #define GUARD_BATTLE_2_H

+#include "global.h"
+
 void CB2_InitBattle(void);
 void BattleMainCB2(void);
 void CB2_QuitRecordedBattle(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
 #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H

+#include "global.h"
+
 void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
 void BattleAI_SetupAIData(u8 defaultScoreMoves);
 u8 BattleAI_ChooseMoveOrAction(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_AI_SWITCH_ITEMS_H
 #define GUARD_BATTLE_AI_SWITCH_ITEMS_H

+#include "global.h"
+
 enum
 {
    AI_ITEM_FULL_RESTORE = 1,
@@ -1,6 +1,12 @@
 #ifndef GUARD_BATTLE_ANIM_H
 #define GUARD_BATTLE_ANIM_H

+#include "global.h"
+
+#ifndef BATTLE_BANKS_COUNT
+#define BATTLE_BANKS_COUNT 4
+#endif // BATTLE_BANKS_COUNT
+
 enum
 {
    ANIM_BANK_ATTACKER,
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_CONTROLLERS_H
 #define GUARD_BATTLE_CONTROLLERS_H

+#include "global.h"
+
 enum
 {
    REQUEST_ALL_BATTLE,
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_DOME_CARDS_H
 #define GUARD_BATTLE_DOME_CARDS_H

+#include "global.h"
+
 bool16 dp13_810BB8C(void);
 u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
@@ -1,6 +1,7 @@
 #ifndef GUARD_BATTLE_INTERFACE_H
 #define GUARD_BATTLE_INTERFACE_H

+#include "global.h"
 #include "battle_controllers.h"

 enum
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_MESSAGE_H
 #define GUARD_BATTLE_MESSAGE_H

+#include "global.h"
+
 // for 0xFD

 #define B_TXT_BUFF1 0x0
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H
 #define GUARD_BATTLE_SCRIPT_COMMANDS_H

+#include "global.h"
+
 #define NO_ACC_CALC 0xFFFE
 #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
 #define ACC_CURR_MOVE 0
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_SCRIPTS_H
 #define GUARD_BATTLE_SCRIPTS_H

+#include "global.h"
+
 extern const u8 BattleScript_HitFromCritCalc[];
 extern const u8 BattleScript_MoveEnd[];
 extern const u8 BattleScript_MakeMoveMissed[];
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_SETUP_H
 #define GUARD_BATTLE_SETUP_H

+#include "global.h"
+
 void BattleSetup_StartScriptedWildBattle(void);
 u8 BattleSetup_GetTerrainId(void);
 u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_STRING_IDS_H
 #define GUARD_BATTLE_STRING_IDS_H

+#include "global.h"
+
 #define BATTLESTRINGS_COUNT     369

 #define BATTLESTRINGS_ID_ADDER  12 // all battlestrings have its ID + 12, because first 5 are reserved
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_TOWER_H
 #define GUARD_BATTLE_TOWER_H

+#include "global.h"
+
 u16 sub_8164FCC(u8, u8);

 #endif //GUARD_BATTLE_TOWER_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_TRANSITION_H
 #define GUARD_BATTLE_TRANSITION_H

+#include "global.h"
+
 void sub_8149DFC(u8 a1);

 #endif // GUARD_BATTLE_TRANSITION_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_UTIL_H
 #define GUARD_BATTLE_UTIL_H

+#include "global.h"
+
 #define MOVE_LIMITATION_ZEROMOVE                (1 << 0)
 #define MOVE_LIMITATION_PP                      (1 << 1)
 #define MOVE_LIMITATION_DISABLED                (1 << 2)
@@ -1,6 +1,8 @@
 #ifndef GUARD_BATTLE_UTIL2_H
 #define GUARD_BATTLE_UTIL2_H

+#include "global.h"
+
 void AllocateBattleResources(void);
 void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 bank);
@@ -1,6 +1,8 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H

+#include "global.h"
+
 enum
 {
    BERRY_FIRMNESS_UNKNOWN,
@@ -1,6 +1,8 @@
 #ifndef GUARD_BG_H
 #define GUARD_BG_H

+#include "global.h"
+
 struct BGCntrlBitfield // for the I/O registers
 {
    volatile u16 priority:2;
@@ -1,6 +1,8 @@
 #ifndef GUARD_BLEND_PALETTE_H
 #define GUARD_BLEND_PALETTE_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_CALCULATE_BASE_DAMAGE_H
 #define GUARD_CALCULATE_BASE_DAMAGE_H

+#include "global.h"
+
 s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 bankAtk, u8 bankDef);

 #endif // GUARD_CALCULATE_BASE_DAMAGE_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_COINS_H
 #define GUARD_COINS_H

+#include "global.h"
+
 void PrintCoinsString(u32 coinAmount);
 void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y);
 void HideCoinsWindow(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONFIG_H
 #define GUARD_CONFIG_H

+#include "global.h"
+
 // In the Generation 3 games, Asserts were used in various debug builds.
 // Ruby/Sapphire and Emerald do not have these asserts while Fire Red
 // still has them in the ROM. This is because the developers forgot
@@ -1,6 +1,8 @@
 #ifndef GUARD_DATA2_H
 #define GUARD_DATA2_H

+#include "global.h"
+
 struct MonCoords
 {
    // This would use a bitfield, but some function
@@ -1,6 +1,8 @@
 #ifndef GUARD_DAYCARE_H
 #define GUARD_DAYCARE_H

+#include "global.h"
+
 #define EGG_HATCH_LEVEL 5

 u8 *GetMonNick(struct Pokemon *mon, u8 *dest);
@@ -1,6 +1,8 @@
 #ifndef GUARD_DECOMPRESS_H
 #define GUARD_DECOMPRESS_H

+#include "global.h"
+
 #include "sprite.h"

 extern u8 gDecompressionBuffer[0x4000];
@@ -1,6 +1,8 @@
 #ifndef GUARD_DIPLOMA_H
 #define GUARD_DIPLOMA_H

+#include "global.h"
+
 void CB2_ShowDiploma(void);

 #endif // GUARD_DIPLOMA_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_DMA3_H
 #define GUARD_DMA3_H

+#include "global.h"
+
 void ClearDma3Requests(void);
 void ProcessDma3Requests(void);
 int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);
@@ -1,6 +1,8 @@
 #ifndef GUARD_EASYCHAT_H
 #define GUARD_EASYCHAT_H

+#include "global.h"
+
 // Taken from Pokeruby, check if it's correct
 enum
 {
@@ -1,6 +1,8 @@
 #ifndef GUARD_EGG_HATCH_H
 #define GUARD_EGG_HATCH_H

+#include "global.h"
+
 void ScriptHatchMon(void);
 bool8 sub_8071614(void);
 void EggHatch(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_EVENT_DATA_H
 #define GUARD_EVENT_DATA_H

+#include "global.h"
+
 #include "constants/flags.h"
 #include "constants/vars.h"

@@ -5,6 +5,8 @@
 #ifndef GUARD_EVENT_SCRIPTS_H
 #define GUARD_EVENT_SCRIPTS_H

+#include "global.h"
+
 extern const u8 gUnknown_0823B4E8[];
 extern const u8 gUnknown_0823B5E9[];
 extern const u8 EventScript_275BB7[];
@@ -1,6 +1,8 @@
 #ifndef GUARD_EVOLUTION_GRAPHICS_H
 #define GUARD_EVOLUTION_GRAPHICS_H

+#include "global.h"
+
 void LoadEvoSparkleSpriteAndPal(void);

 u8 LaunchTask_PreEvoSparklesSet1(u16 arg0);
@@ -1,6 +1,8 @@
 #ifndef GUARD_EVOLUTION_SCENE_H
 #define GUARD_EVOLUTION_SCENE_H

+#include "global.h"
+
 void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
 void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
 void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_CAMERA_H
 #define GUARD_FIELD_CAMERA_H

+#include "global.h"
+
 // Exported type declarations

 struct CameraObject
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_CONTROL_AVATAR_H
 #define GUARD_FIELD_CONTROL_AVATAR_H

+#include "global.h"
+
 extern u32 gUnknown_3005078;

 #endif //GUARD_FIELD_CONTROL_AVATAR_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELDDOOR_H
 #define GUARD_FIELDDOOR_H

+#include "global.h"
+
 void FieldSetDoorOpened(u32, u32);
 void FieldSetDoorClosed(u32, u32);
 s8 FieldAnimateDoorClose(u32, u32);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_EFFECTS_H
 #define GUARD_FIELD_EFFECTS_H

+#include "global.h"
+
 enum FieldEffectScriptIdx
 {
    FLDEFF_EXCLAMATION_MARK_ICON_1,
@@ -5,6 +5,8 @@
 #ifndef GUARD_FIELD_EFFECT_HELPERS_H
 #define GUARD_FIELD_EFFECT_HELPERS_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_FADETRANSITION_H
 #define GUARD_FIELD_FADETRANSITION_H

+#include "global.h"
+
 void sub_80AF734(void);
 void sp13E_warp_to_last_warp(void);
 void sub_80AF7D0(void);
@@ -5,6 +5,8 @@
 #ifndef GUARD_FIELD_GROUND_EFFECT_H
 #define GUARD_FIELD_GROUND_EFFECT_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_MAP_OBJ_H
 #define GUARD_FIELD_MAP_OBJ_H

+#include "global.h"
+
 #define NUM_OBJECT_GRAPHICS_INFO 239
 #define SPRITE_VAR 240

@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELDMAPOBJHELP_H
 #define GUARD_FIELDMAPOBJHELP_H

+#include "global.h"
+
 void UnfreezeMapObjects(void);
 void sub_8097B78(u8, u8);

@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_MESSAGE_BOX_H
 #define GUARD_FIELD_MESSAGE_BOX_H

+#include "global.h"
+
 bool8 ShowFieldMessage(const u8 *message);
 bool8 sub_8098238(const u8 *message);
 bool8 ShowFieldAutoScrollMessage(const u8 *message);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_PLAYER_AVATAR_H
 #define GUARD_FIELD_PLAYER_AVATAR_H

+#include "global.h"
+
 void ClearPlayerAvatarInfo(void);
 void SetPlayerAvatarExtraStateTransition(u8, u8);
 u8 GetPlayerAvatarGenderByGraphicsId(u8);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_POISON_H
 #define GUARD_FIELD_POISON_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_SCREEN_H
 #define GUARD_FIELD_SCREEN_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_SCREEN_EFFECT_H
 #define GUARD_FIELD_SCREEN_EFFECT_H

+#include "global.h"
+
 void sub_80AF79C(void);
 void sub_80B009C(u8);
 void sub_80B0244(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_SPECIALS_H
 #define GUARD_FIELD_SPECIALS_H

+#include "global.h"
+
 u8 GetLeadMonIndex(void);

 #endif // GUARD_FIELD_SPECIALS_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_TASKS_H
 #define GUARD_FIELD_TASKS_H

+#include "global.h"
+
 void ActivatePerStepCallback(u8);

 #endif // GUARD_FIELD_TASKS_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_WEATHER_H
 #define GUARD_WEATHER_H

+#include "global.h"
+
 void fade_screen(u8, s8);

 void SetSav1Weather(u32);
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELDMAP_H
 #define GUARD_FIELDMAP_H

+#include "global.h"
+
 extern struct MapCoords {
    int width;
    int height;
@@ -1,6 +1,8 @@
 #ifndef GUARD_FLDEFF_80F9BCC_H
 #define GUARD_FLDEFF_80F9BCC_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_GLOBAL_BERRY_H
 #define GUARD_GLOBAL_BERRY_H

+#include "global.h"
+
 #define BERRY_NAME_COUNT 7
 #define BERRY_ITEM_EFFECT_COUNT 18

@@ -1,6 +1,8 @@
 #ifndef GUARD_GLOBAL_FIELDMAP_H
 #define GUARD_GLOBAL_FIELDMAP_H

+#include "global.h"
+
 #define NUM_FIELD_OBJECTS 16

 enum
@@ -3,6 +3,7 @@

 #include "config.h"
 #include "gba/gba.h"
+#include <string.h>

 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");
@@ -12,10 +13,18 @@
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")

 #if defined (__APPLE__) || defined (__CYGWIN__)
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-int strcmp(const char *s1, const char *s2);
-char* strcpy(char *dst0, const char *src0);
+// Get the IDE to stfu
+
+// We define it this way to fool preproc.
+#define INCBIN(x) {0}
+#define INCBIN_U8  INCBIN
+#define INCBIN_U16 INCBIN
+#define INCBIN_U32 INCBIN
+#define INCBIN_S8  INCBIN
+#define INCBIN_S16 INCBIN
+#define INCBIN_S32 INCBIN
+#define _(x) (x)
+#define __(x) (x)
 #endif // __APPLE__

 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
@@ -518,7 +527,12 @@ union QuestLogScene

 typedef union QuestLogScene QuestLogScene;

+// This name is a complete guess and may change.
+
+// Declare here so that it can be recursively referenced.
 union QuestLogMovement;
+
+// Define here
 union QuestLogMovement
 {
 	u16 ident_raw;
@@ -537,8 +551,11 @@ struct QuestLog
    /*0x0004*/ s16 unk_004;
    /*0x0006*/ s16 unk_006;
    /*0x0008*/ u8 filler_008[0x140];
-    /*0x0148*/ u8 unk_148[0x120];
-    /*0x02c8*/ u8 unk_268[0x200];
+
+    // These arrays hold the game state for
+    // playing back the quest log
+    /*0x0148*/ u8 flags[0x120];
+    /*0x02c8*/ u16 vars[0x100];
    /*0x0468*/ struct QuestLogNPCData npcData[64];
    /*0x0568*/ u16 unk_568[128];
    /*0x0668*/ u16 end[0];
@@ -1,6 +1,8 @@
 #ifndef GUARD_GPU_REGS_H
 #define GUARD_GPU_REGS_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -5,6 +5,8 @@
 #ifndef GUARD_GRAPHICS_H
 #define GUARD_GRAPHICS_H

+#include "global.h"
+
 extern const u8 gInterfaceGfx_PokeBall[];
 extern const u8 gInterfacePal_PokeBall[];
 extern const u8 gInterfaceGfx_GreatBall[];
@@ -1,6 +1,8 @@
 #ifndef GUARD_HALL_OF_FAME_H
 #define GUARD_HALL_OF_FAME_H

+#include "global.h"
+
 void CB2_DoHallOfFameScreen(void);
 void CB2_DoHallOfFameScreenDontSaveData(void);
 void CB2_DoHallOfFamePC(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_HEAL_LOCATION_H
 #define GUARD_HEAL_LOCATION_H

+#include "global.h"
+
 // Exported type declarations

 struct UnkStruct_0859F534 {
@@ -1,6 +1,8 @@
 #ifndef GUARD_HELP_SYSTEM_H
 #define GUARD_HELP_SYSTEM_H

+#include "global.h"
+
 extern bool8 gUnknown_3005ECC;

 #endif //GUARD_HELP_SYSTEM_H
@@ -1,6 +1,8 @@
 #ifndef GUARD_INTERNATIONAL_STRING_UTIL_H
 #define GUARD_INTERNATIONAL_STRING_UTIL_H

+#include "global.h"
+
 #include "menu.h"

 void sub_81DB52C(const u8 *src);
@@ -5,6 +5,8 @@
 #ifndef GUARD_ITEM_ICON_H
 #define GUARD_ITEM_ICON_H

+#include "global.h"
+
 extern EWRAM_DATA void *gUnknown_0203CEBC;
 extern EWRAM_DATA void *gUnknown_0203CEC0;

@@ -1,6 +1,8 @@
 #ifndef GUARD_item_menu_H
 #define GUARD_item_menu_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_ITEM_MENU_ICONS
 #define GUARD_ITEM_MENU_ICONS

+#include "global.h"
+
 u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3);

 #endif // GUARD_ITEM_MENU_ICONS
@@ -1,6 +1,8 @@
 #ifndef GUARD_LINK_H
 #define GUARD_LINK_H

+#include "global.h"
+
 #define MAX_LINK_PLAYERS 4
 #define MAX_RFU_PLAYERS 5
 #define CMD_LENGTH 8
@@ -1,6 +1,8 @@
 #ifndef GUARD_LIST_MENU_H
 #define GUARD_LIST_MENU_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_LOAD_SAVE_H
 #define GUARD_LOAD_SAVE_H

+#include "global.h"
+
 extern bool32 gFlashMemoryPresent;

 void ClearSav2(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_M4A_H
 #define GUARD_M4A_H

+#include "global.h"
+
 #include "gba/m4a_internal.h"

 void m4aSoundVSync(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MAIL_H
 #define GUARD_MAIL_H

+#include "global.h"
+
 #define IS_ITEM_MAIL(itemId)((itemId == ITEM_ORANGE_MAIL            \
                              || itemId == ITEM_HARBOR_MAIL         \
                              || itemId == ITEM_GLITTER_MAIL        \
@@ -1,6 +1,8 @@
 #ifndef GUARD_MAIL_DATA_H
 #define GUARD_MAIL_DATA_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -3,6 +3,8 @@

 #include "global.h"

+#include "global.h"
+
 typedef void (*MainCallback)(void);
 typedef void (*IntrCallback)(void);
 typedef void (*IntrFunc)(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MALLOC_H
 #define GUARD_MALLOC_H

+#include "global.h"
+
 #define HEAP_SIZE 0x1C000
 #define malloc Alloc
 #define calloc(ct, sz) AllocZeroed((ct) * (sz))
@@ -1,6 +1,8 @@
 #ifndef GUARD_MAP_NAME_POPUP_H
 #define GUARD_MAP_NAME_POPUP_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_MAP_OBJ_80688E4_H
 #define GUARD_MAP_OBJ_80688E4_H

+#include "global.h"
+
 void player_bitmagic(void);

 #endif //GUARD_MAP_OBJ_80688E4_H
@@ -5,6 +5,8 @@
 #ifndef GUARD_MAP_OBJ_8097404_H
 #define GUARD_MAP_OBJ_8097404_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_MAP_OBJ_LOCK_H
 #define GUARD_MAP_OBJ_LOCK_H

+#include "global.h"
+
 bool8 sub_80983C4(void);
 void ScriptFreezeMapObjects(void);
 bool8 sub_809847C(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MENEWS_JISAN_H
 #define GUARD_MENEWS_JISAN_H

+#include "global.h"
+
 void sub_8146C30(u32 a0);
 void sub_8146C88(void);
 void sub_8146CA4(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MENU_H
 #define GUARD_MENU_H

+#include "global.h"
+
 #include "text.h"
 #include "window.h"

@@ -1,6 +1,8 @@
 #ifndef GUARD_MENU_HELPERS_H
 #define GUARD_MENU_HELPERS_H

+#include "global.h"
+
 // Exported type declarations

 struct YesNoFuncTable {
@@ -1,6 +1,8 @@
 #ifndef GUARD_MENU_INDICATORS_H
 #define GUARD_MENU_INDICATORS_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_METATILE_BEHAVIOR
 #define GUARD_METATILE_BEHAVIOR

+#include "global.h"
+
 bool8 ShouldDoJumpLandingDustEffect(u8);
 bool8 MetatileBehavior_IsEncounterTile(u8);
 bool8 MetatileBehavior_IsJumpEast(u8);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MEVENT_H
 #define GUARD_MEVENT_H

+#include "global.h"
+
 struct MysteryEventStruct * sub_8143D94(void);
 bool32 sub_8143E1C(void);

@@ -1,6 +1,8 @@
 #ifndef GUARD_MONEY_H
 #define GUARD_MONEY_H

+#include "global.h"
+
 u32 GetMoney(u32* moneyPtr);
 void SetMoney(u32* moneyPtr, u32 newValue);
 bool8 IsEnoughMoney(u32* moneyPtr, u32 cost);
@@ -1,6 +1,8 @@
 #ifndef GUARD_MULTIBOOT_H
 #define GUARD_MULTIBOOT_H

+#include "global.h"
+
 #define MULTIBOOT_MASTER_INFO            0x62
 #define MULTIBOOT_CLIENT_INFO            0x72
 #define MULTIBOOT_MASTER_START_PROBE     0x61
@@ -1,6 +1,8 @@
 #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H
 #define GUARD_MYSTERY_EVENT_SCRIPT_H

+#include "global.h"
+
 u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_NAMING_SCREEN_H
 #define GUARD_NAMING_SCREEN_H

+#include "global.h"
+
 #define NAMING_SCREEN_PLAYER        0
 #define NAMING_SCREEN_BOX           1
 #define NAMING_SCREEN_CAUGHT_MON    2
@@ -1,6 +1,8 @@
 #ifndef GUARD_NEW_GAME_H
 #define GUARD_NEW_GAME_H

+#include "global.h"
+
 void WriteUnalignedWord(u32 var, u8 *dataPtr);
 u32 ReadUnalignedWord(u8* dataPtr);
 void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom);
@@ -1,6 +1,8 @@
 #ifndef GUARD_NEW_MENU_HELPERS_H
 #define GUARD_NEW_MENU_HELPERS_H

+#include "global.h"
+
 #include "text.h"
 #include "task.h"

@@ -1,6 +1,8 @@
 #ifndef GUARD_ROM4_H
 #define GUARD_ROM4_H

+#include "global.h"
+
 #include "main.h"

 struct UnkPlayerStruct
@@ -3,6 +3,8 @@

 #include "global.h"

+#include "global.h"
+
 #define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade
 #define gPaletteFade_blendCnt         (gPaletteFade.multipurpose1) // hardware fade
 #define gPaletteFade_delay            (gPaletteFade.multipurpose2) // normal and hardware fade
@@ -1,6 +1,8 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H

+#include "global.h"
+
 enum {
    AILMENT_NONE,
    AILMENT_PSN,
@@ -1,6 +1,8 @@
 #ifndef GUARD_PLAY_TIME_H
 #define GUARD_PLAY_TIME_H

+#include "global.h"
+
 void PlayTimeCounter_Reset(void);
 void PlayTimeCounter_Start(void);
 void PlayTimeCounter_Stop(void);
@@ -1,6 +1,8 @@
 #ifndef GUARD_PLAYER_PC_H
 #define GUARD_PLAYER_PC_H

+#include "global.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEBALL_H
 #define GUARD_POKEBALL_H

+#include "global.h"
+
 enum
 {
    BALL_POKE,
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEDEX_H
 #define GUARD_POKEDEX_H

+#include "global.h"
+
 void ResetPokedex(void);
 void CopyMonCategoryText(u16 species, u8 *dst);
 u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_H
 #define GUARD_POKEMON_H

+#include "global.h"
+
 #define MON_DATA_PERSONALITY        0
 #define MON_DATA_OT_ID              1
 #define MON_DATA_NICKNAME           2
@@ -570,8 +572,14 @@ void DecryptBoxMon(struct BoxPokemon *boxMon);
 // but they are not used since some code erroneously omits the third arg.
 // u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data);
 // u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data);
+
+#ifdef IS_POKEMON_C
+u32 GetMonData(struct Pokemon *, s32, u8 *);
+u32 GetBoxMonData(struct BoxPokemon *, s32, u8 *);
+#else
 u32 GetMonData();
 u32 GetBoxMonData();
+#endif // IS_POKEMON_C

 void SetMonData(struct Pokemon *mon, s32 field, const void *data);
 void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *data);
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_3_H
 #define GUARD_POKEMON_3_H

+#include "global.h"
+
 const u8* GetTrainerClassNameFromId(u16 trainerId);
 const u8* GetTrainerNameFromId(u16 trainerId);

@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_ICON_H
 #define GUARD_POKEMON_ICON_H

+#include "global.h"
+
 const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
 const u16 *GetValidMonIconPalettePtr(u16 speciesId);
 u16 sub_80D2E84(u16 speciesId);
@@ -55,8 +55,8 @@ struct PokemonItemEffect
    /*field 6
    u8 value;
 };
-*/

 bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 itemId, u8 partyId, u8 monMoveIndex, u8 a5);
+*/

 #endif // GUARD_POKEMON_ITEM_EFFECTS
--- a/Show More
+++ b/Show More