Merge pull request #363 from hatal175/manager22

This commit is contained in:
notyourav
2022-02-09 15:46:53 -08:00
committed by GitHub
17 changed files with 206 additions and 470 deletions
+2 -2
View File
@@ -355,7 +355,7 @@ bool32 sub_08041170(Enemy50Entity* this) {
} else {
if ((sub_08049FDC(super, 1)) &&
((sub_0806FD54(super) ||
((0xf < (s16)gArea.unk_0a && (EntityInRectRadius(super, gUnk_020000B0, 0x70, 0x48))))))) {
((0xf < (s16)gArea.lightLevel && (EntityInRectRadius(super, gUnk_020000B0, 0x70, 0x48))))))) {
sub_08041134(this);
return TRUE;
}
@@ -378,7 +378,7 @@ bool32 sub_080411E8(Enemy50Entity* this) {
}
return TRUE;
case 2:
if ((s16)gArea.unk_0a < 0x10) {
if ((s16)gArea.lightLevel < 0x10) {
return FALSE;
}
return TRUE;
+2 -2
View File
@@ -320,7 +320,7 @@ bool32 sub_0803F5A8(GhiniEntity* this) {
u32 result;
if (sub_08049FDC(super, 1) == 0) {
result = 0;
} else if ((s16)gArea.unk_0a < 0x10) {
} else if ((s16)gArea.lightLevel < 0x10) {
result = sub_0806FD54(super);
} else {
result = 1;
@@ -334,7 +334,7 @@ bool32 sub_0803F5D4(GhiniEntity* this) {
} else {
if ((sub_08049FDC(super, 1)) &&
((sub_0806FD54(super) ||
((0xf < (s16)gArea.unk_0a && (EntityInRectRadius(super, gUnk_020000B0, 0x70, 0x48))))))) {
((0xf < (s16)gArea.lightLevel && (EntityInRectRadius(super, gUnk_020000B0, 0x70, 0x48))))))) {
sub_0803F630(this);
return TRUE;
}