Skip to content
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.

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

"Fix" removed logs cutscenes #62

Merged
merged 1 commit into from
Oct 2, 2023
Merged
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
2 changes: 1 addition & 1 deletion asm/patches/diffs/remove-small-events-diff.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0x08737A64: [0xE8, 0x1F, 0x80, 0x52]
0x088154E8: [0xE8, 0x1F, 0x80, 0x52]
0x088440E8: [0xF3, 0x03, 0x00, 0xAA]
0x088440F4: [0x00, 0x04, 0x40, 0x11, 0x0B, 0xF4, 0x0F, 0x39, 0xE9, 0x1F, 0x80, 0x52]
0x088440F4: [0x00, 0x04, 0x40, 0x91, 0x0B, 0xF4, 0x0F, 0x39, 0xE9, 0x1F, 0x80, 0x52]
0x08844104: [0x09, 0xF0, 0x0F, 0x39]
15 changes: 11 additions & 4 deletions asm/patches/remove-small-events.asm
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
; don't play event when blowing up rocks
; Rocks
; Don't play event when blowing up rocks
.offset 0x08737a64
mov w8, #0xFF

; don't play event when pushing logs

; Logs
; Don't play event when pushing logs
.offset 0x088440e8
mov x19, x0 ; move self into x19 early

.offset 0x088440f4
add w0, w0, #0x1000 ; add offset to w0 instead of in the strb
add x0, x0, #0x1000 ; add offset to w0 instead of in the strb
strb w11, [x0, #0x3FD]

mov w9, #0xFF ; use now free w9 to store -1 for the event index

.offset 0x08844104
strb w9, [x0, #0x3FC] ; store new event index

; don't play event when knocking down ivy ropes

; Ropes
; Don't play event when knocking down ivy ropes
.offset 0x088154e8
mov w8, #0xFF


; Arrow Switches
; DOESN'T WORK
; don't play event when shooting arrow switches (eyes)
; .offset 0x086f5aac
Expand Down