diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /src/calculate_base_damage.c | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
Diffstat (limited to 'src/calculate_base_damage.c')
| -rw-r--r-- | src/calculate_base_damage.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index ae60e30fe..0f2605e5b 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -35,7 +35,11 @@ extern struct PokemonStorage gPokemonStorage; extern u8 gBadEggNickname[]; extern struct SpriteTemplate gSpriteTemplate_8208288[]; -extern u8 gSecretBaseTrainerClasses[]; +extern u8 gTrainerClassToPicIndex[]; +extern u8 gTrainerClassToNameIndex[]; +extern u8 gUnknown_08208238[]; +extern u8 gUnknown_0820823C[]; +extern u8 gStatStageRatios[]; extern u8 gHoldEffectToType[][2]; #define APPLY_STAT_MOD(var, mon, stat, statIndex) \ |