summaryrefslogtreecommitdiff
path: root/src/object/fileScreenObjects.c
diff options
context:
space:
mode:
authorTheo <65437533+notyourav@users.noreply.github.com>2024-01-01 13:10:06 -0800
committerGitHub <noreply@github.com>2024-01-01 13:10:06 -0800
commit6fb8b41a8e003d0a4997740f4178aeb0c3f24ead (patch)
tree9ada8fe01cc0e308e32e385f9b6965971010cda0 /src/object/fileScreenObjects.c
parent983412cc77d81692ad9431c0bd55f8d24e5554f8 (diff)
parentf5c6178ed4830769f65fbc74b18e3403eda05f86 (diff)
Merge pull request #686 from notyourav/followtest
document unused zelda follower and gust jar states
Diffstat (limited to 'src/object/fileScreenObjects.c')
-rw-r--r--src/object/fileScreenObjects.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c
index b474fdd6..19842f23 100644
--- a/src/object/fileScreenObjects.c
+++ b/src/object/fileScreenObjects.c
@@ -20,7 +20,7 @@ typedef struct {
/*0x70*/ u8 unk_70;
} FileScreenObjectsEntity;
-extern u32 sub_080041EC(s32, s32);
+extern u32 CalcDistance(s32, s32);
static bool32 sub_0808E950(void);
static void sub_0808EABC(FileScreenObjectsEntity*);
@@ -550,14 +550,14 @@ static u32 sub_0808EF6C(FileScreenObjectsEntity* this) {
return 0;
}
- var4 = var7 = sub_080041EC(var0, var2);
+ var4 = var7 = CalcDistance(var0, var2);
var4 += 128;
var7 = var4 + var7 * 16;
if (this->unk_6c < var7) {
var7 = this->unk_6c;
}
super->speed = var7;
- super->direction = sub_080045DA(var0, var2) >> 3;
+ super->direction = CalcOffsetAngle(var0, var2) >> 3;
LinearMoveUpdate(super);
return 1;
}