mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-08 03:36:29 -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/playerItem/playerItem10.c
+1 -1
View File
@@ -86,7 +86,7 @@ void sub_080ACC04(Entity* this) {
this->flags2 = gPlayerEntity.flags2;
this->direction = this->animationState << 2;
this->speed = 0x200;
this->flags |= 0xa0;
this->flags |= ENT_COLLIDE | ENT_20;
this->field_0x3c = 2;
this->hitbox = (Hitbox*)gUnk_0812AAD8[this->type];
this->field_0x70.WORD = 0x10;
src/playerItem/playerItem11.c
+7 -7
View File
@@ -33,16 +33,16 @@ void sub_08018CBC(Entity* this) {
uVar2 = this->animationState = gPlayerEntity.animationState & 0xe;
this->direction = (u8)(uVar2 << 2);
this->speed = 0x400;
this->damageType = 0x96;
this->hitType = 0x96;
this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x80;
this->flags2 = gPlayerEntity.flags2;
pEVar3 = this->attachedEntity;
if (pEVar3 != NULL) {
this->action = 1;
this->flags = this->flags & 0x7f;
COLLISION_OFF(this);
this->actionDelay = 0x56;
this->field_0x40 = 0x1c;
this->field_0x44 = 6;
this->hurtType = 0x1c;
this->damage = 6;
this->hitbox = &gUnk_080B3E18;
this->attachedEntity->spriteOffsetX = 0;
this->attachedEntity->spriteSettings.b.draw = 0;
@@ -57,8 +57,8 @@ void sub_08018CBC(Entity* this) {
this->spriteVramOffset = 0;
this->type = gPlayerState.field_0x1d[0] - 1;
this->actionDelay = gUnk_080B3DE0[this->type * 2];
this->field_0x44 = gUnk_080B3DE0[this->type * 2 + 1];
this->field_0x40 = 0x1b;
this->damage = gUnk_080B3DE0[this->type * 2 + 1];
this->hurtType = 0x1b;
this->hitbox = gUnk_080B3DE8[this->type];
(u32*)gPlayerEntity.field_0x70.WORD = this;
sub_08078CD0(&gPlayerEntity);
@@ -83,7 +83,7 @@ void sub_08018DE8(Entity* this) {
break;
case 5:
this->attachedEntity->subAction = 4;
this->flags = this->flags | 0x80;
COLLISION_ON(this);
this->action = 2;
this->spritePriority.b0 = 2;
this->attachedEntity->spriteSettings.b.draw = 1;
src/playerItem/playerItem12.c
+1 -1
View File
@@ -33,7 +33,7 @@ ASM_FUNC("asm/non_matching/playerItem12/sub_080703BC.inc", void sub_080703BC(Ent
void sub_08070458(Entity* this) {
this->action = 2;
this->flags &= 0x7f;
COLLISION_OFF(this);
this->speed = 0;
if (this->field_0x7c.WORD != 0) {
SetTile(this->field_0x7c.WORD, TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer);
src/playerItem/playerItemBow.c
+1 -1
View File
@@ -33,7 +33,7 @@ void sub_08019444(Entity* this) {
}
void sub_08019468(Entity* this) {
if (this->field_0x40 == 0x0e) {
if (this->hurtType == 0x0e) {
CreateFx(this, FX_REFLECT5, 0);
}
}
src/playerItem/playerItemC.c
+1 -1
View File
@@ -55,6 +55,6 @@ END_NONMATCH
ASM_FUNC("asm/non_matching/playerItemC/sub_0801B938.inc", void sub_0801B938(Entity* this))
void sub_0801B9F0(Entity* this) {
this->flags &= 0x7f;
COLLISION_OFF(this);
sub_08017744(this);
}
src/playerItem/playerItemLantern.c
+1 -1
View File
@@ -18,7 +18,7 @@ NONMATCH("asm/non_matching/playerItemLantern/sub_08054A60.inc", void sub_08054A6
this->actionDelay = 0x04;
this->frameIndex = -1;
// TODO regalloc and mov 6 too early
this->scriptedScene = (this->scriptedScene & 0xf0) | 6;
this->updateConditions = (this->updateConditions & 0xf0) | 6;
this->field_0x3c = 7;
this->flags2 = -0x80;
this->animationState = gPlayerEntity.animationState & 0xe;