From 3d1c16523e277b0b4044e685aa118c15aaaeffe9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 21 Oct 2017 17:32:35 +0200 Subject: start working on battle controllers, especially player --- 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 c26c28afa..5048c1e4c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -643,6 +643,7 @@ void PartySpreadPokerus(struct Pokemon *party); s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); +u8 GetDefaultMoveTarget(u8 atkBank); #include "sprite.h" -- cgit v1.2.3 From 813b1bfd4a8f0fc316e78b39abaaafd09a42f0c4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 22 Oct 2017 01:04:02 +0200 Subject: label and do more work at player controller --- include/pokemon.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 5048c1e4c..626d4d7a1 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -644,6 +644,9 @@ s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetDefaultMoveTarget(u8 atkBank); +u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); +void sub_806A1C0(u16 arg0, u8 bankIdentity); +void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity); #include "sprite.h" -- cgit v1.2.3 From 1f3a867a0b05c52344c5a145db3272e653deb697 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 23 Oct 2017 16:38:11 +0200 Subject: battle link partner controller is done --- 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 626d4d7a1..478f7c345 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -629,7 +629,7 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality); void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies); bool8 IsTradedMon(struct Pokemon *mon); void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality); -s32 sub_806D864(u16 a1); +s32 GetBankMultiplayerId(u16 a1); bool16 sub_806D82C(u8 id); u16 MonTryLearningNewMove(struct Pokemon* mon, bool8); void sub_8068AA4(void); // sets stats for deoxys -- cgit v1.2.3 From 94b3a8dd69699f7a127cf27282c06ca8a27d0a63 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 24 Oct 2017 15:35:36 +0200 Subject: spd to speed --- 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 d732552f4..98cff2094 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -30,7 +30,7 @@ #define MON_DATA_HP_EV 26 #define MON_DATA_ATK_EV 27 #define MON_DATA_DEF_EV 28 -#define MON_DATA_SPD_EV 29 +#define MON_DATA_SPEED_EV 29 #define MON_DATA_SPATK_EV 30 #define MON_DATA_SPDEF_EV 31 #define MON_DATA_FRIENDSHIP 32 @@ -43,7 +43,7 @@ #define MON_DATA_HP_IV 39 #define MON_DATA_ATK_IV 40 #define MON_DATA_DEF_IV 41 -#define MON_DATA_SPEED_IV 42 +#define MON_DATA_SPEED_IV 42 #define MON_DATA_SPATK_IV 43 #define MON_DATA_SPDEF_IV 44 #define MON_DATA_IS_EGG 45 @@ -62,7 +62,7 @@ #define MON_DATA_MAX_HP 58 #define MON_DATA_ATK 59 #define MON_DATA_DEF 60 -#define MON_DATA_SPEED 61 +#define MON_DATA_SPEED 61 #define MON_DATA_SPATK 62 #define MON_DATA_SPDEF 63 #define MON_DATA_MAIL 64 -- cgit v1.2.3 From fa36e23683a27876156d74829c543f69fcd1f297 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 25 Oct 2017 21:57:28 +0200 Subject: start opponent controller, thx bird --- 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 98cff2094..9967fcc34 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -647,6 +647,7 @@ u8 GetDefaultMoveTarget(u8 atkBank); u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); void sub_806A1C0(u16 arg0, u8 bankIdentity); void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity); +u8 GetSecretBaseTrainerPicIndex(void); #include "sprite.h" -- cgit v1.2.3 From e8903fb4dd3e1f9ef260beb93a939a7e6e9a045b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 27 Oct 2017 18:52:21 +0200 Subject: start workin on evo scene --- 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 4159a2f96..c1c61d241 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -620,7 +620,7 @@ void SetWildMonHeldItem(void); u16 GetMonEVCount(struct Pokemon *); const struct CompressedSpritePalette *sub_806E794(struct Pokemon *mon); -const struct CompressedSpritePalette *sub_806E7CC(u16 species, u32 otId , u32 personality); +const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality); bool32 IsHMMove2(u16 move); bool8 IsPokeSpriteNotFlipped(u16 species); bool8 IsMonShiny(struct Pokemon *mon); -- cgit v1.2.3