Skip to content

Add Y distance check to business Deku Scrub talk #2552

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

Add Y distance check to business Deku Scrub talk #2552

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
91a2022
Add Y distance check to business Deku Scrub talk
Apr 12, 2026
3b2c43c
Delete newline in endns_checkydist
Apr 15, 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,508 changes: 755 additions & 753 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 "endns_checkydist.asm"

.align 0x10
.importobj "../build/bundle.o"
Expand Down
16 changes: 16 additions & 0 deletions ASM/src/endns_checkydist.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
; z_en_dns
EnDns_CheckYDist:
move a0,s0
lui at,0x42c8
lwc1 $f0,148(s0)
mtc1 at,$f4
abs.s $f0,$f0
c.lt.s $f0,$f4
bc1fl @@EnDns_OutsideRange
nop ; in Y talking range, continue function
jr ra ; 0x80a7550c
nop
@@EnDns_OutsideRange: ; outside of Y talking range, return function
addi ra,ra,0x8c
jr ra ; 0x80a75598
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,3 +4161,4 @@ DemoEffect_DrawJewel_AfterHook:
.include "hacks/ovl_en_ssh.asm"
.include "hacks/ovl_en_okarina_tag.asm"
.include "hacks/sound.asm"
.include "hacks/z_en_dns.asm"
11 changes: 11 additions & 0 deletions ASM/src/hacks/z_en_dns.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.headersize(0x80a74c60 - 0x00df75a0)

;================================================================================
; Adds Y distance check to talking with business Deku Scrub (prevents buying in
; Deku Tree from the water, but not being able to get the item)
;================================================================================
; Replaces lh t6,182(s0)
; move a0,s0
.org 0x80a75504 ; in EnDns_Idle
jal EnDns_CheckYDist ; endns_checkydist.s
lh t6,182(s0)
2 changes: 1 addition & 1 deletion 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