mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
parent
c34add7e08
commit
3bb94e4928
@ -1349,19 +1349,13 @@ SunnyDayMoves:
|
|||||||
- ; res SUBSTATUS_NIGHTMARE, [hl]
|
- ; res SUBSTATUS_NIGHTMARE, [hl]
|
||||||
+ ld hl, wEnemySubStatus1
|
+ ld hl, wEnemySubStatus1
|
||||||
+ res SUBSTATUS_NIGHTMARE, [hl]
|
+ res SUBSTATUS_NIGHTMARE, [hl]
|
||||||
- ; Bug: this should reset SUBSTATUS_CONFUSED
|
...
|
||||||
- ; Uncomment the 2 lines below to fix
|
|
||||||
- ; ld hl, wEnemySubStatus3
|
|
||||||
- ; res SUBSTATUS_CONFUSED, [hl]
|
|
||||||
+ ld hl, wEnemySubStatus5
|
|
||||||
+ res SUBSTATUS_TOXIC, [hl]
|
|
||||||
ret
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
### AI use of Full Heal does not cure confusion status
|
### AI use of Full Heal does not cure confusion status
|
||||||
|
|
||||||
**Fix:** Edit `EnemyUsedFullRestore`, `EnemyUsedFullHeal`, and `AI_HealStatus` in [engine/battle/ai/items.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/ai/items.asm):
|
**Fix:** Edit `EnemyUsedFullRestore`, and `AI_HealStatus` in [engine/battle/ai/items.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/ai/items.asm):
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
EnemyUsedFullRestore:
|
EnemyUsedFullRestore:
|
||||||
@ -1370,19 +1364,8 @@ SunnyDayMoves:
|
|||||||
ld [wCurEnemyItem], a
|
ld [wCurEnemyItem], a
|
||||||
- ld hl, wEnemySubStatus3
|
- ld hl, wEnemySubStatus3
|
||||||
- res SUBSTATUS_CONFUSED, [hl]
|
- res SUBSTATUS_CONFUSED, [hl]
|
||||||
xor a
|
- xor a
|
||||||
ld [wEnemyConfuseCount], a
|
- ld [wEnemyConfuseCount], a
|
||||||
```
|
|
||||||
|
|
||||||
```diff
|
|
||||||
EnemyUsedFullHeal:
|
|
||||||
call AIUsedItemSound
|
|
||||||
call AI_HealStatus
|
|
||||||
ld a, FULL_HEAL
|
|
||||||
+ ld [wCurEnemyItem], a
|
|
||||||
+ xor a
|
|
||||||
+ ld [wEnemyConfuseCount], a
|
|
||||||
jp PrintText_UsedItemOn_AND_AIUpdateHUD
|
|
||||||
```
|
```
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
@ -1394,12 +1377,11 @@ SunnyDayMoves:
|
|||||||
xor a
|
xor a
|
||||||
ld [hl], a
|
ld [hl], a
|
||||||
ld [wEnemyMonStatus], a
|
ld [wEnemyMonStatus], a
|
||||||
- ; Bug: this should reset SUBSTATUS_NIGHTMARE
|
+ ld [wEnemyConfuseCount], a
|
||||||
- ; Uncomment the 2 lines below to fix
|
; Bug: this should reset SUBSTATUS_NIGHTMARE
|
||||||
- ; ld hl, wEnemySubStatus1
|
; Uncomment the 2 lines below to fix
|
||||||
- ; res SUBSTATUS_NIGHTMARE, [hl]
|
; ld hl, wEnemySubStatus1
|
||||||
+ ld hl, wEnemySubStatus1
|
; res SUBSTATUS_NIGHTMARE, [hl]
|
||||||
+ res SUBSTATUS_NIGHTMARE, [hl]
|
|
||||||
- ; Bug: this should reset SUBSTATUS_CONFUSED
|
- ; Bug: this should reset SUBSTATUS_CONFUSED
|
||||||
- ; Uncomment the 2 lines below to fix
|
- ; Uncomment the 2 lines below to fix
|
||||||
- ; ld hl, wEnemySubStatus3
|
- ; ld hl, wEnemySubStatus3
|
||||||
|
Loading…
Reference in New Issue
Block a user