Fix unmigrated macro in NONMATCHING

This commit is contained in:
PikalaxALT 2021-06-30 13:18:42 -04:00
parent f6abfb424c
commit 628a4e6bf8
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ jobs:
env:
NONMATCHING: 1
COMPARE: 0
run: make -j${nproc} $(git grep -wl NONMATCHING src | sed -r 's/^/-W /g')
run: make -j${nproc} $(git grep -wl NONMATCHING src | sed -r 'i-W')
- name: Setup German
run: sh de_before.sh

View File

@ -2775,7 +2775,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_KnockedOff;
*CHOICED_MOVE(gEffectBattler) = 0;
*((u16 *)&gSharedMem[BSTRUCT_OFF(choicedMove) + gEffectBattler * 2]) = MOVE_NONE;
}
break;
case 59: //overheat