mirror of
https://github.com/zeldaret/tmc
synced 2026-08-17 21:33:45 -04:00
Merge branch 'master' into cleanup_declarations
This commit is contained in:
+2
-2
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user