diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
| commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
| tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /include/pokemon.h | |
| parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
move mon data fix conflicts
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index cf42a7471..ce3074a0b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -128,7 +128,6 @@ #define NUMBER_OF_MON_TYPES 0x12 -#define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 @@ -626,7 +625,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 GetBankMultiplayerId(u16 a1); +s32 GetBattlerMultiplayerId(u16 a1); bool16 sub_806D82C(u8 id); u16 MonTryLearningNewMove(struct Pokemon* mon, bool8); void sub_8068AA4(void); // sets stats for deoxys |