Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a CANNOT_MOVE constant (#1182)

Browse Source
This commit is contained in:
Rangi
2025-05-31 15:07:34 -04:00
committed by GitHub
parent 34aae0d20f
commit fd2af282b6
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/move_constants.asm
View File

@@ -259,6 +259,8 @@
const BEAT_UP ; fb const BEAT_UP ; fb
DEF NUM_ATTACKS EQU const_value - 1 DEF NUM_ATTACKS EQU const_value - 1
DEF CANNOT_MOVE EQU $ff
; Battle animations use the same constants as the moves up to this point ; Battle animations use the same constants as the moves up to this point
const_next $ff const_next $ff
const ANIM_SWEET_SCENT_2 ; ff const ANIM_SWEET_SCENT_2 ; ff

2
engine/battle/core.asm
View File

@@ -4175,7 +4175,7 @@ PursuitSwitch:
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE
call GetBattleVarAddr call GetBattleVarAddr
ld a, $ff ld a, CANNOT_MOVE
ld [hl], a ld [hl], a
pop af pop af

2
engine/battle/effect_commands.asm
View File

@@ -111,9 +111,9 @@ CheckTurn:
BattleCommand_CheckTurn: BattleCommand_CheckTurn:
; Repurposed as hardcoded turn handling. Useless as a command. ; Repurposed as hardcoded turn handling. Useless as a command.
; Move $ff immediately ends the turn.
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE
call GetBattleVar call GetBattleVar
assert CANNOT_MOVE == $ff
inc a inc a
jp z, EndTurn jp z, EndTurn