summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-02-07 19:30:58 -0500
committergolem galvanize <golemgalvanize@github.com>2018-02-07 19:30:58 -0500
commit4a903279df847024148b823990a317e79bc23c9f (patch)
treeb18c801e9ed8fea9b39b0b8bda6a567ca2b24e32 /include/pokemon.h
parent1b303aeee87095400aae7c0d1ff9f94e83594691 (diff)
parent48e63979c8a131bc059974194bd548f60dcdd24c (diff)
decompile task_new_game_prof_birch_speech_4
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index cdab96687..f5d1683a2 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
@@ -631,7 +630,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