alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge branch 'master' of https://github.com/mmxbass/z3randomizer

Browse Source
This commit is contained in:
Karkat
2018-03-29 23:11:58 -04:00
parent fd52a1c20b b1dd967864
commit 6b40d650c7
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
darkworldspawn.asm
View File

@@ -53,6 +53,7 @@ JMP DoWorldFix
.pyramid .pyramid
LDA #$40 : STA $7EF3CA ; set flag to dark world LDA #$40 : STA $7EF3CA ; set flag to dark world
LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog
.done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
FakeWorldFix: FakeWorldFix:
@@ -76,9 +77,9 @@ FixAgahnimFollowers:
JSL PrepDungeonExit ; thing we wrote over JSL PrepDungeonExit ; thing we wrote over
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
macro SetMinimum(base,compare) macro SetMinimum(base,filler,compare)
LDA.l <compare> : CMP.l <base> : !BLT ?done LDA.l <compare> : !SUB.l <base> : !BLT ?done
STA.l <base> STA.l <filler>
?done: ?done:
endmacro endmacro
RefreshRainAmmo: RefreshRainAmmo:
@@ -86,19 +87,19 @@ RefreshRainAmmo:
.rain .rain
LDA $7EF3C8 LDA $7EF3C8
+ CMP.b #$03 : BNE + ; Uncle + CMP.b #$03 : BNE + ; Uncle
%SetMinimum($7EF36E,RainDeathRefillMagic_Uncle) %SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Uncle)
%SetMinimum($7EF375,RainDeathRefillBombs_Uncle) %SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Uncle)
%SetMinimum($7EF377,RainDeathRefillArrows_Uncle) %SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Uncle)
BRA .done BRA .done
+ CMP.b #$02 : BNE + ; Cell + CMP.b #$02 : BNE + ; Cell
%SetMinimum($7EF36E,RainDeathRefillMagic_Cell) %SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Cell)
%SetMinimum($7EF375,RainDeathRefillBombs_Cell) %SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Cell)
%SetMinimum($7EF377,RainDeathRefillArrows_Cell) %SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Cell)
BRA .done BRA .done
+ CMP.b #$04 : BNE + ; Mantle + CMP.b #$04 : BNE + ; Mantle
%SetMinimum($7EF36E,RainDeathRefillMagic_Mantle) %SetMinimum($7EF36E,$7EF373,RainDeathRefillMagic_Mantle)
%SetMinimum($7EF375,RainDeathRefillBombs_Mantle) %SetMinimum($7EF343,$7EF375,RainDeathRefillBombs_Mantle)
%SetMinimum($7EF377,RainDeathRefillArrows_Mantle) %SetMinimum($7EF377,$7EF376,RainDeathRefillArrows_Mantle)
+ +
.done .done
RTL RTL

1
events.asm
View File

@@ -21,6 +21,7 @@ OnPlayerDead:
PHA PHA
JSL.l SetDeathWorldChecked JSL.l SetDeathWorldChecked
JSL.l SetSilverBowMode JSL.l SetSilverBowMode
JSL.l RefreshRainAmmo
PLA PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------