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

Merge branch 'master' into tilemap-docs

Browse Source
This commit is contained in:
octorock
2023-12-31 02:12:41 +01:00
parent 957da774e4 9c87bcca8e
commit 109b1020dc
549 changed files with 15821 additions and 15437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_08049DF4.c
+8 -9
View File
@@ -1,4 +1,3 @@
#define NENT_DEPRECATED
#include "asm.h"
#include "global.h"
#include "entity.h"
@@ -25,8 +24,8 @@ Entity* sub_08049E18(void) {
!(gPlayerState.flags &
(PL_BUSY | PL_DROWNING | PL_CAPTURED | PL_USE_PORTAL | PL_HIDDEN | PL_DISABLE_ITEMS | PL_FALLING | PL_FROZEN |
PL_IN_MINECART | PL_PIT_IS_EXIT | PL_MOLDWORM_CAPTURED | PL_IN_HOLE | PL_CONVEYOR_PUSHED | PL_CLIMBING))) {
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
gUnk_020000B0 = &gPlayerEntity.base;
return &gPlayerEntity.base;
}
return NULL;
}
@@ -36,8 +35,8 @@ Entity* sub_08049E4C(void) {
!(gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_CAPTURED | PL_USE_PORTAL | PL_HIDDEN | PL_MINISH |
PL_DISABLE_ITEMS | PL_FALLING | PL_FROZEN | PL_IN_MINECART | PL_PIT_IS_EXIT |
PL_MOLDWORM_CAPTURED | PL_IN_HOLE | PL_CONVEYOR_PUSHED | PL_CLIMBING))) {
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
gUnk_020000B0 = &gPlayerEntity.base;
return &gPlayerEntity.base;
}
return NULL;
}
@@ -46,15 +45,15 @@ Entity* sub_08049E80(void) {
if ((gPlayerState.field_0x3c != 0) || !(gPlayerState.flags & PL_MINISH)) {
return NULL;
}
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
gUnk_020000B0 = &gPlayerEntity.base;
return &gPlayerEntity.base;
}
Entity* sub_08049EB0(void) {
if ((gPlayerState.field_0x3c == 0) &&
!(gPlayerState.flags & (PL_MOLDWORM_CAPTURED | PL_DISABLE_ITEMS | PL_MINISH | PL_CAPTURED))) {
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
gUnk_020000B0 = &gPlayerEntity.base;
return &gPlayerEntity.base;
}
return NULL;
}