Sync more with pokeyellow

This commit is contained in:
Rangi 2020-11-05 16:55:39 -05:00
parent 2a4b8b5a24
commit e16dec874a
18 changed files with 102 additions and 79 deletions

View file

@ -86,7 +86,7 @@ HealEffect_:
ld [wHPBarNewHP], a
.playAnim
ld hl, PlayCurrentMoveAnimation
call BankswitchEtoF
call EffectCallBattleCore
ldh a, [hWhoseTurn]
and a
hlcoord 10, 9
@ -98,14 +98,14 @@ HealEffect_:
ld [wHPBarType], a
predef UpdateHPBar2
ld hl, DrawHUDsAndHPBars
call BankswitchEtoF
call EffectCallBattleCore
ld hl, RegainedHealthText
jp PrintText
.failed
ld c, 50
call DelayFrames
ld hl, PrintButItFailedText_
jp BankswitchEtoF
jp EffectCallBattleCore
StartedSleepingEffect:
text_far _StartedSleepingEffect

View file

@ -23,14 +23,14 @@ ReflectLightScreenEffect_:
.playAnim
push hl
ld hl, PlayCurrentMoveAnimation
call BankswitchEtoF
call EffectCallBattleCore
pop hl
jp PrintText
.moveFailed
ld c, 50
call DelayFrames
ld hl, PrintButItFailedText_
jp BankswitchEtoF
jp EffectCallBattleCore
LightScreenProtectedText:
text_far _LightScreenProtectedText
@ -40,6 +40,6 @@ ReflectGainedArmorText:
text_far _ReflectGainedArmorText
text_end
BankswitchEtoF:
EffectCallBattleCore:
ld b, BANK(BattleCore)
jp Bankswitch

View file

@ -141,7 +141,7 @@ TransformEffect_:
.failed
ld hl, PrintButItFailedText_
jp BankswitchEtoF
jp EffectCallBattleCore
TransformedText:
text_far _TransformedText