diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-23 21:21:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 21:21:59 -0400 |
| commit | 9640df02dd8651d5b05cf3767f6c7e16a697db3b (patch) | |
| tree | df7fed98e02c4113507f6994e615b8f8074dd69e /src/calculate_base_damage.c | |
| parent | 21ffe2fa910ede21f0f18a3013ed8ba29c70011e (diff) | |
| parent | 3f7d0a195afd90c182cd631e14f5acb5d29be34b (diff) | |
Merge pull request #303 from marijnvdwerf/clean/includes
Clean/includes
Diffstat (limited to 'src/calculate_base_damage.c')
| -rw-r--r-- | src/calculate_base_damage.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index 293e2f24d..7868a2c67 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -2,6 +2,7 @@ #include "abilities.h" #include "battle.h" #include "berry.h" +#include "data2.h" #include "event_data.h" #include "hold_effects.h" #include "item.h" @@ -11,6 +12,7 @@ #include "species.h" #include "sprite.h" #include "string_util.h" +#include "strings2.h" #include "text.h" extern u8 gPlayerPartyCount; @@ -34,15 +36,9 @@ extern u16 gTrainerBattleOpponent; extern struct PokemonStorage gPokemonStorage; extern u8 gBadEggNickname[]; -extern u8 gEggNickname[]; extern u32 gBitTable[]; extern struct BaseStats gBaseStats[]; -extern u8 gSpeciesNames[][11]; -extern struct BattleMove gBattleMoves[]; extern struct SpriteTemplate gSpriteTemplate_8208288[]; -extern union AmimCmd *gSpriteAnimTable_81E7C64[]; -extern union AnimCmd **gUnknown_081EC2A4[]; -extern union AnimCmd **gUnknown_081ECACC[]; extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; extern u8 gSecretBaseTrainerClasses[]; |