summaryrefslogtreecommitdiff
path: root/src/battle/battle_7.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-15 20:41:55 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-15 20:41:55 -0600
commit5d923c4d5f3d0786715663b3ad83bc9f3e778164 (patch)
tree99e35c489871918c95493c74ae753a9e3eb60357 /src/battle/battle_7.c
parented152b1566fa5c39ee72ca190c49fbfe30708036 (diff)
import some battle_4.c code from emerald and get atk23_getexp matching
Diffstat (limited to 'src/battle/battle_7.c')
-rw-r--r--src/battle/battle_7.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 1c79d7ebf..00216ce05 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -763,7 +763,7 @@ void sub_80324E0(u8 a)
ewram17800[a].substituteSprite = 0;
}
-void sub_80324F8(struct Pokemon *pkmn, u8 b)
+void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b)
{
u16 hp = GetMonData(pkmn, MON_DATA_HP);
u16 maxHP = GetMonData(pkmn, MON_DATA_MAX_HP);
@@ -793,7 +793,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b)
}
}
-void BattleMusicStop(void)
+void BattleStopLowHpSound(void)
{
u8 r4 = GetBankByIdentity(0);
@@ -821,11 +821,11 @@ void sub_8032638(void)
u8 r5 = pokemon_order_func(gBattlePartyID[r9]);
if (GetMonData(&gPlayerParty[r4], MON_DATA_HP) != 0)
- sub_80324F8(&gPlayerParty[r4], r8);
+ HandleLowHpMusicChange(&gPlayerParty[r4], r8);
if (IsDoubleBattle())
{
if (GetMonData(&gPlayerParty[r5], MON_DATA_HP) != 0)
- sub_80324F8(&gPlayerParty[r5], r9);
+ HandleLowHpMusicChange(&gPlayerParty[r5], r9);
}
}
}