diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 11:26:10 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 11:26:10 -0400 |
commit | e81dfc98e26bece01763110254648d7c20cb198d (patch) | |
tree | 90b72a7eaf35e112bfb52c3941b80e35f04397ec /include | |
parent | 0747fe684c46d010d8917c4257dd1f1a52241385 (diff) |
through SetBoxMonDataInternal
Diffstat (limited to 'include')
-rw-r--r-- | include/pokemon.h | 14 | ||||
-rw-r--r-- | include/proto.h | 1 | ||||
-rw-r--r-- | include/seals.h | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 7cc5ef5d..451c7d1b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -125,9 +125,9 @@ #define MON_DATA_RESERVED_114 114 // Plat #define MON_DATA_UNUSED_115 115 #define MON_DATA_NICKNAME 116 -#define MON_DATA_UNUSED_117 117 -#define MON_DATA_NICKNAME_2 118 // ??? -#define MON_DATA_NICKNAME_3 119 // ??? +#define MON_DATA_NICKNAME_2 117 +#define MON_DATA_NICKNAME_3 118 // ??? +#define MON_DATA_NICKNAME_4 119 // ??? #define MON_DATA_UNK_120 120 #define MON_DATA_GAME_VERSION 121 #define MON_DATA_SINNOH_RIBBON_122 122 @@ -500,10 +500,10 @@ u32 GetBoxMonData(); u32 GetMonData(struct Pokemon * pokemon, int attr, void * ptr); u32 GetBoxMonData(struct BoxPokemon * pokemon, int attr, void * ptr); #endif -void SetMonDataInternal(struct Pokemon * pokemon, int attr, const void * ptr); -void SetMonData(struct Pokemon * pokemon, int attr, const void * ptr); -void SetBoxMonData(struct BoxPokemon * pokemon, int attr, const void * ptr); -void SetBoxMonDataEncrypted(struct BoxPokemon * pokemon, int attr, const void * ptr); +void SetMonDataInternal(struct Pokemon * pokemon, int attr, void * ptr); +void SetMonData(struct Pokemon * pokemon, int attr, void * ptr); +void SetBoxMonDataInternal(struct BoxPokemon * pokemon, int attr, void * ptr); +void SetBoxMonData(struct BoxPokemon * pokemon, int attr, void * ptr); void AddMonData(struct Pokemon * pokemon, int attr, u32 amount); void AddBoxMonData(struct Pokemon * pokemon, int attr, u32 amount); diff --git a/include/proto.h b/include/proto.h index 37655429..c8f50d33 100644 --- a/include/proto.h +++ b/include/proto.h @@ -7,6 +7,7 @@ u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); void FUN_02021A20(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); +void FUN_02021EF0(const u16 * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); u32 GetArceusTypeByPlate(u16 plate); diff --git a/include/seals.h b/include/seals.h index fc0fc449..8fda23b9 100644 --- a/include/seals.h +++ b/include/seals.h @@ -9,7 +9,7 @@ struct SealStruct struct SealStruct * CreateNewSealsObject(u32 heap_id); -void CopySealsObject(struct SealStruct *, struct SealStruct *); -void FUN_02029C74(u8 *, u8 *); +void CopySealsObject(const struct SealStruct *, struct SealStruct *); +void FUN_02029C74(const u8 *, u8 *); #endif //POKEDIAMOND_SEALS_H |