diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae64c067d..ac73f2935 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 23e988dd2..454daf1fc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -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 |