Merge branch 'master' into pot

src/object/object48.c

@@ -9,7 +9,6 @@
 #include "readKeyInput.h"
 #include "structures.h"
 
-extern bool32 sub_080AE008(Entity*, int, int);
 extern int sub_0807A094(int);
 extern u32 sub_0801D754(const u8*, u8, u8);
 extern u32 sub_080041EC(int, int);

src/object/pot.c

@@ -38,7 +38,7 @@ void sub_0808222C(Entity* this) {
     this->boundingBox = &gUnk_080FD338;
     this->nonPlanarMovement = 0x80;
     this->y.HALF.HI += 3;
-    this->possibleBool = 0;
+    this->field_0x16 = 0;
     this->flags |= 0x80;
     this->currentHealth = 1;
     this->field_0x3c = 7;