diff options
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 110 |
1 files changed, 56 insertions, 54 deletions
@@ -452,7 +452,7 @@ INCLUDE "audio/sfx/get_item2_4.asm" SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] -PlayBattleMusic:: ; 9064 (2:5064) +PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a @@ -490,7 +490,7 @@ INCLUDE "audio/engine_1.asm" ; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: ; 99bd (2:59bd) +Music_RivalAlternateStart:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -501,7 +501,7 @@ Music_RivalAlternateStart:: ; 99bd (2:59bd) call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) +Audio1_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -509,7 +509,7 @@ Audio1_OverwriteChannelPointer: ; 99d6 (2:59d6) ret ; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: ; 99db (2:59db) +Music_RivalAlternateTempo:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -517,10 +517,10 @@ Music_RivalAlternateTempo:: ; 99db (2:59db) jr asm_99ed ; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: ; 99e7 (2:59e7) +Music_RivalAlternateStartAndTempo:: call Music_RivalAlternateStart ld de, Music_MeetRival_branch_b19b -asm_99ed: ; 99ed (2:59ed) +asm_99ed: ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer @@ -528,7 +528,7 @@ asm_99ed: ; 99ed (2:59ed) ret ; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) +Music_Cities1AlternateTempo:: ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a @@ -545,7 +545,7 @@ Music_Cities1AlternateTempo:: ; 99f4 (2:59f4) SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] -Music_DoLowHealthAlarm:: ; 2131e (8:531e) +Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -627,7 +627,7 @@ INCLUDE "audio/engine_2.asm" SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -PlayPokedexRatingSfx:: ; 7d0d6 (1f:50d6) +PlayPokedexRatingSfx:: ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues @@ -650,7 +650,7 @@ PlayPokedexRatingSfx:: ; 7d0d6 (1f:50d6) call PlayMusic jp PlayDefaultMusic -PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) +PokedexRatingSfxPointers: db SFX_DENIED, BANK(SFX_Denied_3) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) @@ -659,7 +659,7 @@ PokedexRatingSfxPointers: ; 7d0f8 (1f:50f8) db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) -OwnedMonValues: ; 7d106 (1f:5106) +OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff @@ -667,7 +667,9 @@ INCLUDE "audio/engine_3.asm" SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4] -SurfingPikachu1Graphics:: INCBIN "gfx/surfing_pikachu_1.t4.2bpp" +SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu_1a.2bpp" +SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu_1b.2bpp" +SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu_1c.t5.2bpp" INCLUDE "audio/engine_4.asm" @@ -751,7 +753,7 @@ INCLUDE "audio/music/meetjessiejames.asm" INCBIN "audio/unknown_832b9.bin" SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1] -PikachuCry1:: ; 84000 (21:4000) +PikachuCry1:: dw (PikachuCry1_End - PikachuCry1) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm" PikachuCry1_End: @@ -760,21 +762,21 @@ PikachuCry1_End: ; Game Freak might have made a slight error, because all of ; the pcm data has one trailing byte that is never processed. -PikachuCry2:: ; 8491a (21:491a) +PikachuCry2:: dw (PikachuCry2_End - PikachuCry2) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_2.pcm" PikachuCry2_End: db $77 ; unused -PikachuCry3:: ; 84fdc (21:4fdc) +PikachuCry3:: dw (PikachuCry3_End - PikachuCry3) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_3.pcm" PikachuCry3_End: db $03 ; unused -PikachuCry4:: ; 859ee (21:59ee) +PikachuCry4:: dw (PikachuCry4_End - PikachuCry4) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_4.pcm" PikachuCry4_End: @@ -783,21 +785,21 @@ PikachuCry4_End: SECTION "Pikachu Cries 2",ROMX,BANK[PCM_2] -PikachuCry5:: ; 88000 (22:4000) +PikachuCry5:: dw (PikachuCry5_End - PikachuCry5) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm" PikachuCry5_End: db $77 ; unused -PikachuCry6:: ; 89042 (22:5042) +PikachuCry6:: dw (PikachuCry6_End - PikachuCry6) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_6.pcm" PikachuCry6_End: db $77 ; unused -PikachuCry7:: ; 8a254 (22:6254) +PikachuCry7:: dw (PikachuCry7_End - PikachuCry7) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_7.pcm" PikachuCry7_End: @@ -806,21 +808,21 @@ PikachuCry7_End: SECTION "Pikachu Cries 3",ROMX,BANK[PCM_3] -PikachuCry8:: ; 8c000 (23:4000) +PikachuCry8:: dw (PikachuCry8_End - PikachuCry8) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm" PikachuCry8_End: db $f7 ; unused -PikachuCry9:: ; 8d0ca (23:50ca) +PikachuCry9:: dw (PikachuCry9_End - PikachuCry9) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_9.pcm" PikachuCry9_End: db $f3 ; unused -PikachuCry10:: ; 8de0c (23:5e0c) +PikachuCry10:: dw (PikachuCry10_End - PikachuCry10) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_10.pcm" PikachuCry10_End: @@ -829,21 +831,21 @@ PikachuCry10_End: SECTION "Pikachu Cries 4",ROMX,BANK[PCM_4] -PikachuCry11:: ; 90000 (24:4000) +PikachuCry11:: dw (PikachuCry11_End - PikachuCry11) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm" PikachuCry11_End: db $77 ; unused -PikachuCry12:: ; 90722 (24:4772) +PikachuCry12:: dw (PikachuCry12_End - PikachuCry12) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_12.pcm" PikachuCry12_End: db $ff ; unused -PikachuCry13:: ; 914a4 (24:54a4) +PikachuCry13:: dw (PikachuCry13_End - PikachuCry13) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_13.pcm" PikachuCry13_End: @@ -852,14 +854,14 @@ PikachuCry13_End: SECTION "Pikachu Cries 5",ROMX,BANK[PCM_5] -PikachuCry14:: ; 94000 (25:4000) +PikachuCry14:: dw (PikachuCry14_End - PikachuCry14) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm" PikachuCry14_End: db $fc ; unused -PikachuCry15:: ; 9589a (25:589a) +PikachuCry15:: dw (PikachuCry15_End - PikachuCry15) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm" PikachuCry15_End: @@ -867,21 +869,21 @@ PikachuCry15_End: db $77 ; unused SECTION "Pikachu Cries 6",ROMX,BANK[PCM_6] -PikachuCry16:: ; c4000 (31:4000) +PikachuCry16:: dw (PikachuCry16_End - PikachuCry16) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm" PikachuCry16_End: db $e7 ; unused -PikachuCry18:: ; c549a (31:549a) +PikachuCry18:: dw (PikachuCry18_End - PikachuCry18) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_18.pcm" PikachuCry18_End: db $00 ; unused -PikachuCry22:: ; c63a4 (31:63a4) +PikachuCry22:: dw (PikachuCry22_End - PikachuCry22) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_22.pcm" PikachuCry22_End: @@ -890,14 +892,14 @@ PikachuCry22_End: SECTION "Pikachu Cries 7",ROMX,BANK[PCM_7] -PikachuCry20:: ; c8000 (32:4000) +PikachuCry20:: dw (PikachuCry20_End - PikachuCry20) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm" PikachuCry20_End: db $07 ; unused -PikachuCry21:: ; ca002 (32:6002) +PikachuCry21:: dw (PikachuCry21_End - PikachuCry21) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_21.pcm" PikachuCry21_End: @@ -906,42 +908,42 @@ PikachuCry21_End: SECTION "Pikachu Cries 8",ROMX,BANK[PCM_8] -PikachuCry19:: ; cc000 (33:4000) +PikachuCry19:: dw (PikachuCry19_End - PikachuCry19) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm" PikachuCry19_End: db $06 ; unused -PikachuCry24:: ; cd632 (33:5632) +PikachuCry24:: dw (PikachuCry24_End - PikachuCry24) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_24.pcm" PikachuCry24_End: db $e0 ; unused -PikachuCry26:: ; cf25c (33:725c) +PikachuCry26:: dw (PikachuCry26_End - PikachuCry26) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm" PikachuCry26_End: SECTION "Pikachu Cries 9",ROMX,BANK[PCM_9] -PikachuCry17:: ; d0000 (34:4000) +PikachuCry17:: dw (PikachuCry17_End - PikachuCry17) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm" PikachuCry17_End: db $00 ; unused -PikachuCry23:: ; d0862 (34:4862) +PikachuCry23:: dw (PikachuCry23_End - PikachuCry23) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_23.pcm" PikachuCry23_End: db $00 ; unused -PikachuCry25:: ; d173c (34:573c) +PikachuCry25:: dw (PikachuCry25_End - PikachuCry25) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_25.pcm" PikachuCry25_End: @@ -950,63 +952,63 @@ PikachuCry25_End: SECTION "Pikachu Cries 10",ROMX,BANK[PCM_10] -PikachuCry27:: ; d4000 (35:4000) +PikachuCry27:: dw (PikachuCry27_End - PikachuCry27) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm" PikachuCry27_End: db $ff ; unused -PikachuCry28:: ; d4b5a (35:4b5a) +PikachuCry28:: dw (PikachuCry28_End - PikachuCry28) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_28.pcm" PikachuCry28_End: db $1b ; unused -PikachuCry29:: ; d5da4 (35:5da4) +PikachuCry29:: dw (PikachuCry29_End - PikachuCry29) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_29.pcm" PikachuCry29_End: db $87 ; unused -PikachuCry30:: ; d69ce (35:69ce) +PikachuCry30:: dw (PikachuCry30_End - PikachuCry30) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_30.pcm" PikachuCry30_End: db $00 ; unused -PikachuCry31:: ; d6e80 (35:6ea0) +PikachuCry31:: dw (PikachuCry31_End - PikachuCry31) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm" PikachuCry31_End: SECTION "Pikachu Cries 11",ROMX,BANK[PCM_11] -PikachuCry32:: ; d8000 (36:4000) +PikachuCry32:: dw (PikachuCry32_End - PikachuCry32) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm" PikachuCry32_End: db $ff ; unused -PikachuCry33:: ; d858a (36:458a) +PikachuCry33:: dw (PikachuCry33_End - PikachuCry33) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_33.pcm" PikachuCry33_End: db $1f ; unused -PikachuCry34:: ; d923c (36:523c) +PikachuCry34:: dw (PikachuCry34_End - PikachuCry34) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_34.pcm" PikachuCry34_End: db $01 ; unused -PikachuCry41:: ; da746 (36:6746) +PikachuCry41:: dw (PikachuCry41_End - PikachuCry41) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_41.pcm" PikachuCry41_End: @@ -1015,21 +1017,21 @@ PikachuCry41_End: SECTION "Pikachu Cries 12",ROMX,BANK[PCM_12] -PikachuCry35:: ; dc000 (37:4000) +PikachuCry35:: dw (PikachuCry35_End - PikachuCry35) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm" PikachuCry35_End: db $00 ; unused -PikachuCry36:: ; dd22a (37:5d2a) +PikachuCry36:: dw (PikachuCry36_End - PikachuCry36) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_36.pcm" PikachuCry36_End: db $01 ; unused -PikachuCry39:: ; dee0c (37:6e0c) +PikachuCry39:: dw (PikachuCry39_End - PikachuCry39) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_39.pcm" PikachuCry39_End: @@ -1038,28 +1040,28 @@ PikachuCry39_End: SECTION "Pikachu Cries 13",ROMX,BANK[PCM_13] -PikachuCry37:: ; e0000 (38:4000) +PikachuCry37:: dw (PikachuCry37_End - PikachuCry37) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm" PikachuCry37_End: db $3f ; unused -PikachuCry38:: ; e0dfa (38:4dfa) +PikachuCry38:: dw (PikachuCry38_End - PikachuCry38) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_38.pcm" PikachuCry38_End: db $ff ; unused -PikachuCry40:: ; e1a64 (38:5a64) +PikachuCry40:: dw (PikachuCry40_End - PikachuCry40) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_40.pcm" PikachuCry40_End: db $ff ; unused -PikachuCry42:: ; e2976 (38:6976) +PikachuCry42:: dw (PikachuCry42_End - PikachuCry42) - 2 ; length of pcm data INCBIN "audio/pikachu_cries/pikachu_cry_42.pcm" PikachuCry42_End: |