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.

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

fix(hammer): Fixes hammer charge attack distance #2

Merged
merged 1 commit into from
Oct 13, 2021
Merged

fix(hammer): Fixes hammer charge attack distance #2

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
5 changes: 5 additions & 0 deletions hammerChargeDistance.hks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
HammerChargeDistance:
type: branch
link: true
func: NormaliseHammerCharge
addr: 0x008b84d0
6 changes: 3 additions & 3 deletions normaliseCameraSpeed.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
.global NormaliseCameraSpeed
NormaliseCameraSpeed:
fmuls s0, s1, s3
ldr r0, =0x8119d90
ldr r0, [r0]
ldr r0, [r0,#0x14]
ldr r0, =0x8119d90
ldr r0, [r0]
ldr r0, [r0,#0x14]
fmsr s4, r0
mov r0, #0x40000000
fmsr s5, r0
Expand Down
20 changes: 20 additions & 0 deletions normaliseHammerCharge.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.text
.align 4

.global NormaliseHammerCharge
NormaliseHammerCharge:
ldr r0, =0x8119d90
ldr r0, [r0]
ldr r0, [r0,#0x14]
fmsr s12, r0
mov r0, #0x40000000
fmsr s13, r0
fdivs s12, s12, s13
flds s0, [sp]
fmuls s0, s0, s12
fsts s0, [sp]
flds s0, [sp,#8]
fmuls s0, s0, s12
fsts s0, [sp,#8]
ldr r0, [r5]
bx lr