ref: fe230e2e7dc15e8cba0b771c5220cf51aad20f08
parent: 5aec11492d2b269a658b31646d09328f56ff59d1
author: yenatch <[email protected]>
date: Tue Jan 27 10:04:01 EST 2015
Get rid of one-byte incbins in sound data.
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -4,9 +4,7 @@
dbw $02, Music_DancingHall_Ch3
; ef9c5
-
-INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
-
+ db $3
Music_DancingHall_Ch1: ; ef9c6
tempo 208
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -4,9 +4,7 @@
dbw $02, Music_KantoTrainerBattle_Ch3
; eca03
-
-INCBIN "baserom.gbc", $eca03, $eca04 - $eca03
-
+ db $3
Music_KantoTrainerBattle_Ch1: ; eca04
tempo 114
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -4,9 +4,7 @@
dbw $02, Music_KantoWildBattle_Ch3
; ed076
-
-INCBIN "baserom.gbc", $ed076, $ed077 - $ed076
-
+ db $3
Music_KantoWildBattle_Ch1: ; ed077
tempo 112
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -4,9 +4,7 @@
dbw $02, Music_LavenderTown_Ch3
; ef738
-
-INCBIN "baserom.gbc", $ef738, $ef739 - $ef738
-
+ db $3
Music_LavenderTown_Ch1: ; ef739
tempo 160
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -4,9 +4,7 @@
dbw $02, Music_LookKimonoGirl_Ch3
; f79c1
-
-INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1
-
+ db $3
Music_LookKimonoGirl_Ch1: ; f79c2
tempo 160
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -61,10 +61,8 @@
loopchannel 0, Music_LookYoungster_branch_f66ea
; f670e
+ db $ff
-INCBIN "baserom.gbc", $f670e, $f670f - $f670e
-
-
Music_LookYoungster_Ch2: ; f670f
stereopanning $f0
vibrato $12, $26
@@ -162,10 +160,8 @@
loopchannel 0, Music_LookYoungster_branch_f672f
; f6783
+ db $ff
-INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
-
-
Music_LookYoungster_Ch3: ; f6784
stereopanning $ff
vibrato $2, $24
@@ -300,8 +296,6 @@
loopchannel 0, Music_LookYoungster_branch_f67ae
; f6810
-
-INCBIN "baserom.gbc", $f6810, $f6811 - $f6810
-
+ db $ff
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -4,9 +4,7 @@
dbw $02, Music_NewBarkTown_Ch3
; eb2dc
-
-INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc
-
+ db $3
Music_NewBarkTown_Ch1: ; eb2dd
tempo 187
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -3,9 +3,7 @@
dbw $01, Music_PostCredits_Ch2
; cfda4
-
-INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4
-
+ db $2
Music_PostCredits_Ch1: ; cfda5
tempo 271
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -4,9 +4,7 @@
dbw $02, Music_ProfOaksPokemonTalk_Ch3
; f4ca8
-
-INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8
-
+ db $3
Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
tempo 164
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -4,9 +4,7 @@
dbw $02, Music_Route1_Ch3
; ec009
-
-INCBIN "baserom.gbc", $ec009, $ec00a - $ec009
-
+ db $3
Music_Route1_Ch1: ; ec00a
stereopanning $f
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -4,9 +4,7 @@
dbw $02, Music_Surf_Ch3
; f5193
-
-INCBIN "baserom.gbc", $f5193, $f5194 - $f5193
-
+ db $3
Music_Surf_Ch1: ; f5194
tempo 108
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -4,9 +4,7 @@
dbw $02, Music_VermilionCity_Ch3
; eb67f
-
-INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f
-
+ db $3
Music_VermilionCity_Ch1: ; eb680
stereopanning $f
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -1088,10 +1088,8 @@
endchannel
; f0def
+ db $df
-INCBIN "baserom.gbc", $f0def, $f0df0 - $f0def
-
-
Sfx_RegisterPhoneNumber_Ch6: ; f0df0
togglesfx
dutycycle $3
@@ -1115,10 +1113,8 @@
endchannel
; f0e07
+ db $df
-INCBIN "baserom.gbc", $f0e07, $f0e08 - $f0e07
-
-
Sfx_RegisterPhoneNumber_Ch7: ; f0e08
togglesfx
notetype $c, $25
@@ -1139,10 +1135,8 @@
endchannel
; f0e1b
+ db $df
-INCBIN "baserom.gbc", $f0e1b, $f0e1c - $f0e1b
-
-
Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
togglesfx
sfxtogglenoise $4
@@ -1153,10 +1147,8 @@
endchannel
; f0e25
+ db $df
-INCBIN "baserom.gbc", $f0e25, $f0e26 - $f0e25
-
-
Sfx_3RdPlace: ; f0e26
dbw $84, Sfx_3RdPlace_Ch5
dbw $05, Sfx_3RdPlace_Ch6
@@ -1181,10 +1173,8 @@
endchannel
; f0e44
+ db $df
-INCBIN "baserom.gbc", $f0e44, $f0e45 - $f0e44
-
-
Sfx_3RdPlace_Ch6: ; f0e45
togglesfx
dutycycle $2
@@ -1201,10 +1191,8 @@
endchannel
; f0e55
+ db $df
-INCBIN "baserom.gbc", $f0e55, $f0e56 - $f0e55
-
-
Sfx_3RdPlace_Ch7: ; f0e56
togglesfx
notetype $c, $25
@@ -1221,10 +1209,8 @@
endchannel
; f0e65
+ db $df
-INCBIN "baserom.gbc", $f0e65, $f0e66 - $f0e65
-
-
Sfx_GetEggFromDaycareLady: ; f0e66
Sfx_GetEggFromDaycareMan: ; f0e66
dbw $c4, Sfx_GetEggFromDaycareLady_Ch5
@@ -1265,10 +1251,8 @@
endchannel
; f0e9a
+ db $df
-INCBIN "baserom.gbc", $f0e9a, $f0e9b - $f0e9a
-
-
Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b
Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
togglesfx
@@ -1298,10 +1282,8 @@
endchannel
; f0ebd
+ db $df
-INCBIN "baserom.gbc", $f0ebd, $f0ebe - $f0ebd
-
-
Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe
Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
togglesfx
@@ -1321,10 +1303,8 @@
endchannel
; f0ecf
+ db $df
-INCBIN "baserom.gbc", $f0ecf, $f0ed0 - $f0ecf
-
-
Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0
Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
togglesfx
@@ -1337,10 +1317,8 @@
endchannel
; f0edb
+ db $df
-INCBIN "baserom.gbc", $f0edb, $f0edc - $f0edb
-
-
Sfx_MoveDeleted: ; f0edc
dbw $c4, Sfx_MoveDeleted_Ch5
dbw $05, Sfx_MoveDeleted_Ch6
@@ -1377,10 +1355,8 @@
endchannel
; f0f0c
+ db $df
-INCBIN "baserom.gbc", $f0f0c, $f0f0d - $f0f0c
-
-
Sfx_MoveDeleted_Ch6: ; f0f0d
togglesfx
dutycycle $3
@@ -1416,10 +1392,8 @@
endchannel
; f0f36
+ db $df
-INCBIN "baserom.gbc", $f0f36, $f0f37 - $f0f36
-
-
Sfx_MoveDeleted_Ch7: ; f0f37
togglesfx
notetype $6, $25
@@ -1446,10 +1420,8 @@
endchannel
; f0f52
+ db $df
-INCBIN "baserom.gbc", $f0f52, $f0f53 - $f0f52
-
-
Sfx_MoveDeleted_Ch8: ; f0f53
togglesfx
sfxtogglenoise $3
@@ -1461,10 +1433,8 @@
endchannel
; f0f5d
+ db $df
-INCBIN "baserom.gbc", $f0f5d, $f0f5e - $f0f5d
-
-
Sfx_2ndPlace: ; f0f5e
dbw $c4, Sfx_2ndPlace_Ch5
dbw $05, Sfx_2ndPlace_Ch6
@@ -1505,10 +1475,8 @@
endchannel
; f0f91
+ db $df
-INCBIN "baserom.gbc", $f0f91, $f0f92 - $f0f91
-
-
Sfx_2ndPlace_Ch6: ; f0f92
togglesfx
dutycycle $2
@@ -1532,10 +1500,8 @@
endchannel
; f0fac
+ db $df
-INCBIN "baserom.gbc", $f0fac, $f0fad - $f0fac
-
-
Sfx_2ndPlace_Ch7: ; f0fad
togglesfx
notetype $8, $25
@@ -1573,10 +1539,8 @@
endchannel
; f0fd1
+ db $df
-INCBIN "baserom.gbc", $f0fd1, $f0fd2 - $f0fd1
-
-
Sfx_2ndPlace_Ch8: ; f0fd2
togglesfx
sfxtogglenoise $3
@@ -1591,10 +1555,8 @@
endchannel
; f0fe1
+ db $df
-INCBIN "baserom.gbc", $f0fe1, $f0fe2 - $f0fe1
-
-
Sfx_1stPlace: ; f0fe2
dbw $c4, Sfx_1stPlace_Ch5
dbw $05, Sfx_1stPlace_Ch6
@@ -1642,10 +1604,8 @@
endchannel
; f101f
+ db $df
-INCBIN "baserom.gbc", $f101f, $f1020 - $f101f
-
-
Sfx_1stPlace_Ch6: ; f1020
togglesfx
dutycycle $3
@@ -1669,10 +1629,8 @@
endchannel
; f103c
+ db $df
-INCBIN "baserom.gbc", $f103c, $f103d - $f103c
-
-
Sfx_1stPlace_Ch7: ; f103d
togglesfx
notetype $c, $25
@@ -1696,10 +1654,8 @@
endchannel
; f1053
+ db $df
-INCBIN "baserom.gbc", $f1053, $f1054 - $f1053
-
-
Sfx_1stPlace_Ch8: ; f1054
togglesfx
sfxtogglenoise $4
@@ -1720,10 +1676,8 @@
endchannel
; f1068
+ db $df
-INCBIN "baserom.gbc", $f1068, $f1069 - $f1068
-
-
Sfx_ChooseACard: ; f1069
dbw $c4, Sfx_ChooseACard_Ch5
dbw $05, Sfx_ChooseACard_Ch6
@@ -1776,10 +1730,8 @@
endchannel
; f10a8
+ db $df
-INCBIN "baserom.gbc", $f10a8, $f10a9 - $f10a8
-
-
Sfx_ChooseACard_Ch6: ; f10a9
togglesfx
dutycycle $3
@@ -1811,10 +1763,8 @@
endchannel
; f10c8
+ db $df
-INCBIN "baserom.gbc", $f10c8, $f10c9 - $f10c8
-
-
Sfx_ChooseACard_Ch7: ; f10c9
togglesfx
notetype $6, $25
@@ -1850,10 +1800,8 @@
endchannel
; f10eb
+ db $df
-INCBIN "baserom.gbc", $f10eb, $f10ec - $f10eb
-
-
Sfx_ChooseACard_Ch8: ; f10ec
togglesfx
sfxtogglenoise $4
@@ -1878,10 +1826,8 @@
endchannel
; f1103
+ db $df
-INCBIN "baserom.gbc", $f1103, $f1104 - $f1103
-
-
Sfx_GetTm: ; f1104
dbw $c4, Sfx_GetTm_Ch5
dbw $05, Sfx_GetTm_Ch6
@@ -1914,10 +1860,8 @@
endchannel
; f1130
+ db $df
-INCBIN "baserom.gbc", $f1130, $f1131 - $f1130
-
-
Sfx_GetTm_Ch6: ; f1131
togglesfx
dutycycle $3
@@ -1940,10 +1884,8 @@
endchannel
; f114b
+ db $df
-INCBIN "baserom.gbc", $f114b, $f114c - $f114b
-
-
Sfx_GetTm_Ch7: ; f114c
togglesfx
notetype $6, $25
@@ -1974,10 +1916,8 @@
endchannel
; f1169
+ db $df
-INCBIN "baserom.gbc", $f1169, $f116a - $f1169
-
-
Sfx_GetTm_Ch8: ; f116a
togglesfx
sfxtogglenoise $4
@@ -1997,10 +1937,8 @@
endchannel
; f117c
+ db $df
-INCBIN "baserom.gbc", $f117c, $f117d - $f117c
-
-
Sfx_GetBadge: ; f117d
dbw $c4, Sfx_GetBadge_Ch5
dbw $05, Sfx_GetBadge_Ch6
@@ -2028,10 +1966,8 @@
endchannel
; f11a9
+ db $df
-INCBIN "baserom.gbc", $f11a9, $f11aa - $f11a9
-
-
Sfx_GetBadge_branch_f11aa: ; f11aa
note __, 5
octave 3
@@ -2103,10 +2039,8 @@
endchannel
; f11f4
+ db $df
-INCBIN "baserom.gbc", $f11f4, $f11f5 - $f11f4
-
-
Sfx_GetBadge_Ch7: ; f11f5
togglesfx
notetype $6, $25
@@ -2145,10 +2079,8 @@
endchannel
; f121a
+ db $df
-INCBIN "baserom.gbc", $f121a, $f121b - $f121a
-
-
Sfx_GetBadge_Ch8: ; f121b
togglesfx
sfxtogglenoise $4
@@ -2174,10 +2106,8 @@
endchannel
; f1235
+ db $df
-INCBIN "baserom.gbc", $f1235, $f1236 - $f1235
-
-
Sfx_QuitSlots: ; f1236
dbw $c4, Sfx_QuitSlots_Ch5
dbw $05, Sfx_QuitSlots_Ch6
@@ -2216,10 +2146,8 @@
endchannel
; f1265
+ db $df
-INCBIN "baserom.gbc", $f1265, $f1266 - $f1265
-
-
Sfx_QuitSlots_Ch6: ; f1266
togglesfx
dutycycle $2
@@ -2246,10 +2174,8 @@
endchannel
; f1282
+ db $df
-INCBIN "baserom.gbc", $f1282, $f1283 - $f1282
-
-
Sfx_QuitSlots_Ch7: ; f1283
togglesfx
notetype $8, $25
@@ -2280,10 +2206,8 @@
endchannel
; f12a0
+ db $df
-INCBIN "baserom.gbc", $f12a0, $f12a1 - $f12a0
-
-
Sfx_QuitSlots_Ch8: ; f12a1
togglesfx
sfxtogglenoise $3
@@ -2303,10 +2227,8 @@
endchannel
; f12b3
+ db $df
-INCBIN "baserom.gbc", $f12b3, $f12b4 - $f12b3
-
-
Sfx_Protect: ; f12b4
dbw $44, Sfx_Protect_Ch5
dbw $07, Sfx_Protect_Ch8
@@ -3259,10 +3181,8 @@
endchannel
; f189a
+ db $df
-INCBIN "baserom.gbc", $f189a, $f189b - $f189a
-
-
Sfx_DexFanfareLessThan20_Ch6: ; f189b
togglesfx
notetype $8, $c1
@@ -3281,10 +3201,8 @@
endchannel
; f18ac
+ db $df
-INCBIN "baserom.gbc", $f18ac, $f18ad - $f18ac
-
-
Sfx_DexFanfareLessThan20_Ch7: ; f18ad
togglesfx
notetype $8, $25
@@ -3312,10 +3230,8 @@
endchannel
; f18c7
+ db $df
-INCBIN "baserom.gbc", $f18c7, $f18c8 - $f18c7
-
-
Sfx_DexFanfareLessThan20_Ch8: ; f18c8
togglesfx
sfxtogglenoise $4
@@ -3326,10 +3242,8 @@
endchannel
; f18d1
+ db $df
-INCBIN "baserom.gbc", $f18d1, $f18d2 - $f18d1
-
-
Sfx_DexFanfare140169: ; f18d2
dbw $c4, Sfx_DexFanfare140169_Ch5
dbw $05, Sfx_DexFanfare140169_Ch6
@@ -3365,10 +3279,8 @@
endchannel
; f1900
+ db $df
-INCBIN "baserom.gbc", $f1900, $f1901 - $f1900
-
-
Sfx_DexFanfare140169_Ch6: ; f1901
togglesfx
dutycycle $2
@@ -3394,10 +3306,8 @@
endchannel
; f191d
+ db $df
-INCBIN "baserom.gbc", $f191d, $f191e - $f191d
-
-
Sfx_DexFanfare140169_Ch7: ; f191e
togglesfx
notetype $c, $25
@@ -3431,10 +3341,8 @@
endchannel
; f193e
+ db $df
-INCBIN "baserom.gbc", $f193e, $f193f - $f193e
-
-
Sfx_DexFanfare140169_Ch8: ; f193f
togglesfx
sfxtogglenoise $4
@@ -3451,10 +3359,8 @@
endchannel
; f1950
+ db $df
-INCBIN "baserom.gbc", $f1950, $f1951 - $f1950
-
-
Sfx_DexFanfare170199: ; f1951
dbw $c4, Sfx_DexFanfare170199_Ch5
dbw $05, Sfx_DexFanfare170199_Ch6
@@ -3490,10 +3396,8 @@
endchannel
; f1981
+ db $df
-INCBIN "baserom.gbc", $f1981, $f1982 - $f1981
-
-
Sfx_DexFanfare170199_Ch6: ; f1982
togglesfx
vibrato $12, $34
@@ -3521,10 +3425,8 @@
endchannel
; f19a2
+ db $df
-INCBIN "baserom.gbc", $f19a2, $f19a3 - $f19a2
-
-
Sfx_DexFanfare170199_Ch7: ; f19a3
togglesfx
notetype $8, $25
@@ -3552,10 +3454,8 @@
endchannel
; f19bf
+ db $df
-INCBIN "baserom.gbc", $f19bf, $f19c0 - $f19bf
-
-
Sfx_DexFanfare170199_Ch8: ; f19c0
togglesfx
sfxtogglenoise $4
@@ -3577,10 +3477,8 @@
endchannel
; f19d5
+ db $fd
-INCBIN "baserom.gbc", $f19d5, $f19d6 - $f19d5
-
-
Sfx_DexFanfare200229: ; f19d6
dbw $c4, Sfx_DexFanfare200229_Ch5
dbw $05, Sfx_DexFanfare200229_Ch6
@@ -3614,10 +3512,8 @@
endchannel
; f1a03
+ db $df
-INCBIN "baserom.gbc", $f1a03, $f1a04 - $f1a03
-
-
Sfx_DexFanfare200229_Ch6: ; f1a04
togglesfx
vibrato $12, $34
@@ -3640,10 +3536,8 @@
endchannel
; f1a1e
+ db $df
-INCBIN "baserom.gbc", $f1a1e, $f1a1f - $f1a1e
-
-
Sfx_DexFanfare200229_Ch7: ; f1a1f
togglesfx
notetype $8, $25
@@ -3687,10 +3581,8 @@
endchannel
; f1a49
+ db $df
-INCBIN "baserom.gbc", $f1a49, $f1a4a - $f1a49
-
-
Sfx_DexFanfare200229_Ch8: ; f1a4a
togglesfx
sfxtogglenoise $4
@@ -3719,10 +3611,8 @@
endchannel
; f1a65
+ db $df
-INCBIN "baserom.gbc", $f1a65, $f1a66 - $f1a65
-
-
Sfx_DexFanfare230Plus: ; f1a66
dbw $c4, Sfx_DexFanfare230Plus_Ch5
dbw $05, Sfx_DexFanfare230Plus_Ch6
@@ -3777,10 +3667,8 @@
endchannel
; f1ab1
+ db $df
-INCBIN "baserom.gbc", $f1ab1, $f1ab2 - $f1ab1
-
-
Sfx_DexFanfare230Plus_Ch6: ; f1ab2
togglesfx
vibrato $12, $34
@@ -3815,10 +3703,8 @@
endchannel
; f1ad9
+ db $df
-INCBIN "baserom.gbc", $f1ad9, $f1ada - $f1ad9
-
-
Sfx_DexFanfare230Plus_Ch7: ; f1ada
togglesfx
notetype $8, $25
@@ -3867,10 +3753,8 @@
endchannel
; f1b0b
+ db $df
-INCBIN "baserom.gbc", $f1b0b, $f1b0c - $f1b0b
-
-
Sfx_DexFanfare230Plus_Ch8: ; f1b0c
togglesfx
sfxtogglenoise $4
@@ -3906,9 +3790,7 @@
endchannel
; f1b32
-
-INCBIN "baserom.gbc", $f1b32, $f1b33 - $f1b32
-
+ db $df
Sfx_NotVeryEffective: ; f1b33
dbw $07, Sfx_NotVeryEffective_Ch8