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

Minor fixes

Browse Source
This commit is contained in:
aerinon
2020-11-03 10:15:41 -07:00
parent 5c2df8b6a6 fcebea97af
commit 5310569aa3
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drhooks.asm
View File

@@ -104,12 +104,6 @@ nop : stz $0dd0, X : rts
.not_in_ganons_tower .not_in_ganons_tower
;org $208206
;org $20820E
;jsl MirrorCheckOverride2
;org $208270
;org $20827C
;jsl MirrorCheckOverride2
org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD) org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
jsl BlockEraseFix jsl BlockEraseFix
nop #2 nop #2
@@ -131,11 +125,6 @@ nop #2 : jsl BlindAtticFix
org $028409 org $028409
jsl SuctionOverworldFix jsl SuctionOverworldFix
; also rando's hooks.asm line 1360
; 106e4e -> goes to a0ee4e
;org $a0ee8a ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
;org $a0eeab
;jsl DrHudOverride
org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30) org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30)
jsl DrHudDungeonItemsAdditions jsl DrHudDungeonItemsAdditions
;org $098638 ; rando's hooks.asm line 2192 ;org $098638 ; rando's hooks.asm line 2192

1
stats.asm
View File

@@ -242,6 +242,7 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountChestKey: ; called by neighbor functions CountChestKey: ; called by neighbor functions
PHA : PHX PHA : PHX
lda !MULTIWORLD_ITEM_PLAYER_ID : bne .end
CPY #$24 : BEQ + ; small key for this dungeon - use $040C CPY #$24 : BEQ + ; small key for this dungeon - use $040C
CPY #$A0 : !BLT .end ; Ignore most items CPY #$A0 : !BLT .end ; Ignore most items
CPY #$AE : !BGE .end ; Ignore reserved key and generic key CPY #$AE : !BGE .end ; Ignore reserved key and generic key