audio.o

14 files changed, 53 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 7a6e47f..c41aa7a 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 .SECONDEXPANSION:
 
 ROMS := tcg.gbc
-OBJS := main.o gfx.o text.o
+OBJS := main.o gfx.o text.o audio.o
 
 $(foreach obj, $(OBJS), \
 	$(eval $(obj:.o=)_dep := $(shell python extras/scan_includes.py $(obj:.o=.asm))) \
diff --git a/audio.asm b/audio.asm
new file mode 100755
index 0000000..adfa6a6
--- /dev/null
+++ b/audio.asm
@@ -0,0 +1,12 @@
+INCLUDE "constants.asm"
+INCLUDE "macros.asm"
+INCLUDE "hram.asm"
+
+SECTION "bank3D",ROMX,BANK[$3D]
+INCLUDE "audio/music1.asm"
+
+SECTION "bank3E",ROMX,BANK[$3E]
+INCLUDE "audio/music2.asm"
+
+SECTION "bank3F",ROMX,BANK[$3F]
+INCLUDE "audio/sfx.asm"
diff --git a/engine/music1.asm b/audio/music1.asm
index 21b7007..0e1767b 100755
--- a/engine/music1.asm
+++ b/audio/music1.asm
@@ -1,34 +1,34 @@
-SetupSound_Ext: ; f4000 (3d:4000)
+SetupSound_Ext:: ; f4000 (3d:4000)
 	jp Func_f407d
 
-SoundTimerHandler_Ext: ; f4003 (3d:4003)
+SoundTimerHandler_Ext:: ; f4003 (3d:4003)
 	jp Func_f40e9
 
-Func_f4006: ; f4006 (3d:4006)
+Func_f4006:: ; f4006 (3d:4006)
 	jp Func_f4021
 
-Func_f4009: ; f4009 (3d:4009)
+Func_f4009:: ; f4009 (3d:4009)
 	jp Func_f402d
 
-Func_f400c: ; f400c (3d:400c)
+Func_f400c:: ; f400c (3d:400c)
 	jp Func_f404e
 
-Func_f400f: ; f400f (3d:400f)
+Func_f400f:: ; f400f (3d:400f)
 	jp Func_f4052
 
-Func_f4012: ; f4012 (3d:4012)
+Func_f4012:: ; f4012 (3d:4012)
 	jp Func_f405c
 
-Func_f4015: ; f4015 (3d:4015)
+Func_f4015:: ; f4015 (3d:4015)
 	jp Func_f4066
 
-Func_f4018: ; f4018 (3d:4018)
+Func_f4018:: ; f4018 (3d:4018)
 	jp Func_f406f
 
-Func_f401b: ; f401b (3d:401b)
+Func_f401b:: ; f401b (3d:401b)
 	jp Func_f49c4
 
-Func_f401e: ; f401e (3d:401e)
+Func_f401e:: ; f401e (3d:401e)
 	jp Func_f49d0
 
 Func_f4021: ; f4021 (3d:4021)
@@ -1856,18 +1856,18 @@ Unknown_f4c30: ; f4c30 (3d:4c30)
 INCBIN "baserom.gbc",$f4c30,$f4cda - $f4c30
 
 Music1_WaveInstruments: ; f4cda (3d:4cda)
-INCLUDE "data/wave_instruments.asm"
+INCLUDE "audio/wave_instruments.asm"
 
 Music1_NoiseInstruments: ; f4d34 (3d:4d34)
-INCLUDE "data/noise_instruments.asm"
+INCLUDE "audio/noise_instruments.asm"
 
 Music1_VibratoTypes: ; f4dde (3d:4dde)
-INCLUDE "data/vibrato_types.asm"
+INCLUDE "audio/vibrato_types.asm"
 
 Unknown_f4e85: ; f4e85 (3d:4e85)
 INCBIN "baserom.gbc",$f4e85,$f4ee5 - $f4e85
 
-INCLUDE "data/music1_headers.asm"
+INCLUDE "audio/music1_headers.asm"
 
 INCLUDE "audio/music/titlescreen.asm"
 INCLUDE "audio/music/dueltheme1.asm"
diff --git a/data/music1_headers.asm b/audio/music1_headers.asm
index 3344365..3344365 100755
--- a/data/music1_headers.asm
+++ b/audio/music1_headers.asm
diff --git a/engine/music2.asm b/audio/music2.asm
index db44d1d..6ed8e63 100755
--- a/engine/music2.asm
+++ b/audio/music2.asm
@@ -1856,18 +1856,18 @@ Unknown_f8c30: ; f8c30 (3e:4c30)
 INCBIN "baserom.gbc",$f8c30,$f8cda - $f8c30
 
 Music2_WaveInstruments: ; f8cda (3e:4cda)
-INCLUDE "data/wave_instruments.asm"
+INCLUDE "audio/wave_instruments.asm"
 
 Music2_NoiseInstruments: ; f8d34 (3e:4d34)
-INCLUDE "data/noise_instruments.asm"
+INCLUDE "audio/noise_instruments.asm"
 
 Music2_VibratoTypes: ; f8dde (3e:4dde)
-INCLUDE "data/vibrato_types.asm"
+INCLUDE "audio/vibrato_types.asm"
 
 Unknown_f8e85: ; f8e85 (3e:4e85)
 INCBIN "baserom.gbc",$f8e85,$f8ee5 - $f8e85
 
-INCLUDE "data/music2_headers.asm"
+INCLUDE "audio/music2_headers.asm"
 
 INCLUDE "audio/music/pcmainmenu.asm"
 INCLUDE "audio/music/pokemondome.asm"
diff --git a/data/music2_headers.asm b/audio/music2_headers.asm
index cafaa4f..cafaa4f 100755
--- a/data/music2_headers.asm
+++ b/audio/music2_headers.asm
diff --git a/data/noise_instruments.asm b/audio/noise_instruments.asm
index 96433ab..96433ab 100755
--- a/data/noise_instruments.asm
+++ b/audio/noise_instruments.asm
diff --git a/engine/sfx.asm b/audio/sfx.asm
index 63a83b6..cb3e2a8 100755
--- a/engine/sfx.asm
+++ b/audio/sfx.asm
@@ -493,10 +493,10 @@ Func_fc279: ; fc279 (3f:4279)
 	ld [$dd8c], a
 	ret
 
-INCLUDE "data/sfx_headers.asm"
+INCLUDE "audio/sfx_headers.asm"
 
 SFX_WaveInstruments: ; fc485 (3f:4485)
-INCLUDE "data/wave_instruments.asm"
+INCLUDE "audio/wave_instruments.asm"
 
 INCLUDE "audio/sfx/sfx_01.asm"
 INCLUDE "audio/sfx/sfx_02.asm"
diff --git a/data/sfx_headers.asm b/audio/sfx_headers.asm
index 6485425..6485425 100755
--- a/data/sfx_headers.asm
+++ b/audio/sfx_headers.asm
diff --git a/data/vibrato_types.asm b/audio/vibrato_types.asm
index d51546e..d51546e 100755
--- a/data/vibrato_types.asm
+++ b/audio/vibrato_types.asm
diff --git a/data/wave_instruments.asm b/audio/wave_instruments.asm
index 98197dc..98197dc 100755
--- a/data/wave_instruments.asm
+++ b/audio/wave_instruments.asm
diff --git a/engine/home.asm b/engine/home.asm
index e7570cc..dd06781 100755
--- a/engine/home.asm
+++ b/engine/home.asm
@@ -4830,7 +4830,7 @@ Func_3e2a: ; 3e2a (0:3e2a)
 INCBIN "baserom.gbc",$3e31,$3fe0 - $3e31
 
 ; jumps to 3f:hl
-Bankswitch3dTo3f: ; 3fe0 (0:3fe0)
+Bankswitch3dTo3f:: ; 3fe0 (0:3fe0)
 	push af
 	ld a, $3f
 	ld [hBankROM], a
diff --git a/main.asm b/main.asm
index 0057991..08d9c56 100755
--- a/main.asm
+++ b/main.asm
@@ -47,12 +47,3 @@ INCLUDE "engine/bank1c.asm"
 
 SECTION "bank20",ROMX,BANK[$20]
 INCLUDE "engine/bank20.asm"
-
-SECTION "bank3D",ROMX,BANK[$3D]
-INCLUDE "engine/music1.asm"
-
-SECTION "bank3E",ROMX,BANK[$3E]
-INCLUDE "engine/music2.asm"
-
-SECTION "bank3F",ROMX,BANK[$3F]
-INCLUDE "engine/sfx.asm"
diff --git a/wram.asm b/wram.asm
index 1f40a45..9acee3e 100755
--- a/wram.asm
+++ b/wram.asm
@@ -150,56 +150,56 @@ wPlayerXCoord: ; d330
 wPlayerYCoord: ; d331
 	ds $a53
 
-wMusicDC: ; dd84
+wMusicDC:: ; dd84
 	ds $2
 
-wMusicDuty: ; dd86
+wMusicDuty:: ; dd86
 	ds $4
 
-wMusicWave: ; dd8a
+wMusicWave:: ; dd8a
 	ds $1
 
-wMusicWaveChange: ; dd8b
+wMusicWaveChange:: ; dd8b
 	ds $2
 
-wMusicIsPlaying: ; dd8d
+wMusicIsPlaying:: ; dd8d
 	ds $4
 
-wMusicTie: ; dd91
+wMusicTie:: ; dd91
 	ds $c
 
-wMusicMainLoop: ; dd9d
+wMusicMainLoop:: ; dd9d
 	ds $12
 
-wMusicOctave: ; ddaf
+wMusicOctave:: ; ddaf
 	ds $10
 
-wMusicE8: ; ddbf
+wMusicE8:: ; ddbf
 	ds $8
 
-wMusicE9: ; ddc7
+wMusicE9:: ; ddc7
 	ds $4
 
-wMusicEC: ; ddcb
+wMusicEC:: ; ddcb
 	ds $4
 
-wMusicSpeed: ; ddcf
+wMusicSpeed:: ; ddcf
 	ds $4
 
-wMusicVibratoType: ; ddd3
+wMusicVibratoType:: ; ddd3
 	ds $4
 
-wMusicVibratoType2: ; ddd7
+wMusicVibratoType2:: ; ddd7
 	ds $8
 
-wMusicVibratoDelay: ; dddf
+wMusicVibratoDelay:: ; dddf
 	ds $8
 
-wMusicVolume: ; dde7
+wMusicVolume:: ; dde7
 	ds $3
 
-wMusicE4: ; ddea
+wMusicE4:: ; ddea
 	ds $9
 
-wMusicReturnAddress: ; ddf3
+wMusicReturnAddress:: ; ddf3
 	ds $8