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
This commit is contained in:
codemann8
2024-05-30 22:56:26 -05:00
parent 68ee8262ea
commit 6b84306b9f
3 changed files with 17 additions and 1 deletions

2
Rom.py
View File

@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'd72b50e97435c3f36b8278d2921e88a0'
RANDOMIZERBASEHASH = '87be9d9bd56b6ad8e4b9697ecfc31841'
class JsonRom(object):

View File

@@ -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 +

Binary file not shown.