diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-30 14:35:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 14:35:18 -0800 |
| commit | 9c87bcca8ea4b52199ed908c0ea28ab08b1d0747 (patch) | |
| tree | 8df9fe68628826c949bf4ec0de9f74db40a9914d /src/code_08049DF4.c | |
| parent | 3c0c1ba5a0653e0acb1c433c3619cda0e3223ddd (diff) | |
| parent | 8b69eadaef0e0d9f1a4071d1cfad00e93183590b (diff) | |
Merge pull request #679 from octorock/enemies
Use new entity structs for enemies and player
Diffstat (limited to 'src/code_08049DF4.c')
| -rw-r--r-- | src/code_08049DF4.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c index a4af4474..e9794e59 100644 --- a/src/code_08049DF4.c +++ b/src/code_08049DF4.c @@ -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; } |