Merge branch 'master' into doc-banim

2021-11-13 23:26:46 -05:00
parent 4c4fa1f25e 8d18d03c79
commit f42eafc85b
573 changed files with 5399 additions and 5181 deletions
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1847,7 +1847,7 @@ static void OpponentHandleFaintingCry(void)
 {
    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);

-    PlayCry3(species, 25, 5);
+    PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
    OpponentBufferExecCompleted();
 }