Merge branch 'master' of https://git.sanqui.net/pret/pokegold-spaceworld

29 files changed, 391 insertions, 0 deletions

diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
new file mode 100644
index 0000000..a004938
--- /dev/null
+++ b/data/tileset_headers.asm
@@ -0,0 +1,280 @@
+Tileset_00: ; 0xc88d
+	db $06 ; bank
+	dw $4400 ; blocks
+	dw Tileset_00_GFX ; graphics
+	dw $4c00 ; collisions
+	db $77 ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_01: ; 0xc898
+	db $06 ; bank
+	dw $5c00 ; blocks
+	dw Tileset_01_GFX ; graphics
+	dw $6400 ; collisions
+	db $4b ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_02: ; 0xc8a3
+	db $06 ; bank
+	dw $6a00 ; blocks
+	dw Tileset_02_GFX ; graphics
+	dw $7200 ; collisions
+	db $1f ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_03: ; 0xc8ae
+	db $07 ; bank
+	dw $7600 ; blocks
+	dw Tileset_03_GFX ; graphics
+	dw $7e00 ; collisions
+	db $1f ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_04: ; 0xc8b9
+	db $08 ; bank
+	dw $4400 ; blocks
+	dw Tileset_04_GFX ; graphics
+	dw $4c00 ; collisions
+	db $4b ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_05: ; 0xc8c4
+	db $07 ; bank
+	dw $6800 ; blocks
+	dw Tileset_05_GFX ; graphics
+	dw $7000 ; collisions
+	db $a7 ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_06: ; 0xc8cf
+	db $07 ; bank
+	dw $5a00 ; blocks
+	dw Tileset_06_GFX ; graphics
+	dw $6200 ; collisions
+	db $4b ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_07: ; 0xc8da
+	db $08 ; bank
+	dw $5200 ; blocks
+	dw Tileset_07_GFX ; graphics
+	dw $5a00 ; collisions
+	db $1f ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_08: ; 0xc8e5
+	db $08 ; bank
+	dw $6000 ; blocks
+	dw Tileset_08_GFX ; graphics
+	dw $6800 ; collisions
+	db $4b ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_09: ; 0xc8f0
+	db $06 ; bank
+	dw $7a00 ; blocks
+	dw Tileset_09_GFX ; graphics
+	dw $7e00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0a: ; 0xc8fb
+	db $13 ; bank
+	dw $4600 ; blocks
+	dw Tileset_0a_GFX ; graphics
+	dw $4a00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0b: ; 0xc906
+	db $0c ; bank
+	dw $5100 ; blocks
+	dw Tileset_0b_GFX ; graphics
+	dw $5500 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0c: ; 0xc911
+	db $0c ; bank
+	dw $7700 ; blocks
+	dw Tileset_0c_GFX ; graphics
+	dw $7b00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0d: ; 0xc91c
+	db $0c ; bank
+	dw $5c00 ; blocks
+	dw Tileset_0d_GFX ; graphics
+	dw $6000 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0e: ; 0xc927
+	db $07 ; bank
+	dw $5100 ; blocks
+	dw Tileset_0e_GFX ; graphics
+	dw $5500 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_0f: ; 0xc932
+	db $08 ; bank
+	dw $7000 ; blocks
+	dw Tileset_0f_GFX ; graphics
+	dw $7400 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_10: ; 0xc93d
+	db $37 ; bank
+	dw $4600 ; blocks
+	dw Tileset_10_GFX ; graphics
+	dw $4a00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_11: ; 0xc948
+	db $08 ; bank
+	dw $7b00 ; blocks
+	dw Tileset_11_GFX ; graphics
+	dw $7f00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_12: ; 0xc953
+	db $0c ; bank
+	dw $4600 ; blocks
+	dw Tileset_12_GFX ; graphics
+	dw $4a00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_13: ; 0xc95e
+	db $07 ; bank
+	dw $4600 ; blocks
+	dw Tileset_13_GFX ; graphics
+	dw $4a00 ; collisions
+	db $df ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_14: ; 0xc969
+	db $0c ; bank
+	dw $6700 ; blocks
+	dw Tileset_14_GFX ; graphics
+	dw $6f00 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_15: ; 0xc974
+	db $37 ; bank
+	dw $5100 ; blocks
+	dw Tileset_15_GFX ; graphics
+	dw $5900 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_16: ; 0xc97f
+	db $13 ; bank
+	dw $5100 ; blocks
+	dw Tileset_16_GFX ; graphics
+	dw $5900 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_17: ; 0xc98a
+	db $37 ; bank
+	dw $6100 ; blocks
+	dw Tileset_17_GFX ; graphics
+	dw $6900 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_18: ; 0xc995
+	db $37 ; bank
+	dw $7100 ; blocks
+	dw Tileset_18_GFX ; graphics
+	dw $7900 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_19: ; 0xc9a0
+	db $13 ; bank
+	dw $5f00 ; blocks
+	dw Tileset_19_GFX ; graphics
+	dw $6700 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+Tileset_1a: ; 0xc9ab
+	db $13 ; bank
+	dw $6d00 ; blocks
+	dw Tileset_1a_GFX ; graphics
+	dw $7500 ; collisions
+	db $07 ; talking over tile 1
+	db $41 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
+
+; uses tileset 00 graphics
+Tileset_1b: ; 0xc9b6
+	db $06 ; bank
+	dw $4e00 ; blocks
+	dw Tileset_00_GFX ; graphics
+	dw $5600 ; collisions
+	db $77 ; talking over tile 1
+	db $40 ; talking over tile 2
+	db $00 ; talking over tile 3
+	db $00 ; unknown
diff --git a/gfx/tilesets/tileset_00.png b/gfx/tilesets/tileset_00.png
new file mode 100755
index 0000000..921783e
--- /dev/null
+++ b/gfx/tilesets/tileset_00.png
diff --git a/gfx/tilesets/tileset_01.png b/gfx/tilesets/tileset_01.png
new file mode 100755
index 0000000..60b7b48
--- /dev/null
+++ b/gfx/tilesets/tileset_01.png
diff --git a/gfx/tilesets/tileset_02.png b/gfx/tilesets/tileset_02.png
new file mode 100755
index 0000000..8943669
--- /dev/null
+++ b/gfx/tilesets/tileset_02.png
diff --git a/gfx/tilesets/tileset_03.png b/gfx/tilesets/tileset_03.png
new file mode 100755
index 0000000..8dc6441
--- /dev/null
+++ b/gfx/tilesets/tileset_03.png
diff --git a/gfx/tilesets/tileset_04.png b/gfx/tilesets/tileset_04.png
new file mode 100755
index 0000000..b3fddf2
--- /dev/null
+++ b/gfx/tilesets/tileset_04.png
diff --git a/gfx/tilesets/tileset_05.png b/gfx/tilesets/tileset_05.png
new file mode 100755
index 0000000..c153d6f
--- /dev/null
+++ b/gfx/tilesets/tileset_05.png
diff --git a/gfx/tilesets/tileset_06.png b/gfx/tilesets/tileset_06.png
new file mode 100755
index 0000000..3a9451b
--- /dev/null
+++ b/gfx/tilesets/tileset_06.png
diff --git a/gfx/tilesets/tileset_07.png b/gfx/tilesets/tileset_07.png
new file mode 100755
index 0000000..157a3ba
--- /dev/null
+++ b/gfx/tilesets/tileset_07.png
diff --git a/gfx/tilesets/tileset_08.png b/gfx/tilesets/tileset_08.png
new file mode 100755
index 0000000..0b24af2
--- /dev/null
+++ b/gfx/tilesets/tileset_08.png
diff --git a/gfx/tilesets/tileset_09.png b/gfx/tilesets/tileset_09.png
new file mode 100644
index 0000000..d55d572
--- /dev/null
+++ b/gfx/tilesets/tileset_09.png
diff --git a/gfx/tilesets/tileset_0a.png b/gfx/tilesets/tileset_0a.png
new file mode 100644
index 0000000..7d9c5cf
--- /dev/null
+++ b/gfx/tilesets/tileset_0a.png
diff --git a/gfx/tilesets/tileset_0b.png b/gfx/tilesets/tileset_0b.png
new file mode 100644
index 0000000..9a92744
--- /dev/null
+++ b/gfx/tilesets/tileset_0b.png
diff --git a/gfx/tilesets/tileset_0c.png b/gfx/tilesets/tileset_0c.png
new file mode 100644
index 0000000..9379de2
--- /dev/null
+++ b/gfx/tilesets/tileset_0c.png
diff --git a/gfx/tilesets/tileset_0d.png b/gfx/tilesets/tileset_0d.png
new file mode 100644
index 0000000..9cb015a
--- /dev/null
+++ b/gfx/tilesets/tileset_0d.png
diff --git a/gfx/tilesets/tileset_0e.png b/gfx/tilesets/tileset_0e.png
new file mode 100644
index 0000000..61e93e6
--- /dev/null
+++ b/gfx/tilesets/tileset_0e.png
diff --git a/gfx/tilesets/tileset_0f.png b/gfx/tilesets/tileset_0f.png
new file mode 100644
index 0000000..76a2319
--- /dev/null
+++ b/gfx/tilesets/tileset_0f.png
diff --git a/gfx/tilesets/tileset_10.png b/gfx/tilesets/tileset_10.png
new file mode 100644
index 0000000..3b6fad6
--- /dev/null
+++ b/gfx/tilesets/tileset_10.png
diff --git a/gfx/tilesets/tileset_11.png b/gfx/tilesets/tileset_11.png
new file mode 100644
index 0000000..b8a6623
--- /dev/null
+++ b/gfx/tilesets/tileset_11.png
diff --git a/gfx/tilesets/tileset_12.png b/gfx/tilesets/tileset_12.png
new file mode 100644
index 0000000..3f14d1a
--- /dev/null
+++ b/gfx/tilesets/tileset_12.png
diff --git a/gfx/tilesets/tileset_13.png b/gfx/tilesets/tileset_13.png
new file mode 100644
index 0000000..0230ff9
--- /dev/null
+++ b/gfx/tilesets/tileset_13.png
diff --git a/gfx/tilesets/tileset_14.png b/gfx/tilesets/tileset_14.png
new file mode 100644
index 0000000..3b50f32
--- /dev/null
+++ b/gfx/tilesets/tileset_14.png
diff --git a/gfx/tilesets/tileset_15.png b/gfx/tilesets/tileset_15.png
new file mode 100644
index 0000000..d376e0d
--- /dev/null
+++ b/gfx/tilesets/tileset_15.png
diff --git a/gfx/tilesets/tileset_16.png b/gfx/tilesets/tileset_16.png
new file mode 100644
index 0000000..8c62ba0
--- /dev/null
+++ b/gfx/tilesets/tileset_16.png
diff --git a/gfx/tilesets/tileset_17.png b/gfx/tilesets/tileset_17.png
new file mode 100644
index 0000000..d5f4d61
--- /dev/null
+++ b/gfx/tilesets/tileset_17.png
diff --git a/gfx/tilesets/tileset_18.png b/gfx/tilesets/tileset_18.png
new file mode 100644
index 0000000..08d2a7e
--- /dev/null
+++ b/gfx/tilesets/tileset_18.png
diff --git a/gfx/tilesets/tileset_19.png b/gfx/tilesets/tileset_19.png
new file mode 100755
index 0000000..7add271
--- /dev/null
+++ b/gfx/tilesets/tileset_19.png
diff --git a/gfx/tilesets/tileset_1a.png b/gfx/tilesets/tileset_1a.png
new file mode 100755
index 0000000..55ee5dd
--- /dev/null
+++ b/gfx/tilesets/tileset_1a.png
diff --git a/main.asm b/main.asm
index 63c61f7..56df9bd 100644
--- a/main.asm
+++ b/main.asm
@@ -65,6 +65,9 @@ SECTION "SGB Border GFX", ROMX[$6B1C], BANK[$02]
 SGBBorderGFX::
 INCBIN "gfx/sgb/sgb_border.2bpp"
 
+SECTION "Tileset Headers", ROMX[$488D], BANK[$03]
+INCLUDE "data/tileset_headers.asm"
+
 SECTION "Title Screen GFX", ROMX[$47CF], BANK[$04]
 TitleScreenGFX::
 INCBIN "gfx/title/title.2bpp"
@@ -86,10 +89,86 @@ SECTION "Unused Leader", ROMX[$7BA3], BANK[$04]
 UnusedLeaderNameGFX::
 INCBIN "gfx/trainer_card/unused_leader_name.2bpp"
 
+SECTION "Bank 6 Tilesets 00", ROMX[$4000], BANK[$06]
+Tileset_00_GFX:
+INCBIN "gfx/tilesets/tileset_00.2bpp"
+
+SECTION "Bank 6 Tilesets 01", ROMX[$5800], BANK[$06]
+Tileset_01_GFX:
+INCBIN "gfx/tilesets/tileset_01.2bpp"
+
+SECTION "Bank 6 Tilesets 02", ROMX[$6600], BANK[$06]
+Tileset_02_GFX:
+INCBIN "gfx/tilesets/tileset_02.2bpp"
+
+SECTION "Bank 6 Tilesets 09", ROMX[$7400], BANK[$06]
+Tileset_09_GFX:
+INCBIN "gfx/tilesets/tileset_09.2bpp"
+
+SECTION "Bank 7 Tilesets 13", ROMX[$4000], BANK[$07]
+Tileset_13_GFX:
+INCBIN "gfx/tilesets/tileset_13.2bpp"
+
+SECTION "Bank 7 Tilesets 0e", ROMX[$4B00], BANK[$07]
+Tileset_0e_GFX:
+INCBIN "gfx/tilesets/tileset_0e.2bpp"
+
+SECTION "Bank 7 Tilesets 06", ROMX[$5600], BANK[$07]
+Tileset_06_GFX:
+INCBIN "gfx/tilesets/tileset_06.2bpp"
+
+SECTION "Bank 7 Tilesets 05", ROMX[$6400], BANK[$07]
+Tileset_05_GFX:
+INCBIN "gfx/tilesets/tileset_05.2bpp"
+
+SECTION "Bank 7 Tilesets 03", ROMX[$7200], BANK[$07]
+Tileset_03_GFX:
+INCBIN "gfx/tilesets/tileset_03.2bpp"
+
+SECTION "Bank 8 Tilesets 04", ROMX[$4000], BANK[$08]
+Tileset_04_GFX:
+INCBIN "gfx/tilesets/tileset_04.2bpp"
+
+SECTION "Bank 8 Tilesets 07", ROMX[$4E00], BANK[$08]
+Tileset_07_GFX:
+INCBIN "gfx/tilesets/tileset_07.2bpp"
+
+SECTION "Bank 8 Tilesets 08", ROMX[$5C00], BANK[$08]
+Tileset_08_GFX:
+INCBIN "gfx/tilesets/tileset_08.2bpp"
+
+SECTION "Bank 8 Tilesets 0f", ROMX[$6A00], BANK[$08]
+Tileset_0f_GFX:
+INCBIN "gfx/tilesets/tileset_0f.2bpp"
+
+SECTION "Bank 8 Tilesets 11", ROMX[$7500], BANK[$08]
+Tileset_11_GFX:
+INCBIN "gfx/tilesets/tileset_11.2bpp"
+
 SECTION "Gameboy GFX", ROMX[$5641], BANK[$0A]
 TradeGameBoyGFX::
 INCBIN "gfx/trade/gameboy.2bpp"
 
+SECTION "Bank C Tilesets 12", ROMX[$4000], BANK[$0C]
+Tileset_12_GFX:
+INCBIN "gfx/tilesets/tileset_12.2bpp"
+
+SECTION "Bank C Tilesets 0b", ROMX[$4B00], BANK[$0C]
+Tileset_0b_GFX:
+INCBIN "gfx/tilesets/tileset_0b.2bpp"
+
+SECTION "Bank C Tilesets 0d", ROMX[$5600], BANK[$0C]
+Tileset_0d_GFX:
+INCBIN "gfx/tilesets/tileset_0d.2bpp"
+
+SECTION "Bank C Tilesets 14", ROMX[$6100], BANK[$0C]
+Tileset_14_GFX:
+INCBIN "gfx/tilesets/tileset_14.2bpp"
+
+SECTION "Bank C Tilesets 0c", ROMX[$7100], BANK[$0C]
+Tileset_0c_GFX:
+INCBIN "gfx/tilesets/tileset_0c.2bpp"
+
 SECTION "Type Matchups", ROMX[$506D],BANK[$0D]
 INCLUDE "data/types/type_matchups.asm"
 
@@ -114,6 +193,22 @@ INCBIN "gfx/pokedex/cursors.2bpp"
 PokedexSearchGFX::
 INCBIN "gfx/pokedex/search.2bpp"
 
+SECTION "Bank 13 Tilesets 0a", ROMX[$4000], BANK[$13]
+Tileset_0a_GFX:
+INCBIN "gfx/tilesets/tileset_0a.2bpp"
+
+SECTION "Bank 13 Tilesets 16", ROMX[$4B00], BANK[$13]
+Tileset_16_GFX:
+INCBIN "gfx/tilesets/tileset_16.2bpp"
+
+SECTION "Bank 13 Tilesets 19", ROMX[$5B00], BANK[$13]
+Tileset_19_GFX:
+INCBIN "gfx/tilesets/tileset_19.2bpp"
+
+SECTION "Bank 13 Tilesets 1a", ROMX[$6900], BANK[$13]
+Tileset_1a_GFX:
+INCBIN "gfx/tilesets/tileset_1a.2bpp"
+
 SECTION "Base Data", ROMX[$4F10],BANK[$14]
 INCLUDE "data/pokemon/base_stats.asm"
 
@@ -201,6 +296,22 @@ INCBIN "gfx/minigames/slots.2bpp"
 SlotMachine2GFX::
 INCBIN "gfx/minigames/slots_2.2bpp"
 
+SECTION "Bank 37 Tilesets 10", ROMX[$4000], BANK[$37]
+Tileset_10_GFX:
+INCBIN "gfx/tilesets/tileset_10.2bpp"
+
+SECTION "Bank 37 Tilesets 15", ROMX[$4B00], BANK[$37]
+Tileset_15_GFX:
+INCBIN "gfx/tilesets/tileset_15.2bpp"
+
+SECTION "Bank 37 Tilesets 17", ROMX[$5B00], BANK[$37]
+Tileset_17_GFX:
+INCBIN "gfx/tilesets/tileset_17.2bpp"
+
+SECTION "Bank 37 Tilesets 18", ROMX[$6B00], BANK[$37]
+Tileset_18_GFX:
+INCBIN "gfx/tilesets/tileset_18.2bpp"
+
 SECTION "Poker GFX", ROMX[$5403], BANK[$38]
 PokerGFX::
 INCBIN "gfx/minigames/poker.2bpp"