Merge branch 'master' into DRMain
# Conflicts: # LTTP_RND_GeneralBugfixes.asm # catfish.asm # compasses.asm # darkworldspawn.asm # hooks.asm # inventory.asm # newitems.asm # shopkeeper.asm # stats.asm # tables.asm Adn some updates from DR
This commit is contained in:
@@ -108,9 +108,9 @@ RTL
|
||||
!RNG_POINTERS = "$7F5200"
|
||||
GetStaticRNG:
|
||||
PHX : PHP
|
||||
REP #$20 ; set 16-bit accumulator and index registers
|
||||
AND.w #$007F
|
||||
ASL : TAX : LDA !RNG_POINTERS, X : INC : AND.w #$03FF : STA !RNG_POINTERS, X : TAX : ASL ; increment pointer and move value to X
|
||||
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
|
||||
PLP : PLX
|
||||
RTL
|
||||
@@ -124,7 +124,7 @@ InitRNGPointerTable:
|
||||
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
|
||||
CPX.w #$007F : !BLT -
|
||||
CPX.w #$001F : !BLT -
|
||||
PLP : PLX
|
||||
RTL
|
||||
.rngDefaults
|
||||
|
||||
Reference in New Issue
Block a user