diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /audio | |
| parent | Merge pull request #277 from Rangi42/master (diff) | |
| parent | Missingno's Pokédex weight is two bytes like the rest (diff) | |
| download | pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/low_health_alarm.asm | 15 | ||||
| -rw-r--r-- | audio/play_battle_music.asm | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm index 514db55f..a550cf70 100644 --- a/audio/low_health_alarm.asm +++ b/audio/low_health_alarm.asm @@ -61,15 +61,20 @@ Music_DoLowHealthAlarm:: jr nz, .copyLoop ret +alarm_tone: MACRO + db \1 ; length + db \2 ; envelope + dw \3 ; frequency +ENDM + ;bytes to write to sound channel 1 registers for health alarm. -;starting at FF11 (FF10 is always zeroed), so these bytes are: -;length, envelope, freq lo, freq hi +;starting at FF11 (FF10 is always zeroed). .toneDataHi - db $A0,$E2,$50,$87 + alarm_tone $A0, $E2, $8750 .toneDataLo - db $B0,$E2,$EE,$86 + alarm_tone $B0, $E2, $86EE ;written to stop the alarm .toneDataSilence - db $00,$00,$00,$80 + alarm_tone $00, $00, $8000 diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index f8bfcd19..93cf8a77 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -16,7 +16,7 @@ PlayBattleMusic:: ld a, [wCurOpponent] cp OPP_ID_OFFSET jr c, .wildBattle - cp OPP_SONY3 + cp OPP_RIVAL3 jr z, .finalBattle cp OPP_LANCE jr nz, .normalTrainerBattle |