From 7a12032067b3641da46c9c0415186cf18ff37dd2 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sat, 3 Jan 2026 13:19:29 -0600 Subject: [PATCH] More supertile shape updates --- dungeon_map/data/supertile_shapes.asm | 130 +++++++++++++------------- dungeon_map/draw_rooms.asm | 7 +- menu/map_icons.3bpp | Bin 3072 -> 3072 bytes menu/map_icons.dat | Bin 0 -> 256 bytes menu/map_icons.pal | Bin 0 -> 768 bytes menu/map_icons_1.3bppc | Bin 584 -> 716 bytes menu/map_icons_2.3bppc | Bin 676 -> 743 bytes 7 files changed, 71 insertions(+), 66 deletions(-) create mode 100644 menu/map_icons.dat create mode 100644 menu/map_icons.pal diff --git a/dungeon_map/data/supertile_shapes.asm b/dungeon_map/data/supertile_shapes.asm index 117b843..316f819 100644 --- a/dungeon_map/data/supertile_shapes.asm +++ b/dungeon_map/data/supertile_shapes.asm @@ -12,7 +12,7 @@ db $58, $1F, $FF, $FF ; 0A db $2E, $67, $2E, $1E ; 0B db $31, $31, $14, $14 ; 0C db $FF, $FF, $4F, $FF ; 0D - Aga 2 -db $FF, $FF, $57, $72 ; 0E +db $FF, $FF, $D9, $22 ; 0E db $FF, $FF, $FF, $FF ; 0F - unused and should never be used, treated as non-id db $00, $00, $10, $00 ; 10 db $00, $30, $00, $10 ; 11 @@ -23,13 +23,13 @@ db $34, $00, $01, $00 ; 15 db $75, $65, $2E, $2E ; 16 db $30, $30, $00, $00 ; 17 db $75, $FF, $74, $FF ; 18 - useless fairy drop -db $FF, $29, $FF, $2A ; 19 +db $FF, $29, $FF, $1B ; 19 db $6E, $6F, $6D, $75 ; 1A -db $2E, $67, $75, $FF ; 1B +db $33, $D9, $21, $FF ; 1B db $74, $74, $3E, $2E ; 1C db $72, $67, $FF, $FF ; 1D -db $FF, $68, $57, $4B ; 1E -db $FF, $FF, $71, $57 ; 1F +db $FF, $F8, $D9, $26 ; 1E +db $FF, $FF, $20, $D9 ; 1F db $FF, $FF, $4F, $FF ; 20 db $00, $10, $00, $01 ; 21 db $FF, $FF, $28, $08 ; 22 @@ -38,48 +38,48 @@ db $10, $10, $01, $10 ; 24 db $FF, $FF, $FF, $FF ; 25 - unused db $00, $3C, $14, $42 ; 26 db $30, $30, $00, $00 ; 27 -db $65, $FF, $2D, $08 ; 28 +db $65, $FF, $18, $08 ; 28 db $FF, $FF, $FF, $56 ; 29 - Mothula -db $10, $12, $10, $5E -db $2A, $FF, $0D, $70 ; 2B +db $10, $12, $10, $5E ; 2A +db $2A, $FF, $0D, $CD ; 2B db $00, $00, $10, $10 ; 2C - hookshot cave back db $FF, $FF, $FF, $FF ; 2D - unused db $FF, $4F, $FF, $FF ; 2E db $74, $FF, $2E, $72 ; 2F - Kakariko well -db $75, $FF, $65, $FF ; 30 +db $21, $FF, $DA, $FF ; 30 - inset stairs if possible db $2E, $57, $2E, $57 ; 31 -db $14, $14, $44, $44 +db $14, $14, $44, $44 ; 32 db $FF, $FF, $4F, $FF ; 33 -db $00, $01, $40, $01 +db $00, $01, $40, $01 ; 34 db $4D, $77, $71, $3D ; 35 -db $15, $15, $15, $15 +db $15, $15, $15, $15 ; 36 db $77, $4D, $3D, $71 ; 37 db $6C, $FF, $77, $FF ; 38 db $FF, $FF, $72, $69 ; 39 -db $64, $64, $14, $14 -db $65, $FF, $75, $FF +db $64, $64, $14, $14 ; 3A - make bespoke if feasible +db $65, $FF, $75, $FF ; 3B - inset stairs if feasible db $00, $10, $00, $10 ; 3C - hookshot cave front db $2E, $2E, $75, $65 ; 3D -db $FF, $74, $72, $2E ; 3E -db $FF, $FF, $57, $57 -db $65, $FF, $2E, $57 ; 40 -db $00, $30, $14, $14 +db $FF, $CF, $72, $33 ; 3E +db $FF, $FF, $D9, $D9 ; 3F +db $65, $FF, $32, $D9 ; 40 - inset stairs if feasible +db $00, $30, $14, $14 ; 41 db $58, $49, $FF, $FF ; 42 -db $72, $2E, $FF, $75 -db $70, $3D, $70, $3D -db $6C, $74, $3D, $2E ; 45 -db $14, $14, $00, $00 +db $72, $2E, $FF, $75 ; 43 +db $CD, $5F, $CD, $5F ; 44 +db $6B, $CF, $24, $DB ; 45 +db $35, $35, $33, $33 ; 46 db $FF, $FF, $FF, $FF ; 47 - unused db $FF, $FF, $FF, $FF ; 48 - unused db $72, $2E, $72, $2E ; 49 db $61, $61, $14, $14 ; 4A -db $75, $0E, $2E, $2E ; 4B +db $21, $D1, $33, $33 ; 4B db $FF, $65, $FF, $77 ; 4C -db $10, $30, $01, $00 -db $72, $57, $FF, $FF ; 4E -db $FF, $70, $56, $FF +db $10, $30, $01, $00 ; 4D +db $22, $D9, $FF, $FF ; 4E +db $FF, $56, $CD, $FF ; 4F db $FF, $77, $FF, $75 ; 50 -db $14, $14, $44, $44 +db $14, $14, $44, $44 ; 51 db $77, $FF, $19, $08 ; 52 db $65, $75, $2E, $2E ; 53 db $50, $50, $40, $00 ; 54 @@ -87,19 +87,19 @@ db $00, $00, $10, $00 ; 55 db $74, $74, $2D, $3D ; 56 db $2E, $70, $4A, $5B ; 57 db $00, $00, $11, $10 ; 58 - split -db $10, $00, $10, $00 +db $10, $00, $10, $00 ; 59 db $FF, $FF, $FF, $4F ; 5A - Helmasaur King db $FF, $77, $FF, $75 ; 5B db $71, $6A, $FF, $74 ; 5C db $2E, $67, $75, $FF ; 5D -db $FF, $68, $57, $4B ; 5E +db $FF, $F8, $DC, $26 ; 5E db $FF, $FF, $7B, $FF ; 5F db $FF, $39, $FF, $2A ; 60 db $47, $45, $16, $16 ; 61 db $06, $14, $12, $00 ; 62 db $65, $FF, $75, $FF ; 63 -db $FF, $FF, $57, $71 ; 64 -db $FF, $FF, $71, $69 ; 65 +db $FF, $FF, $D9, $F1 ; 64 +db $FF, $FF, $F1, $69 ; 65 db $00, $30, $10, $00 ; 66 db $00, $10, $00, $01 ; 67 db $00, $10, $01, $00 ; 68 @@ -114,36 +114,36 @@ db $7A, $FF, $FF, $FF ; 70 db $65, $FF, $2D, $70 ; 71 db $44, $44, $04, $14 ; 72 - slight cheating I guess... db $74, $74, $2E, $4B ; 73 -db $00, $00, $05, $05 +db $00, $00, $05, $05 ; 74 db $74, $74, $4A, $75 ; 75 db $2D, $7C, $2E, $57 ; 76 -db $30, $00, $60, $60 +db $30, $00, $60, $60 ; 77 db $FF, $FF, $FF, $FF ; 78 - unused db $FF, $FF, $FF, $FF ; 79 - unused db $FF, $FF, $FF, $FF ; 7A - unused db $1E, $71, $4F, $4D ; 7B -db $77, $74, $77, $77 +db $77, $74, $77, $77 ; 7C db $2E, $70, $52, $51 ; 7D - warp tiles -db $FF, $77, $53, $2D ; 7E -db $77, $FF, $55, $FF +db $FF, $77, $DC, $BA ; 7E +db $A2, $FF, $CE, $FF ; 7F db $67, $70, $FF, $FF ; 80 -db $10, $01, $00, $01 +db $10, $01, $00, $01 ; 81 db $5D, $14, $01, $00 ; 82 db $74, $75, $2D, $2E ; 83 -db $04, $05, $14, $14 +db $04, $05, $14, $14 ; 84 db $4B, $72, $2E, $72 ; 85 db $FF, $FF, $FF, $FF ; 86 - unused -db $67, $2E, $54, $74 +db $67, $2E, $54, $74 ; 87 db $FF, $FF, $FF, $FF ; 88 - unused -db $70, $70, $FF, $FF +db $70, $70, $FF, $FF ; 89 db $FF, $FF, $FF, $FF ; 8A - unused -db $2D, $71, $2D, $70 +db $2D, $71, $2D, $70 ; 8B db $7E, $7F, $7D, $78 ; 8C db $71, $2D, $70, $2D ; 8D -db $FF, $4E, $FF, $FF +db $FF, $4E, $FF, $FF ; 8E db $FF, $FF, $FF, $FF ; 8F - unused db $FF, $FF, $4F, $FF ; 90 -db $FF, $65, $FF, $77 +db $FF, $65, $FF, $77 ; 91 db $00, $00, $01, $01 ; 92 - should it be split? idk db $2C, $2C, $77, $74 ; 93 db $FF, $FF, $FF, $FF ; 94 - unused @@ -156,44 +156,44 @@ db $FF, $FF, $FF, $FF ; 9A - unused db $72, $1E, $1E, $38 ; 9B db $10, $10, $01, $01 ; 9C db $1E, $72, $71, $1E ; 9D -db $FF, $65, $70, $79 ; 9E +db $FF, $DA, $CD, $79 ; 9E db $FF, $FF, $5B, $FF ; 9F -db $72, $57, $FF, $FF ; A0 +db $A2, $DC, $FF, $FF ; A0 db $70, $1D, $FF, $2A ; A1 -db $45, $45, $16, $06 ; A2 +db $45, $45, $16, $06 ; A2 - show paths somehow db $1A, $FF, $2A, $FF ; A3 db $FF, $FF, $4E, $FF ; A4 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 $DB, $76, $DB, $63 ; A8 db $17, $17, $16, $16 ; A9 -db $03, $00, $12, $00 ; AA +db $0B, $DB, $1B, $DB ; AA db $FF, $FF, $5A, $FF ; AB db $FF, $FF, $FF, $4F ; AC - Blind 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 $DB, $DC, $DB, $D9 ; B0 db $0E, $75, $0C, $2D ; B1 -db $1C, $62, $72, $4B ; B2 - split this monster somehow? -db $4A, $FF, $4A, $FF ; B3 +db $1C, $62, $22, $26 ; B2 +db $2D, $FF, $2D, $FF ; B3 db $10, $00, $44, $44 ; B4 db $30, $00, $10, $00 ; B5 db $65, $74, $75, $75 ; B6 db $74, $FF, $75, $FF ; B7 db $FF, $4A, $FF, $74 ; B8 -db $15, $15, $14, $14 ; B9 +db $2B, $2B, $14, $14 ; B9 db $73, $70, $FF, $FF ; BA -db $2D, $3D, $2E, $3D ; BB -db $7F, $2D, $73, $2D ; BC - block off entrances? +db $BA, $24, $32, $24 ; BB +db $7F, $BA, $A4, $BA ; BC - block off entrances? db $FF, $FF, $FF, $FF ; BD - unused -db $FF, $65, $FF, $4A ; BE -db $FF, $FF, $4D, $FF ; BF -db $2E, $67, $2E, $57 ; C0 -db $2E, $73, $2D, $73 ; C1 +db $FF, $DA, $FF, $A5 ; BE +db $FF, $56, $4D, $FF ; BF +db $32, $DC, $32, $D9 ; C0 +db $DB, $24, $25, $24 ; C1 db $11, $13, $01, $13 ; C2 -db $13, $00, $03, $00 ; C3 +db $13, $00, $03, $00 ; C3 - show layers db $44, $44, $00, $01 ; C4 db $75, $FF, $4A, $FF ; C5 db $10, $11, $10, $11 ; C6 @@ -204,18 +204,18 @@ db $FF, $FF, $FF, $FF ; CA - unused db $00, $03, $14, $07 ; CB db $13, $10, $07, $14 ; CC db $FF, $FF, $FF, $FF ; CD - unused -db $FF, $78, $FF, $FF +db $FF, $78, $FF, $FF ; CE - Kholdstare drop db $FF, $FF, $FF, $FF ; CF - unused -db $2E, $67, $2E, $57 ; D0 -db $4E, $4F, $1E, $70 ; D1 -db $FF, $75, $FF, $55 +db $32, $DC, $32, $D9 ; D0 +db $4E, $4F, $41, $CD ; D1 +db $FF, $75, $FF, $55 ; D2 db $FF, $FF, $FF, $FF ; D3 - unused db $FF, $FF, $FF, $FF ; D4 - unused db $75, $FF, $75, $FF ; D5 db $75, $75, $74, $75 ; D6 db $FF, $FF, $FF, $FF ; D7 - unused -db $FF, $75, $FF, $77 ; D8 -db $FF, $FF, $71, $71 ; D9 +db $FF, $21, $FF, $A2 ; D8 +db $FF, $FF, $20, $20 ; D9 db $FF, $FF, $5C, $FF ; DA db $14, $06, $14, $3F ; DB db $06, $14, $03, $00 ; DC diff --git a/dungeon_map/draw_rooms.asm b/dungeon_map/draw_rooms.asm index 0be9c57..e1eac54 100644 --- a/dungeon_map/draw_rooms.asm +++ b/dungeon_map/draw_rooms.asm @@ -60,6 +60,11 @@ DrawDungeonMapRoom: LDA.w SupertileRoomShapes+, Y AND.w #$00FF CMP.w #$00FF : BEQ ?.empty + BIT.w #$0080 + BEQ ?+ + AND.w #$007F + ORA.w #$C000 + ?+ CLC : ADC.w #$0340 PHA LDA.b $0E @@ -97,7 +102,7 @@ DrawDungeonMapRoom: LDA.w #$174F ?.write - ORA.w #(3-)<<14 + EOR.w #(3-)<<14 STA.l $7F0000+, X ?.done endmacro diff --git a/menu/map_icons.3bpp b/menu/map_icons.3bpp index ab68c7fe3cf6598c0323da043358374955b43ff0..3af636bf3bc2b109d68c1710ab5680fca950a0f4 100644 GIT binary patch delta 691 zcmY*Xu}T9$5S_bCPK_XlXvPyfkwrm4)Yc&30ul?c4MZ?lTsmz*OkIm9Hr0%+R%)ZM{$B>sZGZd28@syD6r@d1<+B*C(@h%{REN)rsKMuNRy+mEJc6Lm`g`PvUHJ-21Wn# zMI`P-$b9Ok9h4%=ZEz#}*9O;B)+$q^g-mlr>4 z%ZIrfwMk)ijS~zs5(u}BO2uL+4Cyl4#6jOO#6DlioI1YGVzlm|^iH+02|D%`~0b>K6zse9N@dNG3D#q=h~`s4$ENMRs%-Yk@qL_u+l?VVi3XtG&<9$0f}Q zXVXTSKt|dGy^hW1Q|?(=W-sn}Uvh8xTG03>cNlMsq2=+7xQ?wLBj)5cK;%6;89$%- KGZ{1fuEq~<%j5(A delta 525 zcmZXRF-yZh6vtogav^EKQfbYZL5g$`2T5lGih`ZQFHo?9IEk);P%=A6!(03W`T_g` zQg>(3Rk~UymvZsm-KC1=ad7=TpcVxHoas*$eO&pG70dw?HBL{8 znJiu;cD$rbcWo(|!R`~+x2JgIy)`SHydSm7aho0DvPf_k_;|+#*b-aV5$k_e4JZ5n zn?n2h<4tmL5K?J0$7V8}ert7n_1F3&xnLtRMnDUVdd}vb?re;XJEEr%61)~S`n;m$ zDg&AUW796CfsCnHy_7gyARY%j>QylLuinFb@a%CINxTdPtxxzeHHQqqYlLCry=z`S z3Is9))y L>WJ+qlpV!414OYL diff --git a/menu/map_icons.dat b/menu/map_icons.dat new file mode 100644 index 0000000000000000000000000000000000000000..be85915c716131319e2daa52cdf68d7ec0f52491 GIT binary patch literal 256 zcmWe&1Of&|Mt(L?Gk#%ZV*y4MW(Echb}m*m11>Rj2@s!?jf0)vK!AZC2ta&BHlTU~ L1_2PCVTc0&-wgvt literal 0 HcmV?d00001 diff --git a/menu/map_icons.pal b/menu/map_icons.pal new file mode 100644 index 0000000000000000000000000000000000000000..0becfb6c06288654d0fda8cd39c01c6af9573a82 GIT binary patch literal 768 zcmcJLF-YrB6o&uN(Qa;~ck7@`nVVYVB5Hk&OJ3gvRSR;w9?(Q382-EObf8w>`c(P%Q6 zOsCU0j^$-!9>ub-8Jf~OI&|nDRy020@m@8OMi6x-5i|DP4VWw z`VwA9$)F&Z&i)lKf#M*7jD|v(TG4v;x4uB>y9syZZkn-<=Gi37Q4B>&KOBw#D zh#YDag`K@$mC7Vk2s4CJY34B(j77ODvgQ_A^&CYdJ^0}Sm_*(~tBa&n6R;YH-QB>f zP}f1{3JqlNX6dHxEM1Rg=`8nQ*Ta(^t2Zr;;vw{+2pLI60(sspioqOJTVxL($of8a3vVQx|9RNyGR5Kzf|ssc(kNGNzs zDE8n+)qo;bgXr*8*+s_q{zlex?KCFy{z zeJViiv|mEpb?irR*!u$7Ivf7P$Il#I%J>9J*2wv3%92yC19 M1wonx9xRI5e{(>hW&i*H delta 426 zcmW;IK}%af5C`!8%x)!ksL+BeIao?I`RmuY&c~+@fDB?lV9woi?6X=VuZ&%Fr z1>2ko6$HPB4HZfcqKDo@5J6Jt)tiLXect{vhne5Z$)i7VZ@g{Fa1sPzo?!V7CW5Ks zod=B@Pzwru4=i!rq zGNULpesQ_X9&Ps)QbmZ5brc2$9Mh4exxp{L263+;veFTRgR QJwbMjpfbxyd*Ar=Jw+jYAOHXW diff --git a/menu/map_icons_2.3bppc b/menu/map_icons_2.3bppc index a20db9e57d8ea0d4bcff551c6421a06c84113c87..5c7be3fe719fe0ffc2ae09f1489268d5f7348e46 100644 GIT binary patch delta 567 zcmW+yJ!n%=7(L&;FKNK|7sXx@uxegK5Tc8S5G3TK)@BeC2d&r!f8vr=m&!}ZeSgVI zLt~tUg3c9j3J#JC4lYg##X(AW0lRc?kfgrn)$QF$40Rw9wHPAAqbddG6`-X zgb@f9!puT52kG=crr|T-qjMN!7A~V40u4V2BZB`(DY=`%C6psL5}X5E`Pk3ky+yZj zqHw@O9>tT{;S=v0a^-tMl*$LbwI3_$eZ*GI$xigfJNAs_bJAw zG;M0f+9dUa{ek#UWm-9Ss)N}mG~B}fZoA`KWt=$=S^ErgE?_OV3F{778)U^9EiO6-nFVxC z!wH$U$*DN7Q%c*p%Sf-O_=MNF>_g&3+;?Q=92LB2tD o)ixEO=D*UoY&2y1D^Od1&s$HKn~1d%uaYX;X4&l;l|zMakD| zm)A+RqHpB=pt=>`r1&TKpW$-^DMAGwFu2Z!zX36^$)8Qv=+a}HuHz5>%DYses-{(s zjjM>3!JWR@4^7oOgNPbnU6I}pvvMkqh4ZB*M9q10@SP3sBe;OJ19yi_H0JNHc$N9* zFiPRxCifY+B}Sc2RA(-Sn}SwW++P^I;Oair