From 9de69d03133dcf96394d2dd4b1a5a29b9cc4e24c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 30 May 2024 16:41:13 -0500 Subject: [PATCH] Added flute cancel X gfx to flute map --- data/preloadedgfx.4bpp | Bin 2048 -> 2048 bytes data/preloadedgfx.png | Bin 16626 -> 16662 bytes owrando.asm | 16 ++++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/data/preloadedgfx.4bpp b/data/preloadedgfx.4bpp index 1e6e942cbf6995d59ea8d96e2d1f6ac6ce67d45e..d6d45bb15e931e695b333ed8dcc812cc1c0fd791 100644 GIT binary patch delta 58 zcmZn=Xb{+-z^GtjQz!BN@c-vPJhM*1#)iQrtFfuVQ)=hS1 NUdbr2`7N_B3jpCl7cKw* delta 56 zcmV-80LTA;5P%S}0wVz(IDAz8*8cAP)_hbrH~;_uI4FE5{t*5s{wRC^II}peZ2o~zu!5(4}VpjP8CR@(DJd;qA;xppb|MPfspIIy2q{!q=xf zB!#io+WOK2`whS29Iw1-02(LU$QW*R@i($!yxPHT9A?<=-3sYVccCHqo4)G3SAVJ- zQaq%r{V}mdp=PsIURJ4dR(|$UNkAe&#_7DDR-s|KOOLFp<^zIk0WXW5M|bGh?Y6ZM zrM#Uc$8hXN>A;1wby>{05A7Bn!bD#H)XpAI-yaI7-@b1&+vm7?Y+AOdC(zp3S_fb^ z1_sn8)*L+5mnbv}kCJI`NCrIV=G%1u*PhNnM#q3#QPOGMZQBe;!0S@!AxG1az~}d3 znB-TxYbzHBmH{&akE>?uS<4MME#SjY)`IEFlD~PS>O~vNZRYoWEF&Z7z_M;rvE6MX_{Z~*9O zvwM}{GQRKWJt@dd78>&)WX)mUZ+Frbk~xr(Vf~wB+Ky#n z`ja&aLGO!4_a|07#h}%`%%jEnA8N!kcg5b2KaAkxjiFtH7S{$?vn;rJ-mz=xBgylI|^z&wVvmTS7z*4q> zKsvdqm|tAZ@~e3lFZlWWc9Y`Gti08Ri`c`mro*Unth-~Wkue&CFEo!htDbQsIPp&* zi=m|96F|aOV%0StS61Ho`1mJ3Lno$3m$|z0gF2JrB(5{m4&`T?D;Eb?wrHPS@$%OM z+0HA0KCSmt0sDet~3P@I{SCOZA`C9^(+xPQ24-B+<8~R}>@5{kNukM#)OPnycR@|?yg*~;)rC6Ow zDwq zH#{$RZE#IZI!Tiu2o$q&1cC!3H83(WGdDIdEj48_H7z$cG-54cGc__TF*If{W;SAD zG-Ek8lU@cu1vM}_Ff_AW2%`ZDGBs2%Fgi6bIxsYo3ko|6GBs2%Fgi6bIxsY|Q3@9_ z1cAYY6O(K_FMmQwL_t(|+U#5{Y}-H-{%)J(!mt(&+Gv(ikg>p$Nf}CDVTMWv4Fglu z!on7{(nz7%1`^3bHY`k8$fN|_Kz#1K^Z9BgX_cn$lcMzb-JPA}efR$C3MnNRFOTz^ zNArso0C3hnbm}z_{aOD|)LFmId?7@Y5s3HxyM1EQt$&B_KW+*my1nR&+^}G7Fw4JR zCHz<%92@`u#@90dke5-n7&DAwWw7G>=CP#D$4JdUB>>PdRKMbfc=eft zuybQJn~@KEc=VAnN`9uS6c0oW{BJ}~vtQ2n5dX-9EEWrL{-i_4N2fF-91iBI9Vtl)S=ZOW zWz;2xtRG)z4cmO1UJJF*Zm+xug9*|Iem6oEM}P3U(NlPkrcYs&MvmhBy45Jbvv`ok zb6xXYdOft7OgJxPf;5C8hYGa-AP52gfcNFM08n_0;(ajR>Q-!ef^9`QMwZ4(iThGsBUiKgxqpOt* zb7K_B6G$lw1HH_EVFbA?GkuZBuUvuS)av60&Q3eZKM_6@8Er z$#<;}f)VX&3}%bUjm?(3B_p56@mmiizn7h$NP0q+=2ESF1oo_|-_ zr_jo+jc+$!E|)8Vy_;9gANE>mOi4fNwcvRk^6QWW5k-hH!K_wyj99eRBU z?Sq6TCqzEEr+t(0_=?DJ9CHrBD1U?dAa-z>m!W$S?t>U$53*qbFND|&gW~5wm>^q+ z=XsD)l1FdfD!32A1bHzueYAF0a}e%>Si(-;F&JFtWe@VAP<@5B%#n)My9ZaX7<&WX z_lYOWvP@Lz>gt&w%|eml(OSJD&Db4s6#sU~k{2qS()+$Ib&}ZhOppdJ^ItV}s|I5? zkR%BqhDiXOIOf+jJ<=a>>h?8!Z0M^luOSZgt1q|XzC%J o%{#dd!q}I4ueM#q0)YPm0EUXqJWT%*ng9R*07*qoM6N<$g6Moqi~s-t diff --git a/owrando.asm b/owrando.asm index 1e91896..3c0c022 100644 --- a/owrando.asm +++ b/owrando.asm @@ -78,6 +78,8 @@ org $8ab7af ;LDA $F2 : ORA $F0 : AND #$C0 jml OWFluteCancel2 : nop org $8ab90d ;JSL $02E99D jsl OWFluteCancel +org $8ab816 +JSL OWMapFluteCancelIcon ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house org $868a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40) @@ -334,6 +336,20 @@ OWFluteCancel2: lda.b #$01 : sta.w RandoOverworldTargetEdge + rtl } +OWMapFluteCancelIcon: +{ + STA.b Scrap0B : LDX.b #$10 ; what we wrote over + LDA.l OWFlags+1 : AND.b #$01 : BEQ .return + LDA.b GameSubMode : CMP.b #$0A : BNE .return + LDA.b FrameCounter : AND.b #$10 : BNE .return + LDA.b #$7E : STA.b Scrap0D + LDA.b #$34 : STA.b Scrap0C + STZ.b Scrap0B + LDA.b Scrap0E : CLC : ADC.b #$04 : STA.b Scrap0E + LDA.b Scrap0F : CLC : ADC.b #$04 : STA.b Scrap0F + .return + RTL +} OWSmithAccept: { lda.l FollowerIndicator : cmp.b #$07 : beq +