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

Fix some misnamed substatus constants.

Browse Source 
SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE.
SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT.
Substatus 5 bit 4 was actually SUBSTATUS_ENCORED.

Also use some more (sub)status constants where needed.
This commit is contained in:
yenatch
2014-06-17 12:52:32 -07:00
parent c2dba43188
commit dbe4c7ab67
6 changed files with 118 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
battle/effects/rollout.asm
View File

@@ -7,19 +7,18 @@ BattleCommand5b: ; 37718
ld de, PlayerRolloutCount
ld a, [hBattleTurn]
and a
jr z, .asm_37723
jr z, .ok
ld de, EnemyRolloutCount
.asm_37723
.ok
ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVar
bit SUBSTATUS_ENCORED, a
jr z, .asm_37731
bit SUBSTATUS_ROLLOUT, a
jr z, .reset
ld b, $4 ; doturn
jp SkipToBattleCommand
.asm_37731
.reset
xor a
ld [de], a
ret
@@ -66,13 +65,13 @@ BattleCommand5c: ; 37734
ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr
res SUBSTATUS_ENCORED, [hl]
res SUBSTATUS_ROLLOUT, [hl]
jr .asm_37775
.asm_3776e
ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr
set SUBSTATUS_ENCORED, [hl]
set SUBSTATUS_ROLLOUT, [hl]
.asm_37775
ld a, BATTLE_VARS_SUBSTATUS2