diff options
Diffstat (limited to 'src/code_08049DF4.c')
| -rw-r--r-- | src/code_08049DF4.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c index b2004f1a..2852df19 100644 --- a/src/code_08049DF4.c +++ b/src/code_08049DF4.c @@ -7,12 +7,11 @@ #include "room.h" #include "enemy.h" -extern Entity* gUnk_020000B0; extern Entity* (*const gUnk_080D3BE8[])(void); Entity* sub_08049DF4(u32 arg0) { - if (gUnk_020000B0 != NULL) { - return gUnk_020000B0; + if (gEnemyTarget != NULL) { + return gEnemyTarget; } return gUnk_080D3BE8[arg0](); } @@ -22,7 +21,7 @@ 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.base; + gEnemyTarget = &gPlayerEntity.base; return &gPlayerEntity.base; } return NULL; @@ -33,7 +32,7 @@ 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.base; + gEnemyTarget = &gPlayerEntity.base; return &gPlayerEntity.base; } return NULL; @@ -43,14 +42,14 @@ Entity* sub_08049E80(void) { if ((gPlayerState.killed != 0) || !(gPlayerState.flags & PL_MINISH)) { return NULL; } - gUnk_020000B0 = &gPlayerEntity.base; + gEnemyTarget = &gPlayerEntity.base; return &gPlayerEntity.base; } Entity* sub_08049EB0(void) { if ((gPlayerState.killed == 0) && !(gPlayerState.flags & (PL_MOLDWORM_CAPTURED | PL_DISABLE_ITEMS | PL_MINISH | PL_CAPTURED))) { - gUnk_020000B0 = &gPlayerEntity.base; + gEnemyTarget = &gPlayerEntity.base; return &gPlayerEntity.base; } return NULL; |