diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
| commit | 8b97aa28047d5bbc24448b47cbda901a3adb9d0e (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/pokemon_2.c | |
| parent | dda361afb7e2abafc15a498968580be6d1a83cfe (diff) | |
| parent | f568060cae85a1e8c70a0216ea5d1c6e79d6a528 (diff) | |
Merge remote-tracking branch 'marijn/clean/headers'
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 7fbfc1271..91cd77f86 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -1,20 +1,20 @@ #include "global.h" -#include "asm.h" +#include "battle.h" #include "data2.h" #include "event_data.h" #include "main.h" #include "pokemon.h" #include "rng.h" +#include "rom_8077ABC.h" #include "species.h" #include "sprite.h" #include "string_util.h" -#include "text.h" #include "strings2.h" +#include "text.h" +#include "util.h" extern u8 gPlayerPartyCount; -extern struct Pokemon gPlayerParty[6]; extern u8 gEnemyPartyCount; -extern struct Pokemon gEnemyParty[6]; extern u16 unk_20160BC[]; extern struct SecretBaseRecord gSecretBaseRecord; @@ -36,16 +36,9 @@ extern u16 gTrainerBattleOpponent; extern struct PokemonStorage gPokemonStorage; extern u8 gBadEggNickname[]; -extern u32 gBitTable[]; -extern struct BaseStats gBaseStats[]; extern const struct SpriteTemplate gSpriteTemplate_8208288[]; //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.) -extern u8 gTrainerClassToPicIndex[]; -extern u8 gTrainerClassToNameIndex[]; extern u8 gSecretBaseTrainerClasses[]; -extern u8 gUnknown_08208238[]; -extern u8 gUnknown_0820823C[]; -extern u8 gStatStageRatios[][2]; extern u8 gHoldEffectToType[][2]; u8 sub_803C348(u8 a1) |