Unsplit managerF to avoid conflicts with the pr of Ibot02

This commit is contained in:
octorock
2021-09-26 14:57:42 +02:00
parent 9283aa5afe
commit c603199e0a
17 changed files with 475 additions and 55 deletions
+1 -1
View File
@@ -117,7 +117,7 @@ void sub_08060A00(Entity* this) {
this->action = 1;
this->spriteSettings.b.draw = 1;
this->speed = 0x120;
tmp = gRoomControls.filler[0];
tmp = gRoomControls.unk_10;
this->animationState = tmp * 2;
InitAnimationForceUpdate(this, tmp << 0x19 >> 0x19); // TODO some conversion between u8 and u32?
this->frameDuration = (Random() & 0x7f) + 0x80;
+1 -1
View File
@@ -308,7 +308,7 @@ void sub_0806AA18(Entity* this) {
ASM_FUNC("asm/non_matching/rem/sub_0806AA50.inc", void sub_0806AA50(Entity* this, ScriptExecutionContext* context))
void sub_0806AB74(Entity* this) {
gRoomVars.filler[3] = 1;
gRoomVars.field_0x3 = 1;
if ((s32)(this->y.HALF.HI - (u32)gRoomControls.roomOriginY) < 0xa8) {
this->y.HALF.HI = gRoomControls.roomOriginY + 0xa8;
}