summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/tileset_headers.asm13
-rw-r--r--gfx.asm21
-rw-r--r--gfx/tilesets/common.png (renamed from gfx/tilesets/tileset_common.png)bin428 -> 428 bytes
-rwxr-xr-xgfx/tilesets/tileset_00.common.png (renamed from gfx/tilesets/tileset_00.png)bin1943 -> 1943 bytes
-rwxr-xr-xgfx/tilesets/tileset_01.common.png (renamed from gfx/tilesets/tileset_01.png)bin2028 -> 2028 bytes
-rwxr-xr-xgfx/tilesets/tileset_02.common.png (renamed from gfx/tilesets/tileset_02.png)bin2162 -> 2162 bytes
-rwxr-xr-xgfx/tilesets/tileset_03.common.png (renamed from gfx/tilesets/tileset_03.png)bin2093 -> 2093 bytes
-rwxr-xr-xgfx/tilesets/tileset_04.common.png (renamed from gfx/tilesets/tileset_04.png)bin1997 -> 1997 bytes
-rwxr-xr-xgfx/tilesets/tileset_05.common.png (renamed from gfx/tilesets/tileset_05.png)bin2117 -> 2117 bytes
-rwxr-xr-xgfx/tilesets/tileset_06.common.png (renamed from gfx/tilesets/tileset_06.png)bin2053 -> 2053 bytes
-rwxr-xr-xgfx/tilesets/tileset_07.common.png (renamed from gfx/tilesets/tileset_07.png)bin1946 -> 1946 bytes
-rwxr-xr-xgfx/tilesets/tileset_08.common.png (renamed from gfx/tilesets/tileset_08.png)bin2059 -> 2059 bytes
12 files changed, 17 insertions, 17 deletions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index b372abf..f12f762 100644
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -3,14 +3,14 @@ INCLUDE "constants.asm"
SECTION "data/tileset_headers.asm", ROMX
tileset: MACRO
- db BANK(\2) ; Bank
- dw \1, \2, \3 ; Block, GFX, Coll
+ db BANK(\2) ; bank
+ dw \1, \2, \3 ; Meta, GFX, Coll
db \4, \5, \6 ; counter tiles
- db \7 ; grass tile
- ; db \8 ; permission (indoor, cave, outdoor)
+ db \7 ; unknown
ENDM
-Tilesets: ; bank, block, gfx, coll, 3 counter tiles, grass tile, permission
+Tilesets:
+ ; meta, gfx, coll, 3 counter tiles, unknown
tileset Tileset_00_Meta, Tileset_00_GFX, Tileset_00_Coll, $77, $40, $00, $00
tileset Tileset_01_Meta, Tileset_01_GFX, Tileset_01_Coll, $4b, $40, $00, $00
tileset Tileset_02_Meta, Tileset_02_GFX, Tileset_02_Coll, $1f, $40, $00, $00
@@ -38,5 +38,4 @@ Tilesets: ; bank, block, gfx, coll, 3 counter tiles, grass tile, permission
tileset Tileset_18_Meta, Tileset_18_GFX, Tileset_18_Coll, $07, $41, $00, $00
tileset Tileset_19_Meta, Tileset_19_GFX, Tileset_19_Coll, $07, $41, $00, $00
tileset Tileset_1a_Meta, Tileset_1a_GFX, Tileset_1a_Coll, $07, $41, $00, $00
- ; Tileset_1b uses Tileset_00 graphics
- tileset Tileset_1b_Meta, Tileset_00_GFX, Tileset_1b_Coll, $77, $40, $00, $00 \ No newline at end of file
+ tileset Tileset_1b_Meta, Tileset_1b_GFX, Tileset_1b_Coll, $77, $40, $00, $00
diff --git a/gfx.asm b/gfx.asm
index ea4a74f..1b7aa6e 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -104,7 +104,8 @@ Unreferenced_UnusedLeaderNameGFX:: INCBIN "gfx/trainer_card/unused_leader_name.2
SECTION "gfx.asm@Bank 6 Tilesets 00", ROMX
Tileset_00_GFX:
-INCBIN "gfx/tilesets/tileset_00.2bpp"
+Tileset_1b_GFX:
+INCBIN "gfx/tilesets/tileset_00.common.2bpp"
Tileset_00_Meta:
INCBIN "data/tilesets/tileset_00_metatiles.bin"
Tileset_00_Coll:
@@ -118,7 +119,7 @@ INCBIN "data/tilesets/tileset_1b_collision.bin"
SECTION "gfx.asm@Bank 6 Tilesets 01", ROMX
Tileset_01_GFX:
-INCBIN "gfx/tilesets/tileset_01.2bpp"
+INCBIN "gfx/tilesets/tileset_01.common.2bpp"
Tileset_01_Meta:
INCBIN "data/tilesets/tileset_01_metatiles.bin"
Tileset_01_Coll:
@@ -126,7 +127,7 @@ INCBIN "data/tilesets/tileset_01_collision.bin"
SECTION "gfx.asm@Bank 6 Tilesets 02", ROMX
Tileset_02_GFX:
-INCBIN "gfx/tilesets/tileset_02.2bpp"
+INCBIN "gfx/tilesets/tileset_02.common.2bpp"
Tileset_02_Meta:
INCBIN "data/tilesets/tileset_02_metatiles.bin"
Tileset_02_Coll:
@@ -158,7 +159,7 @@ INCBIN "data/tilesets/tileset_0e_collision.bin"
SECTION "gfx.asm@Bank 7 Tilesets 06", ROMX
Tileset_06_GFX:
-INCBIN "gfx/tilesets/tileset_06.2bpp"
+INCBIN "gfx/tilesets/tileset_06.common.2bpp"
Tileset_06_Meta:
INCBIN "data/tilesets/tileset_06_metatiles.bin"
Tileset_06_Coll:
@@ -166,7 +167,7 @@ INCBIN "data/tilesets/tileset_06_collision.bin"
SECTION "gfx.asm@Bank 7 Tilesets 05", ROMX
Tileset_05_GFX:
-INCBIN "gfx/tilesets/tileset_05.2bpp"
+INCBIN "gfx/tilesets/tileset_05.common.2bpp"
Tileset_05_Meta:
INCBIN "data/tilesets/tileset_05_metatiles.bin"
Tileset_05_Coll:
@@ -174,7 +175,7 @@ INCBIN "data/tilesets/tileset_05_collision.bin"
SECTION "gfx.asm@Bank 7 Tilesets 03", ROMX
Tileset_03_GFX:
-INCBIN "gfx/tilesets/tileset_03.2bpp"
+INCBIN "gfx/tilesets/tileset_03.common.2bpp"
Tileset_03_Meta:
INCBIN "data/tilesets/tileset_03_metatiles.bin"
Tileset_03_Coll:
@@ -182,7 +183,7 @@ INCBIN "data/tilesets/tileset_03_collision.bin"
SECTION "gfx.asm@Bank 8 Tilesets 04", ROMX
Tileset_04_GFX:
-INCBIN "gfx/tilesets/tileset_04.2bpp"
+INCBIN "gfx/tilesets/tileset_04.common.2bpp"
Tileset_04_Meta:
INCBIN "data/tilesets/tileset_04_metatiles.bin"
Tileset_04_Coll:
@@ -190,7 +191,7 @@ INCBIN "data/tilesets/tileset_04_collision.bin"
SECTION "gfx.asm@Bank 8 Tilesets 07", ROMX
Tileset_07_GFX:
-INCBIN "gfx/tilesets/tileset_07.2bpp"
+INCBIN "gfx/tilesets/tileset_07.common.2bpp"
Tileset_07_Meta:
INCBIN "data/tilesets/tileset_07_metatiles.bin"
Tileset_07_Coll:
@@ -198,7 +199,7 @@ INCBIN "data/tilesets/tileset_07_collision.bin"
SECTION "gfx.asm@Bank 8 Tilesets 08", ROMX
Tileset_08_GFX:
-INCBIN "gfx/tilesets/tileset_08.2bpp"
+INCBIN "gfx/tilesets/tileset_08.common.2bpp"
Tileset_08_Meta:
INCBIN "data/tilesets/tileset_08_metatiles.bin"
Tileset_08_Coll:
@@ -266,7 +267,7 @@ INCBIN "data/tilesets/tileset_0c_collision.bin"
SECTION "gfx.asm@Bank C Tilesets Common", ROMX
CommonExteriorTilesGFX:
-INCBIN "gfx/tilesets/tileset_common.2bpp"
+INCBIN "gfx/tilesets/common.2bpp"
SECTION "gfx.asm@PokeBalls GFX", ROMX
diff --git a/gfx/tilesets/tileset_common.png b/gfx/tilesets/common.png
index 452f1f6..452f1f6 100644
--- a/gfx/tilesets/tileset_common.png
+++ b/gfx/tilesets/common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_00.png b/gfx/tilesets/tileset_00.common.png
index 921783e..921783e 100755
--- a/gfx/tilesets/tileset_00.png
+++ b/gfx/tilesets/tileset_00.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_01.png b/gfx/tilesets/tileset_01.common.png
index 60b7b48..60b7b48 100755
--- a/gfx/tilesets/tileset_01.png
+++ b/gfx/tilesets/tileset_01.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_02.png b/gfx/tilesets/tileset_02.common.png
index 8943669..8943669 100755
--- a/gfx/tilesets/tileset_02.png
+++ b/gfx/tilesets/tileset_02.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_03.png b/gfx/tilesets/tileset_03.common.png
index 8dc6441..8dc6441 100755
--- a/gfx/tilesets/tileset_03.png
+++ b/gfx/tilesets/tileset_03.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_04.png b/gfx/tilesets/tileset_04.common.png
index b3fddf2..b3fddf2 100755
--- a/gfx/tilesets/tileset_04.png
+++ b/gfx/tilesets/tileset_04.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_05.png b/gfx/tilesets/tileset_05.common.png
index c153d6f..c153d6f 100755
--- a/gfx/tilesets/tileset_05.png
+++ b/gfx/tilesets/tileset_05.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_06.png b/gfx/tilesets/tileset_06.common.png
index 3a9451b..3a9451b 100755
--- a/gfx/tilesets/tileset_06.png
+++ b/gfx/tilesets/tileset_06.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_07.png b/gfx/tilesets/tileset_07.common.png
index 157a3ba..157a3ba 100755
--- a/gfx/tilesets/tileset_07.png
+++ b/gfx/tilesets/tileset_07.common.png
Binary files differ
diff --git a/gfx/tilesets/tileset_08.png b/gfx/tilesets/tileset_08.common.png
index 0b24af2..0b24af2 100755
--- a/gfx/tilesets/tileset_08.png
+++ b/gfx/tilesets/tileset_08.common.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 21:26:52 +0000