diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/overworld/step_functions.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rw-r--r-- | engine/overworld/poison.asm (renamed from engine/overworld/step_functions.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/step_functions.asm b/engine/overworld/poison.asm index 84b09291..03fb8a65 100644 --- a/engine/overworld/step_functions.asm +++ b/engine/overworld/poison.asm @@ -58,7 +58,7 @@ ApplyOutOfBattlePoisonDamage: xor a ld [wJoyIgnore], a call EnableAutoTextBoxDrawing - ld a, $d0 + ld a, TEXT_MON_FAINTED ld [hSpriteIndexOrTextID], a call DisplayTextID callab IsThisPartymonStarterPikachu_Party @@ -102,7 +102,7 @@ ApplyOutOfBattlePoisonDamage: and a ; are any party members poisoned? jr z, .skipPoisonEffectAndSound ld b, $2 - predef InvertBGPal_4Frames ; change BG white to dark grey for 4 frames + predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames ld a, SFX_POISONED call PlaySound .skipPoisonEffectAndSound @@ -111,7 +111,7 @@ ApplyOutOfBattlePoisonDamage: and a jr nz, .noBlackOut call EnableAutoTextBoxDrawing - ld a, $d1 + ld a, TEXT_BLACKED_OUT ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72e |