summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-08-07 17:38:08 -0500
committerMarcus Huderle <huderlem@gmail.com>2020-08-07 17:38:08 -0500
commit5963472d01c0789b3c4b85c7a62a8643cd19fdca (patch)
tree5ffe56337e76fc4113199e2a622464f402f2f1cb /src/object
parent57198666432a4ab60588f7aed33cdd5f2b84ae93 (diff)
Match cloud/sub_0809F770
Diffstat (limited to 'src/object')
-rw-r--r--src/object/cloud.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/object/cloud.c b/src/object/cloud.c
index 96ffc659..54fa6621 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -156,28 +156,21 @@ void sub_0809F700(Entity* this) {
}
}
-#ifdef NON_MATCHING
Entity* sub_0809F770(Entity* this) {
Entity* cloud;
- s32 uVar1;
+ int uVar1;
cloud = CreateObject(163, 1, 0);
- if (cloud != NULL) {
+ if (cloud) {
PositionEntityOnTop(this, cloud);
uVar1 = Random();
- cloud->x.HALF.HI = ((cloud->x.HALF.HI - 16) + (uVar1 >> 0)) & 31;
- cloud->y.HALF.HI = ((cloud->y.HALF.HI - 16) + (uVar1 >> 8)) & 31;
- cloud->animationList = (u8)(uVar1 >> 16) & 3;
- cloud->direction = 255;
+ cloud->x.HALF.HI += ((uVar1 >> 0) & 31) - 16;
+ cloud->y.HALF.HI += ((uVar1 >> 8) & 31) - 16;
+ cloud->frameIndex = (uVar1 >> 16) & 3;
+ cloud->direction = 0xFF;
}
return cloud;
}
-#else
-NAKED
-Entity* sub_0809F770(Entity* this) {
- asm(".include \"asm/non_matching/cloud/sub_0809F770.inc\"");
-}
-#endif
void sub_0809F7BC(Entity* this) {
Entity* cloud;