summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xengine/HoF_room_pc.asm2
-rwxr-xr-xengine/intro.asm12
-rw-r--r--gfx/blue/intro_purin_1.png (renamed from gfx/blue/intro_purin_1.6x6.png)bin380 -> 380 bytes
-rw-r--r--gfx/blue/intro_purin_2.png (renamed from gfx/blue/intro_purin_2.6x6.png)bin374 -> 374 bytes
-rw-r--r--gfx/blue/intro_purin_3.png (renamed from gfx/blue/intro_purin_3.6x6.png)bin430 -> 430 bytes
-rw-r--r--gfx/game_boy.png (renamed from gfx/game_boy.norepeat.png)bin264 -> 264 bytes
-rw-r--r--gfx/red/intro_nido_1.png (renamed from gfx/red/intro_nido_1.6x6.png)bin476 -> 476 bytes
-rw-r--r--gfx/red/intro_nido_2.png (renamed from gfx/red/intro_nido_2.6x6.png)bin463 -> 463 bytes
-rw-r--r--gfx/red/intro_nido_3.png (renamed from gfx/red/intro_nido_3.6x6.png)bin509 -> 509 bytes
-rw-r--r--gfx/theend.png (renamed from gfx/theend.interleave.png)bin153 -> 153 bytes
-rwxr-xr-xgfx/tilesets/cavern.png (renamed from gfx/tilesets/cavern.t14.png)bin1038 -> 1038 bytes
-rwxr-xr-xgfx/tilesets/cemetery.png (renamed from gfx/tilesets/cemetery.t4.png)bin943 -> 943 bytes
-rwxr-xr-xgfx/tilesets/club.png (renamed from gfx/tilesets/club.t5.png)bin914 -> 914 bytes
-rwxr-xr-xgfx/tilesets/gate.png (renamed from gfx/tilesets/gate.t1.png)bin1134 -> 1134 bytes
-rwxr-xr-xgfx/tilesets/house.png (renamed from gfx/tilesets/house.t2.png)bin1178 -> 1178 bytes
-rwxr-xr-xgfx/tilesets/interior.png (renamed from gfx/tilesets/interior.t1.png)bin1156 -> 1156 bytes
-rwxr-xr-xgfx/tilesets/lab.png (renamed from gfx/tilesets/lab.t4.png)bin1066 -> 1066 bytes
-rwxr-xr-xgfx/tilesets/lobby.png (renamed from gfx/tilesets/lobby.t2.png)bin981 -> 981 bytes
-rwxr-xr-xgfx/tilesets/mansion.png (renamed from gfx/tilesets/mansion.t2.png)bin976 -> 976 bytes
-rwxr-xr-xgfx/tilesets/overworld.png (renamed from gfx/tilesets/overworld.t2.png)bin1324 -> 1324 bytes
-rwxr-xr-xgfx/tilesets/plateau.png (renamed from gfx/tilesets/plateau.t10.png)bin1027 -> 1027 bytes
-rwxr-xr-xgfx/tilesets/reds_house.png (renamed from gfx/tilesets/reds_house.t7.png)bin860 -> 860 bytes
-rwxr-xr-xgfx/tilesets/ship.png (renamed from gfx/tilesets/ship.t6.png)bin880 -> 880 bytes
-rwxr-xr-xgfx/tilesets/ship_port.png (renamed from gfx/tilesets/ship_port.t2.png)bin1140 -> 1140 bytes
-rwxr-xr-xgfx/tilesets/underground.png (renamed from gfx/tilesets/underground.t7.png)bin288 -> 288 bytes
-rwxr-xr-xmain.asm32
26 files changed, 23 insertions, 23 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 704fea16..90b9450b 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -266,4 +266,4 @@ 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"
diff --git a/engine/intro.asm b/engine/intro.asm
index 154c41fd..9f17e05c 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -437,14 +437,14 @@ FightIntroBackMon: ; 41a99 (10:5a99)
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"
ds $10 ; blank tile
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"
ds $10 ; blank tile
ENDC
diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.png
index a14acfb3..a14acfb3 100644
--- a/gfx/blue/intro_purin_1.6x6.png
+++ 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.png
index 31793daf..31793daf 100644
--- a/gfx/blue/intro_purin_2.6x6.png
+++ 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 d7bfb1f0..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.png
index adeedabb..adeedabb 100644
--- a/gfx/game_boy.norepeat.png
+++ b/gfx/game_boy.png
Binary files differ
diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.png
index 14d79c6d..14d79c6d 100644
--- a/gfx/red/intro_nido_1.6x6.png
+++ 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 78759914..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 52f35fa5..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.png
index bc6ff558..bc6ff558 100644
--- a/gfx/theend.interleave.png
+++ b/gfx/theend.png
Binary files differ
diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.png
index 7a66b727..7a66b727 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 3dcba0f0..3dcba0f0 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 1e367b1e..1e367b1e 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 4a97d6f9..4a97d6f9 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 dabd6238..dabd6238 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 8273960c..8273960c 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 481b80d7..481b80d7 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 6f6a1189..6f6a1189 100755
--- a/gfx/tilesets/lobby.t2.png
+++ b/gfx/tilesets/lobby.png
Binary files differ
diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.png
index 8c8ab32d..8c8ab32d 100755
--- a/gfx/tilesets/mansion.t2.png
+++ b/gfx/tilesets/mansion.png
Binary files differ
diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.png
index b3b37a2f..b3b37a2f 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 df92791b..df92791b 100755
--- a/gfx/tilesets/plateau.t10.png
+++ b/gfx/tilesets/plateau.png
Binary files differ
diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.png
index 9b4f1d8d..9b4f1d8d 100755
--- a/gfx/tilesets/reds_house.t7.png
+++ b/gfx/tilesets/reds_house.png
Binary files differ
diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.png
index f3db2c24..f3db2c24 100755
--- a/gfx/tilesets/ship.t6.png
+++ b/gfx/tilesets/ship.png
Binary files differ
diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.png
index 25a92082..25a92082 100755
--- a/gfx/tilesets/ship_port.t2.png
+++ b/gfx/tilesets/ship_port.png
Binary files differ
diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.png
index 65f444b1..65f444b1 100755
--- a/gfx/tilesets/underground.t7.png
+++ b/gfx/tilesets/underground.png
Binary files differ
diff --git a/main.asm b/main.asm
index 8def2f85..3d1119fe 100755
--- a/main.asm
+++ b/main.asm
@@ -5496,7 +5496,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"
TradingAnimationGraphics2:
@@ -6456,23 +6456,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"
@@ -6500,7 +6500,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"
@@ -6513,19 +6513,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:00:33 +0000