diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/items.asm | 6 | ||||
| -rw-r--r-- | battle/ai/scoring.asm | 3 | ||||
| -rw-r--r-- | battle/core.asm | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 5a292763e..5346bf8f2 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -749,7 +749,7 @@ TextJump_EnemyWithdrew: ; 384d0 Function384d5: ; This appears to be unused call AIUsedItemSound call AI_HealStatus - ld a, X_SPEED + ld a, FULL_HEAL_RED ; X_SPEED jp PrintText_UsedItemOn_AND_AIUpdateHUD ; 384e0 @@ -761,6 +761,10 @@ AI_HealStatus: ; 384e0 xor a ld [hl], a ld [EnemyMonStatus], a + ; Bug: this should reset SUBSTATUS_NIGHTMARE too + ; Uncomment the lines below to fix + ; ld hl, EnemySubStatus1 + ; res SUBSTATUS_NIGHTMARE, [hl] ld hl, EnemySubStatus5 res SUBSTATUS_TOXIC, [hl] ret diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 400cd0cb4..4e462656c 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -1876,7 +1876,8 @@ AI_Smart_MeanLook: ; 38dfb pop hl jp z, AIDiscourageMove -; 80% chance to greatly encourage this move if the enemy is badly poisoned (weird). +; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy). +; Should check PlayerSubStatus5 instead. ld a, [EnemySubStatus5] bit SUBSTATUS_TOXIC, a jr nz, .asm_38e26 diff --git a/battle/core.asm b/battle/core.asm index 8c4ab73e4..bc8a37725 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -5998,7 +5998,7 @@ CheckPlayerHasUsableMoves: ; 3e786 swap a and $f ld b, a - ld d, $5 + ld d, NUM_MOVES + 1 xor a .loop dec d @@ -6011,7 +6011,9 @@ CheckPlayerHasUsableMoves: ; 3e786 jr .loop .done - and a ; This is probably a bug, and will result in a move with PP Up confusing the game. + ; Bug: this will result in a move with PP Up confusing the game. + ; Replace with "and $3f" to fix. + and a ret nz .force_struggle |