diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-08-17 17:48:41 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-08-17 17:48:41 +0200 |
| commit | 79cf90ab5ec6069d2d27281e6602e85ba5310c87 (patch) | |
| tree | 3206dfe49fc4d71ac17c1d243579930185c4d846 | |
| parent | 2e147d1128b024e970e81b1cb1e188fdd1fe6712 (diff) | |
Fix some StatUp-related labels
| -rw-r--r-- | engine/battle/ai/items.asm | 2 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 10 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 4eead5fd3..28dfb1010 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -806,7 +806,7 @@ EnemyUsedXItem: push bc call PrintText_UsedItemOn pop bc - farcall CheckIfStatCanBeRaised + farcall RaiseStat jp AIUpdateHUD ; Parameter diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 12021bc55..4f34b5be6 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4181,13 +4181,13 @@ BattleCommand_EvasionUp2: BattleCommand_StatUp: ; statup - call CheckIfStatCanBeRaised + call RaiseStat ld a, [wFailedMessage] and a ret nz - jp StatUpAnimation + jp MinimizeDropSub -CheckIfStatCanBeRaised: +RaiseStat: ld a, b ld [wLoweredStat], a ld hl, wPlayerStatLevels @@ -4283,7 +4283,9 @@ CheckIfStatCanBeRaised: ld [wFailedMessage], a ret -StatUpAnimation: +MinimizeDropSub: +; Lower the substitute if we're minimizing + ld bc, wPlayerMinimized ld hl, DropPlayerSub ld a, [hBattleTurn] diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index ee5c4d254..e751b42e6 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2159,7 +2159,7 @@ XItemEffect: ld [hBattleTurn], a ld [wAttackMissed], a ld [wEffectFailed], a - farcall CheckIfStatCanBeRaised + farcall RaiseStat call WaitSFX farcall BattleCommand_StatUpMessage |