mirror of
https://github.com/zeldaret/tmc
synced 2026-08-22 06:44:55 -04:00
Merge branch 'master' into cleanup_declarations
This commit is contained in:
+4
-4
@@ -430,7 +430,7 @@ void sub_08021328(Entity* this) {
|
||||
void sub_0802134C(Entity* this) {
|
||||
this->action = 15;
|
||||
this->direction = DirectionFromAnimationState(this->animationState);
|
||||
this->nonPlanarMovement = 0x200;
|
||||
this->speed = 0x200;
|
||||
this->field_0x76.HWORD = 0x78;
|
||||
sub_08021218(this, 0xe, this->animationState);
|
||||
}
|
||||
@@ -447,7 +447,7 @@ void sub_08021380(Entity* this) {
|
||||
|
||||
void sub_08021390(Entity* this) {
|
||||
this->action = 7;
|
||||
this->nonPlanarMovement = 0x200;
|
||||
this->speed = 0x200;
|
||||
this->damageType = 0x56;
|
||||
sub_08021218(this, 6, this->animationState);
|
||||
}
|
||||
@@ -455,7 +455,7 @@ void sub_08021390(Entity* this) {
|
||||
void sub_080213B0(Entity* this) {
|
||||
this->action = 3;
|
||||
this->actionDelay = 1;
|
||||
this->nonPlanarMovement = 0xc0;
|
||||
this->speed = 0xc0;
|
||||
this->field_0x76.HWORD = 0xf0;
|
||||
sub_08021218(this, 3, this->animationState);
|
||||
}
|
||||
@@ -474,7 +474,7 @@ void sub_080213F0(Entity* this) {
|
||||
|
||||
void sub_08021400(Entity* this) {
|
||||
this->action = 9;
|
||||
this->nonPlanarMovement = 0x60;
|
||||
this->speed = 0x60;
|
||||
sub_08021218(this, 10, this->animationState);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user