diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 4 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/trainer_see.h | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index f0608cb21..1676ddde1 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -59,7 +59,6 @@ void TrainerWantsBattle(u8, const u8 *); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); //u8 ScrSpecial_GetTrainerBattleMode(void); -//u8 ScrSpecial_HasTrainerBeenFought(void); //void sub_808257C(void); //void unref_sub_8082590(void); // unused u8 HasTrainerAlreadyBeenFought(u16); @@ -68,8 +67,6 @@ void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); void CB2_EndTrainerBattle(void); void do_choose_name_or_words_screen(void); -//void ScrSpecial_StartTrainerEyeRematch(void); -//void ScrSpecial_ShowTrainerIntroSpeech(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); //void ScrSpecial_ShowTrainerNonBattlingSpeech(void); @@ -94,6 +91,5 @@ void TryUpdateRandomTrainerRematches(u16, u16); s32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum); s32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum); u16 GetRematchTrainerId(u16 a1); -//u8 ScrSpecial_GetTrainerEyeRematchFlag(void); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8e7c01eb5..5d1539179 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -141,4 +141,8 @@ #define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 +#define PLAYER_HAS_TWO_USABLE_MONS 0 +#define PLAYER_HAS_ONE_MON 1 +#define PLAYER_HAS_ONE_USABLE_MON 2 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index df2d42522..5c19c0447 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -440,7 +440,7 @@ u8 GiveMonToPlayer(struct Pokemon *mon); u8 SendMonToPC(struct Pokemon *mon); u8 CalculatePlayerPartyCount(void); u8 CalculateEnemyPartyCount(void); -u8 sub_803DAA0(void); +u8 GetMonsStateToDoubles(void); u8 GetAbilityBySpecies(u16 species, bool8 altAbility); u8 GetMonAbility(struct Pokemon *mon); void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord); diff --git a/include/trainer_see.h b/include/trainer_see.h index 78487aa57..5c65cb313 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -6,6 +6,5 @@ bool8 CheckTrainers(void); void sub_8084794(struct ObjectEvent *var); -void ScrSpecial_EndTrainerApproach(void); #endif // GUARD_TRAINER_SEE_H |