mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-06 19:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanup_declarations

Browse Source
This commit is contained in:
Henny022p
2021-03-15 22:56:23 +01:00
parent aac7eb7436 e09678c6ab
commit a2cdfd6d8d
549 changed files with 18187 additions and 4914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/fileScreenObjects.c
+2 -2
View File
@@ -504,7 +504,7 @@ static u32 sub_0808EF6C(Entity* this) {
if (this->field_0x6c.HWORD < var7) {
var7 = this->field_0x6c.HWORD;
}
this->nonPlanarMovement = var7;
this->speed = var7;
this->direction = sub_080045DA(var0, var2) >> 3;
sub_0806F69C(this);
return 1;
@@ -515,7 +515,7 @@ static void sub_0808EFF0(Entity* this) {
u8 var1;
this->spriteSettings.b.draw = 2;
this->nonPlanarMovement = 0x400;
this->speed = 0x400;
this->currentHealth = 1;
this->frameIndex = 0xFF;
this->animIndex = 0xFF;