From 6b84306b9f399e255035e4ace0824d93d45d55c7 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 30 May 2024 22:56:26 -0500 Subject: [PATCH] Various updates and fixes to Prize Shuffle - Includes colorblind support - Fixed HP heart refill interrupting boss cutscenes - Improved some QoL on map checks - Added new map GFX for flute spot cancel X --- Rom.py | 2 +- asm/owrando.asm | 16 ++++++++++++++++ data/base2current.bps | Bin 133594 -> 133641 bytes 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index f7c91289..6048605c 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'd72b50e97435c3f36b8278d2921e88a0' +RANDOMIZERBASEHASH = '87be9d9bd56b6ad8e4b9697ecfc31841' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 1e91896a..3c0c022c 100644 --- a/asm/owrando.asm +++ b/asm/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 + diff --git a/data/base2current.bps b/data/base2current.bps index b45c5fea3f33e6e27eb47591569748f8e762b026..8890dd420f348d675519c6fdea557da6e322f620 100644 GIT binary patch delta 1236 zcmW+!ZA?>V6n@{flzv=3T2QKBX-g4NWa6MyyhE)kb5aA_+{W;W4N@l{W@c)b=JHetrG1VRb610D%20ih&|HP8cWK}S5j1Vq`9n|4ts4(;OCFN=nn+=6I5 z1^D^Qge1D<1|R4VKSF;E8~o9VdlbeMAyC#HuF_HEdbH19tjOWD8u%E($yU; zzt*h`JDW;Ar*#x&yZ@_L(;v_%8EbJZ)HA{2LSAC5I9t8=l&!3fPC6~OInJ*04qnl? z6P@-M9&U^s-NvjoF2wRQ6<6)DW4SMYRKn~wYD*K!PoBZbPhJb%M2l$N*gP76=rwPX z{}6MX9`V+lxj_yxTGWvYLf`L$HPwV}1z`w+(oRqSdk!l#Q+;W)sp z1Rhhx@R&7bJvz_fl4R&gLFuZaAjR$hKq4tEHI&x27`o&KX(K4?G94$4Y&s%|FAUAc z0tCTd05}kX3_isGzm$Ip`lxA$BaKSwT^HXU@}Km@RR zhg>R<#{*{sX#BBl^Z`$J-h%eLf>z-N^2w@9#Jm-5)NaZ?Pgxc)P>QCTUiI1boTZiv zSi+x#EL!*G167qh+|S{QB0=jx?z1~1@##BW3kPK1VWOzazwZ$-x0^3DQ>W|Ihy7x1 z=Y3gRnxZjGMWwx^jbXBeO+?*U+ry-^w~%8V>eoXvd(jNliUs-zv!0~9%h>mFBji6_ z7#lIeDQQ+?n3fLKv1PvR%V480r8|F9KmTP(?y-_&p=#TiosALp&9(3op&1PL#@9ks zvhw5Dg-Y_omZYbNyAp>I?)IjbeNU@l4koTgX{{d=`{r+jQwr&C7WonP+}z|St7wKP zLSn@qzMN+05+s>7Pn?*P4fsddzGpSvCBE^!a5&X)J}P(rJ+?9w=Ybv1#0`f{sO!2* z?^cY-LTabxq+8`7s02?Th1EG{OHf~S`U^I3-4E<>J1iHzq(yAR4i~{SY>ER?*qwH} z;`d8nWQ``dgFWSdwW^E?h^SC%u(Ik_py5&|AtXTY)m^%3Hq!|UlJB$+2`y9Y|4}CY z=hQf%Ds6Xr@WZhXFR0nFw0+DJiq};QerhqWHYa>tkk`RZI^oM$dOe1;=$S{Z<2!R0 zI3sB2WML;P7N}RUC7p0u{Jx8<=x*rCIs%Ji9Wi6<5xa5qWe1xdgmZlLSGMgsN-dJM7y};2YQua@m|w+DhDJYCXPlPoP%_ am$P-xdE*kF{W&xxN`m@q^T<9fpbqN<{}EA`{Ai1x6>vLH$g11~(wWM6@m@h6sw~4m{wn zcrAb6FEB+UwIX3HIkjWV)gneATkK+#`ITm}$fk>{a~n}N*!g~WFM03%etCI$k8LL& zK*FsNiOUmurucYKmK@abCCdDT0E3RW`=F4o)6U`{9TitDP~cfJdz7b_-By5I{MOWB z0Frq32h#voH^48`nm`*LpI#0WpZXYVWWjd~uGtEqE*XSEpKf_wmCr5G5Mxd;)u+LN z5>|})39f+?QOsG4TSwVt>}o8CMt`)4{SxY+z`Q1QS32~LdHpJ3eF8y7r_u0|66$CgqorkarJa=e?6Vvwq-f| zjf@2qO0YO!vm3 zNzOn|U3MM26wqIyS3fr#7w)8d-q@waRtnHVoVxutH~t4hljkzGH-FNc+;}*R0vQdf zXiF6f%LC?^4E5#iYPoZITk;j|@K?-Q99g{Klrhdx+>k;t{L8@CVi|M1*IGig@`JyO z$`*?@1biVsD8<1LZ|y5fbgvLfpPb(pbJ82l)4zvEqLR!3CMfUUX%5h(D2(dOJ`kYg z{hRo6FXK(11l`OBF)Bm+3^dVQy^S8( zF7Uomx|@n>+MVl3s{l__v8++i0i*X(H`cmv%IQ~(MVzhESZz0r$sMT3G~-FH0bO`_ zN%7sj2O$@|!fqw$-Nk^(r>HK@+f|DLW`rXKex$aLV zIBb0x98C)9xHhl{1O61ks`uy4Rj#li=A(*-|=h#rS