Skip to content

Fix Slingshot scrub game softlock when hitting target before receiving item #2560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djevangelia wants to merge 2 commits into
base: Dev
Choose a base branch
from
Open

Fix Slingshot scrub game softlock when hitting target before receiving item #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
816f919
Fix Slingshot scrub game softlock when re-hitting target without item
Apr 25, 2026
ae10cdf
EnDntN slingshot game softlock ra fix + merge with Dev
May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,520 changes: 760 additions & 760 deletions ASM/build/asm_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ASM/build/bundle.o
View file
Open in desktop
Binary file not shown.
1,445 changes: 723 additions & 722 deletions ASM/build/c_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ASM/src/build.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ RANDO_CONTEXT:
.include "en_dns.asm"
.include "bg_gate_shutter.asm"
.include "big_poe.asm"
.include "endntn_slingshotfix.asm"
.include "player_laddercutscenefix.asm"

.align 0x10
Expand Down
15 changes: 15 additions & 0 deletions ASM/src/endntn_slingshotfix.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
EnDntN_SlingshotFix:
la t0,SAVE_CONTEXT
lw t1,4(t0) ; Link age
beqz t1,@@DontGive ; If adult, don't try to give
lhu t2,3826(v0) ; Bullet Bag received getiteminf
andi t3,t2,0x2000 ; Item received?
bnez t3,@@DontGive ; If received, don't try to give it again
lb t2,615(s0) ; EnDnNomal->spawnedItem
beqzl t2,@@Return ; If not already spawned item,
li v0,1 ; give it
@@DontGive:
li v0,0 ; Adult or already got item
@@Return:
jr ra
nop
1 change: 1 addition & 0 deletions ASM/src/hacks.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4161,4 +4161,5 @@ DemoEffect_DrawJewel_AfterHook:
.include "hacks/ovl_en_ssh.asm"
.include "hacks/ovl_en_okarina_tag.asm"
.include "hacks/sound.asm"
.include "hacks/ovl_en_dnt_nomal.asm"
.include "hacks/z_player.asm"
19 changes: 19 additions & 0 deletions ASM/src/hacks/ovl_en_dnt_nomal.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.headersize (0x80b4f150 - 0x00eca880)

;================================================================================
; Fix softlock when re-hitting slingshot game scrub target before receiving item
; (checks both vanilla checks + spawnedItem)
;================================================================================
; Replaces lui v0,0x8012
; addiu v0,v0,-23088
; lw t1,4(v0)
; beqzl t1,80b4f7d4
; lw ra,36(sp)
; lhu t2,3826(v0)
.org 0x80b4f6f0 ; in EnDntNomal_TargetWait
jal EnDntN_SlingshotFix
nop
beqzl v0,0x80b4f7d4 ; go to return if not giving bag
lw ra,36(sp)
b 0x80b4f714 ; else continue function
nop
4 changes: 4 additions & 0 deletions data/generated/patch_symbols.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading