diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-05-09 18:10:05 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-05-09 18:10:05 +0300 |
| commit | f6efbab25254e0613f5e63c03dc0948e4c87254b (patch) | |
| tree | dc09915097e3e21e25245cd631d83f82864f2c59 /src | |
| parent | c17adeba29769d224745dea4f43f45e054f5108a (diff) | |
Match sub_080186C0
Diffstat (limited to 'src')
| -rw-r--r-- | src/kinstone.c | 5 | ||||
| -rw-r--r-- | src/object/object6A.c | 2 | ||||
| -rw-r--r-- | src/object/whirlwind.c | 2 | ||||
| -rw-r--r-- | src/physics.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/kinstone.c b/src/kinstone.c index 8ec8d54e..0d4ee14e 100644 --- a/src/kinstone.c +++ b/src/kinstone.c @@ -28,6 +28,11 @@ void sub_080189EC(int); void sub_0801876C(int, int); void sub_08018738(u32, int); +void sub_080186C0(u32 param_1) { + gArea.inventoryGfxIdx = 0xff; + gArea.unk2C = param_1; +} + void sub_080186D4(void) { if (gArea.inventoryGfxIdx == 0xff) { sub_0801855C(); diff --git a/src/object/object6A.c b/src/object/object6A.c index d1296659..8ff73b6f 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -808,7 +808,7 @@ void sub_0809584C(Object6AEntity* this) { u32 tmp, idx; idx = super->health; - if ((idx & 0x7F) != 0 && !ReadBit((u32*)gArea.filler5, idx - 1)) + if ((idx & 0x7F) != 0 && !ReadBit((u32*)gArea.filler6, idx - 1)) DeleteThisEntity(); if (super->timer != 0 && CheckKinstoneFused(super->type2)) DeleteThisEntity(); diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c index 6017bbe7..5659a5a4 100644 --- a/src/object/whirlwind.c +++ b/src/object/whirlwind.c @@ -23,7 +23,7 @@ void Whirlwind(Entity* this) { Whirlwind_Action2, }; u32 tmp = this->health; - if (((tmp & 0x7f) != 0) && (ReadBit(gArea.filler5, tmp - 1) == 0)) { + if (((tmp & 0x7f) != 0) && (ReadBit(gArea.filler6, tmp - 1) == 0)) { DeleteThisEntity(); } Whirlwind_Actions[this->action](this); diff --git a/src/physics.c b/src/physics.c index 609d8e8c..fbe503c1 100644 --- a/src/physics.c +++ b/src/physics.c @@ -26,7 +26,7 @@ static bool32 sub_0807007C(struct_gUnk_020000C0*, u32); void sub_0806F364(void) { gArea.filler[2] ^= 0x80; - MemClear(&gArea.filler5[(gArea.filler[2] + 7) / 8], 16); + MemClear(&gArea.filler6[(gArea.filler[2] + 7) / 8], 16); } void sub_0806F38C(void) { |