pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a wram mislabel (EnemyDisabledMove)

Browse Source
This commit is contained in:
yenatch 2013-05-03 21:04:34 -04:00
parent c539a96f78
commit 8b1afa2265
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
battle/effect_commands.asm
View File

@ -507,7 +507,7 @@ CheckEnemyTurn: ; 3421f
jr nz, .CheckConfused jr nz, .CheckConfused
ld [hl], a ld [hl], a
ld [EnemyEncoredMove], a ld [EnemyDisabledMove], a
; 'disabled no more!' ; 'disabled no more!'
ld hl, DisabledNoMoreText ld hl, DisabledNoMoreText
@ -612,7 +612,7 @@ CheckEnemyTurn: ; 3421f
.CheckDisabledMove .CheckDisabledMove
; We can't disable a move that doesn't exist. ; We can't disable a move that doesn't exist.
ld a, [EnemyEncoredMove] ld a, [EnemyDisabledMove]
and a and a
jr z, .CheckParalyzed jr z, .CheckParalyzed
@ -4990,7 +4990,7 @@ BattleCommand48: ; 35b33
ld d, a ld d, a
jr z, .asm_35b4f ; 35b46 $7 jr z, .asm_35b4f ; 35b46 $7
ld hl, EnemyMonMove2 ld hl, EnemyMonMove2
ld a, [EnemyEncoredMove] ld a, [EnemyDisabledMove]
ld d, a ld d, a
.asm_35b4f .asm_35b4f
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
@ -5059,7 +5059,7 @@ BattleCommand48: ; 35b33
ld a, [DisabledMove] ld a, [DisabledMove]
jr z, .asm_35bbe jr z, .asm_35bbe
ld a, [EnemyEncoredMove] ld a, [EnemyDisabledMove]
.asm_35bbe .asm_35bbe
ld b, a ld b, a
ld a, $10 ld a, $10
@ -8983,7 +8983,7 @@ Function0x372e7: ; 372e7
xor a xor a
ld [EnemyDisableCount], a ld [EnemyDisableCount], a
ld [EnemyEncoredMove], a ld [EnemyDisabledMove], a
ret ret
.player .player

3
wram.asm
View File

@ -690,7 +690,7 @@ AlreadyDisobeyed: ; c6f4
DisabledMove: ; c6f5 DisabledMove: ; c6f5
ds 1 ds 1
EnemyEncoredMove: ; c6f6 EnemyDisabledMove: ; c6f6
ds 1 ds 1
ds 1 ds 1
@ -1082,6 +1082,7 @@ EnemyMonMove3: ; d20a
ds 1 ds 1
EnemyMonMove4: ; d20b EnemyMonMove4: ; d20b
ds 1 ds 1
EnemyMonMovesEnd
EnemyMonDVs: EnemyMonDVs:
EnemyMonAtkDefDV: ; d20c EnemyMonAtkDefDV: ; d20c