pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Identify BATTLEACTION_D and _E (thanks, ax6)

Browse Source
This commit is contained in:
Rangi
2018-10-21 00:52:10 -04:00
parent 12666e3c70
commit 3b20a18200
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/battle/core.asm
View File

@@ -440,9 +440,9 @@ DetermineMoveOrder:
and a
jr z, .use_move
ld a, [wBattleAction]
cp BATTLEACTION_E
cp BATTLEACTION_STRUGGLE
jr z, .use_move
cp BATTLEACTION_D
cp BATTLEACTION_SKIPTURN
jr z, .use_move
sub BATTLEACTION_SWITCH1
jr c, .use_move
@@ -5191,9 +5191,9 @@ PlayerSwitch:
.linked
ld a, [wBattleAction]
cp BATTLEACTION_E
cp BATTLEACTION_STRUGGLE
jp z, .switch
cp BATTLEACTION_D
cp BATTLEACTION_SKIPTURN
jp z, .switch
cp BATTLEACTION_SWITCH1
jp c, .switch
@@ -5774,10 +5774,10 @@ ParseEnemyAction:
call z, LinkBattleSendReceiveAction
call Call_LoadTempTileMapToTileMap
ld a, [wBattleAction]
cp BATTLEACTION_E
cp BATTLEACTION_STRUGGLE
jp z, .struggle
cp BATTLEACTION_D
jp z, .battle_action_d
cp BATTLEACTION_SKIPTURN
jp z, .skip_turn
cp BATTLEACTION_SWITCH1
jp nc, ResetVarsForSubstatusRage
ld [wCurEnemyMoveNum], a
@@ -5811,7 +5811,7 @@ ParseEnemyAction:
jp nz, ResetVarsForSubstatusRage
jr .continue
.battle_action_d
.skip_turn
ld a, $ff
jr .finish

2
engine/battle/effect_commands.asm
View File

@@ -15,7 +15,7 @@ DoEnemyTurn:
jr z, DoTurn
ld a, [wBattleAction]
cp BATTLEACTION_E
cp BATTLEACTION_STRUGGLE
jr z, DoTurn
cp BATTLEACTION_SWITCH1
ret nc