This commit is contained in:
spannerisms
2021-04-05 12:48:32 -04:00
parent b95923fb9a
commit 70933b01f8
3 changed files with 10 additions and 6 deletions

View File

@@ -114,7 +114,7 @@ RTS
FixFrogSmith: FixFrogSmith:
LDA.l $7EF3CA : BNE .darkWorld LDA.l $7EF3CA : BNE .darkWorld
LDA.l $7EF3CC : CMP.b #$07 : BNE .done LDA.l $7EF3CC : CMP.b #$07 : BNE .done
LDA.b #$08 : ; make frog into smith in light world LDA.b #$08 ; make frog into smith in light world
BRA .loadgfx BRA .loadgfx
.darkWorld .darkWorld
LDA.l $7EF3CC : CMP.b #$08 : BNE .done LDA.l $7EF3CC : CMP.b #$08 : BNE .done

View File

@@ -106,7 +106,8 @@ macro SetMinimum(base,filler,compare)
?done: ?done:
endmacro endmacro
RefreshRainAmmo: RefreshRainAmmo:
LDA $7EF3C5 : CMP.b #$01 : BNE .done ; check if we're in rain state LDA $7EF3C5 : CMP.b #$01 : BEQ .rain ; check if we're in rain state
RTL
.rain .rain
LDA $7EF3C8 LDA $7EF3C8
+ CMP.b #$03 : BNE + ; Uncle + CMP.b #$03 : BNE + ; Uncle

View File

@@ -253,11 +253,14 @@ DialogResetSelectionIndex:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DialogItemReceive: DialogItemReceive:
BCS .noMessage ; if doubling the item value overflowed it must be a rando item BCS .nomessage ; if doubling the item value overflowed it must be a rando item
CPY #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
.nomessage
LDA.w #$FFFF LDA.w #$FFFF
CPY #$98 : BCS .done ;if the item is $4C or greater it must be a rando item
LDA.w Ancilla_ReceiveItem_item_messages, Y BRA .done
++ LDA.w Ancilla_ReceiveItem_item_messages, Y
.done .done
CMP.w #$FFFF CMP.w #$FFFF
RTL RTL
@@ -392,7 +395,7 @@ Sprite_ShowMessageMinimal_Alt:
STZ $11 STZ $11
PHX : PHY PHX : PHY
PEA ($00) PEI ($00)
LDA.b $02 : PHA LDA.b $02 : PHA
LDA.b #$1C : STA.b $02 LDA.b #$1C : STA.b $02