alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105 from spannerisms/master

Browse Source 
WOW
This commit is contained in:
KatDevsGames
2021-04-05 12:58:02 -05:00
committed by GitHub
parent b0dda07ce1 70933b01f8
commit 182b23d4de
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bugfixes.asm
View File

@@ -114,7 +114,7 @@ RTS
FixFrogSmith:
LDA.l $7EF3CA : BNE .darkWorld
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
.darkWorld
LDA.l $7EF3CC : CMP.b #$08 : BNE .done

3
darkworldspawn.asm
View File

@@ -106,7 +106,8 @@ macro SetMinimum(base,filler,compare)
?done:
endmacro
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
LDA $7EF3C8
+ CMP.b #$03 : BNE + ; Uncle

11
dialog.asm
View File

@@ -253,11 +253,14 @@ DialogResetSelectionIndex:
RTL
;--------------------------------------------------------------------------------
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
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
CMP.w #$FFFF
RTL
@@ -392,7 +395,7 @@ Sprite_ShowMessageMinimal_Alt:
STZ $11
PHX : PHY
PEA ($00)
PEI ($00)
LDA.b $02 : PHA
LDA.b #$1C : STA.b $02