Merge pull request #231 from yenatch/sfx-cries

Dump cries and sound effects
This commit is contained in:
Bryan Bishop 2014-02-06 20:25:54 -06:00
commit 2d160dcece
112 changed files with 9095 additions and 975 deletions

View File

@ -155,12 +155,12 @@ INCLUDE "audio/music/postcredits.asm"
SECTION "Sound Effects", ROMX, BANK[SOUND_EFFECTS]
INCBIN "baserom.gbc",$f0941, $f2787 - $f0941
INCLUDE "audio/sfx.asm"
SECTION "Crystal Sound Effects", ROMX, BANK[CRYSTAL_SOUND_EFFECTS]
INCBIN "baserom.gbc",$17982d, $1799ef - $17982d
INCLUDE "audio/sfx_crystal.asm"
@ -168,6 +168,6 @@ SECTION "Cries", ROMX, BANK[CRIES]
CryHeaders:: INCLUDE "audio/cry_headers.asm"
INCBIN "baserom.gbc",$f2d69, $f3fb6 - $f2d69
INCLUDE "audio/cries.asm"

2306
audio/cries.asm Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1504,4 +1504,27 @@ CelebiCryHeader: ; 0xf2d63
db $01 ; echo
dw $111 ; length
CryHeader252: ; 0xf2d69
dw 0 ; cry id
db 0 ; pitch
db 0 ; echo
dw 0 ; length
CryHeader253: ; 0xf2d6f
dw 0 ; cry id
db 0 ; pitch
db 0 ; echo
dw 0 ; length
CryHeader254: ; 0xf2d75
dw 0 ; cry id
db 0 ; pitch
db 0 ; echo
dw 0 ; length
CryHeader255: ; 0xf2d7b
dw 0 ; cry id
db 0 ; pitch
db 0 ; echo
dw 0 ; length

View File

@ -1,70 +1,70 @@
; e91b0
dbw $3c, $747d
dbw $3c, $7486
dbw $3c, $748f
dbw $3c, $7498
dbw $3c, $74a1
dbw $3c, $74aa
dbw $3c, $74b3
dbw $3c, $74bc
dbw $3c, $74c5
dbw $3c, $74ce
dbw $3c, $74d7
dbw $3c, $74e0
dbw $3c, $74e9
dbw $3c, $74f2
dbw $3c, $74fb
dbw $3c, $7504
dbw $3c, $750d
dbw $3c, $7516
dbw $3c, $751f
dbw $3c, $7528
dbw $3c, $7531
dbw $3c, $753a
dbw $3c, $7543
dbw $3c, $754c
dbw $3c, $7555
dbw $3c, $755e
dbw $3c, $7567
dbw $3c, $7570
dbw $3c, $7579
dbw $3c, $7582
dbw $3c, $758b
dbw $3c, $7594
dbw $3c, $759d
dbw $3c, $75a6
dbw $3c, $75af
dbw $3c, $75b8
dbw $3c, $75c1
dbw $3c, $75ca
dbw $3c, $6d81
dbw $3c, $6d96
dbw $3c, $6d8a
dbw $3c, $6dde
dbw $3c, $6d9f
dbw $3c, $6dc0
dbw $3c, $6d90
dbw $3c, $6da8
dbw $3c, $6db1
dbw $3c, $6db7
dbw $3c, $6dc6
dbw $3c, $6dcf
dbw $3c, $6e35
dbw $3c, $6dd8
dbw $3c, $6e3e
dbw $3c, $6de7
dbw $3c, $6ded
dbw $3c, $6e6b
dbw $3c, $6df6
dbw $3c, $6e74
dbw $3c, $6e08
dbw $3c, $6e11
dbw $3c, $6e1a
dbw $3c, $6e23
dbw $3c, $6e2c
dbw $3c, $6e62
dbw $3c, $6e47
dbw $3c, $6e50
dbw $3c, $6e59
dbw $3c, $6dff
dbw BANK(Cry_00), Cry_00
dbw BANK(Cry_01), Cry_01
dbw BANK(Cry_02), Cry_02
dbw BANK(Cry_03), Cry_03
dbw BANK(Cry_04), Cry_04
dbw BANK(Cry_05), Cry_05
dbw BANK(Cry_06), Cry_06
dbw BANK(Cry_07), Cry_07
dbw BANK(Cry_08), Cry_08
dbw BANK(Cry_09), Cry_09
dbw BANK(Cry_0A), Cry_0A
dbw BANK(Cry_0B), Cry_0B
dbw BANK(Cry_0C), Cry_0C
dbw BANK(Cry_0D), Cry_0D
dbw BANK(Cry_0E), Cry_0E
dbw BANK(Cry_0F), Cry_0F
dbw BANK(Cry_10), Cry_10
dbw BANK(Cry_11), Cry_11
dbw BANK(Cry_12), Cry_12
dbw BANK(Cry_13), Cry_13
dbw BANK(Cry_14), Cry_14
dbw BANK(Cry_15), Cry_15
dbw BANK(Cry_16), Cry_16
dbw BANK(Cry_17), Cry_17
dbw BANK(Cry_18), Cry_18
dbw BANK(Cry_19), Cry_19
dbw BANK(Cry_1A), Cry_1A
dbw BANK(Cry_1B), Cry_1B
dbw BANK(Cry_1C), Cry_1C
dbw BANK(Cry_1D), Cry_1D
dbw BANK(Cry_1E), Cry_1E
dbw BANK(Cry_1F), Cry_1F
dbw BANK(Cry_20), Cry_20
dbw BANK(Cry_21), Cry_21
dbw BANK(Cry_22), Cry_22
dbw BANK(Cry_23), Cry_23
dbw BANK(Cry_24), Cry_24
dbw BANK(Cry_25), Cry_25
dbw BANK(Cry_26), Cry_26
dbw BANK(Cry_27), Cry_27
dbw BANK(Cry_28), Cry_28
dbw BANK(Cry_29), Cry_29
dbw BANK(Cry_2A), Cry_2A
dbw BANK(Cry_2B), Cry_2B
dbw BANK(Cry_2C), Cry_2C
dbw BANK(Cry_2D), Cry_2D
dbw BANK(Cry_2E), Cry_2E
dbw BANK(Cry_2F), Cry_2F
dbw BANK(Cry_30), Cry_30
dbw BANK(Cry_31), Cry_31
dbw BANK(Cry_32), Cry_32
dbw BANK(Cry_33), Cry_33
dbw BANK(Cry_34), Cry_34
dbw BANK(Cry_35), Cry_35
dbw BANK(Cry_36), Cry_36
dbw BANK(Cry_37), Cry_37
dbw BANK(Cry_38), Cry_38
dbw BANK(Cry_39), Cry_39
dbw BANK(Cry_3A), Cry_3A
dbw BANK(Cry_3B), Cry_3B
dbw BANK(Cry_3C), Cry_3C
dbw BANK(Cry_3D), Cry_3D
dbw BANK(Cry_3E), Cry_3E
dbw BANK(Cry_3F), Cry_3F
dbw BANK(Cry_40), Cry_40
dbw BANK(Cry_41), Cry_41
dbw BANK(Cry_42), Cry_42
dbw BANK(Cry_43), Cry_43
; e927c

View File

@ -5,7 +5,6 @@ Music_AfterTheRivalFight: ; f5127
dbw $03, Music_AfterTheRivalFight_Ch4
; f5133
Music_AfterTheRivalFight_Ch1: ; f5133
tempo 112
volume $77
@ -24,6 +23,7 @@ Music_AfterTheRivalFight_Ch1: ; f5133
note G#, 2
note G#, 2
loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
; f5153
Music_AfterTheRivalFight_Ch2: ; f5153
dutycycle $1
@ -39,6 +39,7 @@ Music_AfterTheRivalFight_Ch2: ; f5153
note G#, 2
note G#, 2
loopchannel 0, Music_AfterTheRivalFight_branch_f502e
; f516a
Music_AfterTheRivalFight_Ch3: ; f516a
notetype $c, $28
@ -52,6 +53,7 @@ Music_AfterTheRivalFight_Ch3: ; f516a
note F_, 2
note D#, 2
loopchannel 0, Music_AfterTheRivalFight_branch_f509d
; f517a
Music_AfterTheRivalFight_Ch4: ; f517a
togglenoise $3
@ -65,3 +67,5 @@ Music_AfterTheRivalFight_Ch4: ; f517a
note D_, 2
loopchannel 0, Music_AfterTheRivalFight_branch_f5118
; f518a

View File

@ -5,7 +5,6 @@ Music_AzaleaTown: ; f57e8
dbw $03, Music_AzaleaTown_Ch4
; f57f4
Music_AzaleaTown_Ch1: ; f57f4
tempo 160
volume $77
@ -13,7 +12,6 @@ Music_AzaleaTown_Ch1: ; f57f4
stereopanning $f
notetype $c, $a1
note __, 2
Music_AzaleaTown_branch_f5801: ; f5801
intensity $a1
octave 3
@ -29,7 +27,6 @@ Music_AzaleaTown_branch_f5801: ; f5801
note F_, 2
note F_, 2
loopchannel 2, Music_AzaleaTown_branch_f5801
Music_AzaleaTown_branch_f5816: ; f5816
callchannel Music_AzaleaTown_branch_f588c
stereopanning $f0
@ -233,6 +230,7 @@ Music_AzaleaTown_branch_f5912: ; f5912
intensity $a1
note A_, 8
endchannel
; f591d
Music_AzaleaTown_Ch2: ; f591d
vibrato $12, $23
@ -270,7 +268,6 @@ Music_AzaleaTown_Ch2: ; f591d
dutycycle $1
octave 5
note C_, 1
Music_AzaleaTown_branch_f5952: ; f5952
callchannel Music_AzaleaTown_branch_f59c7
note C#, 4
@ -423,6 +420,7 @@ Music_AzaleaTown_branch_f59c7: ; f59c7
note D#, 12
intensity $b4
endchannel
; f5a08
Music_AzaleaTown_Ch3: ; f5a08
stereopanning $ff
@ -448,7 +446,6 @@ Music_AzaleaTown_Ch3: ; f5a08
note C#, 1
note __, 1
note G#, 4
Music_AzaleaTown_branch_f5a24: ; f5a24
callchannel Music_AzaleaTown_branch_f5a86
note G#, 4
@ -634,12 +631,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf
note F_, 1
note __, 1
endchannel
; f5ae5
Music_AzaleaTown_Ch4: ; f5ae5
togglenoise $3
notetype $c
note F_, 2
Music_AzaleaTown_branch_f5aea: ; f5aea
note D#, 2
note F#, 2
@ -664,3 +661,5 @@ Music_AzaleaTown_branch_f5aea: ; f5aea
note F#, 2
loopchannel 0, Music_AzaleaTown_branch_f5aea
; f5b03

View File

@ -5,7 +5,6 @@ Music_BattleTowerLobby: ; 17948b
dbw $03, Music_BattleTowerLobby_Ch4
; 179497
Music_BattleTowerLobby_Ch1: ; 179497
tempo 152
volume $77
@ -14,7 +13,6 @@ Music_BattleTowerLobby_Ch1: ; 179497
vibrato $8, $22
stereopanning $f0
notetype $c, $72
Music_BattleTowerLobby_branch_1794a9: ; 1794a9
notetype $c, $72
octave 3
@ -118,13 +116,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9
octave 2
note B_, 4
loopchannel 0, Music_BattleTowerLobby_branch_1794a9
; 17953a
Music_BattleTowerLobby_Ch2: ; 17953a
dutycycle $2
vibrato $10, $34
stereopanning $f
notetype $c, $82
Music_BattleTowerLobby_branch_179544: ; 179544
notetype $c, $82
octave 4
@ -203,10 +201,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544
octave 4
note D#, 1
loopchannel 0, Music_BattleTowerLobby_branch_179544
; 1795ae
Music_BattleTowerLobby_Ch3: ; 1795ae
notetype $c, $11
Music_BattleTowerLobby_branch_1795b1: ; 1795b1
octave 2
note B_, 2
@ -300,10 +298,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1
note D#, 2
note F#, 2
loopchannel 0, Music_BattleTowerLobby_branch_1795b1
; 179610
Music_BattleTowerLobby_Ch4: ; 179610
togglenoise $0
Music_BattleTowerLobby_branch_179612: ; 179612
notetype $c
note __, 2
@ -313,3 +311,5 @@ Music_BattleTowerLobby_branch_179612: ; 179612
note F_, 4
loopchannel 0, Music_BattleTowerLobby_branch_179612
; 17961d

View File

@ -5,7 +5,6 @@ Music_BattleTowerTheme: ; 178889
dbw $03, Music_BattleTowerTheme_Ch4
; 178895
Music_BattleTowerTheme_Ch1: ; 178895
tempo 141
volume $77
@ -13,7 +12,6 @@ Music_BattleTowerTheme_Ch1: ; 178895
vibrato $12, $34
stereopanning $f
notetype $6, $94
Music_BattleTowerTheme_branch_1788a5: ; 1788a5
note __, 16
note __, 16
@ -204,10 +202,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e
note __, 4
note A_, 4
endchannel
; 17896d
Music_BattleTowerTheme_Ch2: ; 17896d
vibrato $12, $34
Music_BattleTowerTheme_branch_178970: ; 178970
dutycycle $3
notetype $6, $b8
@ -361,11 +359,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15
note A#, 4
note A_, 4
endchannel
; 178a20
Music_BattleTowerTheme_Ch3: ; 178a20
vibrato $12, $34
notetype $6, $16
Music_BattleTowerTheme_branch_178a26: ; 178a26
stereopanning $ff
callchannel Music_BattleTowerTheme_branch_178afe
@ -589,11 +587,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe
note C_, 2
note __, 2
endchannel
; 178b0d
Music_BattleTowerTheme_Ch4: ; 178b0d
togglenoise $3
notetype $c
Music_BattleTowerTheme_branch_178b11: ; 178b11
callchannel Music_BattleTowerTheme_branch_178b58
note D_, 2
@ -605,7 +603,6 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11
note C#, 1
note D_, 1
note C#, 1
Music_BattleTowerTheme_branch_178b1d: ; 178b1d
callchannel Music_BattleTowerTheme_branch_178b58
callchannel Music_BattleTowerTheme_branch_178b61
@ -618,7 +615,6 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d
note D_, 1
note D_, 1
note D_, 8
Music_BattleTowerTheme_branch_178b35: ; 178b35
callchannel Music_BattleTowerTheme_branch_178b76
note D_, 2
@ -699,3 +695,5 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76
note C#, 1
endchannel
; 178b81

View File

@ -5,7 +5,6 @@ Music_Bicycle: ; ee119
dbw $03, Music_Bicycle_Ch4
; ee125
Music_Bicycle_Ch1: ; ee125
tempo 140
volume $77
@ -24,7 +23,6 @@ Music_Bicycle_Ch1: ; ee125
note A_, 8
intensity $b2
note F#, 2
Music_Bicycle_branch_ee144: ; ee144
stereopanning $f
intensity $b2
@ -171,6 +169,7 @@ Music_Bicycle_branch_ee144: ; ee144
note G#, 2
note A_, 2
loopchannel 0, Music_Bicycle_branch_ee144
; ee1de
Music_Bicycle_Ch2: ; ee1de
dutycycle $2
@ -196,7 +195,6 @@ Music_Bicycle_Ch2: ; ee1de
octave 3
note B_, 2
note A_, 2
Music_Bicycle_branch_ee1fd: ; ee1fd
stereopanning $ff
dutycycle $2
@ -288,6 +286,7 @@ Music_Bicycle_branch_ee263: ; ee263
note G_, 6
note E_, 4
endchannel
; ee26d
Music_Bicycle_Ch3: ; ee26d
notetype $c, $14
@ -306,7 +305,6 @@ Music_Bicycle_Ch3: ; ee26d
octave 3
note A_, 1
note __, 1
Music_Bicycle_branch_ee27f: ; ee27f
callchannel Music_Bicycle_branch_ee333
note E_, 1
@ -410,7 +408,6 @@ Music_Bicycle_branch_ee27f: ; ee27f
note __, 1
note A_, 1
note __, 1
Music_Bicycle_branch_ee2e9: ; ee2e9
note G_, 1
note __, 1
@ -501,16 +498,15 @@ Music_Bicycle_branch_ee333: ; ee333
note B_, 1
note __, 1
endchannel
; ee345
Music_Bicycle_Ch4: ; ee345
togglenoise $0
notetype $c
note __, 16
note __, 16
Music_Bicycle_branch_ee34b: ; ee34b
note __, 2
Music_Bicycle_branch_ee34c: ; ee34c
stereopanning $f0
note F_, 4
@ -523,3 +519,5 @@ Music_Bicycle_branch_ee34c: ; ee34c
note F_, 2
loopchannel 0, Music_Bicycle_branch_ee34b
; ee35e

View File

@ -5,14 +5,12 @@ Music_BuenasPassword: ; 178153
dbw $03, Music_BuenasPassword_Ch4
; 17815f
Music_BuenasPassword_Ch1: ; 17815f
tempo 136
volume $77
tone $0001
notetype $c, $b3
note __, 8
Music_BuenasPassword_branch_17816b: ; 17816b
stereopanning $ff
note __, 16
@ -191,7 +189,6 @@ Music_BuenasPassword_Ch2: ; 178231
note __, 7
octave 3
note F#, 1
Music_BuenasPassword_branch_17823c: ; 17823c
stereopanning $ff
callchannel Music_BuenasPassword_branch_1782df
@ -386,11 +383,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df
note B_, 1
note G#, 3
endchannel
; 178311
Music_BuenasPassword_Ch3: ; 178311
notetype $c, $14
note __, 8
Music_BuenasPassword_branch_178315: ; 178315
callchannel Music_BuenasPassword_branch_1783a7
callchannel Music_BuenasPassword_branch_1783a7
@ -569,6 +566,7 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc
octave 2
note G#, 2
endchannel
; 1783d0
Music_BuenasPassword_Ch4: ; 1783d0
togglenoise $3
@ -578,7 +576,6 @@ Music_BuenasPassword_Ch4: ; 1783d0
note D_, 2
note D_, 1
note D_, 1
Music_BuenasPassword_branch_1783d9: ; 1783d9
callchannel Music_BuenasPassword_branch_17840c
callchannel Music_BuenasPassword_branch_17840c
@ -646,3 +643,5 @@ Music_BuenasPassword_branch_178424: ; 178424
note D_, 1
endchannel
; 17843b

View File

@ -5,7 +5,6 @@ Music_BugCatchingContest: ; f7c16
dbw $03, Music_BugCatchingContest_Ch4
; f7c22
Music_BugCatchingContest_Ch1: ; f7c22
tempo 144
volume $77
@ -39,16 +38,13 @@ Music_BugCatchingContest_Ch1: ; f7c22
note __, 1
note E_, 1
note E_, 1
Music_BugCatchingContest_branch_f7c4b: ; f7c4b
notetype $c, $b1
Music_BugCatchingContest_branch_f7c4e: ; f7c4e
note __, 2
octave 2
note A_, 2
loopchannel 4, Music_BugCatchingContest_branch_f7c4e
Music_BugCatchingContest_branch_f7c55: ; f7c55
note __, 2
note B_, 2
@ -65,7 +61,6 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55
note E_, 1
intensity $b1
dutycycle $2
Music_BugCatchingContest_branch_f7c6b: ; f7c6b
note __, 2
octave 2
@ -96,7 +91,6 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b
note E_, 4
note __, 4
note E_, 4
Music_BugCatchingContest_branch_f7c8e: ; f7c8e
note __, 4
octave 2
@ -193,6 +187,7 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e
note E_, 2
note E_, 2
loopchannel 0, Music_BugCatchingContest_branch_f7c4b
; f7cf4
Music_BugCatchingContest_Ch2: ; f7cf4
stereopanning $f0
@ -200,7 +195,6 @@ Music_BugCatchingContest_Ch2: ; f7cf4
dutycycle $1
notetype $c, $c7
note __, 8
Music_BugCatchingContest_branch_f7cff: ; f7cff
octave 4
note A_, 1
@ -210,7 +204,6 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff
note A_, 1
note A_, 1
loopchannel 4, Music_BugCatchingContest_branch_f7cff
Music_BugCatchingContest_branch_f7d0a: ; f7d0a
dutycycle $0
callchannel Music_BugCatchingContest_branch_f7d8e
@ -379,6 +372,7 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e
note G_, 1
note __, 1
endchannel
; f7db7
Music_BugCatchingContest_Ch3: ; f7db7
stereopanning $ff
@ -411,7 +405,6 @@ Music_BugCatchingContest_Ch3: ; f7db7
note __, 1
note C#, 1
note C#, 1
Music_BugCatchingContest_branch_f7dda: ; f7dda
notetype $c, $14
note F#, 5
@ -594,6 +587,7 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda
note C#, 2
note C#, 2
loopchannel 0, Music_BugCatchingContest_branch_f7dda
; f7e9a
Music_BugCatchingContest_Ch4: ; f7e9a
togglenoise $4
@ -613,7 +607,6 @@ Music_BugCatchingContest_Ch4: ; f7e9a
note E_, 2
note E_, 2
callchannel Music_BugCatchingContest_branch_f7ee2
Music_BugCatchingContest_branch_f7eaf: ; f7eaf
note D_, 4
note D_, 4
@ -679,3 +672,4 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2
note D_, 2
endchannel
; f7ef3

View File

@ -5,7 +5,6 @@ Music_BurnedTower: ; f6a99
dbw $03, Music_BurnedTower_Ch4
; f6aa5
Music_BurnedTower_Ch1: ; f6aa5
tempo 168
volume $77
@ -28,7 +27,6 @@ Music_BurnedTower_Ch1: ; f6aa5
note D_, 2
intensity $80
note C#, 6
Music_BurnedTower_branch_f6ac8: ; f6ac8
intensity $91
octave 2
@ -39,7 +37,6 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8
note A#, 6
loopchannel 2, Music_BurnedTower_branch_f6ac8
tempo 150
Music_BurnedTower_branch_f6ad8: ; f6ad8
intensity $b1
octave 2
@ -90,7 +87,6 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8
note E_, 2
intensity $a0
note D#, 6
Music_BurnedTower_branch_f6b17: ; f6b17
intensity $b1
octave 2
@ -102,6 +98,7 @@ Music_BurnedTower_branch_f6b17: ; f6b17
note C_, 6
loopchannel 2, Music_BurnedTower_branch_f6b17
loopchannel 0, Music_BurnedTower_branch_f6ad8
; f6b29
Music_BurnedTower_Ch2: ; f6b29
dutycycle $2
@ -110,7 +107,6 @@ Music_BurnedTower_Ch2: ; f6b29
notetype $c, $70
callchannel Music_BurnedTower_branch_f6b8e
intensity $c5
Music_BurnedTower_branch_f6b39: ; f6b39
callchannel Music_BurnedTower_branch_f6b8e
intensity $c1
@ -197,6 +193,7 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e
note D_, 4
note E_, 16
endchannel
; f6ba2
Music_BurnedTower_Ch3: ; f6ba2
stereopanning $f
@ -207,7 +204,6 @@ Music_BurnedTower_Ch3: ; f6ba2
note __, 12
octave 3
note D#, 4
Music_BurnedTower_branch_f6bad: ; f6bad
octave 2
note A_, 2
@ -228,7 +224,6 @@ Music_BurnedTower_branch_f6bad: ; f6bad
note E_, 2
note D#, 4
loopchannel 4, Music_BurnedTower_branch_f6bad
Music_BurnedTower_branch_f6bc3: ; f6bc3
octave 2
note B_, 2
@ -250,16 +245,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3
note F_, 4
loopchannel 2, Music_BurnedTower_branch_f6bc3
loopchannel 0, Music_BurnedTower_branch_f6bad
; f6bdd
Music_BurnedTower_Ch4: ; f6bdd
togglenoise $0
notetype $c
Music_BurnedTower_branch_f6be1: ; f6be1
note __, 16
loopchannel 4, Music_BurnedTower_branch_f6be1
note __, 2
Music_BurnedTower_branch_f6be7: ; f6be7
stereopanning $f0
note G_, 2
@ -269,3 +263,5 @@ Music_BurnedTower_branch_f6be7: ; f6be7
note G_, 4
loopchannel 0, Music_BurnedTower_branch_f6be7
; f6bf2

View File

@ -4,12 +4,10 @@ Music_CeladonCity: ; f435b
dbw $02, Music_CeladonCity_Ch3
; f4364
Music_CeladonCity_Ch1: ; f4364
tempo 146
volume $77
tone $0001
Music_CeladonCity_branch_f436c: ; f436c
stereopanning $f
notetype $c, $a6
@ -22,7 +20,6 @@ Music_CeladonCity_branch_f436c: ; f436c
note E_, 2
note F#, 2
callchannel Music_CeladonCity_branch_f43cc
Music_CeladonCity_branch_f437d: ; f437d
note D_, 2
note F#, 1
@ -145,6 +142,7 @@ Music_CeladonCity_branch_f43fe: ; f43fe
note A_, 1
loopchannel 4, Music_CeladonCity_branch_f43fe
endchannel
; f4406
Music_CeladonCity_Ch2: ; f4406
vibrato $12, $34
@ -161,7 +159,6 @@ Music_CeladonCity_Ch2: ; f4406
note F#, 1
note G_, 1
note A_, 8
Music_CeladonCity_branch_f441a: ; f441a
callchannel Music_CeladonCity_branch_f4463
note A_, 4
@ -273,10 +270,10 @@ Music_CeladonCity_branch_f4474: ; f4474
note D_, 2
note F#, 4
endchannel
; f4492
Music_CeladonCity_Ch3: ; f4492
vibrato $12, $24
Music_CeladonCity_branch_f4495: ; f4495
notetype $c, $25
octave 3
@ -286,7 +283,6 @@ Music_CeladonCity_branch_f4495: ; f4495
note __, 2
note D_, 8
callchannel Music_CeladonCity_branch_f44fd
Music_CeladonCity_branch_f44a1: ; f44a1
octave 2
note A_, 2
@ -398,3 +394,5 @@ Music_CeladonCity_branch_f4510: ; f4510
note B_, 2
endchannel
; f4518

View File

@ -4,7 +4,6 @@ Music_ChampionBattle: ; ea9c1
dbw $02, Music_ChampionBattle_Ch3
; ea9ca
Music_ChampionBattle_Ch1: ; ea9ca
tempo 98
volume $77
@ -19,7 +18,6 @@ Music_ChampionBattle_Ch1: ; ea9ca
note A#, 4
intensity $b7
note B_, 4
Music_ChampionBattle_branch_ea9e2: ; ea9e2
callchannel Music_ChampionBattle_branch_eaaee
octave 3
@ -28,12 +26,10 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
callchannel Music_ChampionBattle_branch_eaaee
octave 3
note E_, 4
Music_ChampionBattle_branch_ea9f0: ; ea9f0
callchannel Music_ChampionBattle_branch_eaafc
loopchannel 3, Music_ChampionBattle_branch_ea9f0
callchannel Music_ChampionBattle_branch_eab06
Music_ChampionBattle_branch_ea9fa: ; ea9fa
callchannel Music_ChampionBattle_branch_eaafc
loopchannel 7, Music_ChampionBattle_branch_ea9fa
@ -77,14 +73,12 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
octave 4
note C_, 1
note C#, 1
Music_ChampionBattle_branch_eaa35: ; eaa35
callchannel Music_ChampionBattle_branch_eab0f
note E_, 2
note E_, 2
intensity $b7
note F#, 4
Music_ChampionBattle_branch_eaa3d: ; eaa3d
intensity $b2
note E_, 2
@ -173,7 +167,6 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
intensity $90
note D#, 16
note C#, 16
Music_ChampionBattle_branch_eaab1: ; eaab1
intensity $b2
octave 2
@ -183,7 +176,6 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
octave 3
note D#, 4
loopchannel 4, Music_ChampionBattle_branch_eaab1
Music_ChampionBattle_branch_eaabe: ; eaabe
intensity $b2
note C_, 2
@ -308,6 +300,7 @@ Music_ChampionBattle_branch_eab31: ; eab31
note C#, 4
intensity $b2
endchannel
; eab4a
Music_ChampionBattle_Ch2: ; eab4a
dutycycle $3
@ -364,7 +357,6 @@ Music_ChampionBattle_Ch2: ; eab4a
note E_, 8
intensity $3c
note E_, 8
Music_ChampionBattle_branch_eab9d: ; eab9d
intensity $c5
note D#, 6
@ -433,7 +425,6 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
note F_, 16
note F#, 16
intensity $c4
Music_ChampionBattle_branch_eabef: ; eabef
octave 5
note D#, 4
@ -558,10 +549,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
note D#, 2
intensity $c5
endchannel
; eac85
Music_ChampionBattle_Ch3: ; eac85
notetype $c, $14
Music_ChampionBattle_branch_eac88: ; eac88
octave 3
note D#, 1
@ -610,12 +601,10 @@ Music_ChampionBattle_branch_eac88: ; eac88
note A#, 2
note F_, 2
note A_, 2
Music_ChampionBattle_branch_eacc6: ; eacc6
note D#, 2
note A#, 2
loopchannel 8, Music_ChampionBattle_branch_eacc6
Music_ChampionBattle_branch_eaccc: ; eaccc
note E_, 2
note B_, 2
@ -628,12 +617,10 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
note B_, 2
note G_, 2
note A_, 2
Music_ChampionBattle_branch_eacda: ; eacda
note D#, 2
note A#, 2
loopchannel 8, Music_ChampionBattle_branch_eacda
Music_ChampionBattle_branch_eace0: ; eace0
note E_, 2
note B_, 2
@ -665,7 +652,6 @@ Music_ChampionBattle_branch_eace0: ; eace0
note D#, 8
note B_, 8
note D#, 8
Music_ChampionBattle_branch_ead05: ; ead05
note D#, 2
note F#, 2
@ -684,13 +670,11 @@ Music_ChampionBattle_branch_ead05: ; ead05
note D#, 2
note E_, 2
callchannel Music_ChampionBattle_branch_ead8e
Music_ChampionBattle_branch_ead1d: ; ead1d
octave 3
note E_, 2
note B_, 2
loopchannel 4, Music_ChampionBattle_branch_ead1d
Music_ChampionBattle_branch_ead24: ; ead24
note D#, 2
note A#, 2
@ -703,7 +687,6 @@ Music_ChampionBattle_branch_ead24: ; ead24
note __, 2
note D#, 2
note __, 2
Music_ChampionBattle_branch_ead32: ; ead32
note E_, 2
note B_, 2
@ -716,19 +699,16 @@ Music_ChampionBattle_branch_ead32: ; ead32
note __, 2
note E_, 2
note __, 2
Music_ChampionBattle_branch_ead40: ; ead40
note D#, 2
note G#, 2
loopchannel 8, Music_ChampionBattle_branch_ead40
Music_ChampionBattle_branch_ead46: ; ead46
note D#, 2
note A#, 2
loopchannel 7, Music_ChampionBattle_branch_ead46
note B_, 2
note A#, 2
Music_ChampionBattle_branch_ead4e: ; ead4e
octave 3
note D#, 2
@ -809,3 +789,5 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
note E_, 2
endchannel
; ead99

View File

@ -5,7 +5,6 @@ Music_CherrygroveCity: ; f5b03
dbw $03, Music_CherrygroveCity_Ch4
; f5b0f
Music_CherrygroveCity_Ch1: ; f5b0f
tempo 152
volume $77
@ -19,7 +18,6 @@ Music_CherrygroveCity_Ch1: ; f5b0f
note C_, 2
note D_, 2
note E_, 2
Music_CherrygroveCity_branch_f5b26: ; f5b26
note A_, 4
note G#, 2
@ -94,6 +92,7 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26
octave 3
note C_, 4
loopchannel 0, Music_CherrygroveCity_branch_f5b26
; f5b74
Music_CherrygroveCity_Ch2: ; f5b74
dutycycle $3
@ -109,7 +108,6 @@ Music_CherrygroveCity_Ch2: ; f5b74
note G_, 2
note A_, 2
note A#, 2
Music_CherrygroveCity_branch_f5b87: ; f5b87
intensity $c6
octave 4
@ -175,6 +173,7 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87
intensity $a7
note F_, 8
loopchannel 0, Music_CherrygroveCity_branch_f5b87
; f5bd8
Music_CherrygroveCity_Ch3: ; f5bd8
notetype $c, $16
@ -187,7 +186,6 @@ Music_CherrygroveCity_Ch3: ; f5bd8
note G_, 2
note F_, 2
note E_, 2
Music_CherrygroveCity_branch_f5be4: ; f5be4
note A_, 2
note F_, 2
@ -286,12 +284,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4
note F_, 2
note A_, 2
loopchannel 0, Music_CherrygroveCity_branch_f5be4
; f5c48
Music_CherrygroveCity_Ch4: ; f5c48
togglenoise $3
notetype $c
note __, 16
Music_CherrygroveCity_branch_f5c4d: ; f5c4d
note C#, 2
note __, 2
@ -310,3 +308,5 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d
note G_, 2
loopchannel 0, Music_CherrygroveCity_branch_f5c4d
; f5c60

View File

@ -5,7 +5,6 @@ Music_Clair: ; 1fa8d
dbw $03, Music_Clair_Ch4
; 1fa99
Music_Clair_Ch1: ; 1fa99
tempo 136
volume $77
@ -14,7 +13,6 @@ Music_Clair_Ch1: ; 1fa99
stereopanning $f
notetype $c, $93
dutycycle $3
Music_Clair_branch_1faab: ; 1faab
octave 4
note F_, 1
@ -39,7 +37,6 @@ Music_Clair_branch_1faab: ; 1faab
note D#, 4
note F_, 4
note G_, 4
Music_Clair_branch_1fac9: ; 1fac9
intensity $93
callchannel Music_Clair_branch_1fb12
@ -147,12 +144,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e
note D#, 1
note F#, 1
endchannel
; 1fb41
Music_Clair_Ch2: ; 1fb41
dutycycle $3
vibrato $12, $34
notetype $6, $b7
Music_Clair_branch_1fb49: ; 1fb49
octave 3
note A#, 2
@ -192,7 +189,6 @@ Music_Clair_branch_1fb49: ; 1fb49
note G_, 2
note A#, 2
intensity $b7
Music_Clair_branch_1fb77: ; 1fb77
callchannel Music_Clair_branch_1fba6
note F#, 2
@ -254,6 +250,7 @@ Music_Clair_branch_1fba6: ; 1fba6
note D#, 16
note __, 4
endchannel
; 1fbb9
Music_Clair_Ch3: ; 1fbb9
notetype $c, $14
@ -277,7 +274,6 @@ Music_Clair_Ch3: ; 1fbb9
note A#, 4
note G#, 4
note G_, 4
Music_Clair_branch_1fbd1: ; 1fbd1
callchannel Music_Clair_branch_1fc3c
octave 2
@ -397,6 +393,7 @@ Music_Clair_branch_1fc3c: ; 1fc3c
octave 1
note G#, 2
endchannel
; 1fc4b
Music_Clair_Ch4: ; 1fc4b
togglenoise $3
@ -414,7 +411,6 @@ Music_Clair_Ch4: ; 1fc4b
note D_, 2
note D_, 1
note D_, 1
Music_Clair_branch_1fc5e: ; 1fc5e
stereopanning $ff
callchannel Music_Clair_branch_1fc6e
@ -445,3 +441,5 @@ Music_Clair_branch_1fc6e: ; 1fc6e
note G_, 1
endchannel
; 1fc87

View File

@ -5,12 +5,10 @@ Music_ContestResults: ; efb3e
dbw $03, Music_ContestResults_Ch4
; efb4a
Music_ContestResults_Ch1: ; efb4a
tempo 144
volume $77
notetype $c, $51
Music_ContestResults_branch_efb52: ; efb52
note __, 2
octave 2
@ -50,10 +48,10 @@ Music_ContestResults_branch_efb52: ; efb52
note G_, 1
note __, 1
loopchannel 0, Music_ContestResults_branch_efb52
; efb7b
Music_ContestResults_Ch2: ; efb7b
notetype $c, $61
Music_ContestResults_branch_efb7e: ; efb7e
octave 2
note C_, 2
@ -95,7 +93,6 @@ Music_ContestResults_branch_efb7e: ; efb7e
octave 3
note F_, 1
note __, 1
Music_ContestResults_branch_efba6: ; efba6
octave 2
note D_, 2
@ -129,11 +126,11 @@ Music_ContestResults_branch_efba6: ; efba6
note D_, 1
note __, 1
loopchannel 0, Music_ContestResults_branch_efb7e
; efbcc
Music_ContestResults_Ch3: ; efbcc
vibrato $8, $24
notetype $c, $23
Music_ContestResults_branch_efbd2: ; efbd2
octave 4
note E_, 5
@ -155,11 +152,11 @@ Music_ContestResults_branch_efbd2: ; efbd2
note A_, 8
note G_, 8
loopchannel 0, Music_ContestResults_branch_efbd2
; efbe9
Music_ContestResults_Ch4: ; efbe9
togglenoise $4
notetype $6
Music_ContestResults_branch_efbed: ; efbed
note C#, 4
note C#, 4
@ -179,3 +176,5 @@ Music_ContestResults_branch_efbed: ; efbed
note G_, 1
loopchannel 0, Music_ContestResults_branch_efbed
; efc01

View File

@ -5,7 +5,6 @@ Music_Credits: ; 1f31c
dbw $03, Music_Credits_Ch4
; 1f328
Music_Credits_Ch1: ; 1f328
tempo 139
volume $77
@ -182,7 +181,6 @@ Music_Credits_Ch1: ; 1f328
octave 5
note C#, 6
notetype $c, $a7
Music_Credits_branch_1f407: ; 1f407
octave 3
note A_, 1
@ -563,6 +561,7 @@ Music_Credits_branch_1f582: ; 1f582
note F#, 6
note C#, 6
endchannel
; 1f58d
Music_Credits_Ch2: ; 1f58d
dutycycle $1
@ -724,7 +723,6 @@ Music_Credits_Ch2: ; 1f58d
octave 2
note F#, 1
note __, 1
Music_Credits_branch_1f657: ; 1f657
octave 1
note G_, 2
@ -982,6 +980,7 @@ Music_Credits_branch_1f748: ; 1f748
octave 5
note C_, 4
endchannel
; 1f772
Music_Credits_Ch3: ; 1f772
vibrato $16, $23
@ -1443,6 +1442,7 @@ Music_Credits_branch_1f94b: ; 1f94b
note G_, 2
note D_, 2
endchannel
; 1f973
Music_Credits_Ch4: ; 1f973
togglenoise $3
@ -1480,7 +1480,6 @@ Music_Credits_Ch4: ; 1f973
callchannel Music_Credits_branch_1fa4d
callchannel Music_Credits_branch_1fa4d
callchannel Music_Credits_branch_1fa6d
Music_Credits_branch_1f9a8: ; 1f9a8
note A#, 2
note G_, 1
@ -1509,7 +1508,6 @@ Music_Credits_branch_1f9a8: ; 1f9a8
note C#, 1
note D_, 1
note D_, 1
Music_Credits_branch_1f9c6: ; 1f9c6
note A#, 2
note G_, 1
@ -1544,7 +1542,6 @@ Music_Credits_branch_1f9c6: ; 1f9c6
callchannel Music_Credits_branch_1fa4d
callchannel Music_Credits_branch_1fa4d
callchannel Music_Credits_branch_1fa6d
Music_Credits_branch_1f9f2: ; 1f9f2
note A#, 2
note G_, 1
@ -1695,3 +1692,5 @@ Music_Credits_branch_1fa6d: ; 1fa6d
note D_, 1
endchannel
; 1fa8d

View File

@ -5,7 +5,6 @@ Music_CrystalOpening: ; 1786e8
dbw $03, Music_CrystalOpening_Ch4
; 1786f4
Music_CrystalOpening_Ch1: ; 1786f4
tempo 136
volume $77
@ -122,6 +121,7 @@ Music_CrystalOpening_Ch1: ; 1786f4
octave 2
note D_, 16
endchannel
; 17877a
Music_CrystalOpening_Ch2: ; 17877a
notetype $c, $a2
@ -177,6 +177,7 @@ Music_CrystalOpening_Ch2: ; 17877a
octave 3
note D_, 16
endchannel
; 1787c8
Music_CrystalOpening_Ch3: ; 1787c8
notetype $c, $16
@ -241,6 +242,7 @@ Music_CrystalOpening_Ch3: ; 1787c8
note D_, 1
note __, 15
endchannel
; 178810
Music_CrystalOpening_Ch4: ; 178810
stereopanning $f
@ -360,3 +362,5 @@ Music_CrystalOpening_Ch4: ; 178810
note __, 16
endchannel
; 178889

View File

@ -4,8 +4,10 @@ Music_DancingHall: ; ef9bc
dbw $02, Music_DancingHall_Ch3
; ef9c5
INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
Music_DancingHall_Ch1: ; ef9c6
tempo 208
volume $77
@ -13,7 +15,6 @@ Music_DancingHall_Ch1: ; ef9c6
notetype $6, $b7
note __, 3
dutycycle $0
Music_DancingHall_branch_ef9d3: ; ef9d3
notetype $c, $b7
callchannel Music_DancingHall_branch_efa17
@ -89,6 +90,7 @@ Music_DancingHall_branch_efa17: ; efa17
note D_, 1
note __, 1
endchannel
; efa2c
Music_DancingHall_Ch2: ; efa2c
stereopanning $f0
@ -96,7 +98,6 @@ Music_DancingHall_Ch2: ; efa2c
dutycycle $0
vibrato $10, $24
note __, 3
Music_DancingHall_branch_efa37: ; efa37
notetype $6, $a2
callchannel Music_DancingHall_branch_efa7a
@ -223,6 +224,7 @@ Music_DancingHall_branch_efa7a: ; efa7a
octave 4
note D_, 1
endchannel
; efad6
Music_DancingHall_Ch3: ; efad6
stereopanning $ff
@ -233,7 +235,6 @@ Music_DancingHall_Ch3: ; efad6
note B_, 1
octave 6
note D_, 1
Music_DancingHall_branch_efae3: ; efae3
note E_, 13
note D_, 1
@ -310,3 +311,5 @@ Music_DancingHall_branch_efae3: ; efae3
note D_, 1
loopchannel 0, Music_DancingHall_branch_efae3
; efb3e

Some files were not shown because too many files have changed in this diff Show More