diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2024-01-01 13:10:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:10:06 -0800 |
| commit | 6fb8b41a8e003d0a4997740f4178aeb0c3f24ead (patch) | |
| tree | 9ada8fe01cc0e308e32e385f9b6965971010cda0 /asm/src | |
| parent | 983412cc77d81692ad9431c0bd55f8d24e5554f8 (diff) | |
| parent | f5c6178ed4830769f65fbc74b18e3403eda05f86 (diff) | |
Merge pull request #686 from notyourav/followtest
document unused zelda follower and gust jar states
Diffstat (limited to 'asm/src')
| -rw-r--r-- | asm/src/code_08003FC4.s | 4 | ||||
| -rw-r--r-- | asm/src/code_080043E8.s | 4 | ||||
| -rw-r--r-- | asm/src/player.s | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/asm/src/code_08003FC4.s b/asm/src/code_08003FC4.s index ff872eb4..cf5a3f86 100644 --- a/asm/src/code_08003FC4.s +++ b/asm/src/code_08003FC4.s @@ -348,8 +348,8 @@ sub_080041E8: @ 0x080041E8 subs r0, r0, r2 subs r1, r1, r3 - thumb_func_start sub_080041EC -sub_080041EC: @ 0x080041EC + thumb_func_start CalcDistance +CalcDistance: @ 0x080041EC adds r2, r0, #0 muls r0, r2, r0 adds r3, r1, #0 diff --git a/asm/src/code_080043E8.s b/asm/src/code_080043E8.s index 3d723136..fa2ddead 100644 --- a/asm/src/code_080043E8.s +++ b/asm/src/code_080043E8.s @@ -301,8 +301,8 @@ CalculateDirectionTo: @ 0x080045D4 ldr r3, _08004694 @ =ram_CalcCollisionDirection bx r3 - non_word_aligned_thumb_func_start sub_080045DA -sub_080045DA: @ 0x080045DA + non_word_aligned_thumb_func_start CalcOffsetAngle +CalcOffsetAngle: @ 0x080045DA push {r0, r1, r4, r5, r6, lr} movs r6, #0x40 cmp r0, #0 diff --git a/asm/src/player.s b/asm/src/player.s index fefcf695..488fdbaa 100644 --- a/asm/src/player.s +++ b/asm/src/player.s @@ -83,7 +83,7 @@ _080085E6: ldr r3, _080088A8 @ =gPlayerState ldrb r2, [r3, #0x1c] orrs r2, r2 - bne _0800861A // field_0x1c != 0 + bne _0800861A // gustJarState != 0 ldrb r2, [r3, #5] orrs r2, r2 bne _0800861A // heldObject != 0 |