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

Continue labeling and documentation in ram.asm, main rando block

Browse Source 
Deleted several unused modules and some commented code
Reorganized some routines to clean up modules
Moved some memory into mirrored WRAM
Refactored NMI hook aux routine
Removed old fake flipper fix
This commit is contained in:
cassidoxa
2022-11-16 21:38:28 -05:00
parent 43f753b517
commit 788cceaab9
67 changed files with 962 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shopkeeper.asm
View File

@@ -110,9 +110,9 @@ SpritePrep_ShopKeeper:
REP #$30 ; set 16-bit accumulator & index registers
LDX.w #$0000
-
LDA.l ShopTable+1, X : CMP.b $A0 : BNE +
LDA.l ShopTable+1, X : CMP.b RoomIndex : BNE +
LDA.l ShopTable+5, X : AND.w #$0040 : BNE ++
LDA.l $7F5099 : AND #$00FF : CMP.l ShopTable+3, X : BNE +
LDA.l PreviousOverworldDoor : AND #$00FF : CMP.l ShopTable+3, X : BNE +
++
SEP #$20 ; set 8-bit accumulator
LDA.l ShopTable, X : STA.l ShopId
@@ -174,9 +174,9 @@ SpritePrep_ShopKeeper:
JMP -
.stop
LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA.l NMIAux+2
LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA.l NMIAux+1
LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA.l NMIAux
LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA.w NMIAux+2
LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA.w NMIAux+1
LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA.w NMIAux
.done
LDA.l ShopType : BIT.b #$20 : BEQ .notTakeAll ; Take-all