Merge remote-tracking branch 'upstream/master'

2018-12-08 12:13:15 +08:00
parent 907ed3f5f5 6068495619
commit 8a8baaeaaa
345 changed files with 8673 additions and 8660 deletions
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3270,7 +3270,7 @@ static void atk23_getexp(void)
        else
        {
            gBattleScripting.atk23_state++;
-            gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
+            gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
        }
        break;
    case 1: // calculate experience points to redistribute