diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /src/calculate_base_damage.c | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (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) \ |