Merge pull request #19 from 21aslade/master

mineralWaterSource.c OK

src/heartContainer.c

@@ -7,7 +7,7 @@ extern void sub_0808E714(Entity*);
 
 extern void (*const gUnk_08121C48[])(Entity*);
 
-extern u32 gUnk_08121C58;
+extern BoundingBox gUnk_08121C58;
 
 void HeartContainer(Entity* this) {
     gUnk_08121C48[this->action](this);

src/mineralWaterSource.c

@@ -0,0 +1,47 @@
+#include "global.h"
+#include "entity.h"
+
+extern void (*MineralWaterSourceActionFuncs[])(Entity *);
+
+typedef struct {
+    u8 field_0x00;
+    u8 field_0x01;
+    u8 field_0x02;
+    u8 field_0x03;
+} UnkStruct_MineralWater;
+
+extern UnkStruct_MineralWater MineralWaterSourceParameters[];
+
+extern bool32 sub_0806FBD8(Entity *);
+
+void MineralWaterSource(Entity *this) {
+    MineralWaterSourceActionFuncs[this->action](this);
+}
+
+void MineralWaterSource_Init(Entity *this) {
+    UnkStruct_MineralWater *unknownParameters;
+
+    if (!sub_0806FBD8(this)) {
+        return;
+    }
+
+    unknownParameters = &MineralWaterSourceParameters[this->entityType.form];
+
+    this->entityType.parameter = unknownParameters->field_0x00;
+    this->field_0x40 = unknownParameters->field_0x03;
+
+    this->boundingBox->field_0x6 = unknownParameters->field_0x01;
+    this->boundingBox->field_0x7 = unknownParameters->field_0x02;
+
+    this->flags |= 0x80;
+
+    this->field_0x3c = 7;
+    this->damageType = 145;
+    this->flags2 = 2;
+
+    this->action = 1;
+}
+
+void sub_080973DC(Entity *this) {
+    this->bitfield = 0;
+}

src/object1A.c

@@ -11,7 +11,7 @@ extern u32 Random(void);
 
 extern void (*gUnk_081206C4[99])(Entity*);
 
-extern u32 gUnk_080FD1A8;
+extern BoundingBox gUnk_080FD1A8;
 
 // Main
 void Object1A(Entity* ent) {