diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-08-09 16:24:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 16:24:35 -0700 |
| commit | 2bd083c9332daf8b75904d79c2f068db2c4231dc (patch) | |
| tree | 93c37ee73b1fdd735c5ae1e355f966b39876f26b /src/object | |
| parent | 2ae15a04f78492667c18aaeb82d8bab49de248a6 (diff) | |
| parent | 4a4ac6fc9139cf9373a0307cb85ae6dc72de5c3c (diff) | |
Merge branch 'master' into pot
Diffstat (limited to 'src/object')
| -rwxr-xr-x | src/object/object48.c | 1 | ||||
| -rwxr-xr-x | src/object/pot.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/object/object48.c b/src/object/object48.c index c2a25071..57d772a9 100755 --- a/src/object/object48.c +++ b/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); diff --git a/src/object/pot.c b/src/object/pot.c index 07ee87ec..5ea63ab5 100755 --- a/src/object/pot.c +++ b/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; |