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

PlayerNormal ok

Browse Source
This commit is contained in:
theo3
2022-01-02 16:10:29 -08:00
parent 466b508413
commit 415f5213a9
39 changed files with 471 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager3.c
+1 -1
View File
@@ -46,7 +46,7 @@ void Manager3_Main(Manager3* this) {
gArea.field_0x18 = 1;
gArea.curPortalType = 5;
} else {
if ((gPlayerState.flags & 0x20) && gPlayerState.jumpStatus == 0) {
if ((gPlayerState.flags & PL_USE_PORTAL) && gPlayerState.jump_status == 0) {
gArea.field_0x18 = 2;
} else {
if (sub_08057810()) {
src/manager/managerA.c
+3 -2
View File
@@ -116,11 +116,12 @@ static u32 PlayerStateValid(ManagerA* this) {
static void sub_08058514(ManagerA* this) {
switch (this->manager.unk_0d) {
case 1:
if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | PL_FALLING | 0x1010))
if (gPlayerState.flags &
(PL_BUSY | PL_DROWNING | PL_USE_PORTAL | PL_FALLING | PL_IN_MINECART | PL_CAPTURED))
return;
if (gPlayerEntity.z.HALF.HI != 0)
return;
gPlayerState.jumpStatus = 0;
gPlayerState.jump_status = 0;
CreateEzloHint(this->msg_idx, this->msg_height);
this->manager.unk_0d++;
this->manager.unk_0e = 30;
src/manager/managerF.c
+1 -1
View File
@@ -359,7 +359,7 @@ void sub_0805938C(ManagerF* this) {
}
u32 sub_080593CC(ManagerF* this) {
if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swimState != 0 && gPlayerEntity.animationState == 0 &&
if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.animationState == 0 &&
(gPlayerState.field_0x90 & 0xF00) == 0x400) {
return sub_0806FCB8(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6);
}