Skip to content

Fix Goron Link softlock when talking for first time out of range #2559

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 3 commits into
base: Dev
Choose a base branch
from
Open

Fix Goron Link softlock when talking for first time out of range #2559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11ab6b7
Fix Goron Link softlock when talking for first time
Apr 25, 2026
d781666
Merge branch 'Dev' into engo2
May 27, 2026
fe9e8f8
Goron Link talkstate fix, remove ra manipulation
May 27, 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,511 changes: 757 additions & 754 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,446 changes: 724 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/ootSymbols.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Flags_UnsetTempClear = 0x800206C8;
Flags_GetCollectible = 0x800206E8;
Flags_SetCollectible = 0x8002071C;
Actor_SetColorFilter = 0x80027090;
Npc_TrackPoint = 0x80027854;
CutsceneFlags_Get = 0x8005991C;
z64_Gfx_SetupDL_42Opa = 0x8007E868;
Audio_StopCurrentMusic = 0x800C7684;
Expand Down
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 "engo2_talkstateupdate.asm"
.include "player_laddercutscenefix.asm"

.align 0x10
Expand Down
17 changes: 17 additions & 0 deletions ASM/src/engo2_talkstateupdate.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
EnGo2_TalkstateUpdate:
addiu sp,sp,-24
sw ra,16(sp)
jal Npc_TrackPoint
nop
lw a0,56(sp) ; EnGo2 actor saved at old 32(sp)
lh v0,388(a0) ; interactInfo.talkState
li t6,1 ; NPC_TALK_STATE_TALKING
bnel t6,v0,@@EnGo2Return ; if not talking, continue as usual
li t0,0 ; t0 because v0 is in use
li t0,1 ; else, update talkstate
@@EnGo2Return:
lw ra,16(sp)
addiu sp,sp,24
lw v0,384(a0) ; displaced
jr ra
lw a1,36(sp) ; playstate, needed for func_80A44790
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/z_en_go2.asm"
.include "hacks/z_player.asm"
15 changes: 15 additions & 0 deletions ASM/src/hacks/z_en_go2.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.headersize (0x80b56910 - 0x00ed2040)

;================================================================================
; Prevent Goron Link first talk softlock if out of range. Add talkState ==
; NPC_TALK_STATE_TALKING as a condition by itself to update talkState and set textId
;================================================================================
; Replaces: jal Npc_TrackPoint
; sw a0,32(sp)
; lw a0,32(sp)
; lw v0,384(a0)
.org 0x80b58f08 ; in func_80A45288
jal EnGo2_TalkstateUpdate
sw a0,32(sp) ; displaced
bnez t0,0x80b58f3c ; if talking, run update talkstate
nop
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
Loading