From 688300d21a2af071fff1ce9fa2a8102522be54ae Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Fri, 2 Jan 2026 17:05:10 -0600
Subject: [PATCH] Tile warps on map

---
 dungeon_map/data/supertile_shapes.asm |  32 +++++++++++++-------------
 menu/map_icons.3bpp                   | Bin 3072 -> 3072 bytes
 menu/map_icons_1.3bppc                | Bin 586 -> 670 bytes
 menu/map_icons_2.3bppc                | Bin 699 -> 722 bytes
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dungeon_map/data/supertile_shapes.asm b/dungeon_map/data/supertile_shapes.asm
index a7d2310..f0b226c 100644
--- a/dungeon_map/data/supertile_shapes.asm
+++ b/dungeon_map/data/supertile_shapes.asm
@@ -7,9 +7,9 @@ db $FF, $FF, $FF, $FF ; 05 - unused
 db $FF, $FF, $4F, $FF ; 06 - Arrghus
 db $00, $40, $00, $00 ; 07 - Moldorm
 db $FF, $FF, $72, $5F ; 08 - useless fairy entrance
-db $66, $66, $FF, $FF ; 09
-db $58, $58, $FF, $FF ; 0A
-db $2E, $67, $2E, $70 ; 0B
+db $66, $3B, $FF, $FF ; 09
+db $58, $1F, $FF, $FF ; 0A
+db $2E, $67, $2E, $1E ; 0B
 db $31, $31, $24, $24 ; 0C
 db $FF, $FF, $4F, $FF ; 0D - Aga 2
 db $FF, $FF, $57, $5F ; 0E
@@ -25,7 +25,7 @@ db $40, $40, $00, $00
 db $75, $FF, $74, $FF ; 18 - useless fairy drop
 db $FF, $29, $FF, $1A ; 19
 db $6E, $6F, $6D, $75 ; 1A
-db $2E, $67, $75, $FF
+db $2E, $67, $75, $FF ; 1B
 db $74, $74, $3E, $2E ; 1C
 db $72, $67, $FF, $FF
 db $FF, $68, $57, $4B
@@ -72,8 +72,8 @@ db $14, $14, $00, $00
 db $FF, $FF, $FF, $FF ; 47 - unused
 db $FF, $FF, $FF, $FF ; 48 - unused
 db $72, $2E, $72, $2E ; 49
-db $61, $61, $24, $24
-db $75, $74, $2E, $2E
+db $61, $61, $24, $24 ; 4A
+db $75, $0E, $2E, $2E ; 4B
 db $FF, $65, $FF, $77 ; 4C
 db $10, $30, $01, $00
 db $72, $57, $FF, $FF ; 4E
@@ -104,7 +104,7 @@ db $00, $30, $10, $00
 db $00, $10, $00, $01 ; 67
 db $00, $10, $01, $00 ; 68
 db $FF, $FF, $FF, $FF ; 69 - unused
-db $FF, $4C, $FF, $74 ; 6A
+db $FF, $4C, $FF, $0E ; 6A
 db $65, $75, $2E, $2E ; 6B
 db $65, $FF, $2E, $71 ; 6C - Lanmolas 2
 db $75, $FF, $77, $FF ; 6D
@@ -121,9 +121,9 @@ db $30, $00, $60, $60
 db $FF, $FF, $FF, $FF ; 78 - unused
 db $FF, $FF, $FF, $FF ; 79 - unused
 db $FF, $FF, $FF, $FF ; 7A - unused
-db $70, $71, $4F, $4D
+db $1E, $71, $4F, $4D ; 7B
 db $77, $74, $77, $77
-db $2E, $70, $77, $4F ; 7D
+db $2E, $70, $52, $51 ; 7D - warp tiles
 db $FF, $77, $53, $2D ; 7E
 db $77, $FF, $55, $FF
 db $67, $70, $FF, $FF ; 80
@@ -153,9 +153,9 @@ db $65, $74, $2E, $2F ; 97
 db $FF, $FF, $5F, $57 ; 98
 db $FF, $74, $0A, $18 ; 99
 db $FF, $FF, $FF, $FF ; 9A - unused
-db $72, $70, $70, $71
+db $72, $1E, $1E, $38 ; 9B
 db $10, $10, $01, $01
-db $70, $72, $71, $70
+db $1E, $72, $71, $1E ; 9D
 db $FF, $65, $70, $79 ; 9E
 db $FF, $FF, $5B, $FF ; 9F
 db $72, $57, $FF, $FF ; A0
@@ -163,8 +163,8 @@ db $70, $1D, $FF, $2A ; A1
 db $45, $45, $16, $06
 db $1A, $FF, $2A, $FF ; A3
 db $FF, $FF, $4E, $FF ; A4
-db $65, $75, $2E, $2E
-db $00, $30, $00, $00
+db $65, $75, $2E, $2E ; A5
+db $00, $30, $00, $00 ; A6
 db $56, $FF, $FF, $FF ; A7 - ToH fairy basement room
 db $00, $03, $00, $12 ; A8
 db $17, $17, $16, $16
@@ -175,8 +175,8 @@ db $FF, $FF, $FF, $FF ; AD - unused
 db $FF, $59, $FF, $FF ; AE
 db $5B, $FF, $FF, $FF ; AF
 db $2E, $67, $2E, $57 ; B0
-db $74, $75, $2E, $2D
-db $14, $05, $10, $11 ; B2 - split this monster somehow?
+db $0E, $75, $0C, $2D ; B1
+db $1C, $62, $72, $4B ; B2 - split this monster somehow?
 db $4A, $FF, $4A, $FF
 db $10, $00, $44, $44
 db $30, $00, $10, $00
@@ -207,7 +207,7 @@ db $FF, $FF, $FF, $FF ; CD - unused
 db $FF, $78, $FF, $FF
 db $FF, $FF, $FF, $FF ; CF - unused
 db $2E, $67, $2E, $57 ; D0
-db $4E, $4F, $70, $70
+db $4E, $4F, $1E, $70 ; D1
 db $FF, $75, $FF, $55
 db $FF, $FF, $FF, $FF ; D3 - unused
 db $FF, $FF, $FF, $FF ; D4 - unused
diff --git a/menu/map_icons.3bpp b/menu/map_icons.3bpp
index d9811c5a671911e814ea5fbec025b6b9c524eed7..4f56f3ffa5100d93c51faf23728028dad1fbc98f 100644
GIT binary patch
delta 425
zcmYjNu}T9$5S`sikYF8nBo-EaK!~MRgiE27ts!6#k-H`!Sj*o1!}a<L!u^2g4~V6u
z=;klxoXMWY&MStUee>qcRH*QBY|b6Az{5i`QTAph6U$Um+k=tP;yocseCkM%BZp?;
zXW4q4xu!5@<~o*oC1RCw3zgEJ01_!Hp~GUnKEvp!UMZ`qH?6%l0|ujh7<`ObRCm}x
zwUv_q3D;M{({XQ5EK0aw@Ok)aE_o){k0r8pJ`Xnf2H7a>8uAmZmQ<iX*=@R9t(Gde
zSGeJA^Lel_atSXs0z7`;zNWy`J=PZ^cjO?55B1+JYc$`ZJJU1b!Ma<E7WM7n(;v~S
Bj*tKV

delta 415
zcmZpWXpq>T!066^1JpD8hr@poHVh7jnHd<EpV{D0zB!%InlTo;B*>_LaL52OiU|n*
zVONY>bn}0vd`6aM49^%Q7qMIr#j0>}IIA&sna%TApECNLV>kzO2m=EXlaUd~86b!d
zw}Fa3Qvr#e2SQLdfE>%jWNg5|3}S&~<}u9U*?fsTj&ZUCCm$C`7YIC4ne4$?CzHmI
x#!v@@3=B?APEk=#AQngy$nl#Wai%cBRRF`Y4x}PYr4A_npW!(WPEO*U2LL41QZ@hp

diff --git a/menu/map_icons_1.3bppc b/menu/map_icons_1.3bppc
index 4e311b9ea930c7f7841e8ce913cabdfc4d8df6c2..c44c5da3ad3eef740235f7021001db27b54656e0 100644
GIT binary patch
delta 281
zcmWlUJxc>Y07PeYSCn*GEh)s0kRs_+L?z&H8;giSv=PKYM6R|Lya?;M+?@e6jg{n2
z*oOoxEW}!@Pq6d{9G=}Y?>**CJx|?Vw*3bXw^5i}y9#E)v8Yx>fnL^u(k%oN+W_;{
zP7D)i6NA7~D2|Uqx4^qK)UjXS;c4&4&og-i!*Nz+62Wx^qjS?kCx!$9vmBOize3*?
zZUkTF%{x??iUYgBOo73~&7nUO_KI$W=}_Q0`x1jio;D-8iY$%D(`n^?#s4f)FI>t;
zt$dT|sxmqH4ekzJxV_~@(tPXNL#RS(E$uq9PiYHje<Y(?av{nqtZ5GgBnO1HCnREb
J#=)%E`~y?nPlf;h

delta 156
zcmbQodWvO2m0afq22%!x`fg7K76}^$hr`WU42;ig%o+L_7^WsLPTc1s!c^x_*LRSC
z(dkg@C5B!HCWb$4{*$E{rTAwnFm|&rFghG=6=Haz&oDWWF~P)vsg;YlHGqlXSr<DC
z<G+Sx9tIHaUspR*YZv1r36>UahF${}=VuHZQ7nv7Qf;CPZj;|I+B3~mm~6u&$z;wj
IIhDy009PI@6951J

diff --git a/menu/map_icons_2.3bppc b/menu/map_icons_2.3bppc
index 040f0b1b3a9f876f343697ff3e4660a3f1eab733..d72be7eb63d9eef444880f11924c988379570d77 100644
GIT binary patch
delta 165
zcmV;W09yaM1=0nO);og~0EJKiLuMF=asdKbT0(;c0fX`YLuVL;LIDIqLPJ<sgiQfM
z{s04>0G<qm3IGHE{sLlRh?N0@T9X9<d_{yV0Ehtq1Ac%&fQmo>M*#i+7>hgr0%jQI
zNEqh}<{0D{e%c!t7#n_kiSPggXBcJ}Bp8PP0gYe)i6#I_egK4H0+I-mwE<=Vy#bRQ
T0z(Ogm;r{z1B<2slWzh{J^?a7

delta 142
zcmV;90CE4)1-k{1)-Q*Q0EvVFgC+ojk^zJ+07L-KiBJFmGcbwN00W)?o(zQw00jX4
z0%BqUgA4$NR+A9{d^Clw0fzzr1Ac%&fQmo>M*#i+7>+yuiW>uoCIE@>00n0lW*8(G
whX4VMU;vFi1Bp}tlm?U10cHXP0+TudLl1>e0f)u|gkAvwT3Un+1(SvXOydzKy8r+H