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

explicitly define type categories

Browse Source
This commit is contained in:
yenatch
2014-01-05 08:24:27 -05:00
parent 883a8b7a90
commit 04f5c51753
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
battle/effect_commands.asm
View File

@@ -3444,7 +3444,7 @@ PlayerAttackDamage: ; 352e2
ret z ret z
ld a, [hl] ld a, [hl]
cp FIRE cp SPECIAL
jr nc, .special jr nc, .special
@@ -3586,7 +3586,7 @@ GetDamageStats: ; 3537e
and a and a
jr nz, .enemy jr nz, .enemy
ld a, [PlayerMoveType] ld a, [PlayerMoveType]
cp FIRE cp SPECIAL
; special ; special
ld a, [PlayerSAtkLevel] ld a, [PlayerSAtkLevel]
ld b, a ld b, a
@@ -3600,7 +3600,7 @@ GetDamageStats: ; 3537e
.enemy .enemy
ld a, [EnemyMoveType] ld a, [EnemyMoveType]
cp FIRE cp SPECIAL
; special ; special
ld a, [EnemySAtkLevel] ld a, [EnemySAtkLevel]
ld b, a ld b, a
@@ -3705,7 +3705,7 @@ EnemyAttackDamage: ; 353f6
ret z ret z
ld a, [hl] ld a, [hl]
cp FIRE cp SPECIAL
jr nc, .Special jr nc, .Special
@@ -4464,51 +4464,58 @@ BattleCommand3f: ; 35726
BattleCommand40: ; 35813 BattleCommand40: ; 35813
; counter ; counter
ld a, $1 ld a, 1
ld [AttackMissed], a ld [AttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
and a and a
ret z ret z
ld b, a ld b, a
callab GetMoveEffect callab GetMoveEffect
ld a, b ld a, b
cp $59 cp EFFECT_COUNTER
ret z ret z
call BattleCommanda3 call BattleCommanda3
ld a, [$d265] ld a, [$d265]
and a and a
ret z ret z
call Function36abf call Function36abf
ret z ret z
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
dec a dec a
ld de, StringBuffer1 ld de, StringBuffer1
call GetMoveData call GetMoveData
ld a, [$d075] ld a, [$d075]
and a and a
ret z ret z
ld a, [$d076] ld a, [$d076]
cp $14 cp SPECIAL
ret nc ret nc
ld hl, CurDamage ld hl, CurDamage
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ret z ret z
ld a, [hl] ld a, [hl]
add a add a
ld [hld], a ld [hld], a
ld a, [hl] ld a, [hl]
adc a adc a
ld [hl], a ld [hl], a
jr nc, .asm_3585f ; 35859 $4 jr nc, .capped
ld a, $ff ld a, $ff
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
.asm_3585f .capped
xor a xor a
ld [AttackMissed], a ld [AttackMissed], a
ret ret
@@ -10190,49 +10197,59 @@ BattleCommand96: ; 37c55
BattleCommand9a: ; 37c95 BattleCommand9a: ; 37c95
; mirrorcoat ; mirrorcoat
ld a, $1 ld a, 1
ld [AttackMissed], a ld [AttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
and a and a
ret z ret z
ld b, a ld b, a
callab GetMoveEffect callab GetMoveEffect
ld a, b ld a, b
cp $90 cp EFFECT_MIRROR_COAT
ret z ret z
call BattleCommanda3 call BattleCommanda3
ld a, [$d265] ld a, [$d265]
and a and a
ret z ret z
call Function36abf call Function36abf
ret z ret z
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
dec a dec a
ld de, StringBuffer1 ld de, StringBuffer1
call GetMoveData call GetMoveData
ld a, [$d075] ld a, [$d075]
and a and a
ret z ret z
ld a, [$d076] ld a, [$d076]
cp $14 cp SPECIAL
ret c ret c
ld hl, CurDamage ld hl, CurDamage
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ret z ret z
ld a, [hl] ld a, [hl]
add a add a
ld [hld], a ld [hld], a
ld a, [hl] ld a, [hl]
adc a adc a
ld [hl], a ld [hl], a
jr nc, .asm_37ce1 ; 37cdb $4 jr nc, .capped
ld a, $ff ld a, $ff
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
.asm_37ce1 .capped
xor a xor a
ld [AttackMissed], a ld [AttackMissed], a
ret ret

6
battle/hidden_power.asm
View File

@@ -86,10 +86,10 @@ HiddenPowerDamage: ; fbced
jr c, .done jr c, .done
inc a inc a
; Skip unused types between Steel and Fire ; Skip unused types
cp STEEL + 1 cp UNUSED_TYPES
jr c, .done jr c, .done
add FIRE - (STEEL + 1) add SPECIAL - UNUSED_TYPES
.done .done