Enemy screens

This commit is contained in:
yenatch
2013-04-20 02:57:11 -04:00
parent 494f4c13fe
commit 984b47f3e7
2 changed files with 16 additions and 11 deletions

View File

@@ -3449,7 +3449,7 @@ PlayerAttackDamage: ; 352e2
ld c, [hl] ld c, [hl]
; Reflect ; Reflect
ld a, [$c700] ld a, [EnemyScreens]
bit 4, a bit 4, a
jr z, .physicalcrit jr z, .physicalcrit
sla c sla c
@@ -3475,7 +3475,7 @@ PlayerAttackDamage: ; 352e2
ld c, [hl] ld c, [hl]
; Light Screen ; Light Screen
ld a, [$c700] ld a, [EnemyScreens]
bit 3, a bit 3, a
jr z, .specialcrit jr z, .specialcrit
sla c sla c
@@ -4003,7 +4003,7 @@ Function0x355dd: ; 355dd
jr z, .asm_355f7 jr z, .asm_355f7
ld hl, EnemyMonDef ld hl, EnemyMonDef
ld de, $c700 ld de, EnemyScreens
ld a, [EnemyMonLevel] ld a, [EnemyMonLevel]
.asm_355f7 .asm_355f7
push af push af
@@ -8989,7 +8989,7 @@ BattleCommand2e: ; 372fc
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3730d jr z, .asm_3730d
ld hl, $c700 ld hl, EnemyScreens
ld bc, $c706 ld bc, $c706
.asm_3730d .asm_3730d
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
@@ -9597,7 +9597,7 @@ BattleCommand5a: ; 3766f
BattleCommand56: ; 37683 BattleCommand56: ; 37683
; spikes ; spikes
ld hl, $c700 ld hl, EnemyScreens
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3768e ; 37689 $3 jr z, .asm_3768e ; 37689 $3
@@ -10087,7 +10087,7 @@ BattleCommand64: ; 37939
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3794a ; 37942 $6 jr z, .asm_3794a ; 37942 $6
ld hl, $c700 ld hl, EnemyScreens
ld de, $c705 ld de, $c705
.asm_3794a .asm_3794a
bit 2, [hl] bit 2, [hl]
@@ -10106,7 +10106,7 @@ BattleCommand64: ; 37939
Function0x37962: ; 37962 Function0x37962: ; 37962
push hl push hl
ld hl, $c700 ld hl, EnemyScreens
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3796e jr z, .asm_3796e
@@ -10121,7 +10121,7 @@ Function0x37962: ; 37962
BattleCommand65: ; 37972 BattleCommand65: ; 37972
; checksafeguard ; checksafeguard
ld hl, $c700 ld hl, EnemyScreens
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3797d ; 37978 $3 jr z, .asm_3797d ; 37978 $3
@@ -10448,7 +10448,7 @@ BattleCommand69: ; 37b39
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_37b5b ; 37b53 $6 jr z, .asm_37b5b ; 37b53 $6
ld hl, $c700 ld hl, EnemyScreens
ld de, $c731 ld de, $c731
.asm_37b5b .asm_37b5b
bit 0, [hl] bit 0, [hl]

View File

@@ -710,7 +710,12 @@ PlayerScreens: ; c6ff
; bit 3: light screen ; bit 3: light screen
ds 1 ds 1
ds 2 EnemyScreens: ; c700
; bit 4: reflect
; bit 3: light screen
ds 1
ds 1
PlayerLightScreenCount: ; c702 PlayerLightScreenCount: ; c702
ds 1 ds 1