Add a CANNOT_MOVE constant (#1182)

2025-05-31 15:07:34 -04:00
parent 34aae0d20f
commit fd2af282b6
3 changed files with 4 additions and 2 deletions
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4175,7 +4175,7 @@ PursuitSwitch:

 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVarAddr
-	ld a, $ff
+	ld a, CANNOT_MOVE
 	ld [hl], a

 	pop af
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -111,9 +111,9 @@ CheckTurn:
 BattleCommand_CheckTurn:
 ; Repurposed as hardcoded turn handling. Useless as a command.

-; Move $ff immediately ends the turn.
 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVar
+	assert CANNOT_MOVE == $ff
 	inc a
 	jp z, EndTurn