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

Fixed jumps and return to be proper for the banks the code is in

Browse Source
This commit is contained in:
aerinon
2020-08-26 16:50:19 -06:00
committed by aerinon
parent f565fc93be
commit cdd4199cf9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bookofmudora.asm
View File

@@ -58,11 +58,11 @@ GiveBonkItem:
PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key
LDA $7EF36F : INC A : STA $7EF36F LDA $7EF36F : INC A : STA $7EF36F
LDA.b #$2F : JSL.l Sound_SetSfx3PanLong LDA.b #$2F : JSL.l Sound_SetSfx3PanLong
JSR CountBonkKey JSL CountBonkItem
RTL RTL
.notKey .notKey
PHY : TAY : JSL.l Link_ReceiveItem : PLY PHY : TAY : JSL.l Link_ReceiveItem : PLY
JSR CountBonkKey JSL CountBonkItem
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LoadBonkItem: LoadBonkItem:

3
itemdowngrade.asm
View File

@@ -3,10 +3,9 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ItemDowngradeFix: ItemDowngradeFix:
JSR ItemDowngradeFixMain JSR ItemDowngradeFixMain
JSR CountChestKey JSL CountChestKeyLong
RTL RTL
ItemDowngradeFixMain: ItemDowngradeFixMain:
JSL.l AddInventory JSL.l AddInventory
BMI .dontWrite ; thing we wrote over part 1 BMI .dontWrite ; thing we wrote over part 1

8
stats.asm
View File

@@ -257,7 +257,11 @@ DecrementSmallKeys:
JSL.l UpdateKeys JSL.l UpdateKeys
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountChestKey: ; called from ItemDowngradeFix in itemdowngrade.asm (also from CountBonkItem below) CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm
JSR CountChestKey
RTL
;--------------------------------------------------------------------------------
CountChestKey: ; called by neighbor functions
PHA : PHX PHA : PHX
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
@@ -285,7 +289,7 @@ CountBonkItem: ; called from GetBonkItem in bookofmudora.asm
TAY : JSR CountChestKey TAY : JSR CountChestKey
PLY PLY
+ +
RTS RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
IncrementAgahnim2Sword: IncrementAgahnim2Sword:
PHA PHA