Added Sound Map Headers for bank 2 and tile collision files plus some other minor fixes

hg-commit-id: 427ef8cd033b

21 files changed, 224 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 96a86234..afb2ee8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 #gawk sort order
-LC_CTYPE=C
+#LC_CTYPE=C
+export LC_CTYPE=C
 
 .SUFFIXES: .asm .tx .o .gbc
 
diff --git a/common.asm b/common.asm
index 9c3f32e1..ba380d93 100644
--- a/common.asm
+++ b/common.asm
@@ -2959,7 +2959,209 @@ INCBIN "baserom.gbc",$7b68,$e1
 
 SECTION "bank2",DATA,BANK[$2]
 
-INCBIN "baserom.gbc",$8000,$4000
+INCBIN "baserom.gbc",$8000,$822E - $8000
+
+;Music Headers
+
+;Pallet Town
+PalletTown_mh: ;0x822E - 0x8236
+db $80
+	dw $67C5 ;Channel 1
+db $01
+	dw $685F ;Channel 2
+db $02
+	dw $68DE ;Channel 3
+	
+;Pokemon Center
+Pokecenter_mh: ;0x8237 - 0x823F
+db $80
+	dw $7E56 ;Channel 1
+db $01
+	dw $7EF9 ;Channel 2
+db $02
+	dw $7F70 ;Channel 3
+
+;Gyms
+Gym_mh: ;0x8240 - 0x8248
+db $80
+	dw $7CBB ;Channel 1
+db $01
+	dw $7D6B ;Channel 2
+db $02
+	dw $7DFA ;Channel 3
+
+;Viridian City, Pewter City, Saffron City	
+Cities1_mh: ;0x8249 - 0x8254
+db $C0
+	dw $6A76 ;Channel 1
+db $01
+	dw $6B92 ;Channel 2
+db $02
+	dw $6C32 ;Channel 3
+db $03
+	dw $6CEF ;Channel 4
+	
+;Cerulean City, Fuchsia City
+Cities2_mh: ;0x8255 - 0x825D
+db $80
+	dw $7504 ;Channel 1
+db $01
+	dw $7569 ;Channel 2
+db $02
+	dw $7640 ;Channel 3
+	
+;Celedon City
+Celedon_mh: ;0x825E - 0x8266
+db $80
+	dw $76C7 ;Channel 1
+db $01
+	dw $773A ;Channel 2
+db $02
+	dw $77B5 ;Channel 3
+	
+;Cinnabar Island
+Cinnabar_mh: ;0x8267-0x826F
+db $80
+	dw $786D ;Channel 1
+db $01
+	dw $78D4 ;Channel 2
+db $02
+	dw $793D ;Channel 3
+	
+;Vermillion City
+Vermillion_mh: ;0x8270 - 0x827B
+db $C0
+	dw $79EB ;Channel 1
+db $01
+	dw $7A61 ;Channel 2
+db $02
+	dw $7AA6 ;Channel 3
+db $03
+	dw $7B0D ;Channel 4
+	
+;Lavender Town
+Lavender_mh: ;0x827C - 0x8287
+db $C0
+	dw $7B58 ;Channel 1
+db $01
+	dw $7B9E ;Channel 2
+db $02
+	dw $7BAE ;Channel 3
+db $03
+	dw $7C21 ;Channel 4
+	
+;SS Anne
+SSAnne_mh: ;0x8288 - 0x8290
+db $80
+	dw $73A7 ;Channel 1
+db $01
+	dw $7419 ;Channel 2
+db $02
+	dw $74CB ;Channel 3
+	
+;Meet Prof. Oak
+MeetProfOak_mh: ;0x8291 - 0x8299
+db $80
+	dw $6F59 ;Channel 1
+db $01
+	dw $6FA9 ;Channel 2
+db $02
+	dw $703D ;Channel 3
+	
+;Meet Rival
+MeetRival_mh: ;0x829A - 0x82A2
+db $80
+	dw $7120 ;Channel 1
+db $01
+	dw $71BB ;Channel 2
+db $02
+	dw $7233 ;Channel 3
+	
+;Guy walks you to museum
+MuseumGuy_mh: ;0x82A3 - 0x82AE
+db $C0
+	dw $6DAE ;Channel 1
+db $01
+	dw $6DF1 ;Channel 2
+db $02
+	dw $6E6E ;Channel 3
+db $03
+	dw $6ED1 ;Channel 4
+	
+;Safari Zone
+SafariZone_mh: ;0x82AF - 0x82B7
+db $80
+	dw $7C2E ;Channel 1
+db $01
+	dw $7C6A ;Channel 2
+db $02
+	dw $7C94 ;Channel 3
+	
+;Pokemon Get Healed
+PkmnHealed_mh: ;0x82B8 - 0x82C0
+db $80
+	dw $5BA3 ;Channel 1
+db $01
+	dw $5BC4 ;Channel 2
+db $02
+	dw $5BD2 ;Channel 3
+	
+;Routes 1 and 2
+Routes1_mh: ;0x82C1 - 0x82CC
+db $C0
+	dw $5BDE ;Channel 1
+db $01
+	dw $5C51 ;Channel 2
+db $02
+	dw $5CD8 ;Channel 3
+db $03
+	dw $5D24 ;Channel 4
+	
+;Routes 24 and 25
+Routes2_mh: ;0x82CD - 0x82D8
+db $C0
+	dw $5DB9 ;Channel 1
+db $01
+	dw $5E4F ;Channel 2
+db $02
+	dw $5E9B ;Channel 3
+db $03
+	dw $5F08 ;Channel 4
+	
+;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
+Routes3_mh: ;0x82D9 - 0x82E4
+db $C0
+	dw $5FAD ;Channel 1
+db $01
+	dw $6009 ;Channel 2
+db $02
+	dw $607F ;Channel 3
+db $03
+	dw $6131 ;Channel 4
+	
+;Routes 11, 12, 13, 14, 15
+Routes4_mh: ;0x82E5 - 0x82F0
+db $C0
+	dw $626A ;Channel 1
+db $01
+	dw $6304 ;Channel 2
+db $02
+	dw $63C4 ;Channel 3
+db $03
+	dw $649D ;Channel 4
+	
+;Indigo Plateau
+IndigoPlateau_mh: ;0x82F1 - 0x82FC
+db $C0
+	dw $65F0 ;Channel 1
+db $01
+	dw $6664 ;Channel 2
+db $02
+	dw $66BA ;Channel 3
+db $03
+	dw $670F ;Channel 4
+
+INCBIN "baserom.gbc",$82FD,$C000 - $82FD
 
 SECTION "bank3",DATA,BANK[$3]
 
diff --git a/gfx/tilesets/00.tilecoll b/gfx/tilesets/00.tilecoll
new file mode 100644
index 00000000..dae824f1
--- /dev/null
+++ b/gfx/tilesets/00.tilecoll
diff --git a/gfx/tilesets/01.tilecoll b/gfx/tilesets/01.tilecoll
new file mode 100644
index 00000000..b19db300
--- /dev/null
+++ b/gfx/tilesets/01.tilecoll
@@ -0,0 +1 @@
+
ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/02.tilecoll b/gfx/tilesets/02.tilecoll
new file mode 100644
index 00000000..928af693
--- /dev/null
+++ b/gfx/tilesets/02.tilecoll
@@ -0,0 +1 @@
+<^ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/03.tilecoll b/gfx/tilesets/03.tilecoll
new file mode 100644
index 00000000..45bf737e
--- /dev/null
+++ b/gfx/tilesets/03.tilecoll
@@ -0,0 +1 @@
+ .0479:@QRZ\^_ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/05.tilecoll b/gfx/tilesets/05.tilecoll
new file mode 100644
index 00000000..916e2579
--- /dev/null
+++ b/gfx/tilesets/05.tilecoll
@@ -0,0 +1 @@
++<=?JLMÿ
\ No newline at end of file
diff --git a/gfx/tilesets/08.tilecoll b/gfx/tilesets/08.tilecoll
new file mode 100644
index 00000000..95497e70
--- /dev/null
+++ b/gfx/tilesets/08.tilecoll
@@ -0,0 +1 @@
+
(27DT\ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/09.tilecoll b/gfx/tilesets/09.tilecoll
new file mode 100644
index 00000000..dd06b044
--- /dev/null
+++ b/gfx/tilesets/09.tilecoll
@@ -0,0 +1 @@
+
78;<^ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/0b.tilecoll b/gfx/tilesets/0b.tilecoll
new file mode 100644
index 00000000..75efd22b
--- /dev/null
+++ b/gfx/tilesets/0b.tilecoll
@@ -0,0 +1 @@
+ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/0d.tilecoll b/gfx/tilesets/0d.tilecoll
new file mode 100644
index 00000000..d78bcc45
--- /dev/null
+++ b/gfx/tilesets/0d.tilecoll
@@ -0,0 +1 @@
+
#479Jÿ
\ No newline at end of file
diff --git a/gfx/tilesets/0e.tilecoll b/gfx/tilesets/0e.tilecoll
new file mode 100644
index 00000000..2dc99b5c
--- /dev/null
+++ b/gfx/tilesets/0e.tilecoll
@@ -0,0 +1,2 @@
+
+2;ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/0f.tilecoll b/gfx/tilesets/0f.tilecoll
new file mode 100644
index 00000000..f4bee2ee
--- /dev/null
+++ b/gfx/tilesets/0f.tilecoll
@@ -0,0 +1 @@
+
"BRÿ
\ No newline at end of file
diff --git a/gfx/tilesets/10.tilecoll b/gfx/tilesets/10.tilecoll
new file mode 100644
index 00000000..b5d32687
--- /dev/null
+++ b/gfx/tilesets/10.tilecoll
@@ -0,0 +1 @@
+;EGUVÿ
\ No newline at end of file
diff --git a/gfx/tilesets/11.tilecoll b/gfx/tilesets/11.tilecoll
new file mode 100644
index 00000000..dab3e10f
--- /dev/null
+++ b/gfx/tilesets/11.tilecoll
@@ -0,0 +1 @@
+ !"*-0ÿÿ
\ No newline at end of file
diff --git a/gfx/tilesets/12.tilecoll b/gfx/tilesets/12.tilecoll
new file mode 100644
index 00000000..6388083c
--- /dev/null
+++ b/gfx/tilesets/12.tilecoll
@@ -0,0 +1 @@
+ 8Eÿ
\ No newline at end of file
diff --git a/gfx/tilesets/13.tilecoll b/gfx/tilesets/13.tilecoll
new file mode 100644
index 00000000..e07ea10a
--- /dev/null
+++ b/gfx/tilesets/13.tilecoll
@@ -0,0 +1 @@
+
,Sÿ
\ No newline at end of file
diff --git a/gfx/tilesets/14.tilecoll b/gfx/tilesets/14.tilecoll
new file mode 100644
index 00000000..c171ba99
--- /dev/null
+++ b/gfx/tilesets/14.tilecoll
@@ -0,0 +1 @@
+&47ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/15.tilecoll b/gfx/tilesets/15.tilecoll
new file mode 100644
index 00000000..9bd5f3ba
--- /dev/null
+++ b/gfx/tilesets/15.tilecoll
@@ -0,0 +1 @@
+&(),-./Aÿ
\ No newline at end of file
diff --git a/gfx/tilesets/16.tilecoll b/gfx/tilesets/16.tilecoll
new file mode 100644
index 00000000..d55b119b
--- /dev/null
+++ b/gfx/tilesets/16.tilecoll
@@ -0,0 +1 @@
+
 !"012BCHRUX^ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/17.tilecoll b/gfx/tilesets/17.tilecoll
new file mode 100644
index 00000000..5958688e
--- /dev/null
+++ b/gfx/tilesets/17.tilecoll
@@ -0,0 +1 @@
+#,-;Eÿ
\ No newline at end of file