diff options
Diffstat (limited to 'audio/music')
| -rw-r--r-- | audio/music/dancinghall.asm | 4 | ||||
| -rw-r--r-- | audio/music/kantotrainerbattle.asm | 4 | ||||
| -rw-r--r-- | audio/music/kantowildbattle.asm | 4 | ||||
| -rw-r--r-- | audio/music/lavendertown.asm | 4 | ||||
| -rw-r--r-- | audio/music/lookkimonogirl.asm | 4 | ||||
| -rw-r--r-- | audio/music/lookyoungster.asm | 12 | ||||
| -rw-r--r-- | audio/music/newbarktown.asm | 4 | ||||
| -rw-r--r-- | audio/music/postcredits.asm | 4 | ||||
| -rw-r--r-- | audio/music/profoakspokemontalk.asm | 4 | ||||
| -rw-r--r-- | audio/music/route1.asm | 4 | ||||
| -rw-r--r-- | audio/music/surf.asm | 4 | ||||
| -rw-r--r-- | audio/music/vermilioncity.asm | 4 |
12 files changed, 14 insertions, 42 deletions
diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 3070830b6..a21f1a867 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -4,9 +4,7 @@ Music_DancingHall: ; ef9bc dbw $02, Music_DancingHall_Ch3 ; ef9c5 - -INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5 - + db $3 Music_DancingHall_Ch1: ; ef9c6 tempo 208 diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 21d1a7e95..ad639d07f 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -4,9 +4,7 @@ Music_KantoTrainerBattle: ; ec9fa dbw $02, Music_KantoTrainerBattle_Ch3 ; eca03 - -INCBIN "baserom.gbc", $eca03, $eca04 - $eca03 - + db $3 Music_KantoTrainerBattle_Ch1: ; eca04 tempo 114 diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index e14e8b85e..6569695d6 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -4,9 +4,7 @@ Music_KantoWildBattle: ; ed06d dbw $02, Music_KantoWildBattle_Ch3 ; ed076 - -INCBIN "baserom.gbc", $ed076, $ed077 - $ed076 - + db $3 Music_KantoWildBattle_Ch1: ; ed077 tempo 112 diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 780bdc607..3e79400e7 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -4,9 +4,7 @@ Music_LavenderTown: ; ef72f dbw $02, Music_LavenderTown_Ch3 ; ef738 - -INCBIN "baserom.gbc", $ef738, $ef739 - $ef738 - + db $3 Music_LavenderTown_Ch1: ; ef739 tempo 160 diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 32d4498db..511204f1a 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -4,9 +4,7 @@ Music_LookKimonoGirl: ; f79b8 dbw $02, Music_LookKimonoGirl_Ch3 ; f79c1 - -INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1 - + db $3 Music_LookKimonoGirl_Ch1: ; f79c2 tempo 160 diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index 7ae3ec957..f9ffb2295 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -61,9 +61,7 @@ Music_LookYoungster_branch_f66ea: ; f66ea loopchannel 0, Music_LookYoungster_branch_f66ea ; f670e - -INCBIN "baserom.gbc", $f670e, $f670f - $f670e - + db $ff Music_LookYoungster_Ch2: ; f670f stereopanning $f0 @@ -162,9 +160,7 @@ Music_LookYoungster_branch_f672f: ; f672f loopchannel 0, Music_LookYoungster_branch_f672f ; f6783 - -INCBIN "baserom.gbc", $f6783, $f6784 - $f6783 - + db $ff Music_LookYoungster_Ch3: ; f6784 stereopanning $ff @@ -300,8 +296,6 @@ Music_LookYoungster_branch_f67ae: ; f67ae loopchannel 0, Music_LookYoungster_branch_f67ae ; f6810 - -INCBIN "baserom.gbc", $f6810, $f6811 - $f6810 - + db $ff diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index a528a3985..90fb91b4a 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -4,9 +4,7 @@ Music_NewBarkTown: ; eb2d3 dbw $02, Music_NewBarkTown_Ch3 ; eb2dc - -INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc - + db $3 Music_NewBarkTown_Ch1: ; eb2dd tempo 187 diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index 4402327f8..1f35ee2ea 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -3,9 +3,7 @@ Music_PostCredits: ; cfd9e dbw $01, Music_PostCredits_Ch2 ; cfda4 - -INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4 - + db $2 Music_PostCredits_Ch1: ; cfda5 tempo 271 diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 578c0272d..f12d846c9 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -4,9 +4,7 @@ Music_ProfOaksPokemonTalk: ; f4c9f dbw $02, Music_ProfOaksPokemonTalk_Ch3 ; f4ca8 - -INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8 - + db $3 Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 tempo 164 diff --git a/audio/music/route1.asm b/audio/music/route1.asm index ef6de9f6f..ab4faecb9 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -4,9 +4,7 @@ Music_Route1: ; ec000 dbw $02, Music_Route1_Ch3 ; ec009 - -INCBIN "baserom.gbc", $ec009, $ec00a - $ec009 - + db $3 Music_Route1_Ch1: ; ec00a stereopanning $f diff --git a/audio/music/surf.asm b/audio/music/surf.asm index 2d8d3fa1f..27c77e0f0 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -4,9 +4,7 @@ Music_Surf: ; f518a dbw $02, Music_Surf_Ch3 ; f5193 - -INCBIN "baserom.gbc", $f5193, $f5194 - $f5193 - + db $3 Music_Surf_Ch1: ; f5194 tempo 108 diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index 705c8a3ab..fd9bffec7 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -4,9 +4,7 @@ Music_VermilionCity: ; eb676 dbw $02, Music_VermilionCity_Ch3 ; eb67f - -INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f - + db $3 Music_VermilionCity_Ch1: ; eb680 stereopanning $f |