Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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,498 changes: 750 additions & 748 deletions ASM/build/asm_symbols.txt

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ASM/src/build.asm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ RANDO_CONTEXT:
.include "player_laddercutscenefix.asm"
.include "player_bunny_hover_matrix.asm"
.include "player_hookshotcheckspawn.asm"
.include "enin_talkaftereponafix.asm"

.align 0x10
.importobj "../build/bundle.o"
Expand Down
14 changes: 14 additions & 0 deletions ASM/src/enin_talkaftereponafix.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
EnIn_TalkAfterEponaFix:
lui t1,0x8012
lhu t1,-17974(t1) ; race state flags
li at,6 ; post race win state
andi t1,t1,0xf
beql t1,at,@@Return ; return 1 if post race
li v0,1 ; else, continue and run displaced
lui v1,0x8012 ; displaced
addiu v1,v1,-23088 ; displaced
lhu a0,3798(v1) ; displaced
andi t7,a0,0x100 ; displaced
@@Return:
jr ra
nop
1 change: 1 addition & 0 deletions ASM/src/hacks.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4155,3 +4155,4 @@ DemoEffect_DrawJewel_AfterHook:
.include "hacks/sound.asm"
.include "hacks/z_player.asm"
.include "hacks/z_en_sa.asm"
.include "hacks/z_en_in.asm"
13 changes: 13 additions & 0 deletions ASM/src/hacks/z_en_in.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.headersize (0x809c05a0 - 0x00d50720)

; Make Ingo say "I'll never let you leave this ranch" (vanilla text)
; when talking to him after winning the race (for overworld ER)
; Replaces: lui v1,0x8012
; addiu v1,v1,-23088
; lhu a0,3798(v1)
; andi t7,a0,0x100
.org 0x809c0628
jal EnIn_TalkAfterEponaFix
move v0,zero ; assume not post race
bnezl v0,0x809c0748 ; if post race, go to return
li v0,0x203c ; set vanilla post race text
2 changes: 1 addition & 1 deletion data/generated/patch_symbols.json

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

Loading
Loading