Merge pull request #142 from adrienntindall/master

Add Compiler Warnings
pret · May 29, 2023 · 1f63e3d · 1f63e3d
2 parents 34ab060 + 3695578
commit 1f63e3d
Show file tree

Hide file tree

Showing 129 changed files with 847 additions and 201 deletions.
diff --git a/common.mk b/common.mk
@@ -108,7 +108,8 @@ XMAP              := $(NEF).xMAP
 
 EXCCFLAGS         := -Cpp_exceptions off
 
-MWCFLAGS           = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed #-W all -W noimpl_signedunsigned
+MWCFLAGS           = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed -W all -W nopedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error
+
 MWASFLAGS          = $(DEFINES) -proc $(PROC_S) -gccinc -i . -i ./include -i $(WORK_DIR)/asm/include -i $(WORK_DIR)/files -i $(WORK_DIR)/lib/asm/include -i $(WORK_DIR)/lib/NitroDWC/asm/include -i $(WORK_DIR)/lib/NitroSDK/asm/include -i $(WORK_DIR)/lib/syscall/asm/include -I$(WORK_DIR)/lib/include -DSDK_ASM
 MWLDFLAGS         := -w off -proc $(PROC) -nopic -nopid -interworking -map closure,unused -symtab sort -m _start -msgstyle gcc
 ARFLAGS           := rcS

diff --git a/include/battle_arcade_game_board.h b/include/battle_arcade_game_board.h
@@ -152,5 +152,8 @@ typedef struct BATTLE_ARCADE_OBJECT {
 BOOL BattleArcadeGameBoard_InitOverlay(OVY_MANAGER *man, int *state);
 BOOL BattleArcadeGameBoard_Main(OVY_MANAGER *man, int *state);
 BOOL ov84_0223DFF0(OVY_MANAGER *man, int *state);
+void ov84_0223ED34(int a0, int size, void *data, void *_work);
+void ov84_0223EDA8(int a0, int size, void *data, void *_work);
+void ov84_0223EE08(int a0, int size, void *data, void *_work);
 
 #endif
diff --git a/include/battle_command.h b/include/battle_command.h
diff --git a/include/battle_setup.h b/include/battle_setup.h
@@ -6,7 +6,7 @@
 #include "player_data.h"
 #include "trainer_data.h"
 
-typedef struct BattleSetupStruct {
+struct BATTLE_SETUP { //declared in trainer_data.h
     u32 flags;
     PARTY *party[4];
     u32 winFlag;
@@ -61,12 +61,18 @@ typedef struct BattleSetupStruct {
     u8 unk1CD;
     u8 unk1CE;
     u8 unk1CF;
-} BATTLE_SETUP;
+};
 
 BOOL IsBattleResultWin(u32 a0);
 int sub_02052564(u32 a0);
 int sub_02052574(u32 a0);
 void BattleSetup_Delete(BATTLE_SETUP *setup);
 BATTLE_SETUP *sub_02051AAC(HeapID heapId, FieldSystem *fsys);
+void sub_02052444(BATTLE_SETUP *setup, FieldSystem *fsys);
+void BattleSetup_InitFromFsys(BATTLE_SETUP *setup, FieldSystem *fsys);
+BATTLE_SETUP *BattleSetup_New(HeapID heapId, u32 battleFlags);
+void sub_020522F0(BATTLE_SETUP *setup, FieldSystem *fsys, void *a1);
+void sub_02051F2C(BATTLE_SETUP *setup, FieldSystem *fsys, int level);
+void sub_020520B0(BATTLE_SETUP *setup, FieldSystem *fsys, PARTY *party, void *a4);
 
 #endif //POKEHEARTGOLD_BATTLE_SETUP_H
diff --git a/include/battle_system.h b/include/battle_system.h
@@ -23,5 +23,7 @@ SOUND_CHATOT *BattleSys_GetChatotVoice(BattleSystem *bsys, int battlerId);
 int BattleSys_GetChatotVoiceParam(BattleSystem *bsys, int battlerId);
 int BattleSys_GetBattlerIdPartner(BattleSystem *bsys, int battlerId);
 int BattleSys_GetTrainerIndex(BattleSystem *bsys, int battlerId);
+BOOL Link_QueueNotEmpty(BATTLECONTEXT *ctx);
+BOOL BattleSys_AreBattleAnimationsOn(BattleSystem *bsys);
 
 #endif
diff --git a/include/bug_contest.h b/include/bug_contest.h
@@ -16,6 +16,7 @@ void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest);
 BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n);
 void BugContest_InitOpponents(BUGCONTEST *bugContest);
 void BugContest_InitEncounters(BUGCONTEST *bugContest);
-u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon);
+u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon);
+ENC_SLOT *BugContest_GetEncounterSlot(BUGCONTEST *bugContest, HeapID heapId);
 
 #endif //POKEHEARTGOLD_BUG_CONTEST_H
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -403,12 +403,12 @@ typedef enum BaseStat {
     BASE_DEF,
     BASE_SPEED,
     BASE_SPATK,
-    BASE_SPDEF,
+    BASE_SPDEF, //5
     BASE_TYPE1,
     BASE_TYPE2,
     BASE_CATCH_RATE,
     BASE_EXP_YIELD,
-    BASE_HP_YIELD,
+    BASE_HP_YIELD, //10
     BASE_ATK_YIELD,
     BASE_DEF_YIELD,
     BASE_SPEED_YIELD,

diff --git a/include/easy_chat.h b/include/easy_chat.h
@@ -43,5 +43,7 @@ ECWORD WallpaperPasswordBank_GetWordI(struct WallpaperPasswordBank *pwdBank, int
 s16 WallpaperPasswordBank_GetIndexOfWord(struct WallpaperPasswordBank *unk, int value);
 s32 GetDuplicateWordNum(ECWORD a0);
 ECWORD RemapDuplicateWord(ECWORD a0, s32 a1);
+ECMAN *EasyChatManager_new(HeapID heapId);
+struct WallpaperPasswordBank *WallpaperPasswordBank_Create(HeapID heapId);
 
 #endif //POKEHEARTGOLD_EASY_CHAT_H
diff --git a/include/encounter.h b/include/encounter.h
@@ -30,7 +30,10 @@ void SetupAndStartTutorialBattle(TaskManager *taskManager);
 void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag);
 void sub_02050B90(FieldSystem *fsys, TaskManager *taskManager, BATTLE_SETUP *setup);
 void sub_0205239C(BATTLE_SETUP *setup, FieldSystem *fsys);
-BATTLE_SETUP *BattleSetup_New(HeapID heapId, int battleType);
 void sub_02050AAC(TaskManager *man, BATTLE_SETUP *setup, int effect, int bgm, u32 *winFlag);
+void sub_020511F8(FieldSystem *fsys, BATTLE_SETUP *setup);
+void sub_020515FC(FieldSystem *fsys, PARTY *party, int battleFlags);
+void sub_02051598(FieldSystem *fsys, void *a1, int battleFlags);
+void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag);
 
 #endif //POKEHEARTGOLD_ENCOUNTER_H