From f933849fbf5dc838d2697636b8c1a5ea31bfea63 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 25 May 2024 03:13:26 -0500 Subject: [PATCH] Last Prize Shuffle changes --- data/preloadedgfx.4bpp | Bin 2048 -> 2048 bytes data/preloadedgfx.png | Bin 1919 -> 16626 bytes menu/overworldmap.asm | 45 ++++++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/data/preloadedgfx.4bpp b/data/preloadedgfx.4bpp index 7b0b8ef51469ff75e96b01249ae641441fa9c0de..1e6e942cbf6995d59ea8d96e2d1f6ac6ce67d45e 100644 GIT binary patch delta 171 zcmZn=Xb{+-#5g&LQ9+x5Lq^Gt!Oqc+K}LyzgMopA!_LmkF1g;!&d!bl$hTlHfkKPP zYZ=8iw=m8FYGhX8lwg2Dps+Nf!Q@P4b6*Cam<|xyfJp`h8=Jbi|4>j@XJf+v7RM)V O0W+1sX7gKSVHN;oa4RAJ delta 111 zcmZn=Xb{-MlEgS!iBVy56XOELi2@Fjm6(+#w=m22+A!2H{D;Ci1{($j8;Lrd|2qF| afLI48fGMwoBG15J!5{&Ho8K}Evj70i$|7q3 diff --git a/data/preloadedgfx.png b/data/preloadedgfx.png index 0e20e3937843d1369503747383d523888ab69848..3aa855c5c8f3f055eea2d96fa2997a74e9663b80 100644 GIT binary patch literal 16626 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 K)%!7X7yk$RZ`N}F delta 1288 zcmey=$oQXcf{L1CiEBhjaDG}zd16s2gJVj5QmTSyZen_BP-P=q8Xgk@8Nt01w z@?2&KCR?S+`OG>ZN(vRZ1-`ykF8Rr&xv6<2o-RNMd2S6An1p9uaY5=JYXb#>lc$Vf~` z=n9M2vB*`5(?ljib+e>cecGCopsu{Sb^2BBi_+C2AEmte?m4yiUrlHB{`dFhukAJD z%8;9HcVG1O`}p%+Z@=En|L&HNuJc1by}jxG^q*0$CkVc{UN`^V!I16xEJBX^=1M2p zU3+S0^yW}SKHJ6_<(3{i#ut*-*|>dreeQhgry_@a0d_VTrA3Rn&+p9G^Z$H(iIr%Q zl}(klXzD%h&{yt;{{(799>?G8KlRh=zo5F&?6XJSFSo7y^Wc$3kAHGytlM*8L%;p9 z9fd|SyFN!1M*veNkFCln?B}bPT$HrN0WuIAQuLzzbcYGtC z%FQ*Grp$2Y2${O1`{$9}iZbg{ZnDhX!~RsML02l_=nbuT^XG>yzZ|(D>E^3xt-)Aj*+)+(pW|5l{j-k$ zw%c_`o!WQoXNlUejhERA*B4v$JPDOg_qZh8_M+Ir{N##y2l*qPVq}&YJX1PxG_mF< z?`N$?zn!0_6$^ZEeBk&^ZuUCAwNoZ6;@`wjF+o^>tt7kL(@o2;K~5*`)`iMeG?FJCMd8k=>O#s0kGiS8RQEE`;z*GNRS>K(E8=TpY0wf=D4G!ZTfsj( zyy^TEf5Woh0(%#pncOzrNPTzhls^?$R@cctS)_hme`@W7y#4ye{&v2Z-Q%`BX^skK zkwAjri{=B(3||+D{Zin2;MlK{$oyN?`qR&dBZaDT;?MGu)C94hSR z{V2e3!E51_%83_t8|(EO>0hu4*=yk@Q(wEYubmyJyC>AvMfL)a_4&=!Wve4v_A~J? ZIQjZ^eSQ0&j{yigUHw>H);T3K0RZw{E)@U( diff --git a/menu/overworldmap.asm b/menu/overworldmap.asm index a85fc1c..1423344 100644 --- a/menu/overworldmap.asm +++ b/menu/overworldmap.asm @@ -88,6 +88,8 @@ dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, .tr dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FFFF +; FREE: 0x20 bytes, for any future usage of extra icons ^^^ + warnpc $8ABF36 org $8ABF36 ; vhpp ccco tttttttt @@ -115,20 +117,20 @@ db $00, $00 ; ; Ganon's Tower warnpc $8ABF52 org $8ABF52 WorldMapIcon_dungeon_tile: -db $22, $7E ; white H ; Hyrule Castle +db $1A, $7E ; white H ; Hyrule Castle db $00, $00 ; ; Sewers -db $24, $7F ; blue 1 ; Eastern Palace -db $24, $79 ; blue 2 ; Desert Palace -db $22, $7D ; white A ; Agahnim's Tower -db $22, $79 ; red 2 ; Swamp Palace -db $22, $7F ; red 1 ; Dark Palace -db $22, $6F ; red 6 ; Misery Mire -db $22, $6C ; red 3 ; Skull Woods -db $22, $6E ; red 5 ; Ice Palace -db $24, $6C ; blue 3 ; Tower of Hera -db $22, $6D ; red 4 ; Thieves' Town -db $22, $7C ; red 7 ; Turtle Rock -db $22, $66 ; skull ; Ganon's Tower +db $14, $7F ; blue 1 ; Eastern Palace +db $14, $79 ; blue 2 ; Desert Palace +db $1A, $7D ; white A ; Agahnim's Tower +db $12, $79 ; red 2 ; Swamp Palace +db $12, $7F ; red 1 ; Dark Palace +db $12, $6F ; red 6 ; Misery Mire +db $12, $6C ; red 3 ; Skull Woods +db $12, $6E ; red 5 ; Ice Palace +db $14, $6C ; blue 3 ; Tower of Hera +db $12, $6D ; red 4 ; Thieves' Town +db $12, $7C ; red 7 ; Turtle Rock +db $12, $66 ; skull ; Ganon's Tower ; db $22, $68 ; red X warnpc $8ABF6E @@ -375,7 +377,8 @@ WorldMap_LoadChrHalfSlot: LDA.b #PreloadedGraphicsROM>>16 : STA.b Scrap02 REP #$20 LDX.b GameSubMode : CPX.b #$07 : BEQ .not_flute_menu - LDX.b #(.list_end-.list_flute)-6 + REP #$10 + LDX.w #(.list_end-.list_flute)-6 .next_flute_group LDA.l .list_flute+4,X : TAY @@ -386,7 +389,8 @@ WorldMap_LoadChrHalfSlot: BRA .return .not_flute_menu - LDX.b #(.list_flute-.list)-6 + REP #$10 + LDX.w #(.list_flute-.list)-6 .next_group LDA.l .list+4,X : TAY @@ -396,17 +400,16 @@ WorldMap_LoadChrHalfSlot: TXA : SBC.w #6 : TAX : BPL .next_group ; SEC is always set .return - SEP #$20 + SEP #$30 PLB RTL -; from (bank $A2 only), to (bank $7F only), length (limited to 8-bit) +; from (bank $A2 only), to (bank $7F only), length .list -dw #PreloadedGraphicsROM+$180, $7F1180, $80-2 -dw #PreloadedGraphicsROM+$380, $7F1380, $80-2 -dw #PreloadedGraphicsROM+$360, $7F1320, $20-2 +dw #PreloadedGraphicsROM+$140, $7F1140, $C0-2 +dw #PreloadedGraphicsROM+$320, $7F1320, $E0-2 .list_flute -dw #PreloadedGraphicsROM+$160, $7F13C0, $20-2 +dw #PreloadedGraphicsROM+$120, $7F13C0, $20-2 .list_end warnpc $8AC3B1