From aae220fb4683831e6d4c6aefd8aa00076183a7f6 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Wed, 7 Jan 2026 20:09:35 -0600 Subject: [PATCH] Update supertiles, fix incorrect linkpoint --- dungeon_map/blink_loot.asm | 2 +- dungeon_map/data/supertile_shapes.asm | 12 ++++++------ dungeon_map/dungeon_switch.asm | 8 ++++++++ menu/map_icons.3bpp | Bin 4608 -> 4608 bytes menu/map_icons_1.3bppc | Bin 640 -> 650 bytes menu/map_icons_4.3bppc | Bin 533 -> 718 bytes menu/map_icons_b.3bpp | Bin 4608 -> 4608 bytes menu/map_sheet_d4.3bpp | Bin 1536 -> 1536 bytes menu/map_sheet_d4.3bppc | Bin 593 -> 593 bytes 9 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dungeon_map/blink_loot.asm b/dungeon_map/blink_loot.asm index d0e65e1..db8f671 100644 --- a/dungeon_map/blink_loot.asm +++ b/dungeon_map/blink_loot.asm @@ -8,7 +8,7 @@ BlinkLoot: BNE .hide LDA.b FrameCounter - AND.b #$10 + AND.b #$20 BEQ .show .hide LDA.b #$01 diff --git a/dungeon_map/data/supertile_shapes.asm b/dungeon_map/data/supertile_shapes.asm index 8d2434b..ad18f93 100644 --- a/dungeon_map/data/supertile_shapes.asm +++ b/dungeon_map/data/supertile_shapes.asm @@ -18,10 +18,10 @@ dw $C340, $8340, $4350, $0340 ; 10 dw $83B7, $C3AC, $03B7, $438A ; 11 dw $C354, $8354, $4354, $0354 ; 12 dw $FFFF, $83B7, $FFFF, $03B7 ; 13 -dw $C351, $8341, $4351, $0351 ; 14 +dw $012E, $012F, $013E, $013F ; 14 dw $C374, $8340, $4341, $0340 ; 15 -dw $0108, $0109, $C3B2, $83B2 ; 16 - gross (add middle section if feasible) -dw $C104, $0103, $4104, $0104 ; 17 +dw $0108, $0109, $436B, $036B ; 16 +dw $C114, $0104, $4114, $0114 ; 17 dw $C3B5, $FFFF, $43B4, $FFFF ; 18 - useless fairy drop dw $FFFF, $8369, $FFFF, $035A ; 19 dw $03E7, $03E8, $03F7, $0361 ; 1A @@ -37,7 +37,7 @@ dw $FFFF, $FFFF, $FFFF, $039B ; 23 dw $4365, $0365, $0364, $0365 ; 24 dw $FFFF, $FFFF, $FFFF, $FFFF ; 25 - unused dw $039B, $03E4, $4363, $0382 ; 26 -dw $C104, $0103, $4104, $0104 ; 27 +dw $C114, $0104, $4114, $0114 ; 27 dw $C3A5, $FFFF, $4358, $0348 ; 28 dw $FFFF, $FFFF, $FFFF, $0396 ; 29 - Mothula dw $C350, $8352, $4350, $03F8 ; 2A @@ -117,7 +117,7 @@ dw $038F, $038F, $839B, $0366 ; 73 dw $43B2, $03B2, $43A8, $03A8 ; 74 dw $038F, $83B4, $0365, $03B5 ; 75 dw $838A, $03F4, $03B7, $C399 ; 76 -dw $C370, $8340, $43A0, $03A0 ; 77 +dw $0126, $0127, $4137, $0137 ; 77 dw $FFFF, $FFFF, $FFFF, $FFFF ; 78 - unused dw $FFFF, $FFFF, $FFFF, $FFFF ; 79 - unused dw $FFFF, $FFFF, $FFFF, $FFFF ; 7A - unused @@ -133,7 +133,7 @@ dw $038F, $83B5, $4365, $43B7 ; 83 dw $C344, $8345, $4354, $0354 ; 84 dw $C38B, $C39B, $03B7, $439B ; 85 dw $FFFF, $FFFF, $FFFF, $FFFF ; 86 - unused -dw $8399, $439B, $4394, $838F ; 87 +dw $0136, $0117, $4394, $838F ; 87 dw $FFFF, $FFFF, $FFFF, $FFFF ; 88 - unused dw $C3B0, $83B0, $FFFF, $FFFF ; 89 dw $FFFF, $FFFF, $FFFF, $FFFF ; 8A - unused diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm index 34c1e58..317c65b 100644 --- a/dungeon_map/dungeon_switch.asm +++ b/dungeon_map/dungeon_switch.asm @@ -72,6 +72,10 @@ DungeonMapSwitch_Submodule: SkipMapSprites: STZ.b $00 + LDA.b $02 : PHA + LDA.b $03 : PHA + LDA.b $04 : PHA + LDA.l DRMode BNE + LDA.w $0200 @@ -80,6 +84,10 @@ SkipMapSprites: JSL DrawEntrances + + PLA : STA.b $04 + PLA : STA.b $03 + PLA : STA.b $02 + STZ.b $0E STZ.b $0F diff --git a/menu/map_icons.3bpp b/menu/map_icons.3bpp index a8fa0d5ca06aaf330f079f31432a33f85e66d6ed..67e769159ce202ab584f5b99e06d0b9191395486 100644 GIT binary patch delta 36 hcmZorX;9g~!6N>L;U5xYU`R=00)l^=(^b delta 15 XcmeBTZD8GSl#zMnGUmyb7cI7jHRbk0M@TT{4BlZVweH zix*G+0{sa}k5Y;Ur8jrcu=P+%te2p}jQax~@4Ywl$hvz4@UR39;S9aZd+xz&cLu>G z5Tl_A>a-WvK1I{I_#-&S{_65=xa$hVP24anActbHqA|-CkZuM%FNHnMe1m{lbwrga37;#NK}c~b#j_F}1MF4a&4U<&z$!ss0d z4A|pka_d?_4I_i>LzR2P&JJzkAZ69Z@gvd~=-!8px@a+W0-P|0mnQlU3teETlZ4@b zy-E`*bIw`*S`tQij2)snql%cHu(ehECL{~zG2XT~6Tie~{+IvbFC30Q dU*=p7R){)Qj+#hQPULrYDvOCl=Z&*U{|9Hjt)Tz_ delta 300 zcmWm4F-rnb00;2@d++XqkTV)0!fwdNVN=r5632mu<#cm6==7Wdv8j^xhIdj!4I=Fg zeGu^jIMom?BBD#gbz{i0T7Uc|_Oo>|s{jfynovyUdWD+;RHs!vk7K}Kj<38K$ytzk zDU7!>o@d$M*e};$bQvXT0}_Tu#)`Pyf?PVzQV4))0#=DD19iEd7u-vORHml$gG^rm zILvZg$2EiR-Gh;Ww+^DUVRCJH`jv14SvREdlDNbQbFOe1W_6#9|m zxL5%z!5@GKikv}jgN0$6KeeFWiS8mv*y0nG3u(3g3fc*ywtL$M!$w;7slH%U1=>XX d?_5;F)^*>d#O(E#q+g_LOr1&k;nP!WegURgWa0n- diff --git a/menu/map_icons_b.3bpp b/menu/map_icons_b.3bpp index 5646bdf4ef4c1429786908840d944f45cc1a36ed..51416348ef8415572a4e080d66db61f7fe0438e4 100644 GIT binary patch delta 488 zcmYjNJx>Bb6r4L0EG}L&kx(6pxkyJ&u_WvzbjF0%k_zm#IFZ~^X)E#*>?QsKLSbQu zouLzAj93_QV&Mfhd%oqvxYN9ynfKo0HSC6+1x%#Dz!P=TGtW$zDW_U0m4J{SAwLR% zML@W={xWH1_cs^3K^j5vcc(krmK78NSr*h30GLcB6(be2+FDW@w(hlUbE)XM9#_h@ zmP>jNvmp{b@_^Ti>)ndo+SNPPu>+n*v_PIz+a3WU+r~UD_zcvQcFL|>CH{Xfia^11 zodPPqF?VyEEd1`F@-MebJkr;QQ?@;7n7`)q(qZrt5gW2GYuDTLTb`*#j0q75Sm7WT z1pV+yDhT-%gi#c=8Y{;~oX%;{47*Zv%Q;o~kSTR60Z+~LyL!B*D(f$quXrn0c8fkP z2-2DRLv&E9sgrqb^YhAS@G*bq4{XYQ*m;71b}|-KGn(wngdB*N7>MVgP&~zad%f9M GHGTnd5V_j` delta 263 zcmZorX;9H)V5n#CXNYI0XRc$f;jiRps4qxxcK7#ZVED)Ih~XX2zXNp->^{hSVE88| zbm-AUJrg0QI8Yu0LE;-r)EGtWKGc2qSMZDB6G)KZ)2B~GY<&MFuV)lvJTUnfqY^(% zh6xBjGT#}EC$q3!o5bwpTE}pk;Xe@GW~gJZVNgkX&cN_IO$F{UpbP7P;vknfIHUu` zkzD|^3+MtSrhk(e**;EgV98LA2l}TDD6Ep^?2u3lV%0JHllaE~asY_OPm&i1Mse) F0RNUA60HCL delta 47 zcmV+~0MP%@1knVrDgq}o0E62CLl^*$!vv4l1cl55A{dJG1fBH+On*O%l>m&i1Mse) F0RNVH60iUO