diff options
author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-26 14:53:51 +0200 |
---|---|---|
committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-26 15:40:11 +0200 |
commit | 4d2b22a899c11dfcacfec6889968ab01655a3fe3 (patch) | |
tree | 046ea9bcc455ab967a6cfa7676f02870f68c881b /src/pokemon_3.c | |
parent | 49dbd87051650e06248ed4e70fbe4b623a8db779 (diff) |
Add headers
Diffstat (limited to 'src/pokemon_3.c')
-rw-r--r-- | src/pokemon_3.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index f9eb3a7e9..8622c11d9 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1,5 +1,9 @@ +#include "battle_message.h" +#include "rom_8077ABC.h" +#include "rom_8094928.h" +#include "util.h" #include "global.h" -#include "asm.h" +#include "pokemon.h" #include "battle.h" #include "data2.h" #include "event_data.h" @@ -9,7 +13,6 @@ #include "link.h" #include "main.h" #include "m4a.h" -#include "pokemon.h" #include "rng.h" #include "rom4.h" #include "rtc.h" @@ -55,14 +58,10 @@ struct SpindaSpot }; extern u8 gPlayerPartyCount; -extern struct Pokemon gPlayerParty[6]; extern u8 gEnemyPartyCount; -extern struct Pokemon gEnemyParty[6]; extern struct BattlePokemon gBattleMons[4]; -extern u8 * const gItemEffectTable[]; extern u8 gUnknown_02024A60; extern struct BattleEnigmaBerry gEnigmaBerries[]; -extern struct EvolutionData gEvolutionTable[]; extern u16 gSpeciesToHoennPokedexNum[]; extern u16 gSpeciesToNationalPokedexNum[]; extern u16 gHoennToNationalOrder[]; @@ -79,11 +78,7 @@ extern s8 gNatureStatTable[][5]; extern s8 gUnknown_082082FE[][3]; extern u16 gTrainerBattleOpponent; extern u16 gBattleTypeFlags; -extern struct BaseStats gBaseStats[]; -extern u32 gBitTable[]; -extern u32 gExperienceTables[8][101]; extern u32 gTMHMLearnsets[][2]; -extern const u16 *gLevelUpLearnsets[]; extern u8 gBattleMonForms[]; extern const u8 BattleText_Wally[]; extern const u16 gHMMoves[]; @@ -100,8 +95,6 @@ extern u8 gUnknown_083FEE5D[]; extern u8 gUnknown_083FEE92[]; extern u8 *gUnknown_08400F58[]; -u8 CheckPartyHasHadPokerus(struct Pokemon *, u8); - bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId) { u32 status = GetMonData(mon, MON_DATA_STATUS, 0); @@ -1191,8 +1184,6 @@ void current_map_music_set__default_for_battle(u16 song) PlayNewMapMusic(sub_8040728()); } -const u16 *species_and_otid_get_pal(u16, u32, u32); - const u16 *pokemon_get_pal(struct Pokemon *mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); @@ -1221,8 +1212,6 @@ const u16 *species_and_otid_get_pal(u16 species, u32 otId , u32 personality) return gMonPaletteTable[species].data; } -const struct SpritePalette *sub_80409C8(u16, u32, u32); - const struct SpritePalette *sub_8040990(struct Pokemon *mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); @@ -1270,8 +1259,6 @@ s8 sub_8040A7C(u32 personality, u8 a2) return gUnknown_083F7E28[nature * 5 + a2]; } -bool8 IsOtherTrainer(u32, u8 *); - bool8 IsTradedMon(struct Pokemon *mon) { u8 otName[8]; |