thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-13 16:54:47 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix duplicate labels

Browse source
This commit is contained in:
xCrystal 2015-01-21 11:24:55 +01:00
parent e6499cd505
commit d3bf8bca5e
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/battle/core.asm
View file

@ -7382,14 +7382,14 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
call QuarterSpeedDueToParalysis ; quarter speed of affected mon call QuarterSpeedDueToParalysis ; quarter speed of affected mon
ld a, ANIM_A9 ld a, ANIM_A9
call PlayAnimation call PlayBattleAnimatiom
jp PrintMayNotAttackText ; print paralysis text jp PrintMayNotAttackText ; print paralysis text
.burn .burn
ld a, 1 << BRN ld a, 1 << BRN
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
call HalveAttackDueToBurn ; halve attack of affected mon call HalveAttackDueToBurn ; halve attack of affected mon
ld a, ANIM_A9 ld a, ANIM_A9
call PlayAnimation call PlayBattleAnimatiom
ld hl, BurnedText ld hl, BurnedText
jp PrintText jp PrintText
.freeze .freeze
@ -7397,7 +7397,7 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
ld a, 1 << FRZ ld a, 1 << FRZ
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
ld a, ANIM_A9 ld a, ANIM_A9
call PlayAnimation call PlayBattleAnimatiom
ld hl, FrozenText ld hl, FrozenText
jp PrintText jp PrintText
opponentAttacker: ; 3f382 (f:7382) opponentAttacker: ; 3f382 (f:7382)
@ -7744,7 +7744,7 @@ StatModifierDownEffect: ; 3f54c (f:754c)
ld [hl], b ; save modified mod ld [hl], b ; save modified mod
ld a, c ld a, c
cp $4 cp $4
jr nc, UpdateStatDone ; jump for evasion/accuracy jr nc, UpdateStat2Done ; jump for evasion/accuracy
push hl push hl
push de push de
ld hl, wEnemyMonAttack + 1 ld hl, wEnemyMonAttack + 1
@ -7803,19 +7803,19 @@ StatModifierDownEffect: ; 3f54c (f:754c)
ld b, a ld b, a
ld a, [$ff97] ld a, [$ff97]
or b or b
jp nz, UpdateStat jp nz, UpdateStat2
ld [$ff97], a ld [$ff97], a
ld a, $1 ld a, $1
ld [$ff98], a ld [$ff98], a
UpdateStat: ; 3f624 (f:7624) UpdateStat2: ; 3f624 (f:7624)
ld a, [$ff97] ld a, [$ff97]
ld [hli], a ld [hli], a
ld a, [$ff98] ld a, [$ff98]
ld [hl], a ld [hl], a
pop de pop de
pop hl pop hl
UpdateStatDone: ; 3f62c (f:762c) UpdateStat2Done: ; 3f62c (f:762c)
ld b, c ld b, c
inc b inc b
push de push de
@ -8057,7 +8057,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739)
jp Func_3fb4e jp Func_3fb4e
.asm_3f7e4 .asm_3f7e4
push af push af
call PlayAnimation call PlayBattleAnimatiom
ld c, $14 ld c, $14
call DelayFrames call DelayFrames
pop af pop af
@ -8185,7 +8185,7 @@ ChargeEffect: ; 3f88c (f:788c)
xor a xor a
ld [wcc5b], a ld [wcc5b], a
ld a, b ld a, b
call PlayAnimation call PlayBattleAnimatiom
ld a, [de] ld a, [de]
ld [wWhichTrade], a ld [wWhichTrade], a
ld hl, ChargeMoveEffectText ld hl, ChargeMoveEffectText
@ -8660,7 +8660,7 @@ Func_3fba8: ; 3fba8 (f:7ba8)
and a and a
ret z ret z
PlayAnimation: ; 3fbb9 (f:7bb9) PlayBattleAnimatiom: ; 3fbb9 (f:7bb9)
ld [W_ANIMATIONID], a ld [W_ANIMATIONID], a
Func_3fbbc: ; 3fbbc (f:7bbc) Func_3fbbc: ; 3fbbc (f:7bbc)