diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-02-05 17:59:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 17:59:01 -0600 |
| commit | 5048f24816e95fc38a708b967648deb86c62a689 (patch) | |
| tree | c6b15116aefe09c91c3047d506fc7bbf677f8001 /engine/battle | |
| parent | New Discord invite link (diff) | |
| parent | Rename dnote to drum_note and dspeed to drum_speed (diff) | |
| download | pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.gz pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.xz pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.zip | |
Merge pull request #223 from pret/audio-macros
Audio macros
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/core.asm | 6 | ||||
| -rwxr-xr-x | engine/battle/end_of_battle.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 04336810..2b00a812 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -872,7 +872,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -956,7 +956,7 @@ EndLowHealthAlarm: ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wLowHealthAlarm], a ; turn off low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1954,7 +1954,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index c77e3b39..830a23a1 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a |