summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLeonarthCG <angel.cantos.giron@gmail.com>2021-06-21 11:01:34 +0200
committerLeonarthCG <angel.cantos.giron@gmail.com>2021-06-21 11:01:34 +0200
commit59ca3b7be50dfd2c44b8dcc95fef583788fcc3ce (patch)
treef4d85e31d0ca1a188762a3fee6366bf36e79d170 /src
parent7abb984cc64c618c5efa8a3fad88206c3ebac7d3 (diff)
decompile object31 (frozenFlower)
Diffstat (limited to 'src')
-rw-r--r--src/object.c2
-rw-r--r--src/object/frozenFlower.c21
2 files changed, 22 insertions, 1 deletions
diff --git a/src/object.c b/src/object.c
index b5eff460..768c8d12 100644
--- a/src/object.c
+++ b/src/object.c
@@ -52,7 +52,7 @@ void (*const gObjectFunctions[])(Entity*) = {
[PUSHABLE_ROCK] = PushableRock,
[HITTABLE_LEVER] = HittableLever,
[OBJECT_30] = Object30,
- [OBJECT_31] = Object31,
+ [FROZEN_FLOWER] = FrozenFlower,
[PULLABLE_MUSHROOM] = PullableMushroom,
[BOLLARD] = Bollard,
[WARP_POINT] = WarpPoint,
diff --git a/src/object/frozenFlower.c b/src/object/frozenFlower.c
new file mode 100644
index 00000000..a668506b
--- /dev/null
+++ b/src/object/frozenFlower.c
@@ -0,0 +1,21 @@
+#include "global.h"
+#include "entity.h"
+
+extern void (*const gUnk_0812119C[])(Entity*);
+
+void FrozenFlower(Entity* this)
+{
+ gUnk_0812119C[this->action](this);
+}
+
+void sub_0808A9DC(Entity* this)
+{
+ this->action = 1;
+ this->frameIndex = this->type;
+ this->spriteRendering.b3 = 3;
+ this->spritePriority.b0 = 7;
+}
+
+void nullsub_519(Entity* this)
+{
+}