diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-17 20:06:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 20:06:22 -0800 |
| commit | 64d569ecae2da4346b5b3f5427ff9eaec514a53b (patch) | |
| tree | 3240af9c85be1d8a12013f8fb145fd5d90c2a377 /src/object | |
| parent | 155a440bdd8f394add75398124d701d4faefa734 (diff) | |
| parent | 21d08b03d052f49a34d383f294e1b62559cbdc37 (diff) | |
Merge pull request #387 from hatal175/sub_08099880
match sub_08099880
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/bigIceBlock.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c index dc9539bb..78efddb7 100644 --- a/src/object/bigIceBlock.c +++ b/src/object/bigIceBlock.c @@ -100,13 +100,12 @@ void BigIceBlock_Action2(BigIceBlockEntity* this) { super->flags &= 0x7f; } -NONMATCH("asm/non_matching/bigIceBlock/sub_08099880.inc", void sub_08099880(BigIceBlockEntity* this)) { +void sub_08099880(BigIceBlockEntity* this) { Entity* obj; s32 rand; u8 uVar3; u32 uVar4; s32 x; - s32 y; if (--super->actionDelay == 0) { DeleteThisEntity(); @@ -121,13 +120,12 @@ NONMATCH("asm/non_matching/bigIceBlock/sub_08099880.inc", void sub_08099880(BigI if (obj != NULL) { rand = Random(); x = ((rand >> 0x10) % 0x21) - 0x10; - y = (rand & 0xf) - 4; + rand = (rand & 0xf) - 4; obj->spritePriority.b0 = 3; - PositionRelative(super, obj, x * 0x10000, y * 0x10000); + PositionRelative(super, obj, x * 0x10000, rand * 0x10000); } } } -END_NONMATCH void sub_08099910(BigIceBlockEntity* this) { u32 uVar2; |