Rename movement functions

This commit is contained in:
octorock
2022-02-12 20:00:08 +01:00
parent d6c79aa263
commit b69a6d223c
141 changed files with 2334 additions and 2992 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ void sub_0809CD0C(Entity* this) {
gPlayerEntity.iframes = 16;
gPlayerEntity.knockbackDirection = 16;
gPlayerEntity.knockbackDuration = 12;
gPlayerEntity.field_0x46 = 16;
gPlayerEntity.knockbackSpeed = 16;
}
}
}
+2 -2
View File
@@ -203,7 +203,7 @@ void sub_080811D8(Entity* this) {
void sub_080811EC(Entity* this) {
if (this->field_0x68.HALF.HI != 6) {
sub_080AEFE0(this);
ProcessMovement2(this);
} else {
LinearMoveUpdate(this);
}
@@ -389,7 +389,7 @@ void sub_08081500(Entity* this) {
UpdateSpriteForCollisionLayer(this);
}
sub_080AEFE0(this);
ProcessMovement2(this);
}
}
}
-5
View File
@@ -6,11 +6,6 @@
#include "flags.h"
#include "functions.h"
extern void sub_0809EB30(Entity*);
extern void sub_0809EAD8(Entity*);
extern void sub_0809EABC(Entity*);
extern void sub_080A2CC0(Entity*, Entity**, u16*);
extern void (*const gUnk_081243B4[])(Entity*);
extern void (*const gUnk_081243BC[])(Entity*);
extern void (*const gUnk_081243C4[])(Entity*);
+1 -1
View File
@@ -114,7 +114,7 @@ void sub_08085A44(LilypadLargeEntity* this) {
}
}
sub_08085EFC(this);
sub_080AF134(super);
ProcessMovement4(super);
sub_08085F1C(this);
}
+1 -1
View File
@@ -22,7 +22,7 @@ void ObjectB2(Entity* this) {
}
this->speed = this->parent->speed;
LinearMoveUpdate(this);
if (sub_080AE4CC((u8*)this->child, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
if (IsTileCollision((u8*)this->child, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
DeleteThisEntity();
}
if (this->speed < 0x41) {
+1 -1
View File
@@ -37,7 +37,7 @@ void sub_08086A28(Entity* ent) {
if (iVar1 == 0) {
ent->action = 2;
}
ProcessMovement(ent);
ProcessMovement0(ent);
CopyPosition(ent, ent->child);
}
}
+1 -1
View File
@@ -205,7 +205,7 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
if (uVar3 != 0) {
return 0;
}
sub_080AEFE0(super);
ProcessMovement2(super);
sub_0800445C(super);
if (super->actionDelay != 0) {
super->speed += 0x10;