summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-11 13:20:03 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-11-11 13:20:03 -0800
commit92fda2cc0d5afa76e94927cb72ceac9700f54c1b (patch)
tree24a7840f1c49602a6ad033ea6cc1cb27b7e12be4 /include/pokemon.h
parent955c5a8e90c9afba35114c583628f74f849a0da4 (diff)
parent999c4d59793e761ca71ab7b27272de46d78de138 (diff)
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 572862b8f..7fc8e181f 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -541,11 +541,13 @@ union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality,
// 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);
+// void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg);
+// void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg);
u32 GetMonData();
u32 GetBoxMonData();
+void SetMonData();
+void SetBoxMonData();
-void SetMonData(struct Pokemon *mon, s32 field, const u8 *data);
-void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data);
void CopyMon(void *dest, void *src, size_t size);
u8 GiveMonToPlayer(struct Pokemon *mon);
u8 SendMonToPC(struct Pokemon *mon);