Skip to content

Port 1.1/1.2 scarecrow vibrato fix #2513

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
GSKirox wants to merge 1 commit into
base: Dev
Choose a base branch
from
Open

Port 1.1/1.2 scarecrow vibrato fix #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2,521 changes: 1,261 additions & 1,260 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,447 changes: 723 additions & 724 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/hacks.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4159,3 +4159,4 @@ DemoEffect_DrawJewel_AfterHook:
.include "hacks/ovl_en_changer.asm"
.include "hacks/ovl_en_ssh.asm"
.include "hacks/ovl_en_okarina_tag.asm"
.include "hacks/sound.asm"
8 changes: 8 additions & 0 deletions ASM/src/hacks/sound.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.headersize(0x800B0280 - 0x00B261E0)

.org 0x800C2BB8
; Replaces
; sb $zero, 0x0000(v1)
; lui $at, 0x8010
jal scarecrow_vibrato_fix
nop
11 changes: 11 additions & 0 deletions ASM/src/scarecrow.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,14 @@ adapt_scarecrow:
nop
; Now we can continue with our comparison between t0 and at
; If at != t0, following code will branch to ignore


scarecrow_vibrato_fix:
; Displaced code
sb $zero, 0x0000(v1) ; sCurOcarinaBendIndex = 0;
lui $at, 0x8010

lui v0, 0x8010
addiu v0, v0, 0x2230
jr ra
sb $zero, 0x0000(v0) ; sCurOcarinaVibrato = 0
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