Merge branch 'master' into cleanup_declarations

This commit is contained in:
Henny022p
2021-03-15 22:56:23 +01:00
549 changed files with 18187 additions and 4914 deletions
+2 -2
View File
@@ -40,7 +40,7 @@ void sub_08060428(Entity* this) {
void* data;
this->actionDelay = 0x5a;
this->nonPlanarMovement = 0x180;
this->speed = 0x180;
if (this->type2 != 0) {
data = GetCurrentRoomProperty(this->type2);
} else {
@@ -195,7 +195,7 @@ void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
u32 x = coords->x + gRoomControls.roomOriginX;
u32 y = coords->y + gRoomControls.roomOriginY;
sub_0807DEDC(entity, context, x, y);
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
void sub_0806075C(Entity* this) {