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 some StatUp-related labels

Browse Source
This commit is contained in:
mid-kid 2018-08-17 17:48:41 +02:00
parent 2e147d1128
commit 79cf90ab5e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/ai/items.asm
View File

@ -806,7 +806,7 @@ EnemyUsedXItem:
push bc push bc
call PrintText_UsedItemOn call PrintText_UsedItemOn
pop bc pop bc
farcall CheckIfStatCanBeRaised farcall RaiseStat
jp AIUpdateHUD jp AIUpdateHUD
; Parameter ; Parameter

10
engine/battle/effect_commands.asm
View File

@ -4181,13 +4181,13 @@ BattleCommand_EvasionUp2:
BattleCommand_StatUp: BattleCommand_StatUp:
; statup ; statup
call CheckIfStatCanBeRaised call RaiseStat
ld a, [wFailedMessage] ld a, [wFailedMessage]
and a and a
ret nz ret nz
jp StatUpAnimation jp MinimizeDropSub
CheckIfStatCanBeRaised: RaiseStat:
ld a, b ld a, b
ld [wLoweredStat], a ld [wLoweredStat], a
ld hl, wPlayerStatLevels ld hl, wPlayerStatLevels
@ -4283,7 +4283,9 @@ CheckIfStatCanBeRaised:
ld [wFailedMessage], a ld [wFailedMessage], a
ret ret
StatUpAnimation: MinimizeDropSub:
; Lower the substitute if we're minimizing
ld bc, wPlayerMinimized ld bc, wPlayerMinimized
ld hl, DropPlayerSub ld hl, DropPlayerSub
ld a, [hBattleTurn] ld a, [hBattleTurn]

2
engine/items/item_effects.asm
View File

@ -2159,7 +2159,7 @@ XItemEffect:
ld [hBattleTurn], a ld [hBattleTurn], a
ld [wAttackMissed], a ld [wAttackMissed], a
ld [wEffectFailed], a ld [wEffectFailed], a
farcall CheckIfStatCanBeRaised farcall RaiseStat
call WaitSFX call WaitSFX
farcall BattleCommand_StatUpMessage farcall BattleCommand_StatUpMessage