mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 09:22:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename gUnk_020000B0 to gEnemyTarget and move it to a header

Browse Source
This commit is contained in:
Henny022p
2025-01-12 01:46:48 +00:00
parent cd2b8d4b53
commit ca873e6b7f
30 changed files with 107 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_08049DF4.c
+6 -7
View File
@@ -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;