From 33979f0fa69001b41668726828603e22326694c1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 14 May 2019 15:22:16 +0200 Subject: use ability num instead of alt ability --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 76bd6d877..b4c4bdf5c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3390,7 +3390,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1; gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; - gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility); + gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum); hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)]; *hpOnSwitchout = gBattleMons[gActiveBattler].hp; for (i = 0; i < NUM_BATTLE_STATS; i++) -- cgit v1.2.3 From 20863ac85bcf047feeeba8295d0f9bcecef6f636 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Jul 2019 20:46:00 -0400 Subject: Resolve compile warnings in modern --- src/battle_main.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index b4c4bdf5c..61b6a5a12 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -72,6 +72,9 @@ extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForSafariActions[]; // this file's functions +#if !defined(NONMATCHING) && MODERN +#define static +#endif static void CB2_InitBattleInternal(void); static void CB2_PreInitMultiBattle(void); static void CB2_PreInitIngamePlayerPartnerBattle(void); -- cgit v1.2.3