diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-10-05 10:42:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 10:42:42 -0700 |
| commit | bcbfcc0ee4e80f2728699a1b330c8011c3946c74 (patch) | |
| tree | 5189db1d1b00fdf566e50a45e14a92dbc16934c4 /src/manager | |
| parent | feddaf4c9da3fe7fb391cdbfcb12593163f24391 (diff) | |
| parent | c50c628c80f41b6e24a6036b701f2b6b22b1b683 (diff) | |
Merge pull request #176 from Ibot02/warpPoint
Diffstat (limited to 'src/manager')
| -rw-r--r-- | src/manager/manager15.c | 4 | ||||
| -rw-r--r-- | src/manager/manager2E.c | 3 | ||||
| -rw-r--r-- | src/manager/managerF.c | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/manager/manager15.c b/src/manager/manager15.c index 47a384ac..24b214b5 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -296,8 +296,6 @@ void sub_0805A758(Manager15* this) { } } -extern void sub_0805E4E0(Manager*, u32); - void sub_0805A76C(Manager15* this) { if ((gPlayerEntity.currentHealth != 0) && (gPlayerEntity.height.HALF.HI == 0) && (!gPlayerState.field_0x2c)) { switch (gPlayerState.field_0xa9) { @@ -307,7 +305,7 @@ void sub_0805A76C(Manager15* this) { this->manager.action++; sub_08004168(&gPlayerEntity); gPlayerEntity.animationState = 4; - sub_0805E4E0(&this->manager, 0x258); + sub_0805E4E0((Entity*)this, 0x258); sub_08078A90(0xFF); gUnk_02034490[0] = 1; gRoomControls.cameraTarget = 0; diff --git a/src/manager/manager2E.c b/src/manager/manager2E.c index 5d114b6f..f52c185e 100644 --- a/src/manager/manager2E.c +++ b/src/manager/manager2E.c @@ -19,7 +19,6 @@ extern void (*const gUnk_08108D3C[])(Manager2E*); extern void (*const gUnk_08108D44[])(Manager2E*); void sub_0805D2F4(Manager2E*); -extern void sub_0805E4E0(void*, u32); extern void (*const gUnk_08108D50[])(Manager2E*); @@ -52,7 +51,7 @@ void sub_0805D2C0(Manager2E* this) { if (this->manager.unk_0e == 1) { sub_0805D2F4(this); } - sub_0805E4E0(this, this->manager.unk_0e); + sub_0805E4E0((Entity*)this, this->manager.unk_0e); } } diff --git a/src/manager/managerF.c b/src/manager/managerF.c index a4f5c78f..d7e1d7bb 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -92,7 +92,6 @@ void sub_08059064(ManagerF*); void sub_080592EC(ManagerF*); void sub_0805930C(ManagerF*); u32 sub_080593CC(ManagerF*); -void sub_0805E4E0(ManagerF*, u32); // to be moved to headers extern EntityData gUnk_080F4B88[]; @@ -151,7 +150,7 @@ void sub_08058FB0(ManagerF* this) { if (CheckFlags(this->unk_3e)) { this->manager.action = 2; this->manager.unk_0e = 120; - sub_0805E4E0(this, 0xF0); + sub_0805E4E0((Entity*)this, 0xF0); sub_08059064(this); } break; @@ -241,7 +240,7 @@ void sub_08059124(ManagerF* this) { break; case 1: if (CheckFlags(this->unk_3e)) { - sub_0805E4E0(this, 0x4b); + sub_0805E4E0((Entity*)this, 0x4b); this->manager.unk_0e = 0x2d; this->manager.action++; } |