From d96f88cf5ce70b183d7b11a58dbe5ba41d831f9a Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 9 Jun 2024 16:13:50 -0400 Subject: [PATCH] update dark link gfx and fight --- Sprites/Bosses/dark_link.asm | 22 +++++++++++----------- Sprites/Bosses/dark_link.bin | Bin 8192 -> 8192 bytes 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Sprites/Bosses/dark_link.asm b/Sprites/Bosses/dark_link.asm index 6492c10..b94034e 100644 --- a/Sprites/Bosses/dark_link.asm +++ b/Sprites/Bosses/dark_link.asm @@ -38,7 +38,7 @@ Sprite_DarkLink_Long: ; ADD GANON CODE if subtype == 05 LDA.w SprSubtype, X : CMP #$05 : BNE .NotGanon - JSR Sprite_Ganon_Draw + ; JSR Sprite_Ganon_Draw JSL Sprite_CheckActive ; Check if game is not paused (Prevent timers from running if game is paused) BCC .SpriteIsNotActive2 ; Skip Main code is sprite is innactive JSR Sprite_Ganon_Main ; do ganon instead @@ -92,13 +92,13 @@ Sprite_DarkLink_Prep: { PHB : PHK : PLB - REP #$20 ; P is still on stack, so we don't even need to fix this - LDX #$20 - -- - LDA DarkLink_Palette, X : STA $7EC600, X - DEX : DEX : BNE -- - INC $15 ; Refresh Palettes - SEP #$20 + ; REP #$20 ; P is still on stack, so we don't even need to fix this + ; LDX #$10 + ; -- + ; LDA.l DarkLink_Palette, X : STA $7EC600, X + ; DEX : DEX : BNE -- + ; INC $15 ; Refresh Palettes + ; SEP #$20 PLB @@ -765,7 +765,7 @@ Sprite_DarkLink_Main: LDA #$01 : STA.w SprMiscA, X %ShowUnconditionalMessage($016F) - LDA.b #$1F : STA $012C + LDA.b #$15 : STA $012C .nomessage ; IF health is a certain level spawn crumbling tiles @@ -1533,7 +1533,7 @@ GanonInit: LDA $03 : STA.w $0D20, Y LDA.b #$30 : STA.w SprTimerA, Y - LDA #$1E : STA.w $012C + LDA #$1C : STA.w $012C RTL } @@ -1551,8 +1551,8 @@ Sprite_Ganon_Main: Wait: { - JSR ApplyDarkLinkGraphics LDA.w SprTimerA, X : BNE .wait + JSR ApplyDarkLinkGraphics LDA.b #$30 : STA.w SprTimerA, X %ShowUnconditionalMessage($46) %GotoAction(1) diff --git a/Sprites/Bosses/dark_link.bin b/Sprites/Bosses/dark_link.bin index 0b532041098510bb86d3f6107abe1767b86b404a..98ba23c5b74ccba4c7b9208a43756455e08b1e4b 100644 GIT binary patch delta 2243 zcmb7FL1^1%6n=_a|59XGO6^)otXN(HwFg_{C51Yx7wb^ktqkVw)I(T(8-v1BR$9}A zS+|B==2koG5SWi0^q{VT=1_(XV}z|Rw})X$U^?XBLfEtsRxymd_senOxG>oNgY~}m zz4!k2zxV&YEyFTo*c&WFSe_ge?W>H+d2q>l)V{HSU?wWT8`8OQD7x^SyXu4@0hP?@ zq3FRgZ@GL)=Zx&&YpSi)a$AF zlpYnLgerE-wr5)1O1ItdLyP0HxtWwOh{95f>l-`!Q36y5WjUwnq9O`}+`f8D=yKa? z;B=gp=ON_ZN-QZ$N?w*RM}>d1x!zgtBsnfbI;Tl7mHjeM~g(_ zj2=f>opYh-%HG||{?_({O{Z^tMRI8!7+g$B;@Ty*)b6$e2uu@Q)6p0Rkz?`OSCg>_ z#3PwVlIzI6i_}a=C8Z%1M=F4BHKb(7%kwnnnJ5QIZkHxJ6Q$aZ3sgKe(2nN=z!RQK z9+_qH%2ITB`enZ1HM}pqH-C8l-d1&krjeQ)xM*xrpzy+h#khB!?Hm1SeNu_*>=~`7 zkMrHN-S&3zvD0pvRx4{Z!<;>6H8&j;wON|;xKARkk_@lMCA3h8?*@=>1t?GRX`%@_ zmx<91C}gX;y4I0tNvHWDNs|=%4494?R85O+Wty+$PD>d^*<-G41Wv&XnIq-2#uBti zlbTa=HVd`T{#5!*Qjt^=t}d)s^Zuq^bb~?xyGc+DYizG_Am- z1s|m-BLCdF`Pq;YQsRPGmdm1!j|Hw*X;zv(1WsUC=sL$J_^UJY%Ezio;&4)kbp3S!~?*F(1^vxVRIWNSY zAO7NuueR0c<@?b;Qa$IddrxULzvHXk zF1K1NVc0v8D=6H4Y}%DuH*b9Yg-;twZ>e&UIWz#6L({Tc*BF_0L0%L&Rm~Uk#Y?q{ z>G-xO&$0~5+LoM*X?-ySDncYx`)aH*{N`nq_-z-!4o& zsqe2o0TFsxM<$CE9IoxUS&+fQf3kz=g%zd&CfFz|u+)E$KZ_F98Bx=#dWP$|77ha} zj4+5{p==>vj}lQz>(`f8w6jn|1px_kScX!F0H`af_lFz0?L+vGtm_ZTZ$n{EMWBvz zhyV({>mFDG__%?Qu>fD|O)y3@^+O1t*Bc>G?AiB|Pwa{01>0hh1p*vdls=iSSRdDftu@O`{jaK%-{nSMUJ@q>&13y{eH23N0dhx|d|J^!09gb0R0`pO) OyBQ2kPdu1Vd*olVK0x{a delta 2771 zcmahLe{36P^_}nHJKJa98GH6MImg!~BZfNjwT-e{7ZOt<8n$S4w~1AdHr^W1GKIx# z6|zK%Pt*R0#01T*K+#6yKPJQ7T3SP|j z-Ni}f6!Cqs?tSmQ@4ffEpH|aqng_H9a1$)4(4*4%XQzW<)_|NkT)Ny7zg;+w&m^J` zld}hBvX}SZvkuRxg_p1NI`oM5CAhJ3c;5-3*Mq3T`1Y~lm0qsezksEGagjhnfcP#| zd#XM%H}ORpKI!PTU>qwByj$PEHvq*Ya!W z+fU#5_VX86(_H7}!FG{-D!2y782Po<_6Gav7-Ik1t-kxS54hS%zf1Hv(tog~AodUL zM4qqRpM5TqNp-}cejn{72wR^Us4W(M?)9$B&)zI88d+7f@mY|z(0}>;*T)L{fEW*O zBsm=n`D07J{@(eq>xqiAC>a>xYYF*zPM}2}2k5~eu3TD~qAbc1jTK=*QIHQ<8rlgd zuF(BE1_H?2UojxBCKqeaKYychi!vL0oaVW`{zSB=E$+yBvvN_NJl9ugU0xDzi{kX* z9Sj8&$*fIps`jL?v9V0E1MQC-VEP7dB&EC(&_0RAH?9-Ip~O8`=r6$__nz_+hk6mpV)I$ znG}=;dgD7;T0QmRtI0)0*O99|Kia)GQ8_V=gBA76jGunlx6-epKt;QMF>x*R>7f_9 zWiA=o$BG*Q8o>M2pRWA;?h9v!OF0#Z3i*%6cgB;UC%aER+$D$z;k)$VJC%_lYxa~a zq{^>N{3C9RX5&1^I=OLcW!ajyIxEAaQ&Wf|)O{^=JT9S)Rd$HmRo+^eM;9oIH5F`Q z$RA|{E*RiBk#v%&dnz|((|gME%DG&wVe7_sTejRWm#x8B%EH<5u_$U+TVfQ?wy`+K z42X=FNSLkx>f_KGJ+z%A8_&T&CHuQfxwKd`pqSRz zi*hT&uO|L|$edU@nnO-)V*^`BHvG@(mAhQ^;GY60P8E5Z%L=d=H<1k8M}QMX%3@Gd z%G(7%gxej>#xp6D=cwMuZ3g62-e63|lyw6nU2mfMVXFY`a7*N?*^_55zoIWFZ{+h$ z`~dB=qfepjhWf;XJ{>FgU+fY8?(p&0Q{9iaF*}zjmgP#ZT$)YW(orRN3HUOR@5*-_ z-Gy7d4ziwCYfO#7;gleg%%t{l7#5)O$aB~K`Y+A&h1m?62c4~n=nmS0fU9M%71I?Z%RLLt2AcGa3G$0aXjPgn+qsVM(lk(R6orXdUM*~BbD`;rXTs*jKHt!cW-pJt zgsj=vj?XYZNzjDPzVFyiB1yCzGXq(IWPplx8vTrQ8ThOs`30KbTyg3r%m@qu9w9Ue zb{zWAL!5!4+iZxizM9V`V1}Gyhd^GZ(@;RWaRM-Py>Zq4n#lYuD-1JGM3!x?0;IKP zJu&SCPrH^5UC>Jlq5DY2de`T_541nS__vqr2+R|Cj0?aY3oJTZ-worz08S zwMg1WqYmUEuqOyq?2muzodcH!|GeCG&s!%7=#|ZD_L)&5_1R~SzIUmv)>X5a3|ZBb SOvBKTJCTZKh__wB8vS2Ojd!vD