diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2022-08-11 21:23:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 21:23:08 -0400 |
| commit | bbb0e7e82deb6741f75a12b48f81076d92f5d9dc (patch) | |
| tree | 068961260e172327acb8cc0eff0d6681ac64ebf2 /engine/battle | |
| parent | Update comments related to Swift and Substitute checks (#380) (diff) | |
| download | pokeyellow-bbb0e7e82deb6741f75a12b48f81076d92f5d9dc.tar.gz pokeyellow-bbb0e7e82deb6741f75a12b48f81076d92f5d9dc.tar.xz pokeyellow-bbb0e7e82deb6741f75a12b48f81076d92f5d9dc.zip | |
Use the same music headers as pokecrystal (#382)
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | 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 6aa697c9..f84b759c 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -782,7 +782,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -866,7 +866,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 + Ch5], a + ld [wChannelSoundIDs + CHAN5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1864,7 +1864,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + CHAN5], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index bd4a1901..b9f9d537 100644 --- 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 + Ch5], a + ld [wChannelSoundIDs + CHAN5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a |