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

Some DR changes (outdoor check for hub and keydrop correct KeyTable address)

Browse Source 
Shop VRAM issue investigated but not solved
This commit is contained in:
aerinon
2020-12-08 10:57:37 -07:00
parent 443070fe2c
commit b3fcd2192e
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -148,6 +148,7 @@ incsrc map.asm
incsrc msu.asm incsrc msu.asm
incsrc dialog.asm incsrc dialog.asm
incsrc entrances.asm incsrc entrances.asm
incsrc clock.asm
incsrc accessability.asm incsrc accessability.asm
incsrc heartbeep.asm incsrc heartbeep.asm
incsrc capacityupgrades.asm incsrc capacityupgrades.asm
@@ -194,7 +195,6 @@ incsrc retro.asm
incsrc dpadinvert.asm incsrc dpadinvert.asm
incsrc boots.asm incsrc boots.asm
incsrc events.asm incsrc events.asm
incsrc clock.asm
incsrc fileselect.asm incsrc fileselect.asm
incsrc playername.asm incsrc playername.asm
incsrc decryption.asm incsrc decryption.asm

1
framehook.asm
View File

@@ -42,7 +42,6 @@ FrameHookAction:
PLP : PLA PLP : PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!NMI_AUX = "$7F5044"
NMIHookAction: NMIHookAction:
PHA : PHX : PHY : PHD ; thing we wrote over, push stuff PHA : PHX : PHY : PHD ; thing we wrote over, push stuff

5
hudadditions.asm
View File

@@ -15,8 +15,9 @@ HudAdditions:
LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit
++ ++
ldx $040c : cpx #$ff : bne + : rts : + LDX $1B : BNE + : RTS : + ; Skip if outdoors
lda.l DRMode : bne + : rts : + ldx $040c : cpx #$ff : bne + : rts : + ; Skip if not in dungeon
lda.l DRMode : bne + : rts : + ; Skip if not door rando
phb : phk : plb phb : phk : plb
lda $7ef364 : and.l $0098c0, x : beq + lda $7ef364 : and.l $0098c0, x : beq +
lda.w CompassBossIndicator, x : and #$00ff : cmp $a0 : bne + lda.w CompassBossIndicator, x : and #$00ff : cmp $a0 : bne +

2
keydropshuffle.asm
View File

@@ -126,7 +126,7 @@ KeyGet:
lda !MULTIWORLD_ITEM_PLAYER_ID : bne .receive lda !MULTIWORLD_ITEM_PLAYER_ID : bne .receive
phx phx
lda $040c : lsr : tax lda $040c : lsr : tax
lda $00 : cmp KeyTable, x : bne + lda $00 : CMP.l KeyTable, x : bne +
- JSL.l FullInventoryExternal : jsl CountChestKeyLong : plx : pla : rtl - JSL.l FullInventoryExternal : jsl CountChestKeyLong : plx : pla : rtl
+ cmp #$af : beq - ; universal key + cmp #$af : beq - ; universal key
cmp #$24 : beq - ; small key for this dungeon cmp #$24 : beq - ; small key for this dungeon

28
shopkeeper.asm
View File

@@ -194,20 +194,20 @@ SpritePrep_ShopKeeper:
BRL - BRL -
.stop .stop
;LDA $A0 : CMP.b #$FF : BNE .normal LDA $A0 : CMP.b #$FF : BNE .normal
;.dumb .dumb
; LDA $2137 LDA $2137
; LDA $213F LDA $213F
; LDA $213D LDA $213D
; CMP.b #60 CMP.b #60
; !BLT .dumb !BLT .dumb
;.normal .normal
;LDA #$80 : STA $2100 LDA #$80 : STA $2100
;JSR Shopkeeper_UploadVRAMTiles JSR Shopkeeper_UploadVRAMTiles
;LDA #$0F : STA $2100 LDA #$0F : STA $2100
LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2 ; LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1 ; LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX ; LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
.done .done
LDA.l !SHOP_TYPE : BIT.b #$20 : BEQ .notTakeAll ; Take-all LDA.l !SHOP_TYPE : BIT.b #$20 : BEQ .notTakeAll ; Take-all