mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-27 08:09:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176 from Ibot02/warpPoint

Browse Source
This commit is contained in:
notyourav
2021-10-05 10:42:42 -07:00
committed by GitHub
parent feddaf4c9d c50c628c80
commit bcbfcc0ee4
9 changed files with 246 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager15.c
+1 -3
View File
@@ -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;
src/manager/manager2E.c
+1 -2
View File
@@ -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);
}
}
src/manager/managerF.c
+2 -3
View File
@@ -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++;
}