summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile15
-rwxr-xr-xengine/HoF_room_pc.asm2
-rwxr-xr-xengine/intro.asm12
-rw-r--r--gfx/blue/intro_purin_1.6x6.pngbin366 -> 0 bytes
-rw-r--r--gfx/blue/intro_purin_1.pngbin0 -> 380 bytes
-rw-r--r--gfx/blue/intro_purin_2.6x6.pngbin360 -> 0 bytes
-rw-r--r--gfx/blue/intro_purin_2.pngbin0 -> 374 bytes
-rw-r--r--gfx/blue/intro_purin_3.png (renamed from gfx/blue/intro_purin_3.6x6.png)bin416 -> 430 bytes
-rw-r--r--gfx/game_boy.norepeat.pngbin246 -> 0 bytes
-rw-r--r--gfx/game_boy.pngbin0 -> 264 bytes
-rw-r--r--gfx/red/intro_nido_1.6x6.pngbin462 -> 0 bytes
-rw-r--r--gfx/red/intro_nido_1.pngbin0 -> 476 bytes
-rw-r--r--gfx/red/intro_nido_2.png (renamed from gfx/red/intro_nido_2.6x6.png)bin449 -> 463 bytes
-rw-r--r--gfx/red/intro_nido_3.png (renamed from gfx/red/intro_nido_3.6x6.png)bin495 -> 509 bytes
-rw-r--r--gfx/theend.interleave.pngbin139 -> 0 bytes
-rw-r--r--gfx/theend.pngbin0 -> 153 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/cavern.png (renamed from gfx/tilesets/cavern.t14.png)bin1022 -> 1038 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/cemetery.png (renamed from gfx/tilesets/cemetery.t4.png)bin928 -> 943 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/club.png (renamed from gfx/tilesets/club.t5.png)bin899 -> 914 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/gate.png (renamed from gfx/tilesets/gate.t1.png)bin1119 -> 1134 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/house.png (renamed from gfx/tilesets/house.t2.png)bin1163 -> 1178 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/interior.png (renamed from gfx/tilesets/interior.t1.png)bin1141 -> 1156 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/lab.png (renamed from gfx/tilesets/lab.t4.png)bin1051 -> 1066 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/lobby.png (renamed from gfx/tilesets/lobby.t2.png)bin966 -> 981 bytes
-rwxr-xr-xgfx/tilesets/mansion.pngbin0 -> 976 bytes
-rw-r--r--gfx/tilesets/mansion.t2.pngbin960 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/overworld.png (renamed from gfx/tilesets/overworld.t2.png)bin1309 -> 1324 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/plateau.png (renamed from gfx/tilesets/plateau.t10.png)bin1011 -> 1027 bytes
-rwxr-xr-xgfx/tilesets/reds_house.pngbin0 -> 860 bytes
-rw-r--r--gfx/tilesets/reds_house.t7.pngbin845 -> 0 bytes
-rwxr-xr-xgfx/tilesets/ship.pngbin0 -> 880 bytes
-rw-r--r--gfx/tilesets/ship.t6.pngbin865 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]gfx/tilesets/ship_port.png (renamed from gfx/tilesets/ship_port.t2.png)bin1125 -> 1140 bytes
-rwxr-xr-xgfx/tilesets/underground.pngbin0 -> 288 bytes
-rw-r--r--gfx/tilesets/underground.t7.pngbin272 -> 0 bytes
-rwxr-xr-xmain.asm32
36 files changed, 32 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index acca2ed0..f9b32b9b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,6 @@ MD5 := md5sum -c --quiet
poketools := extras/pokemontools
-gfx := $(PYTHON) $(poketools)/gfx.py
-2bpp := $(gfx) 2bpp
-1bpp := $(gfx) 1bpp
pic := $(PYTHON) $(poketools)/pic.py compress
includes := $(PYTHON) $(poketools)/scan_includes.py
@@ -65,9 +62,15 @@ red_opt = $(dmg_opt) -t "POKEMON RED"
blue_opt = $(dmg_opt) -t "POKEMON BLUE"
-%.png: ;
-%.2bpp: %.png ; @$(2bpp) $<
-%.1bpp: %.png ; @$(1bpp) $<
+#%.png: ;
+#%.2bpp: %.png ; @$(2bpp) $<
+#%.1bpp: %.png ; @$(1bpp) $<
+.png.2bpp:
+ @rgbgfx -o $@ $<
+
+.png.1bpp:
+ @rgbgfx -b -o $@ $<
+
%.pic: %.2bpp ; @$(pic) $<
# Assemble source files into objects.
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index e00fc57d..847ff3d1 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm"
INCLUDE "text/credits_text.asm"
TheEndGfx: ; 7473e (1d:473e) (7473f on blue)
- INCBIN "gfx/theend.interleave.2bpp"
+ INCBIN "gfx/theend.2bpp"
TheEndGfxEnd:
diff --git a/engine/intro.asm b/engine/intro.asm
index e0c8242c..7ddbe240 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -443,14 +443,14 @@ FightIntroBackMonEnd:
FightIntroFrontMon: ; 42099 (10:6099)
IF DEF(_RED)
- INCBIN "gfx/red/intro_nido_1.6x6.2bpp"
- INCBIN "gfx/red/intro_nido_2.6x6.2bpp"
- INCBIN "gfx/red/intro_nido_3.6x6.2bpp"
+ INCBIN "gfx/red/intro_nido_1.2bpp"
+ INCBIN "gfx/red/intro_nido_2.2bpp"
+ INCBIN "gfx/red/intro_nido_3.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/intro_purin_1.6x6.2bpp"
- INCBIN "gfx/blue/intro_purin_2.6x6.2bpp"
- INCBIN "gfx/blue/intro_purin_3.6x6.2bpp"
+ INCBIN "gfx/blue/intro_purin_1.2bpp"
+ INCBIN "gfx/blue/intro_purin_2.2bpp"
+ INCBIN "gfx/blue/intro_purin_3.2bpp"
ENDC
FightIntroFrontMonEnd:
diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.6x6.png
deleted file mode 100644
index 0e53582c..00000000
--- a/gfx/blue/intro_purin_1.6x6.png
+++ /dev/null
Binary files differ
diff --git a/gfx/blue/intro_purin_1.png b/gfx/blue/intro_purin_1.png
new file mode 100644
index 00000000..a14acfb3
--- /dev/null
+++ b/gfx/blue/intro_purin_1.png
Binary files differ
diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png
deleted file mode 100644
index 21107af0..00000000
--- a/gfx/blue/intro_purin_2.6x6.png
+++ /dev/null
Binary files differ
diff --git a/gfx/blue/intro_purin_2.png b/gfx/blue/intro_purin_2.png
new file mode 100644
index 00000000..31793daf
--- /dev/null
+++ b/gfx/blue/intro_purin_2.png
Binary files differ
diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.png
index 1c30a0e8..d7bfb1f0 100644
--- a/gfx/blue/intro_purin_3.6x6.png
+++ b/gfx/blue/intro_purin_3.png
Binary files differ
diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png
deleted file mode 100644
index 62144956..00000000
--- a/gfx/game_boy.norepeat.png
+++ /dev/null
Binary files differ
diff --git a/gfx/game_boy.png b/gfx/game_boy.png
new file mode 100644
index 00000000..adeedabb
--- /dev/null
+++ b/gfx/game_boy.png
Binary files differ
diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png
deleted file mode 100644
index 4c7804a1..00000000
--- a/gfx/red/intro_nido_1.6x6.png
+++ /dev/null
Binary files differ
diff --git a/gfx/red/intro_nido_1.png b/gfx/red/intro_nido_1.png
new file mode 100644
index 00000000..14d79c6d
--- /dev/null
+++ b/gfx/red/intro_nido_1.png
Binary files differ
diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.png
index a29a4814..78759914 100644
--- a/gfx/red/intro_nido_2.6x6.png
+++ b/gfx/red/intro_nido_2.png
Binary files differ
diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.png
index e920d55d..52f35fa5 100644
--- a/gfx/red/intro_nido_3.6x6.png
+++ b/gfx/red/intro_nido_3.png
Binary files differ
diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png
deleted file mode 100644
index 025ebb61..00000000
--- a/gfx/theend.interleave.png
+++ /dev/null
Binary files differ
diff --git a/gfx/theend.png b/gfx/theend.png
new file mode 100644
index 00000000..bc6ff558
--- /dev/null
+++ b/gfx/theend.png
Binary files differ
diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.png
index 5397fd65..7a66b727 100644..100755
--- a/gfx/tilesets/cavern.t14.png
+++ b/gfx/tilesets/cavern.png
Binary files differ
diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.png
index b1df015a..3dcba0f0 100644..100755
--- a/gfx/tilesets/cemetery.t4.png
+++ b/gfx/tilesets/cemetery.png
Binary files differ
diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.png
index 05a55879..1e367b1e 100644..100755
--- a/gfx/tilesets/club.t5.png
+++ b/gfx/tilesets/club.png
Binary files differ
diff --git a/gfx/tilesets/gate.t1.png b/gfx/tilesets/gate.png
index 372e6751..4a97d6f9 100644..100755
--- a/gfx/tilesets/gate.t1.png
+++ b/gfx/tilesets/gate.png
Binary files differ
diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.png
index b5d67c95..dabd6238 100644..100755
--- a/gfx/tilesets/house.t2.png
+++ b/gfx/tilesets/house.png
Binary files differ
diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.png
index 3123d81c..8273960c 100644..100755
--- a/gfx/tilesets/interior.t1.png
+++ b/gfx/tilesets/interior.png
Binary files differ
diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.png
index 4a114337..481b80d7 100644..100755
--- a/gfx/tilesets/lab.t4.png
+++ b/gfx/tilesets/lab.png
Binary files differ
diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.png
index f2a1c180..6f6a1189 100644..100755
--- a/gfx/tilesets/lobby.t2.png
+++ b/gfx/tilesets/lobby.png
Binary files differ
diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png
new file mode 100755
index 00000000..8c8ab32d
--- /dev/null
+++ b/gfx/tilesets/mansion.png
Binary files differ
diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png
deleted file mode 100644
index 557c23b4..00000000
--- a/gfx/tilesets/mansion.t2.png
+++ /dev/null
Binary files differ
diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.png
index c7533e40..b3b37a2f 100644..100755
--- a/gfx/tilesets/overworld.t2.png
+++ b/gfx/tilesets/overworld.png
Binary files differ
diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.png
index b87162d8..df92791b 100644..100755
--- a/gfx/tilesets/plateau.t10.png
+++ b/gfx/tilesets/plateau.png
Binary files differ
diff --git a/gfx/tilesets/reds_house.png b/gfx/tilesets/reds_house.png
new file mode 100755
index 00000000..9b4f1d8d
--- /dev/null
+++ b/gfx/tilesets/reds_house.png
Binary files differ
diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.t7.png
deleted file mode 100644
index 5f210d04..00000000
--- a/gfx/tilesets/reds_house.t7.png
+++ /dev/null
Binary files differ
diff --git a/gfx/tilesets/ship.png b/gfx/tilesets/ship.png
new file mode 100755
index 00000000..f3db2c24
--- /dev/null
+++ b/gfx/tilesets/ship.png
Binary files differ
diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png
deleted file mode 100644
index cf5b6b95..00000000
--- a/gfx/tilesets/ship.t6.png
+++ /dev/null
Binary files differ
diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.png
index fa5bbb27..25a92082 100644..100755
--- a/gfx/tilesets/ship_port.t2.png
+++ b/gfx/tilesets/ship_port.png
Binary files differ
diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png
new file mode 100755
index 00000000..65f444b1
--- /dev/null
+++ b/gfx/tilesets/underground.png
Binary files differ
diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png
deleted file mode 100644
index baa86c17..00000000
--- a/gfx/tilesets/underground.t7.png
+++ /dev/null
Binary files differ
diff --git a/main.asm b/main.asm
index 8049b646..f8871466 100755
--- a/main.asm
+++ b/main.asm
@@ -5511,7 +5511,7 @@ INCLUDE "engine/battle/trainer_ai.asm"
INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
TradingAnimationGraphics:
- INCBIN "gfx/game_boy.norepeat.2bpp"
+ INCBIN "gfx/game_boy.2bpp"
INCBIN "gfx/link_cable.2bpp"
TradingAnimationGraphicsEnd:
@@ -6473,23 +6473,23 @@ INCLUDE "engine/hidden_object_functions18.asm"
SECTION "bank19",ROMX,BANK[$19]
-Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp"
+Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp"
Overworld_Block: INCBIN "gfx/blocksets/overworld.bst"
RedsHouse1_GFX:
-RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.t7.2bpp"
+RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp"
RedsHouse1_Block:
RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst"
-House_GFX: INCBIN "gfx/tilesets/house.t2.2bpp"
+House_GFX: INCBIN "gfx/tilesets/house.2bpp"
House_Block: INCBIN "gfx/blocksets/house.bst"
-Mansion_GFX: INCBIN "gfx/tilesets/mansion.t2.2bpp"
+Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp"
Mansion_Block: INCBIN "gfx/blocksets/mansion.bst"
-ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.t2.2bpp"
+ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp"
ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst"
-Interior_GFX: INCBIN "gfx/tilesets/interior.t1.2bpp"
+Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp"
Interior_Block: INCBIN "gfx/blocksets/interior.bst"
-Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp"
+Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp"
Plateau_Block: INCBIN "gfx/blocksets/plateau.bst"
@@ -6518,7 +6518,7 @@ Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst"
ForestGate_GFX:
Museum_GFX:
-Gate_GFX: INCBIN "gfx/tilesets/gate.t1.2bpp"
+Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp"
ForestGate_Block:
Museum_Block:
Gate_Block: INCBIN "gfx/blocksets/gate.bst"
@@ -6531,19 +6531,19 @@ Facility_Block: INCBIN "gfx/blocksets/facility.bst"
SECTION "bank1B",ROMX,BANK[$1B]
-Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp"
+Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp"
Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
-Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp"
+Cavern_GFX: INCBIN "gfx/tilesets/cavern.2bpp"
Cavern_Block: INCBIN "gfx/blocksets/cavern.bst"
-Lobby_GFX: INCBIN "gfx/tilesets/lobby.t2.2bpp"
+Lobby_GFX: INCBIN "gfx/tilesets/lobby.2bpp"
Lobby_Block: INCBIN "gfx/blocksets/lobby.bst"
-Ship_GFX: INCBIN "gfx/tilesets/ship.t6.2bpp"
+Ship_GFX: INCBIN "gfx/tilesets/ship.2bpp"
Ship_Block: INCBIN "gfx/blocksets/ship.bst"
-Lab_GFX: INCBIN "gfx/tilesets/lab.t4.2bpp"
+Lab_GFX: INCBIN "gfx/tilesets/lab.2bpp"
Lab_Block: INCBIN "gfx/blocksets/lab.bst"
-Club_GFX: INCBIN "gfx/tilesets/club.t5.2bpp"
+Club_GFX: INCBIN "gfx/tilesets/club.2bpp"
Club_Block: INCBIN "gfx/blocksets/club.bst"
-Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp"
+Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp"
Underground_Block: INCBIN "gfx/blocksets/underground.bst"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 17:32:28 +0000