mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-16 05:09:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

thumb interwork finished

Browse Source
This commit is contained in:
theo3
2021-11-10 00:35:06 -08:00
parent e6eeeefc50
commit 313cc336f2
122 changed files with 1514 additions and 2696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/cat.c
+4 -4
View File
@@ -66,8 +66,8 @@ void sub_080677EC(Entity* this) {
this->direction = 8;
this->speed = 0x80;
this->field_0x3c = 7;
this->field_0x40 = 0x48;
this->damageType = -0x58;
this->hurtType = 0x48;
this->hitType = -0x58;
this->flags2 = 1;
this->field_0x68.HALF.HI = 0xff;
if (this->x.HALF.HI < gPlayerEntity.x.HALF.HI) {
@@ -183,7 +183,7 @@ void sub_08067A0C(Entity* this) {
} else {
tmp = (this->frames.all & 7);
if (tmp != 0) {
this->flags = this->flags | 0x80;
COLLISION_ON(this);
this->hitbox = gUnk_08111154[tmp - 1 + ((this->spriteSettings.b.flipX << 2))];
} else {
sub_08067DDC(this);
@@ -381,7 +381,7 @@ void sub_08067DCC(Entity* this, u32 param) {
}
void sub_08067DDC(Entity* this) {
this->flags = this->flags & 0x7f;
COLLISION_OFF(this);
this->bitfield = 0;
this->iframes = 0;
this->hitbox = &gUnk_08110EF0;
src/npc/npc5.c
+3 -3
View File
@@ -134,11 +134,11 @@ void sub_08060AE0(Entity* this) {
this->myHeap = (u32*)heapObj;
heapObj->unk_0b = 0x20;
this->action = 1;
this->flags |= 0x80;
COLLISION_ON(this);
this->animationState &= 3;
this->field_0x3c = 7;
this->field_0x40 = 0x48;
this->damageType = 0x49;
this->hurtType = 0x48;
this->hitType = 0x49;
this->flags2 = 3;
this->hitbox = &gUnk_080FD150;
this->field_0x17 &= 0xfe;