From 4b459cd4607a48a84bcc14122d2ad324424fdff2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 5 Jan 2019 17:08:30 -0500 Subject: through sub_815E1F0 --- include/pokemon.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index e8782af98..4c6240cd4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -670,4 +670,6 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); +void PlayMapChosenOrBattleBGM(u16 songId); + #endif // GUARD_POKEMON_H -- cgit v1.2.3 From 9c5f01fc8efb546fa6ef546cd1c627befcfd6740 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 8 Jan 2019 08:45:19 -0500 Subject: through sub_815E948 --- include/pokemon.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 4c6240cd4..6a9b85e71 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -671,5 +671,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); void PlayMapChosenOrBattleBGM(u16 songId); +u8 GetMonsStateToDoubles(void); #endif // GUARD_POKEMON_H -- cgit v1.2.3 From 7738fcee638985656b7cf376ec6936f04f53c255 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 8 Jan 2019 10:20:51 -0500 Subject: through sub_815E9FC --- include/pokemon.h | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 6a9b85e71..f1f04c9eb 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -310,31 +310,31 @@ struct PokemonStorage /*0x83C2*/ u8 boxWallpapers[14]; }; -struct UnknownPokemonStruct +struct BattleTowerPokemon { - u16 species; - u16 heldItem; - u16 moves[4]; - u8 level; - u8 ppBonuses; - u8 hpEV; - u8 attackEV; - u8 defenseEV; - u8 speedEV; - u8 spAttackEV; - u8 spDefenseEV; - u32 otId; - u32 hpIV:5; - u32 attackIV:5; - u32 defenseIV:5; - u32 speedIV:5; - u32 spAttackIV:5; - u32 spDefenseIV:5; - u32 gap:1; - u32 altAbility:1; - u32 personality; - u8 nickname[POKEMON_NAME_LENGTH + 1]; - u8 friendship; + /*0x00*/ u16 species; + /*0x02*/ u16 heldItem; + /*0x04*/ u16 moves[4]; + /*0x0C*/ u8 level; + /*0x0D*/ u8 ppBonuses; + /*0x0E*/ u8 hpEV; + /*0x0F*/ u8 attackEV; + /*0x10*/ u8 defenseEV; + /*0x11*/ u8 speedEV; + /*0x12*/ u8 spAttackEV; + /*0x13*/ u8 spDefenseEV; + /*0x14*/ u32 otId; + /*0x18*/ u32 hpIV:5; + u32 attackIV:5; + u32 defenseIV:5; + u32 speedIV:5; + u32 spAttackIV:5; + u32 spDefenseIV:5; + u32 gap:1; + u32 altAbility:1; + /*0x1C*/ u32 personality; + /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x2B*/ u8 friendship; }; #define BATTLE_STATS_NO 8 @@ -672,5 +672,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); void PlayMapChosenOrBattleBGM(u16 songId); u8 GetMonsStateToDoubles(void); +void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src); #endif // GUARD_POKEMON_H -- cgit v1.2.3 From 6eb7cc6cfae14b93feee880b23e903c336c58dcd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Apr 2019 08:46:30 -0400 Subject: through CreateNidoranFSprite --- include/pokemon.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index f1f04c9eb..c08f37b5f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -673,5 +673,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); void PlayMapChosenOrBattleBGM(u16 songId); u8 GetMonsStateToDoubles(void); void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src); +void sub_803F7D4(u16 trainerSpriteId, u8 battlerPosition); #endif // GUARD_POKEMON_H -- cgit v1.2.3 From a4b19e9187a663564b7d41f643dc28ecedaa100d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Apr 2019 20:29:37 -0400 Subject: tm_case finish code --- include/pokemon.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index c08f37b5f..c84eb4c42 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -445,6 +445,8 @@ struct BattleMove u8 flags; }; +extern const struct BattleMove gBattleMoves[]; + #define FLAG_MAKES_CONTACT 0x1 #define FLAG_PROTECT_AFFECTED 0x2 #define FLAG_MAGICCOAT_AFFECTED 0x4 -- cgit v1.2.3 From a37da53f206a190ef54fa9477e16f3e24b541f38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 May 2019 14:56:59 -0400 Subject: Daycare --- include/pokemon.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index c84eb4c42..bf2326ff8 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -7,9 +7,9 @@ #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 #define MON_DATA_LANGUAGE 3 -#define MON_DATA_SANITY_BIT1 4 -#define MON_DATA_SANITY_BIT2 5 -#define MON_DATA_SANITY_BIT3 6 +#define MON_DATA_SANITY_IS_BAD_EGG 4 +#define MON_DATA_SANITY_HAS_SPECIES 5 +#define MON_DATA_SANITY_IS_EGG 6 #define MON_DATA_OT_NAME 7 #define MON_DATA_MARKINGS 8 #define MON_DATA_CHECKSUM 9 -- cgit v1.2.3 From e9e87a0fe47406b5d2881b9360886842b8731c97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 6 May 2019 10:49:10 -0400 Subject: egg_hatch as part of daycare --- include/pokemon.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index bf2326ff8..a6dd9931b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -633,6 +633,7 @@ void SetWildMonHeldItem(void); u16 GetMonEVCount(struct Pokemon *); const struct CompressedSpritePalette *sub_806E794(struct Pokemon *mon); +const struct CompressedSpritePalette *GetMonSpritePalStruct(struct Pokemon *mon); const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality); bool32 IsHMMove2(u16 move); bool8 IsPokeSpriteNotFlipped(u16 species); @@ -675,6 +676,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); void PlayMapChosenOrBattleBGM(u16 songId); u8 GetMonsStateToDoubles(void); void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src); -void sub_803F7D4(u16 trainerSpriteId, u8 battlerPosition); +void SetMultiuseSpriteTemplateToPokemon(u16 trainerSpriteId, u8 battlerPosition); #endif // GUARD_POKEMON_H -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- include/pokemon.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index a6dd9931b..ec828131b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -678,4 +678,6 @@ u8 GetMonsStateToDoubles(void); void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src); void SetMultiuseSpriteTemplateToPokemon(u16 trainerSpriteId, u8 battlerPosition); +const u8 * sub_8042DA4(u16 itemId); + #endif // GUARD_POKEMON_H -- cgit v1.2.3 From a4f1de801550d35314b5ce51d54f30e4bdb8e767 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 10:44:25 -0400 Subject: Some renaming --- include/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index ec828131b..ed0108159 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -678,6 +678,6 @@ u8 GetMonsStateToDoubles(void); void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src); void SetMultiuseSpriteTemplateToPokemon(u16 trainerSpriteId, u8 battlerPosition); -const u8 * sub_8042DA4(u16 itemId); +const u8 * Battle_PrintStatBoosterEffectMessage(u16 itemId); #endif // GUARD_POKEMON_H -- cgit v1.2.3