diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-27 17:18:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-27 17:18:23 -0400 |
| commit | a178ce5d9733abfbf13f1d9e8ae5557915e3afa6 (patch) | |
| tree | e99cba1e5e3a893cc2eeb6ebb4cd75439cb4f50b /include | |
| parent | e4ddc167504a65fabbeb77d9db6e4241b92b2a54 (diff) | |
Resolve warnings in scrcmd_18_c and script_pokemon_util
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/script_pokemon_util.h | 6 | ||||
| -rw-r--r-- | include/scrcmd.h | 6 | ||||
| -rw-r--r-- | include/script_pokemon_util.h | 17 |
3 files changed, 26 insertions, 3 deletions
diff --git a/include/constants/script_pokemon_util.h b/include/constants/script_pokemon_util.h index afd70eeb..4c7a01e6 100644 --- a/include/constants/script_pokemon_util.h +++ b/include/constants/script_pokemon_util.h @@ -1,8 +1,8 @@ -#ifndef POKEDIAMOND_SCRIPT_POKEMON_UTIL_H
-#define POKEDIAMOND_SCRIPT_POKEMON_UTIL_H
+#ifndef POKEDIAMOND_CONSTANTS_SCRIPT_POKEMON_UTIL_H
+#define POKEDIAMOND_CONSTANTS_SCRIPT_POKEMON_UTIL_H
#define FLDPSN_NONE 0
#define FLDPSN_PSN 1
#define FLDPSN_HEAL 2
-#endif //POKEDIAMOND_SCRIPT_POKEMON_UTIL_H
+#endif //POKEDIAMOND_CONSTANTS_SCRIPT_POKEMON_UTIL_H
diff --git a/include/scrcmd.h b/include/scrcmd.h new file mode 100644 index 00000000..5ebec947 --- /dev/null +++ b/include/scrcmd.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_SCRCMD_H +#define POKEDIAMOND_SCRCMD_H + +BOOL ScrCmd_givemon(struct ScriptContext* ctx); + +#endif //POKEDIAMOND_SCRCMD_H diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h new file mode 100644 index 00000000..472e5d77 --- /dev/null +++ b/include/script_pokemon_util.h @@ -0,0 +1,17 @@ +#ifndef POKEDIAMOND_SCRIPT_POKEMON_UTIL_H +#define POKEDIAMOND_SCRIPT_POKEMON_UTIL_H + +BOOL MonNotFaintedOrEgg(struct Pokemon * pokemon); +BOOL GiveMon(u32 heap_id, struct SaveBlock2 * sav2, u16 species, u8 level, u16 item, u32 mapSec, u32 encounterType); +BOOL GiveEgg(u32 heapId, struct SaveBlock2 * sav2, u16 species, int level, int metLocIndex, int a3); +void PartyMonSetMoveInSlot(struct PlayerParty * party, int partySlot, int moveSlot, u16 move); +int GetIdxOfFirstPartyMonWithMove(struct PlayerParty * party, int move); +int CountAlivePokemon(struct PlayerParty * party); +struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party); +struct Pokemon * GetFirstNonEggInParty(struct PlayerParty * party); +BOOL HasEnoughAlivePokemonForDoubleBattle(struct PlayerParty * party); +void GiveAllMonsTheSinnohChampRibbon(struct PlayerParty * party); +int ApplyPoisonStep(struct PlayerParty * party, int location); +BOOL SurvivePoisoning(struct Pokemon * mon); + +#endif //POKEDIAMOND_SCRIPT_POKEMON_UTIL_H |