Convert pcm data to wave files.

7 files changed, 15 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 1f9f0cd..9f6a321 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@
 # converted image data
 *.1bpp
 *.2bpp
+
+# converted audio data
+*.pcm
diff --git a/Makefile b/Makefile
index 8495be4..c7e15d8 100755
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ all: $(ROMS) compare
 $(OBJS): $$*.asm $$($$*_dep)
 	@$(PYTHON) $(PRET)/gfx.py 2bpp $(2bppq)
 	@$(PYTHON) $(PRET)/gfx.py 1bpp $(1bppq)
+	@$(PYTHON) $(PRET)/pcm.py pcm $(pcmq)
 	rgbasm -h -o $@ $<
 
 $(ROMS): $(OBJS)
@@ -39,7 +40,7 @@ compare: $(ROMS) baserom.gbc
 # Remove files generated by the build process.
 clean:
 	rm -f $(ROMS) $(OBJS) $(ROMS:.gbc=.sym)
-	find . \( -iname '*.1bpp' -o -iname '*.2bpp' \) -exec rm {} +
+	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pcm' \) -exec rm {} +
 
 %.2bpp: %.png
 	$(eval 2bppq += $<)
@@ -48,3 +49,7 @@ clean:
 %.1bpp: %.png
 	$(eval 1bppq += $<)
 	@rm -f $@
+
+%.pcm: %.wav
+	$(eval pcmq += $<)
+	@rm -f $@
diff --git a/audio/sound_clips/pi_ka_chu.soundclip b/audio/sound_clips/pi_ka_chu.soundclip
deleted file mode 100755
index 67525dc..0000000
--- a/audio/sound_clips/pi_ka_chu.soundclip
+++ /dev/null
diff --git a/audio/sound_clips/pi_ka_chu.wav b/audio/sound_clips/pi_ka_chu.wav
new file mode 100755
index 0000000..9be38b1
--- /dev/null
+++ b/audio/sound_clips/pi_ka_chu.wav
diff --git a/audio/sound_clips/piiiiikaaaa.soundclip b/audio/sound_clips/piiiiikaaaa.soundclip
deleted file mode 100755
index df1247c..0000000
--- a/audio/sound_clips/piiiiikaaaa.soundclip
+++ /dev/null
diff --git a/audio/sound_clips/piiiiikaaaa.wav b/audio/sound_clips/piiiiikaaaa.wav
new file mode 100755
index 0000000..1c52bc5
--- /dev/null
+++ b/audio/sound_clips/piiiiikaaaa.wav
diff --git a/main.asm b/main.asm
index 5f83bcb..87de1c9 100755
--- a/main.asm
+++ b/main.asm
@@ -48862,14 +48862,16 @@ PikachuSoundClipPointers: ; 0x50076
     dw PikachuThundershockSoundClip
 
 PikachuBillboardBonusSoundClip:  ; 0x5007a
-    INCBIN "audio/sound_clips/pi_ka_chu.soundclip"
+    dw $caf  ; length of the pcm data (todo: there is probably a way to do this dynamically with rgbds)
+    INCBIN "audio/sound_clips/pi_ka_chu.pcm"
 
-    db $1f  ; unused byte
+    db $1f  ; unused
 
 PikachuThundershockSoundClip:  ; 0x50d2c
-    INCBIN "audio/sound_clips/piiiiikaaaa.soundclip"
+    dw $1227  ; length of the pcm data (todo: there is probably a way to do this dynamically with rgbds)
+    INCBIN "audio/sound_clips/piiiiikaaaa.pcm"
 
-    db $f0, $00, $00  ; unused bytes
+    db $f0, $00, $00  ; unused
 
 PlayPikachuPCM: ; 0x51f56
 ; Plays the audio PCM at [hl]