mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-30 07:54:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

framestate, ezlo hint

Browse Source
This commit is contained in:
theo3
2021-12-20 23:11:22 -08:00
parent 40b2a30c1c
commit cb95bdb96a
31 changed files with 326 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager15.c
+3 -3
View File
@@ -297,9 +297,9 @@ void sub_0805A758(Manager15* this) {
void sub_0805A76C(Manager15* this) {
if ((gPlayerEntity.health != 0) && (gPlayerEntity.z.HALF.HI == 0) && (!gPlayerState.field_0x2c)) {
switch (gPlayerState.field_0xa9) {
case 1:
case 0:
switch (gPlayerState.framestate_last) {
case PL_STATE_IDLE:
case PL_STATE_WALK:
if (sub_0805A73C(this)) {
this->manager.action++;
sub_08004168(&gPlayerEntity);
src/manager/manager3.c
+3 -3
View File
@@ -96,9 +96,9 @@ void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
u32 sub_08057810(void) {
if ((gPlayerState.flags & PL_MINISH) && !gPlayerState.field_0xaa && (gArea.curPortalType != 0x6) &&
(gPlayerState.heldObject == 0)) {
switch (gPlayerState.field_0xa8) {
case 0:
case 1:
switch (gPlayerState.framestate) {
case PL_STATE_IDLE:
case PL_STATE_WALK:
return 1;
}
}
src/manager/manager33.c
+1 -1
View File
@@ -11,7 +11,7 @@ void Manager33_Main(Manager* this) {
u32 b = roomControls->roomOriginY + 0x140;
u32 y = (b - gPlayerEntity.y.HALF.HI) + 0x10;
if (this->action == 0) {
if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.field_0xa8 == 0x14) {
if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.framestate == PL_STATE_CAPE) {
this->action += 1;
this->unk_0e = 0x5a;
SoundReq(SFX_10A);
src/manager/managerA.c
+76 -78
View File
@@ -6,53 +6,54 @@
#include "area.h"
#include "functions.h"
void sub_08058398(ManagerA*);
void sub_080583EC(ManagerA*);
void sub_08058408(ManagerA*);
void sub_08058514(ManagerA*);
void sub_080585B0(ManagerA*);
static void sub_08058398(ManagerA*);
static void sub_080583EC(ManagerA*);
static void sub_08058408(ManagerA*);
static void sub_08058514(ManagerA*);
static void sub_080585B0(ManagerA*);
void (*const gUnk_081081F4[])(ManagerA*) = { sub_08058398, sub_080583EC, sub_08058408, sub_08058514, sub_080585B0 };
static u32 PlayerStateValid(ManagerA*);
static void sub_080585DC(ManagerA*);
extern void sub_0801855C(void);
/**
* Ezlo hint manager
*/
void ManagerA_Main(ManagerA* this) {
gUnk_081081F4[this->manager.action](this);
static void (*const sActions[])(ManagerA*) = { sub_08058398, sub_080583EC, sub_08058408, sub_08058514,
sub_080585B0 };
sActions[this->manager.action](this);
}
void sub_08058398(ManagerA* this) {
if (CheckFlags(this->unk_3c) != 0) {
static void sub_08058398(ManagerA* this) {
if (CheckFlags(this->flag1) != 0) {
DeleteThisEntity();
}
this->unk_24 = this->unk_3a << 3;
this->unk_26 = this->unk_3b << 3;
this->unk_20 = this->unk_24 + (this->unk_38 << 4);
this->unk_22 = this->unk_26 + (this->unk_39 << 4);
SetDefaultPriority((Entity*)&this->manager, 0x06);
if (this->unk_3e == 0) {
this->rx = this->rx_raw << 3;
this->ry = this->ry_raw << 3;
this->x = this->rx + (this->x_raw << 4);
this->y = this->ry + (this->y_raw << 4);
SetDefaultPriority((Entity*)&this->manager, PRIO_PLAYER_EVENT);
if (this->flag2 == 0) {
this->manager.action = 2;
} else {
this->manager.action = 1;
}
}
void sub_080583EC(ManagerA* this) {
if (CheckFlags(this->unk_3e) != 0) {
static void sub_080583EC(ManagerA* this) {
if (CheckFlags(this->flag2)) {
this->manager.action = 2;
sub_08058408(this);
}
}
extern void SetPlayerEventPriority(void);
u32 sub_0805848C(ManagerA*);
void sub_080585DC(ManagerA*);
void sub_08058408(ManagerA* this) {
u32 tmp2;
tmp2 = (gPlayerState.flags & 0x08);
if (tmp2 != 0)
static void sub_08058408(ManagerA* this) {
if (gPlayerState.flags & PL_NO_CAP)
return;
if (!CheckPlayerInRegion(this->unk_20, this->unk_22, this->unk_24, this->unk_26))
if (!CheckPlayerInRegion(this->x, this->y, this->rx, this->ry))
return;
switch (this->manager.unk_0a) {
case 1:
@@ -64,101 +65,98 @@ void sub_08058408(ManagerA* this) {
case 0:
default:
sub_080585DC(this);
if (sub_0805848C(this) == 0)
if (!PlayerStateValid(this))
return;
SetPlayerControl(3);
sub_08078B48();
SetPlayerEventPriority();
this->manager.action = 3;
this->manager.unk_0d = 0;
this->manager.unk_0e = 0x1e;
this->manager.unk_0e = 30;
return;
case 3:
this->manager.action = 4;
this->manager.unk_0d = tmp2;
sub_080186C0(this->unk_36);
this->manager.unk_0d = 0;
sub_080186C0(this->msg_idx);
return;
}
}
u32 sub_0805848C(ManagerA* this) {
switch (gPlayerState.field_0xa8 - 5) {
case 0:
case 2:
case 3:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 19:
case 22:
case 23:
static u32 PlayerStateValid(ManagerA* this) {
switch (gPlayerState.framestate) {
case PL_STATE_THROW:
case PL_STATE_SWIM:
case PL_STATE_PARACHUTE:
case PL_STATE_FALL:
case PL_STATE_JUMP:
case PL_STATE_C:
case PL_STATE_D:
case PL_STATE_USEPORTAL:
case PL_STATE_F:
case PL_STATE_TRAPPED:
case PL_STATE_11:
case PL_STATE_DIE:
case PL_STATE_TALKEZLO:
case PL_STATE_CAPE:
case PL_STATE_ITEMGET:
case PL_STATE_DROWN:
case PL_STATE_HOLE:
case PL_STATE_CLIMB:
case PL_STATE_1B:
case PL_STATE_STAIRS:
return 0;
case 1:
case 4:
case 20:
case 21:
case PL_STATE_6:
case PL_STATE_ROLL:
case PL_STATE_PUSH:
case PL_STATE_PULL:
default:
return 1;
}
}
extern void ResetPlayerEventPriority(void);
void sub_08058514(ManagerA* this) {
static void sub_08058514(ManagerA* this) {
switch (this->manager.unk_0d) {
case 1:
if ((gPlayerState.flags & 0x1235) != 0)
if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | 0x1210))
return;
if (gPlayerEntity.z.HALF.HI != 0)
return;
gPlayerState.jumpStatus = 0;
sub_08078AA8(this->unk_36, this->unk_35);
CreateEzloHint(this->msg_idx, this->msg_height);
this->manager.unk_0d++;
this->manager.unk_0e = 0x1E;
this->manager.unk_0e = 30;
return;
case 0:
case 2:
if (((--this->manager.unk_0e) << 0x18) == 0) {
if (--this->manager.unk_0e == 0) {
this->manager.unk_0d++;
}
return;
case 3:
if (gPlayerEntity.action != 1 && gPlayerEntity.action != 9)
return;
gPlayerState.controlMode = 1;
ResetPlayerEventPriority();
SetFlag(this->unk_3c);
DeleteThisEntity();
/* wait for player to finish talking */
if (gPlayerEntity.action == PLAYER_NORMAL || gPlayerEntity.action == PLAYER_MINISH) {
gPlayerState.controlMode = 1;
ResetPlayerEventPriority();
SetFlag(this->flag1);
DeleteThisEntity();
}
return;
default:
return;
}
}
extern void sub_0801855C(void);
void sub_080585B0(ManagerA* this) {
if (gArea.field_0x28 != 0xFF) {
static void sub_080585B0(ManagerA* this) {
if (gArea.inventoryGfxIdx != 0xFF) {
DeleteThisEntity();
}
if (CheckFlags(this->unk_3c)) {
if (CheckFlags(this->flag1)) {
sub_0801855C();
DeleteThisEntity();
}
}
void sub_080585DC(ManagerA* this) {
if (CheckFlags(this->unk_3c)) {
static void sub_080585DC(ManagerA* this) {
if (CheckFlags(this->flag1)) {
DeleteThisEntity();
}
}
src/manager/managerF.c
+1 -1
View File
@@ -414,7 +414,7 @@ void sub_080594DC(ManagerF* this) {
break;
case 2:
default:
if (gArea.field_0x28 != 0xFF) {
if (gArea.inventoryGfxIdx != 0xFF) {
DeleteThisEntity();
}
if (CheckLocalFlagByBank(0x8c0, 0x85)) {