summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/cries.asm4
-rw-r--r--audio/engine.asm12
-rwxr-xr-xaudio/songs/bicycle.asm4
-rwxr-xr-xaudio/songs/evolution.asm4
-rwxr-xr-xaudio/songs/heal.asm4
-rwxr-xr-xaudio/songs/leaderbattle.asm4
-rwxr-xr-xaudio/songs/nidorinointro.asm4
-rwxr-xr-xaudio/songs/none.asm4
-rwxr-xr-xaudio/songs/oakintro.asm4
-rwxr-xr-xaudio/songs/route1.asm4
-rwxr-xr-xaudio/songs/spottedrocket.asm4
-rwxr-xr-xaudio/songs/title.asm4
-rwxr-xr-xaudio/songs/trainerbattle.asm4
-rwxr-xr-xaudio/songs/victorytrainer.asm4
-rwxr-xr-xaudio/songs/viridiancity.asm4
15 files changed, 34 insertions, 34 deletions
diff --git a/audio/cries.asm b/audio/cries.asm
index 3b57f4c..7ceef13 100644
--- a/audio/cries.asm
+++ b/audio/cries.asm
@@ -1,5 +1,5 @@
INCLUDE "constants.asm"
-SECTION "Cries", ROMX[$51CB], BANK[$3C] ; TODO: Temporary, please map 4000-51CA and move this section's base
+SECTION "audio/cries.asm", ROMX
-CryHeaders:: ; TODO: Rip the data, then INCBIN it
+CryHeaders:: ; TODO: Rip the data, then INCBIN it \ No newline at end of file
diff --git a/audio/engine.asm b/audio/engine.asm
index e4f3a2f..6fdc555 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Audio", ROMX[$4000], BANK[$3A]
+SECTION "audio/engine.asm@Audio", ROMX
_DisableAudio:: ; 3a:4000
push hl
@@ -208,7 +208,7 @@ Functione80fa: ; 3a:40fa
.jumptable
; TODO
-SECTION "IsChannelSFXOn", ROMX[$42bd], BANK[$3a]
+SECTION "audio/engine.asm@IsChannelSFXOn", ROMX
IsChannelSFXOn: ; 3a:42bd
; If it's not a valid channel, return
ld a, [wCurChannel]
@@ -249,7 +249,7 @@ IsAnySFXOn: ; 3a:42d0
scf
ret
-SECTION "Functione82f0", ROMX[$42f0], BANK[$3a]
+SECTION "audio/engine.asm@Functione82f0", ROMX
Functione82f0: ; 3a:42f0
call IncrementTempo
call PlayDanger
@@ -502,7 +502,7 @@ FadeMusic: ; 3a:43ce
ld [wVolume], a
ret
-SECTION "Audio engine, part 2", ROMX[$4CEE], BANK[$3A] ; TODO: disassemble what's above (gulp) and remove this
+SECTION "audio/engine.asm@Audio engine, part 2", ROMX
SetGlobalTempo: ; 3a:4cee
push bc
@@ -612,5 +612,5 @@ _PlayMusic:: ; 3a:4d66
xor a
; TODO
-SECTION "Song Header Pointers", ROMX[$52C7], BANK[$3A]
-INCLUDE "audio/song_header_pointers.inc"
+SECTION "audio/engine.asm@Song Header Pointers", ROMX
+INCLUDE "audio/song_header_pointers.inc" \ No newline at end of file
diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm
index 7c773fa..9108c84 100755
--- a/audio/songs/bicycle.asm
+++ b/audio/songs/bicycle.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song Bicycle", ROMX[$563e], BANK[$3b]
+SECTION "audio/songs/bicycle.asm", ROMX
Song_Bicycle:: ; ed63e (3b:563e)
db 3 << 6 | 0
@@ -721,4 +721,4 @@ Song_Bicycle_branch_ed96e::
snare7 1
snare7 1
endchannel
-; 0xed978
+; 0xed978 \ No newline at end of file
diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm
index 98bfc0e..3a018de 100755
--- a/audio/songs/evolution.asm
+++ b/audio/songs/evolution.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song Evolution", ROMX[$5b1c], BANK[$3b]
+SECTION "audio/songs/evolution.asm", ROMX
Song_Evolution:: ; edb1c (3b:5b1c)
db 2 << 6 | 0
@@ -123,4 +123,4 @@ Song_Evolution_branch_edba7::
A_ 2
rest 2
endchannel
-; 0xedbbd
+; 0xedbbd \ No newline at end of file
diff --git a/audio/songs/heal.asm b/audio/songs/heal.asm
index 9ea7368..60e204d 100755
--- a/audio/songs/heal.asm
+++ b/audio/songs/heal.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song Heal", ROMX[$55f4], BANK[$3b]
+SECTION "audio/songs/heal.asm", ROMX
Song_Heal:: ; ed5f4 (3b:55f4)
db 2 << 6 | 0
@@ -59,4 +59,4 @@ Song_Heal_Ch2:: ; ed631 (3b:5631)
E_ 6
rest 2
endchannel
-; 0xed63e
+; 0xed63e \ No newline at end of file
diff --git a/audio/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm
index e013759..e336b1d 100755
--- a/audio/songs/leaderbattle.asm
+++ b/audio/songs/leaderbattle.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song LeaderBattle", ROMX[$4858], BANK[$3b]
+SECTION "audio/songs/leaderbattle.asm", ROMX
Song_LeaderBattle:: ; ec858 (3b:4858)
db 2 << 6 | 0
@@ -1412,4 +1412,4 @@ Song_LeaderBattle_branch_eccc9::
octave 4
G_ 6
loopchannel 0, Song_LeaderBattle_branch_eccc9
-; 0xece31
+; 0xece31 \ No newline at end of file
diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm
index 2124bc1..280e449 100755
--- a/audio/songs/nidorinointro.asm
+++ b/audio/songs/nidorinointro.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song NidorinoIntro", ROMX[$4000], BANK[$3b]
+SECTION "audio/songs/nidorinointro.asm", ROMX
Song_NidorinoIntro:: ; ec000 (3b:4000)
db 3 << 6 | 0
@@ -344,4 +344,4 @@ Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155)
rest 16
rest 14
endchannel
-; 0xec1b9
+; 0xec1b9 \ No newline at end of file
diff --git a/audio/songs/none.asm b/audio/songs/none.asm
index 746a1c9..57109c5 100755
--- a/audio/songs/none.asm
+++ b/audio/songs/none.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song None", ROMX[$52ee], BANK[$3a]
+SECTION "audio/songs/none.asm", ROMX
Song_None:: ; e92ee (3a:52ee)
db 3 << 6 | 0
@@ -17,4 +17,4 @@ Song_None_Ch1:: ; e92fa (3a:52fa)
Song_None_Ch2:: ; e92fa (3a:52fa)
Song_None_Ch3:: ; e92fa (3a:52fa)
endchannel
-; 0xe92fb
+; 0xe92fb \ No newline at end of file
diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm
index e6d6bb4..c545dae 100755
--- a/audio/songs/oakintro.asm
+++ b/audio/songs/oakintro.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song OakIntro", ROMX[$4685], BANK[$3b]
+SECTION "audio/songs/oakintro.asm", ROMX
Song_OakIntro:: ; ec685 (3b:4685)
db 3 << 6 | 0
@@ -442,4 +442,4 @@ Song_OakIntro_branch_ec7e9::
rest 3
loopchannel 0, Song_OakIntro_branch_ec7e9
endchannel
-; 0xec858
+; 0xec858 \ No newline at end of file
diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm
index 0ad9311..35cab89 100755
--- a/audio/songs/route1.asm
+++ b/audio/songs/route1.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song Route1", ROMX[$44c2], BANK[$3b]
+SECTION "audio/songs/route1.asm", ROMX
Song_Route1:: ; ec4c2 (3b:44c2)
db 3 << 6 | 0
@@ -423,4 +423,4 @@ Song_Route1_branch_ec625::
snare4 2
loopchannel 0, Song_Route1_branch_ec625
endchannel
-; 0xec685
+; 0xec685 \ No newline at end of file
diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm
index aef6bb5..90717c8 100755
--- a/audio/songs/spottedrocket.asm
+++ b/audio/songs/spottedrocket.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song SpottedRocket", ROMX[$5978], BANK[$3b]
+SECTION "audio/songs/spottedrocket.asm", ROMX
Song_SpottedRocket:: ; ed978 (3b:5978)
db 2 << 6 | 0
@@ -92,4 +92,4 @@ Song_SpottedRocket_branch_ed9df::
rest 3
A# 4
loopchannel 0, Song_SpottedRocket_branch_ed9df
-; 0xed9ea
+; 0xed9ea \ No newline at end of file
diff --git a/audio/songs/title.asm b/audio/songs/title.asm
index 087980d..38b1823 100755
--- a/audio/songs/title.asm
+++ b/audio/songs/title.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song Title", ROMX[$62fe], BANK[$3c]
+SECTION "audio/songs/title.asm", ROMX
Song_Title:: ; f22fe (3c:62fe)
db 3 << 6 | 0
@@ -692,4 +692,4 @@ Song_Title_branch_f2645::
snare2 1
rest 3
endchannel
-; 0xf264e
+; 0xf264e \ No newline at end of file
diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm
index a7e9a84..77c1d89 100755
--- a/audio/songs/trainerbattle.asm
+++ b/audio/songs/trainerbattle.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song TrainerBattle", ROMX[$4e31], BANK[$3b]
+SECTION "audio/songs/trainerbattle.asm", ROMX
Song_TrainerBattle:: ; ece31 (3b:4e31)
db 2 << 6 | 0
@@ -1869,4 +1869,4 @@ Song_TrainerBattle_branch_ed2f7::
D_ 2
C_ 2
loopchannel 0, Song_TrainerBattle_branch_ed2f7
-; 0xed5f4
+; 0xed5f4 \ No newline at end of file
diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm
index 3fe523e..479df0e 100755
--- a/audio/songs/victorytrainer.asm
+++ b/audio/songs/victorytrainer.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song VictoryTrainer", ROMX[$59ea], BANK[$3b]
+SECTION "audio/songs/victorytrainer.asm", ROMX
Song_VictoryTrainer:: ; ed9ea (3b:59ea)
db 2 << 6 | 0
@@ -275,4 +275,4 @@ Song_VictoryTrainer_branch_edacc::
octave 4
A_ 3
loopchannel 0, Song_VictoryTrainer_branch_edacc
-; 0xedb1c
+; 0xedb1c \ No newline at end of file
diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm
index 4b3a35e..0682a5d 100755
--- a/audio/songs/viridiancity.asm
+++ b/audio/songs/viridiancity.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Song ViridianCity", ROMX[$41b9], BANK[$3b]
+SECTION "audio/songs/viridiancity.asm", ROMX
Song_ViridianCity:: ; ec1b9 (3b:41b9)
db 3 << 6 | 0
@@ -674,4 +674,4 @@ Song_ViridianCity_branch_ec4bd::
triangle2 2
triangle2 2
endchannel
-; 0xec4c2
+; 0xec4c2 \ No newline at end of file