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

Merge pull request #127 from Bonta0/escapeassist

Browse Source 
Events: Fix unusable infinite bombs with empty inventory
This commit is contained in:
KatDevsGames
2021-06-28 11:06:51 -05:00
committed by GitHub
parent 38fdf5442a d3db31b05e
commit 49f1f49ccb
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
events.asm
View File

@@ -55,13 +55,16 @@ OnQuit:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnUncleItemGet: OnUncleItemGet:
JSL Link_ReceiveItem PHA
LDA.l EscapeAssist LDA.l EscapeAssist
BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : + BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : + BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : + BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
PLA
JSL Link_ReceiveItem
LDA.l UncleRefill : BIT.b #$04 : BEQ + : LDA.b #$80 : STA $7EF373 : + ; refill magic LDA.l UncleRefill : BIT.b #$04 : BEQ + : LDA.b #$80 : STA $7EF373 : + ; refill magic
LDA.l UncleRefill : BIT.b #$02 : BEQ + : LDA.b #50 : STA $7EF375 : + ; refill bombs LDA.l UncleRefill : BIT.b #$02 : BEQ + : LDA.b #50 : STA $7EF375 : + ; refill bombs
LDA.l UncleRefill : BIT.b #$01 : BEQ + ; refill arrows LDA.l UncleRefill : BIT.b #$01 : BEQ + ; refill arrows

9
hooks.asm
View File

@@ -319,6 +319,15 @@ JSL.l LoadBombCount16
org $0DDEB3 ; <- 6DEB3 - equipment.asm : 328 (LDA $7EF33F, X) org $0DDEB3 ; <- 6DEB3 - equipment.asm : 328 (LDA $7EF33F, X)
JSL.l IsItemAvailable JSL.l IsItemAvailable
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0DDDE8 ; <- 6DDE8 - equipment.asm : 148 (LDA $7EF340)
JSL.l SearchForEquippedItem
;--------------------------------------------------------------------------------
org $0DDE70 ; <- 6DE70 - equipment.asm : 273 (LDA $7EF340)
JSL.l SearchForEquippedItem
;--------------------------------------------------------------------------------
org $0DE39D ; <- 6E39D - equipment.asm : 1109 (LDA $7EF340)
JSL.l SearchForEquippedItem
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Inverted Mode ; Inverted Mode

6
retro.asm
View File

@@ -26,6 +26,12 @@ StoreBombCount:
.finite .finite
PLA : STA $7EF343 PLA : STA $7EF343
RTL RTL
SearchForEquippedItem:
LDA !INFINITE_BOMBS : BEQ +
LDA.b #$01 : LDX.b #$00 : RTL
+
LDA $7EF340 ; thing we wrote over
RTL
!INFINITE_ARROWS = "$7F50C8" !INFINITE_ARROWS = "$7F50C8"
DecrementArrows: DecrementArrows: