Dump overworld sprites

36 files changed, 137 insertions, 4 deletions

diff --git a/data/overworld_sprites.asm b/data/overworld_sprites.asm
new file mode 100644
index 0000000..ed1d29f
--- /dev/null
+++ b/data/overworld_sprites.asm
@@ -0,0 +1,136 @@
+OWSprite0: ; a18d6 (28:58d6)
+	dw $14
+	INCBIN "gfx/ow/sprite0.2bpp"
+
+OWSprite1: ; a1a18 (28:5a18)
+	dw $14
+	INCBIN "gfx/ow/sprite1.2bpp"
+
+OWSprite2: ; a1b5a (28:5b5a)
+	dw $14
+	INCBIN "gfx/ow/sprite2.2bpp"
+
+OWSprite3: ; a1c9c (28:5c9c)
+	dw $14
+	INCBIN "gfx/ow/sprite3.2bpp"
+
+OWSprite4: ; a1dde (28:5dde)
+	dw $14
+	INCBIN "gfx/ow/sprite4.2bpp"
+
+OWSprite5: ; a1f20 (28:5f20)
+	dw $1b
+	INCBIN "gfx/ow/sprite5.2bpp"
+
+OWSprite6: ; a20d2 (28:60d2)
+	dw $14
+	INCBIN "gfx/ow/sprite6.2bpp"
+
+OWSprite7: ; a2214 (28:6214)
+	dw $14
+	INCBIN "gfx/ow/sprite7.2bpp"
+
+OWSprite8: ; a2356 (28:6356)
+	dw $14
+	INCBIN "gfx/ow/sprite8.2bpp"
+
+OWSprite9: ; a2498 (28:6498)
+	dw $14
+	INCBIN "gfx/ow/sprite9.2bpp"
+
+OWSprite10: ; a25da (28:65da)
+	dw $14
+	INCBIN "gfx/ow/sprite10.2bpp"
+
+OWSprite11: ; a271c (28:671c)
+	dw $14
+	INCBIN "gfx/ow/sprite11.2bpp"
+
+OWSprite12: ; a285e (28:685e)
+	dw $14
+	INCBIN "gfx/ow/sprite12.2bpp"
+
+OWSprite13: ; a29a0 (28:69a0)
+	dw $14
+	INCBIN "gfx/ow/sprite13.2bpp"
+
+OWSprite14: ; a2ae2 (28:6ae2)
+	dw $14
+	INCBIN "gfx/ow/sprite14.2bpp"
+
+OWSprite15: ; a2c24 (28:6c24)
+	dw $14
+	INCBIN "gfx/ow/sprite15.2bpp"
+
+OWSprite16: ; a2d66 (28:6d66)
+	dw $14
+	INCBIN "gfx/ow/sprite16.2bpp"
+
+OWSprite17: ; a2ea8 (28:6ea8)
+	dw $14
+	INCBIN "gfx/ow/sprite17.2bpp"
+
+OWSprite18: ; a2fea (28:6fea)
+	dw $14
+	INCBIN "gfx/ow/sprite18.2bpp"
+
+OWSprite19: ; a312c (28:712c)
+	dw $14
+	INCBIN "gfx/ow/sprite19.2bpp"
+
+OWSprite20: ; a326e (28:726e)
+	dw $14
+	INCBIN "gfx/ow/sprite20.2bpp"
+
+OWSprite21: ; a33b0 (28:73b0)
+	dw $14
+	INCBIN "gfx/ow/sprite21.2bpp"
+
+OWSprite22: ; a34f2 (28:74f2)
+	dw $14
+	INCBIN "gfx/ow/sprite22.2bpp"
+
+OWSprite23: ; a3634 (28:7634)
+	dw $14
+	INCBIN "gfx/ow/sprite23.2bpp"
+
+OWSprite24: ; a3776 (28:7776)
+	dw $14
+	INCBIN "gfx/ow/sprite24.2bpp"
+
+OWSprite25: ; a38b8 (28:78b8)
+	dw $14
+	INCBIN "gfx/ow/sprite25.2bpp"
+
+OWSprite26: ; a39fa (28:79fa)
+	dw $14
+	INCBIN "gfx/ow/sprite26.2bpp"
+
+OWSprite27: ; a3b3c (28:7b3c)
+	dw $14
+	INCBIN "gfx/ow/sprite27.2bpp"
+
+OWSprite28: ; a3c7e (28:7c7e)
+	dw $14
+	INCBIN "gfx/ow/sprite28.2bpp"
+
+OWSprite29: ; a3dc0 (28:7dc0)
+	dw $14
+	INCBIN "gfx/ow/sprite29.2bpp"
+
+INCBIN "baserom.gbc",$a3f02,$a4000 - $a3f02
+
+SECTION "bank29",ROMX,BANK[$29]
+OWSprite30: ; a4000 (29:4000)
+	dw $14
+	INCBIN "gfx/ow/sprite30.2bpp"
+
+OWSprite31: ; a4142 (29:4142)
+	dw $14
+	INCBIN "gfx/ow/sprite31.2bpp"
+
+OWSprite32: ; a4284 (29:4284)
+	dw $14
+	INCBIN "gfx/ow/sprite32.2bpp"
+
+INCBIN "baserom.gbc",$a43c6,$a8000 - $a43c6
diff --git a/data/trainergfx.asm b/data/trainergfx.asm
index 5102b4e..bda81db 100644
--- a/data/trainergfx.asm
+++ b/data/trainergfx.asm
@@ -157,5 +157,3 @@ Face37Gfx: ; a1452 (28:5452)
 Face38Gfx: ; a1694 (28:5694)
 	dw $24
 	INCBIN "gfx/trainers/face38.2bpp"
-
-INCBIN "baserom.gbc",$a18d6,$a4000 - $a18d6
diff --git a/gfx/ow/sprite0.2bpp b/gfx/ow/sprite0.2bpp
new file mode 100644
index 0000000..126f20c
--- /dev/null
+++ b/gfx/ow/sprite0.2bpp
diff --git a/gfx/ow/sprite1.2bpp b/gfx/ow/sprite1.2bpp
new file mode 100644
index 0000000..ad7ede9
--- /dev/null
+++ b/gfx/ow/sprite1.2bpp
diff --git a/gfx/ow/sprite10.2bpp b/gfx/ow/sprite10.2bpp
new file mode 100644
index 0000000..3452933
--- /dev/null
+++ b/gfx/ow/sprite10.2bpp
diff --git a/gfx/ow/sprite11.2bpp b/gfx/ow/sprite11.2bpp
new file mode 100644
index 0000000..b29d326
--- /dev/null
+++ b/gfx/ow/sprite11.2bpp
diff --git a/gfx/ow/sprite12.2bpp b/gfx/ow/sprite12.2bpp
new file mode 100644
index 0000000..4d29201
--- /dev/null
+++ b/gfx/ow/sprite12.2bpp
diff --git a/gfx/ow/sprite13.2bpp b/gfx/ow/sprite13.2bpp
new file mode 100644
index 0000000..4c5dbd5
--- /dev/null
+++ b/gfx/ow/sprite13.2bpp
diff --git a/gfx/ow/sprite14.2bpp b/gfx/ow/sprite14.2bpp
new file mode 100644
index 0000000..6c93a30
--- /dev/null
+++ b/gfx/ow/sprite14.2bpp
diff --git a/gfx/ow/sprite15.2bpp b/gfx/ow/sprite15.2bpp
new file mode 100644
index 0000000..2520b19
--- /dev/null
+++ b/gfx/ow/sprite15.2bpp
diff --git a/gfx/ow/sprite16.2bpp b/gfx/ow/sprite16.2bpp
new file mode 100644
index 0000000..9d35564
--- /dev/null
+++ b/gfx/ow/sprite16.2bpp
diff --git a/gfx/ow/sprite17.2bpp b/gfx/ow/sprite17.2bpp
new file mode 100644
index 0000000..f975b56
--- /dev/null
+++ b/gfx/ow/sprite17.2bpp
diff --git a/gfx/ow/sprite18.2bpp b/gfx/ow/sprite18.2bpp
new file mode 100644
index 0000000..b0e7f45
--- /dev/null
+++ b/gfx/ow/sprite18.2bpp
diff --git a/gfx/ow/sprite19.2bpp b/gfx/ow/sprite19.2bpp
new file mode 100644
index 0000000..51e9805
--- /dev/null
+++ b/gfx/ow/sprite19.2bpp
diff --git a/gfx/ow/sprite2.2bpp b/gfx/ow/sprite2.2bpp
new file mode 100644
index 0000000..b39e65b
--- /dev/null
+++ b/gfx/ow/sprite2.2bpp
diff --git a/gfx/ow/sprite20.2bpp b/gfx/ow/sprite20.2bpp
new file mode 100644
index 0000000..dca427e
--- /dev/null
+++ b/gfx/ow/sprite20.2bpp
diff --git a/gfx/ow/sprite21.2bpp b/gfx/ow/sprite21.2bpp
new file mode 100644
index 0000000..5789d03
--- /dev/null
+++ b/gfx/ow/sprite21.2bpp
diff --git a/gfx/ow/sprite22.2bpp b/gfx/ow/sprite22.2bpp
new file mode 100644
index 0000000..55231d8
--- /dev/null
+++ b/gfx/ow/sprite22.2bpp
diff --git a/gfx/ow/sprite23.2bpp b/gfx/ow/sprite23.2bpp
new file mode 100644
index 0000000..0a85b85
--- /dev/null
+++ b/gfx/ow/sprite23.2bpp
diff --git a/gfx/ow/sprite24.2bpp b/gfx/ow/sprite24.2bpp
new file mode 100644
index 0000000..3e36baf
--- /dev/null
+++ b/gfx/ow/sprite24.2bpp
diff --git a/gfx/ow/sprite25.2bpp b/gfx/ow/sprite25.2bpp
new file mode 100644
index 0000000..72f5b1a
--- /dev/null
+++ b/gfx/ow/sprite25.2bpp
diff --git a/gfx/ow/sprite26.2bpp b/gfx/ow/sprite26.2bpp
new file mode 100644
index 0000000..b5ee98c
--- /dev/null
+++ b/gfx/ow/sprite26.2bpp
diff --git a/gfx/ow/sprite27.2bpp b/gfx/ow/sprite27.2bpp
new file mode 100644
index 0000000..a6eb1eb
--- /dev/null
+++ b/gfx/ow/sprite27.2bpp
diff --git a/gfx/ow/sprite28.2bpp b/gfx/ow/sprite28.2bpp
new file mode 100644
index 0000000..a3f7103
--- /dev/null
+++ b/gfx/ow/sprite28.2bpp
diff --git a/gfx/ow/sprite29.2bpp b/gfx/ow/sprite29.2bpp
new file mode 100644
index 0000000..d7b84b9
--- /dev/null
+++ b/gfx/ow/sprite29.2bpp
diff --git a/gfx/ow/sprite3.2bpp b/gfx/ow/sprite3.2bpp
new file mode 100644
index 0000000..4e8b4bc
--- /dev/null
+++ b/gfx/ow/sprite3.2bpp
diff --git a/gfx/ow/sprite30.2bpp b/gfx/ow/sprite30.2bpp
new file mode 100644
index 0000000..6920ecd
--- /dev/null
+++ b/gfx/ow/sprite30.2bpp
diff --git a/gfx/ow/sprite31.2bpp b/gfx/ow/sprite31.2bpp
new file mode 100644
index 0000000..61744d1
--- /dev/null
+++ b/gfx/ow/sprite31.2bpp
diff --git a/gfx/ow/sprite32.2bpp b/gfx/ow/sprite32.2bpp
new file mode 100644
index 0000000..1671e7d
--- /dev/null
+++ b/gfx/ow/sprite32.2bpp
diff --git a/gfx/ow/sprite4.2bpp b/gfx/ow/sprite4.2bpp
new file mode 100644
index 0000000..223a58c
--- /dev/null
+++ b/gfx/ow/sprite4.2bpp
diff --git a/gfx/ow/sprite5.2bpp b/gfx/ow/sprite5.2bpp
new file mode 100644
index 0000000..a427eaf
--- /dev/null
+++ b/gfx/ow/sprite5.2bpp
diff --git a/gfx/ow/sprite6.2bpp b/gfx/ow/sprite6.2bpp
new file mode 100644
index 0000000..4fc5982
--- /dev/null
+++ b/gfx/ow/sprite6.2bpp
diff --git a/gfx/ow/sprite7.2bpp b/gfx/ow/sprite7.2bpp
new file mode 100644
index 0000000..12cfb88
--- /dev/null
+++ b/gfx/ow/sprite7.2bpp
diff --git a/gfx/ow/sprite8.2bpp b/gfx/ow/sprite8.2bpp
new file mode 100644
index 0000000..e96f55b
--- /dev/null
+++ b/gfx/ow/sprite8.2bpp
diff --git a/gfx/ow/sprite9.2bpp b/gfx/ow/sprite9.2bpp
new file mode 100644
index 0000000..ed09bd4
--- /dev/null
+++ b/gfx/ow/sprite9.2bpp
diff --git a/main.asm b/main.asm
index c0af090..70930b5 100755
--- a/main.asm
+++ b/main.asm
@@ -132,8 +132,7 @@ INCBIN "baserom.gbc",$98000,$4000
 
 INCLUDE "data/trainergfx.asm"
 
-SECTION "bank29",ROMX,BANK[$29]
-INCBIN "baserom.gbc",$A4000,$4000
+INCLUDE "data/overworld_sprites.asm"
 
 SECTION "bank2A",ROMX,BANK[$2A]
 INCBIN "baserom.gbc",$A8000,$4000