Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts: # LTTP_RND_GeneralBugfixes.asm # bookofmudora.asm # build.bat # catfish.asm # compasses.asm # contrib.asm # darkworldspawn.asm # entrances.asm # events.asm # floodgatesoftlock.asm # flute.asm # framehook.asm # goalitem.asm # halfmagicbat.asm # heartpieces.asm # hooks.asm # inventory.asm # invertedmaps.asm # itemtext_lower.asm # lampmantlecone.asm # mantle.asm # msu.asm # music.asm # newhud.asm # newitems.asm # pendantcrystalhud.asm # ram.asm # rngfixes.asm # roomloading.asm # shopkeeper.asm # stats.asm # stats/credits.asm # stats/creditsnew.asm # stats/statConfig.asm # tables.asm # tablets.asm # utilities.asm # zoraking.asm
This commit is contained in:
aerinon
89
rngfixes.asm
89
rngfixes.asm
@@ -2,56 +2,54 @@
|
||||
; RNG Fixes
|
||||
;--------------------------------------------------------------------------------
|
||||
RigDigRNG:
|
||||
LDA $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart
|
||||
LDA.l MiniGameTime+1 : CMP.l DiggingGameRNG : !BGE .forceHeart
|
||||
.normalItem
|
||||
JML GetRandomInt
|
||||
.forceHeart
|
||||
LDA $7FFE00 : BNE .normalItem
|
||||
LDA #$04
|
||||
LDA.l MiniGameTime : BNE .normalItem
|
||||
LDA.b #$04
|
||||
RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
RigChestRNG:
|
||||
JSL.l DecrementChestCounter
|
||||
LDA $04C4 : CMP.l ChestGameRNG : BEQ .forceHeart
|
||||
LDA.w $04C4 : CMP.l ChestGameRNG : BEQ .forceHeart
|
||||
.normalItem
|
||||
JSL GetRandomInt
|
||||
AND.b #$07 ; restrict values to 0-7
|
||||
CMP #$07 : BEQ .notHeart
|
||||
CMP.b #$07 : BEQ .notHeart
|
||||
JSL.l DecrementItemCounter
|
||||
RTL
|
||||
.forceHeart
|
||||
LDA #$33 : STA $C8 ; assure the correct state if player talked to shopkeeper
|
||||
LDA $0403 : AND.b #$40 : BNE .notHeart
|
||||
LDA.b #$33 : STA.b ScrapBufferBD+$0B ; assure the correct state if player talked to shopkeeper
|
||||
LDA.w RoomItemsTaken : AND.b #$40 : BNE .notHeart
|
||||
LDA ChestGameItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
|
||||
LDA #$07 ; give prize item
|
||||
LDA.b #$07 ; give prize item
|
||||
RTL
|
||||
.notHeart
|
||||
JSL.l DecrementItemCounter
|
||||
;LDA #$00 ; bullshit rupee farming in chest game
|
||||
|
||||
JSL GetRandomInt ; spam RNG until we stop getting the prize item
|
||||
AND.b #$07 ; restrict values to 0-7
|
||||
CMP #$07 : BNE + ; player got prize item AGAIN
|
||||
CMP.b #$07 : BNE + ; player got prize item AGAIN
|
||||
LDA.b #$00 ; give them money instead
|
||||
+
|
||||
RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
FixChestCounterForChestGame:
|
||||
JSL.l DecrementItemCounter
|
||||
JSL $0DBA71
|
||||
RTL
|
||||
JSL DecrementItemCounter
|
||||
JML $8DBA71
|
||||
;--------------------------------------------------------------------------------
|
||||
RNG_Lanmolas1:
|
||||
LDA.b #$00 : BRA _rng_done
|
||||
RNG_Moldorm1:
|
||||
LDA.b #$01 : BRA _rng_done
|
||||
RNG_Agahnim1:
|
||||
LDA.b $A0 : CMP #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
|
||||
LDA.b RoomIndex : CMP.b #$20 : BNE RNG_Agahnim2 ; Agah 1 and 2 use the same code, check which agah we're fighting and branch
|
||||
LDA.b #$02
|
||||
JSL.l GetStaticRNG : PHA
|
||||
LDA.l GanonAgahRNG : BEQ + ; check if blue balls are disabled
|
||||
PLA
|
||||
ORA #$01 ; guarantee no blue ball
|
||||
ORA.b #$01 ; guarantee no blue ball
|
||||
RTL
|
||||
+
|
||||
PLA
|
||||
@@ -78,7 +76,7 @@ RNG_Agahnim2:
|
||||
JSL.l GetStaticRNG : PHA
|
||||
LDA.l GanonAgahRNG : BEQ + ; check if blue balls are disabled
|
||||
PLA
|
||||
ORA #$01 ; guarantee no blue ball
|
||||
ORA.b #$01 ; guarantee no blue ball
|
||||
RTL
|
||||
+
|
||||
PLA
|
||||
@@ -90,32 +88,31 @@ RNG_Ganon:
|
||||
RNG_Ganon_Extra_Warp:
|
||||
LDA.b #$0E
|
||||
JSL.l GetStaticRNG : PHA
|
||||
LDA GanonAgahRNG : BEQ + ; check if warps are disabled
|
||||
LDA.l GanonAgahRNG : BEQ + ; check if warps are disabled
|
||||
PLA
|
||||
AND #$FE ; set least significant bit to 0 to prevent teleport
|
||||
AND.b #$FE ; set least significant bit to 0 to prevent teleport
|
||||
RTL
|
||||
+
|
||||
PLA
|
||||
RTL
|
||||
RNG_Enemy_Drops:
|
||||
LDA.l ProgressIndicator : CMP #$01 : BEQ + ; drops are static after uncle pickup & before rescuing zelda
|
||||
JML GetRandomInt
|
||||
LDA.l ProgressIndicator : CMP.b #$01 : BEQ + ; drops are static after uncle pickup & before rescuing zelda
|
||||
JML GetRandomInt
|
||||
+
|
||||
LDA.b #$0F
|
||||
_rng_done:
|
||||
JSL.l GetStaticRNG
|
||||
LDA.b #$0F
|
||||
_rng_done:
|
||||
JSL.l GetStaticRNG
|
||||
RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
; In: A = RNG Index
|
||||
; Out: A = RNG Result
|
||||
;--------------------------------------------------------------------------------
|
||||
!RNG_POINTERS = "$7F5200"
|
||||
GetStaticRNG:
|
||||
PHX : PHP
|
||||
REP #$30 ; set 16-bit accumulator and index registers
|
||||
AND.w #$000F
|
||||
ASL : TAX : LDA !RNG_POINTERS, X : INC : AND.w #$03FF : STA !RNG_POINTERS, X : TAX ; increment pointer and move value to X
|
||||
LDA Static_RNG, X ; load RNG value
|
||||
ASL : TAX : LDA.l RNGPointers, X : INC : AND.w #$03FF : STA.l RNGPointers, X : TAX ; increment pointer and move value to X
|
||||
LDA.l Static_RNG, X ; load RNG value
|
||||
PLP : PLX
|
||||
RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
@@ -124,28 +121,28 @@ InitRNGPointerTable:
|
||||
REP #$30 ; set 16-bit accumulator & index registers
|
||||
LDX.w #$0000
|
||||
-
|
||||
LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA !RNG_POINTERS, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
|
||||
LDA.l .rngDefaults, X : STA.l RNGPointers, X : INX #2
|
||||
CPX.w #$001F : !BLT -
|
||||
PLP : PLX
|
||||
RTL
|
||||
.rngDefaults
|
||||
dw #$0000 ; 00 = Lanmolas 1
|
||||
dw #$0040 ; 01 = Moldorm 1
|
||||
dw #$0080 ; 02 = Agahnim 1
|
||||
dw #$00C0 ; 03 = Helmasaur
|
||||
dw #$0100 ; 04 = Arrghus
|
||||
dw #$0140 ; 05 = Mothula
|
||||
dw #$0180 ; 06 = Kholdstare
|
||||
dw #$01C0 ; 07 = Vitreous
|
||||
dw #$0200 ; 08 = Trinexx
|
||||
dw #$0240 ; 09 = Lanmolas 2
|
||||
dw #$0280 ; 10 = Moldorm 2
|
||||
dw #$02C0 ; 11 = Agahnim 2
|
||||
dw #$0300 ; 12 = Agahnim 2 Phantoms
|
||||
dw #$0340 ; 13 = Ganon
|
||||
dw #$0380 ; 14 = Ganon Extra Warp
|
||||
dw #$03C0 ; 15 = Standard Escape Enemy Drops
|
||||
dw $0000 ; 00 = Lanmolas 1
|
||||
dw $0040 ; 01 = Moldorm 1
|
||||
dw $0080 ; 02 = Agahnim 1
|
||||
dw $00C0 ; 03 = Helmasaur
|
||||
dw $0100 ; 04 = Arrghus
|
||||
dw $0140 ; 05 = Mothula
|
||||
dw $0180 ; 06 = Kholdstare
|
||||
dw $01C0 ; 07 = Vitreous
|
||||
dw $0200 ; 08 = Trinexx
|
||||
dw $0240 ; 09 = Lanmolas 2
|
||||
dw $0280 ; 10 = Moldorm 2
|
||||
dw $02C0 ; 11 = Agahnim 2
|
||||
dw $0300 ; 12 = Agahnim 2 Phantoms
|
||||
dw $0340 ; 13 = Ganon
|
||||
dw $0380 ; 14 = Ganon Extra Warp
|
||||
dw $03C0 ; 15 = Standard Escape Enemy Drops
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user