Merge branch 'master' of https://github.com/pret/pokeyellow

Conflicts:
	.gitignore

.gitignore

@@ -19,6 +19,9 @@
 *.1bpp
 *.pic
 
+# converted audio data
+*.pcm
+
 # swap files for vim
 .*.swp
 
@@ -53,7 +56,4 @@ replace.sh
 .lvimrc
 
 # extras is a submodule, don't include
-extras
-
-# contains hack job of some scripts modified for personal use
-extras1\
+extras/

Makefile

@@ -16,7 +16,6 @@ cgb_opt = -cjsv -k 01 -l 0x33 -m 0x1b -p 0 -r 03
 yellow_opt = $(cgb_opt) -t "POKEMON YELLOW"
 
 
-
 # If your default python is 3, you may want to change this to python27.
 PYTHON := python
 
@@ -33,7 +32,7 @@ compare: yellow
 
 # Clear the default suffixes.
 .SUFFIXES:
-.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic
+.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic .wav .pcm
 
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
@@ -44,13 +43,12 @@ compare: yellow
 # Filepath shortcuts to avoid overly long recipes.
 poketools := extras/pokemontools
 gfx       := $(PYTHON) $(poketools)/gfx.py
+pcm       := $(PYTHON) $(poketools)/pcm.py
 pic       := $(PYTHON) $(poketools)/pic.py
 includes  := $(PYTHON) $(poketools)/scan_includes.py
 
 
-
 # Collect file dependencies for objects in yellow/.
-# These aren't provided by rgbds by default, so we have to look for file includes ourselves.
 $(foreach ver, $(versions), \
 	$(eval $(ver)_asm := $(shell find $(ver) -iname '*.asm')) \
 	$(eval $(ver)_obj := $($(ver)_asm:.asm=.o)) \
@@ -61,32 +59,27 @@ $(foreach obj, $(all_obj), \
 )
 
 
-# Image files are added to a queue to reduce build time. They're converted when building parent objects.
-%.png:  ;
-%.2bpp: %.png  ; $(eval 2bppq += $<) @rm -f $@
-%.1bpp: %.png  ; $(eval 1bppq += $<) @rm -f $@
-%.pic:  %.2bpp ; $(eval picq  += $<) @rm -f $@
+%.png: ;
+%.2bpp: %.png  ; @$(gfx) 2bpp $<
+%.1bpp: %.png  ; @$(gfx) 1bpp $<
+%.pic:  %.2bpp ; @$(pic) compress $<
+
+%.wav: ;
+%.pcm: %.wav $(poketools)/pcm.py ; @$(pcm) pcm $<
 
 # Assemble source files into objects.
-# Queue payloads are here. These are made silent since there may be hundreds of targets.
-# Use rgbasm -h to use halts without nops.
 $(all_obj): $$*.asm $$($$*_dep)
-	@$(gfx) 2bpp $(2bppq);    $(eval 2bppq :=)
-	@$(gfx) 1bpp $(1bppq);    $(eval 1bppq :=)
-	@$(pic) compress $(picq); $(eval picq  :=)
 	rgbasm -h -o $@ $*.asm
 
+# Make a symfile for debugging.
+link_opt = -n poke$*.sym
 
 # Link objects together to build a rom.
-
-# Make a symfile for debugging.
-link = rgblink -n poke$*.sym
-
 poke%.gbc: $$(%_obj)
-	$(link) -o $@ $^
+	rgblink $(link_opt) -o $@ $^
 	rgbfix $($*_opt) $@
 
 
 clean:
 	rm -f $(roms) $(all_obj) poke*.sym
-	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
+	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' -o -iname '*.pcm' \) -exec rm {} +

yellow/main.asm

@@ -3157,48 +3157,119 @@ Func_82bd4: ; 82bd4 (20:6bd4)
 
 SECTION "bank21",ROMX,BANK[$21]
 PikachuCry1: ; 84000 (21:4000)
-	dr $84000,$8491a
+	dw (PikachuCry1_End - PikachuCry1) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
+PikachuCry1_End:
+
+	db $77  ; unused
+	; Game Freak might have made a slight error, because all of
+	; the pcm data has one trailing byte that is never processed.
+
 PikachuCry2: ; 8491a (21:491a)
-	dr $8491a,$84fdc
+	dw (PikachuCry2_End - PikachuCry2) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_2.pcm"
+PikachuCry2_End:
+
+	db $77  ; unused
+
 PikachuCry3: ; 84fdc (21:4fdc)
-	dr $84fdc,$859ee
+	dw (PikachuCry3_End - PikachuCry3) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_3.pcm"
+PikachuCry3_End:
+
+	db $03  ; unused
+
 PikachuCry4: ; 859ee (21:59ee)
-	dr $859ee,$88000
+	dw (PikachuCry4_End - PikachuCry4) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_4.pcm"
+PikachuCry4_End:
+
+	db $e0  ; unused
 
 
 SECTION "bank22",ROMX,BANK[$22]
 PikachuCry5: ; 88000 (22:4000)
-	dr $88000,$89042
+	dw (PikachuCry5_End - PikachuCry5) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
+PikachuCry5_End:
+
+	db $77  ; unused
+
 PikachuCry6: ; 89042 (22:5042)
-	dr $89042,$8a254
+	dw (PikachuCry6_End - PikachuCry6) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_6.pcm"
+PikachuCry6_End:
+
+	db $77  ; unused
+
 PikachuCry7: ; 8a254 (22:6254)
-	dr $8a254,$8c000
+	dw (PikachuCry7_End - PikachuCry7) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_7.pcm"
+PikachuCry7_End:
+
+	db $ff  ; unused
 
 
 SECTION "bank23",ROMX,BANK[$23]
 PikachuCry8: ; 8c000 (23:4000)
-	dr $8c000,$8d0ca
+	dw (PikachuCry8_End - PikachuCry8) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
+PikachuCry8_End:
+
+	db $f7  ; unused
+
 PikachuCry9: ; 8d0ca (23:50ca)
-	dr $8d0ca,$8de0c
+	dw (PikachuCry9_End - PikachuCry9) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_9.pcm"
+PikachuCry9_End:
+
+	db $f3  ; unused
+
 PikachuCry10: ; 8de0c (23:5e0c)
-	dr $8de0c,$90000
+	dw (PikachuCry10_End - PikachuCry10) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_10.pcm"
+PikachuCry10_End:
+
+	db $ff  ; unused
 
 
 SECTION "bank24",ROMX,BANK[$24]
 PikachuCry11: ; 90000 (24:4000)
-	dr $90000,$90722
+	dw (PikachuCry11_End - PikachuCry11) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
+PikachuCry11_End:
+
+	db $77  ; unused
+
 PikachuCry12: ; 90722 (24:4772)
-	dr $90722,$914a4
+	dw (PikachuCry12_End - PikachuCry12) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_12.pcm"
+PikachuCry12_End:
+
+	db $ff  ; unused
+
 PikachuCry13: ; 914a4 (24:54a4)
-	dr $914a4,$94000
+	dw (PikachuCry13_End - PikachuCry13) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_13.pcm"
+PikachuCry13_End:
+
+	db $f0  ; unused
 
 
 SECTION "bank25",ROMX,BANK[$25]
 PikachuCry14: ; 94000 (25:4000)
-	dr $94000,$9589a
-PikachuCry15: ; 9589a (25:589a)
-	dr $9589a,$98000
+	dw (PikachuCry14_End - PikachuCry14) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm"
+PikachuCry14_End:
 
+	db $fc  ; unused
+
+PikachuCry15: ; 9589a (25:589a)
+	dw (PikachuCry15_End - PikachuCry15) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm"
+PikachuCry15_End:
+
+	db $77  ; unused
 
 SECTION "bank2f",ROMX[$5000],BANK[$2F]
 
@@ -3213,79 +3284,201 @@ SECTION "bank30",ROMX,BANK[$30]
 
 SECTION "bank31",ROMX,BANK[$31]
 PikachuCry16: ; c4000 (31:4000)
-	dr $c4000,$c549a
+	dw (PikachuCry16_End - PikachuCry16) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
+PikachuCry16_End:
+
+	db $e7  ; unused
+
 PikachuCry18: ; c549a (31:549a)
-	dr $c549a,$c63a4
+	dw (PikachuCry18_End - PikachuCry18) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_18.pcm"
+PikachuCry18_End:
+
+	db $00  ; unused
+
 PikachuCry22: ; c63a4 (31:63a4)
-	dr $c63a4,$c8000
+	dw (PikachuCry22_End - PikachuCry22) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_22.pcm"
+PikachuCry22_End:
+
+	db $7e  ; unused
 
 
 SECTION "bank32",ROMX,BANK[$32]
 PikachuCry20: ; c8000 (32:4000)
-	dr $c8000,$ca002
+	dw (PikachuCry20_End - PikachuCry20) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
+PikachuCry20_End:
+
+	db $07  ; unused
+
 PikachuCry21: ; ca002 (32:6002)
-	dr $ca002,$cc000
+	dw (PikachuCry21_End - PikachuCry21) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_21.pcm"
+PikachuCry21_End:
+
+	db $ff  ; unused
 
 
 SECTION "bank33",ROMX,BANK[$33]
 PikachuCry19: ; cc000 (33:4000)
-	dr $cc000,$cd632
+	dw (PikachuCry19_End - PikachuCry19) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
+PikachuCry19_End:
+
+	db $06  ; unused
+
 PikachuCry24: ; cd632 (33:5632)
-	dr $cd632,$cf25c
+	dw (PikachuCry24_End - PikachuCry24) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_24.pcm"
+PikachuCry24_End:
+
+	db $e0  ; unused
+
 PikachuCry26: ; cf25c (33:725c)
-	dr $cf25c,$d0000
+	dw (PikachuCry26_End - PikachuCry26) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
+PikachuCry26_End:
 
 
 SECTION "bank34",ROMX,BANK[$34]
 PikachuCry17: ; d0000 (34:4000)
-	dr $d0000,$d0862
+	dw (PikachuCry17_End - PikachuCry17) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
+PikachuCry17_End:
+
+	db $00  ; unused
+
 PikachuCry23: ; d0862 (34:4862)
-	dr $d0862,$d173c
+	dw (PikachuCry23_End - PikachuCry23) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_23.pcm"
+PikachuCry23_End:
+
+	db $00  ; unused
+
 PikachuCry25: ; d173c (34:573c)
-	dr $d173c,$d4000
+	dw (PikachuCry25_End - PikachuCry25) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_25.pcm"
+PikachuCry25_End:
+
+	db $03  ; unused
 
 
 SECTION "bank35",ROMX,BANK[$35]
 PikachuCry27: ; d4000 (35:4000)
-	dr $d4000,$d4b5a
+	dw (PikachuCry27_End - PikachuCry27) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
+PikachuCry27_End:
+
+	db $ff  ; unused
+
 PikachuCry28: ; d4b5a (35:4b5a)
-	dr $d4b5a,$d5da4
+	dw (PikachuCry28_End - PikachuCry28) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_28.pcm"
+PikachuCry28_End:
+
+	db $1b  ; unused
+
 PikachuCry29: ; d5da4 (35:5da4)
-	dr $d5da4,$d69ce
+	dw (PikachuCry29_End - PikachuCry29) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_29.pcm"
+PikachuCry29_End:
+
+	db $87  ; unused
+
 PikachuCry30: ; d69ce (35:69ce)
-	dr $d69ce,$d6e80
-PikachuCry31: ; d6e80 (35:6ea0)	
-	dr $d6e80,$d8000
+	dw (PikachuCry30_End - PikachuCry30) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_30.pcm"
+PikachuCry30_End:
+
+	db $00  ; unused
+
+PikachuCry31: ; d6e80 (35:6ea0)
+	dw (PikachuCry31_End - PikachuCry31) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
+PikachuCry31_End:
 
 
 SECTION "bank36",ROMX,BANK[$36]
 PikachuCry32: ; d8000 (36:4000)
-	dr $d8000,$d858a
+	dw (PikachuCry32_End - PikachuCry32) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
+PikachuCry32_End:
+
+	db $ff  ; unused
+
 PikachuCry33: ; d858a (36:458a)
-	dr $d858a,$d923c
+	dw (PikachuCry33_End - PikachuCry33) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_33.pcm"
+PikachuCry33_End:
+
+	db $1f  ; unused
+
 PikachuCry34: ; d923c (36:523c)
-	dr $d923c,$da746
+	dw (PikachuCry34_End - PikachuCry34) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_34.pcm"
+PikachuCry34_End:
+
+	db $01  ; unused
+
 PikachuCry41: ; da746 (36:6746)
-	dr $da746,$dc000
+	dw (PikachuCry41_End - PikachuCry41) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_41.pcm"
+PikachuCry41_End:
+
+	db $9b  ; unused
+
 
 SECTION "bank37",ROMX,BANK[$37]
 PikachuCry35: ; dc000 (37:4000)
-	dr $dc000,$dd22a
+	dw (PikachuCry35_End - PikachuCry35) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
+PikachuCry35_End:
+
+	db $00  ; unused
+
 PikachuCry36: ; dd22a (37:5d2a)
-	dr $dd22a,$dee0c
+	dw (PikachuCry36_End - PikachuCry36) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_36.pcm"
+PikachuCry36_End:
+
+	db $01  ; unused
+
 PikachuCry39: ; dee0c (37:6e0c)
-	dr $dee0c,$e0000
+	dw (PikachuCry39_End - PikachuCry39) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_39.pcm"
+PikachuCry39_End:
+
+	db $0f  ; unused
 
 
 SECTION "bank38",ROMX,BANK[$38]
 PikachuCry37: ; e0000 (38:4000)
-	dr $e0000,$e0dfa
+	dw (PikachuCry37_End - PikachuCry37) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"
+PikachuCry37_End:
+
+	db $3f  ; unused
+
 PikachuCry38: ; e0dfa (38:4dfa)
-	dr $e0dfa,$e1a64
+	dw (PikachuCry38_End - PikachuCry38) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_38.pcm"
+PikachuCry38_End:
+
+	db $ff  ; unused
+
 PikachuCry40: ; e1a64 (38:5a64)
-	dr $e1a64,$e2976
+	dw (PikachuCry40_End - PikachuCry40) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_40.pcm"
+PikachuCry40_End:
+
+	db $ff  ; unused
+
 PikachuCry42: ; e2976 (38:6976)
-	dr $e2976,$e4000
+	dw (PikachuCry42_End - PikachuCry42) - 2 ; length of pcm data
+	INCBIN "audio/pikachu_cries/pikachu_cry_42.pcm"
+PikachuCry42_End:
 
 
 SECTION "bank39",ROMX,BANK[$39]