diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-11 18:47:10 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-11 18:47:10 -0400 |
commit | 7c1a6b17a5ee7a0d69de7a3c46d26ec6235186ec (patch) | |
tree | ba515a5666dcce4843fe749e8c0589f55807c3fb | |
parent | 3d93ea2867454ad8c24b7c8e81c396c8b541a903 (diff) |
Fix short beeping noise for sent-out Pokémon
-rw-r--r-- | Physical-Special-split.md | 2 | ||||
-rw-r--r-- | Short-beeping-noise-for-low-HP.md | 29 |
2 files changed, 29 insertions, 2 deletions
diff --git a/Physical-Special-split.md b/Physical-Special-split.md index fe2493e..22484fd 100644 --- a/Physical-Special-split.md +++ b/Physical-Special-split.md @@ -102,8 +102,6 @@ Moves: You'll have to assign the right category—`PHYSICAL`, `SPECIAL`, or `STATUS`—to all 251 moves, right after their types. There's a file which already does this with the default pokecrystal moves [here](https://gitgud.io/pfero/axyllagame/blob/b545f49f30cef9c0d567e715cd58a123c6ac31c8/data/moves/moves.asm). (Note: that file also changes Curse's type from `CURSE_T` to `GHOST`.) -Additionally, if you want moves updated to Gen 7 with LGPE changes, copy/paste this file [here](https://raw.githubusercontent.com/petuuuhhh/pokecrystal/master/data/moves/moves.asm) - ## 3. Mask out the category in `PrintMoveType` diff --git a/Short-beeping-noise-for-low-HP.md b/Short-beeping-noise-for-low-HP.md index e83cf28..962869d 100644 --- a/Short-beeping-noise-for-low-HP.md +++ b/Short-beeping-noise-for-low-HP.md @@ -106,6 +106,35 @@ Edit [audio/engine.asm](../blob/master/audio/engine.asm): db $86 ; restart sound ``` +And edit [engine/battle/core.asm](../blob/master/engine/battle/core.asm): + +```diff + CheckDanger: + ld hl, wBattleMonHP + ld a, [hli] + or [hl] + jr z, .no_danger + ld a, [wBattleLowHealthAlarm] + and a + jr nz, .done + ld a, [wPlayerHPPal] + cp HP_RED + jr z, .danger + + .no_danger + ld hl, wLowHealthAlarm ++ ld [hl], 0 +- res DANGER_ON_F, [hl] + jr .done + + .danger + ld hl, wLowHealthAlarm + set DANGER_ON_F, [hl] + + .done + ret +``` + TODO: Explain changes. With this short edit, the noise will stop after just four beeps. It plays when your HP first turns red, and when you send out a Pokémon with low HP. |