diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /src/calculate_base_damage.c | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
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) \ |