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

code_8073CF0 #212

Merged
merged 8 commits into from
Sep 14, 2024
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/code_803E724.s
Original file line number Diff line number Diff line change
Expand Up @@ -2500,7 +2500,7 @@ _0803FBBA:
lsls r3, 1
adds r0, r3
ldr r0, [r0]
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0
bne _0803FBD2
movs r0, 0x1
Expand Down
4 changes: 2 additions & 2 deletions asm/code_8046CE4.s
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ _08047462:
bl sub_80522F4
mov r0, r9
adds r1, r4, 0
bl sub_807A96C
bl TrySendImmobilizeSleepEndMsg
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
Expand Down Expand Up @@ -927,7 +927,7 @@ _0804786E:
bl sub_80522F4
ldr r0, [sp, 0x10]
adds r1, r5, 0
bl sub_807A96C
bl TrySendImmobilizeSleepEndMsg
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
Expand Down
8 changes: 4 additions & 4 deletions asm/code_80521D0.s
Original file line number Diff line number Diff line change
Expand Up @@ -2611,7 +2611,7 @@ _08053888:
lsls r2, 1
adds r0, r1, r2
ldr r0, [r0]
bl RoundUpFixedPoint
bl FixedPointToInt
ldr r1, _080538C4
movs r3, 0
ldrsh r1, [r1, r3]
Expand Down Expand Up @@ -2729,11 +2729,11 @@ _0805397C:
movs r2, 0
ldrsh r1, [r0, r2]
add r0, sp, 0x8
bl sub_80943A0
bl IntToFixedPoint
ldr r2, [sp, 0x8]
ldr r0, [sp, 0x40]
adds r1, r4, 0
bl sub_80942C0
bl FixedPoint_Substract
ldr r0, [sp, 0xC]
ldr r3, [sp, 0x3C]
str r0, [r3]
Expand Down Expand Up @@ -2827,7 +2827,7 @@ _08053A4C:
bl sub_806A1E8
adds r0, r7, 0
adds r1, r5, 0
bl sub_807A96C
bl TrySendImmobilizeSleepEndMsg
movs r4, 0
adds r0, r7, 0
mov r1, r8
Expand Down
2 changes: 1 addition & 1 deletion asm/code_805D8C8_1.s
Original file line number Diff line number Diff line change
Expand Up @@ -2175,7 +2175,7 @@ _08069A02:
lsls r1, 1
adds r0, r5, r1
ldr r0, [r0]
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0
bne _08069A38
ldrb r0, [r5, 0x7]
Expand Down
2 changes: 1 addition & 1 deletion asm/code_8066D04.s
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ _080675C0:
bl sub_8084778
adds r0, r6, 0
adds r1, r5, 0
bl sub_807A96C
bl TrySendImmobilizeSleepEndMsg
adds r0, r5, 0
bl sub_8070BC0
lsls r0, 24
Expand Down
20 changes: 10 additions & 10 deletions asm/code_8069E0C.s
Original file line number Diff line number Diff line change
Expand Up @@ -447,32 +447,32 @@ _0806A664:
mov r0, sp
adds r1, r5, 0
movs r2, 0x5
bl sub_80942C0
bl FixedPoint_Substract
ldr r0, [sp]
str r0, [r4]
movs r1, 0
mov r8, r1
adds r0, r5, 0
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0x13
ble _0806A6A4
ldr r0, [r4]
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0x13
bgt _0806A6A4
ldr r0, _0806A6E0
ldr r0, [r0]
mov r8, r0
_0806A6A4:
adds r0, r5, 0
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0x9
ble _0806A6C4
movs r2, 0x9E
lsls r2, 1
adds r0, r7, r2
ldr r0, [r0]
bl RoundUpFixedPoint
bl FixedPointToInt
cmp r0, 0x9
bgt _0806A6C4
ldr r0, _0806A6E4
Expand Down Expand Up @@ -525,11 +525,11 @@ _0806A70E:
ldr r4, [r5]
mov r0, sp
movs r1, 0xA
bl sub_80943A0
bl IntToFixedPoint
ldr r2, [sp]
add r0, sp, 0x4
adds r1, r4, 0
bl sub_80942C0
bl FixedPoint_Substract
ldr r0, [sp, 0x4]
str r0, [r5]
b _0806A744
Expand All @@ -538,7 +538,7 @@ _0806A72E:
bne _0806A744
add r0, sp, 0x8
movs r1, 0
bl sub_80943A0
bl IntToFixedPoint
movs r0, 0x9E
lsls r0, 1
adds r1, r6, r0
Expand Down Expand Up @@ -3484,15 +3484,15 @@ _0806BDA6:
strh r4, [r6, 0xE]
mov r0, sp
movs r1, 0x64
bl sub_80943A0
bl IntToFixedPoint
movs r2, 0x9E
lsls r2, 1
adds r1, r6, r2
ldr r0, [sp]
str r0, [r1]
add r0, sp, 0x4
movs r1, 0x64
bl sub_80943A0
bl IntToFixedPoint
movs r3, 0xA0
lsls r3, 1
adds r1, r6, r3
Expand Down
4 changes: 2 additions & 2 deletions asm/code_806CD90.s
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ _0806D4FE:
ldr r3, _0806D524
adds r0, r4, 0
movs r2, 0xC
bl sub_806F324
bl DealDamageToEntity
_0806D514:
add sp, 0x1C
pop {r3-r5}
Expand Down Expand Up @@ -677,7 +677,7 @@ _0806D55C:
ldr r6, [r7, 0x70]
mov r0, r9
adds r1, r7, 0
bl sub_807A96C
bl TrySendImmobilizeSleepEndMsg
mov r0, r9
adds r1, r7, 0
bl SetShopkeeperAggression
Expand Down
8 changes: 4 additions & 4 deletions asm/code_806E8B0.s
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ _0806EB3A:
lsls r0, 1
add r0, r10
ldr r0, [r0]
bl RoundUpFixedPoint
bl FixedPointToInt
adds r1, r0, 0
cmp r1, 0
bne _0806EB72
Expand Down Expand Up @@ -1000,8 +1000,8 @@ _0806F2DE:
_0806F320: .4byte 0x000003e7
thumb_func_end sub_806F2BC

thumb_func_start sub_806F324
sub_806F324:
thumb_func_start DealDamageToEntity
DealDamageToEntity:
push {r4-r6,lr}
mov r6, r8
push {r6}
Expand Down Expand Up @@ -1037,7 +1037,7 @@ sub_806F324:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_806F324
thumb_func_end DealDamageToEntity

thumb_func_start sub_806F370
sub_806F370:
Expand Down
Loading