mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 07:25:23 -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/object/button.c
+4 -4
View File
@@ -15,8 +15,8 @@ void Button(Entity* this) {
extern u32 sub_08081E3C(Entity*);
void sub_08081AE0(Entity* this) {
this->flags &= 0x7F;
this->scriptedScene = 3;
COLLISION_OFF(this);
this->updateConditions = 3;
this->y.HALF.HI++;
if (this->cutsceneBeh.HWORD != 0) {
this->collisionLayer = this->cutsceneBeh.HWORD;
@@ -234,13 +234,13 @@ u32 sub_08081F00(u32* unk1, u32* unk2) {
void sub_08081F24(Entity* this) {
Entity* fx = CreateFx(this, FX_DASH, 0x40);
if (fx) {
fx->scriptedScene = 3;
fx->updateConditions = 3;
fx->x.HALF.HI += 7;
fx->y.HALF.HI += 5;
}
fx = CreateFx(this, FX_DASH, 0x40);
if (fx) {
fx->scriptedScene = 3;
fx->updateConditions = 3;
fx->x.HALF.HI -= 7;
fx->y.HALF.HI += 5;
}
src/object/heartContainer.c
+1 -1
View File
@@ -31,7 +31,7 @@ static void sub_0808E6A0(Entity* this) {
this->spriteSettings.b.draw = 0;
this->hitbox = &gUnk_08121C58;
this->collisionLayer = 3;
this->scriptedScene = 3;
this->updateConditions = 3;
}
static void sub_0808E6E4(Entity* this) {
src/object/itemOnGround.c
+19 -19
View File
@@ -50,7 +50,7 @@ void ItemOnGround(Entity* this) {
switch (this->bitfield & 0x7F) {
case 20:
this->action = 3;
this->flags &= 0x7F;
COLLISION_OFF(this);
this->spriteSettings.b.draw = 1;
this->field_0x3c |= 0x10;
this->attachedEntity = this->field_0x4c;
@@ -93,22 +93,22 @@ void sub_08080F20(Entity* this) {
this->spriteSettings.b.draw = 1;
this->spritePriority.b1 = 3;
this->spriteSettings.b.shadow = 0;
this->damageType = 7;
this->hitType = 7;
this->field_0x3c = 0x47;
this->field_0x40 = 0x44;
this->hurtType = 0x44;
this->currentHealth = 0xFF;
this->hitbox = &gUnk_080FD1A8;
switch (this->type - 0x3F) {
case 0:
case 21:
case 22:
case 23:
case 24:
case 25:
case 29:
case 30:
case 31:
case 32:
switch (this->type) {
case 0x3f:
case 0x54:
case 0x55:
case 0x56:
case 0x57:
case 0x58:
case 0x5c:
case 0x5d:
case 0x5e:
case 0x5f:
this->flags2 = 0x17;
break;
default:
@@ -165,7 +165,7 @@ void sub_080810FC(Entity* this) {
} else {
this->action = 2;
this->subAction = 0;
this->flags |= 0x80;
COLLISION_ON(this);
this->flags2 = 0x11;
CopyPosition(&gPlayerEntity, this);
}
@@ -179,7 +179,7 @@ void sub_08081134(Entity* this) {
void sub_08081150(Entity* this) {
this->action = 2;
this->flags |= 0x80;
COLLISION_ON(this);
this->height.HALF.HI = -0x80;
this->spriteOrientation.flipY = 1;
this->spriteRendering.b3 = 1;
@@ -188,7 +188,7 @@ void sub_08081150(Entity* this) {
void sub_08081188(Entity* this) {
this->action = 2;
this->flags |= 0x80;
COLLISION_ON(this);
if (this->collisionLayer == 2) {
sub_08016A30(this);
}
@@ -220,7 +220,7 @@ void sub_080811EC(Entity* this) {
sub_08003FC4(this, 0x2800);
if (this->hVelocity <= 0) {
this->action = 2;
this->flags |= 0x80;
COLLISION_ON(this);
sub_080814A4(this);
}
}
@@ -430,7 +430,7 @@ void sub_08081598(Entity* this) {
sub_08081404(this, 1);
}
this->flags &= 0x7F;
COLLISION_OFF(this);
this->action = 4;
this->actionDelay = 14;
this->hVelocity = 0x20000;
src/object/jarPortal.c
+3 -3
View File
@@ -20,10 +20,10 @@ void JarPortal(Entity* this) {
}
void sub_0808BE9C(Entity* this) {
this->flags |= 0x80;
this->damageType = 1;
COLLISION_ON(this);
this->hitType = 1;
this->field_0x3c = 0x47;
this->field_0x40 = 0x44;
this->hurtType = 0x44;
this->flags2 = 0x80;
this->field_0x68.HALF.LO = 0;
if (CheckLocalFlag(this->type)) {
src/object/lightableSwitch.c
+6 -6
View File
@@ -26,11 +26,11 @@ void sub_0809EA1C(Entity* this) {
void sub_0809EA34(Entity* this) {
this->action = 1;
this->flags = this->flags | 0x80;
COLLISION_ON(this);
this->frameIndex = 0;
this->field_0x3c = 7;
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->hurtType = 0x48;
this->hitType = 0x28;
this->flags2 = 10;
this->hitbox = &gUnk_080FD150;
sub_0809EAD8(this);
@@ -98,11 +98,11 @@ void sub_0809EB68(Entity* this) {
void sub_0809EB80(Entity* this) {
this->action = 1;
this->flags = this->flags | 0x80;
COLLISION_ON(this);
this->frameIndex = 3;
this->field_0x3c = 7;
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->hurtType = 0x48;
this->hitType = 0x28;
this->flags2 = 10;
this->hitbox = &gUnk_080FD150;
sub_0809EAD8(this);
src/object/minecart.c
+12 -12
View File
@@ -45,10 +45,10 @@ void sub_080916EC(Entity* this) {
this->type2 = unk->field_0x6;
this->action = 1;
this->hitbox = &gUnk_080FD310;
this->flags |= 0x80;
this->damageType = 1;
COLLISION_ON(this);
this->hitType = 1;
this->field_0x3c = 0x47;
this->field_0x40 = 0x44;
this->hurtType = 0x44;
this->flags2 = 0x80;
this->direction = DirectionFromAnimationState(this->animationState);
this->speed = 0x700;
@@ -105,12 +105,12 @@ void sub_080918A4(Entity* this) {
gPlayerState.flags = (gPlayerState.flags ^ 0x4000000) | 0x1000;
this->action++;
this->field_0xf = 1;
this->flags |= 0x20;
this->damageType = 0x97;
this->flags |= ENT_20;
this->hitType = 0x97;
this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x20;
this->flags2 = gPlayerEntity.flags2;
this->field_0x40 = 0x18;
this->field_0x44 = 8;
this->hurtType = 0x18;
this->damage = 8;
sub_0801766C(this);
sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer);
SoundReq(SFX_137);
@@ -134,7 +134,7 @@ void sub_080919AC(Entity* this) {
}
if ((gPlayerEntity.frames.all & 0xf) == 0) {
this->flags = this->flags & 0x7f;
COLLISION_OFF(this);
CopyPosition(this, &gPlayerEntity);
if ((gPlayerEntity.frames.all & 0xf0) == 0x10) {
this->spriteOffsetY = 1;
@@ -142,7 +142,7 @@ void sub_080919AC(Entity* this) {
this->spriteOffsetY = 0;
}
} else {
this->flags = this->flags | 0x80;
COLLISION_ON(this);
gPlayerEntity.speed = 0;
sub_0806F69C(this);
CopyPosition(this, &gPlayerEntity);
@@ -166,10 +166,10 @@ void sub_080919AC(Entity* this) {
} else {
switch (uVar3) {
case 0x64:
this->flags = this->flags & 0xdf;
this->damageType = 1;
this->flags &= ~ENT_20;
this->hitType = 1;
this->field_0x3c = 0x47;
this->field_0x40 = 0x44;
this->hurtType = 0x44;
this->flags2 = 0x80;
this->action = 6;
sub_08017744(this);
src/object/mineralWaterSource.c
+3 -3
View File
@@ -28,15 +28,15 @@ void MineralWaterSource_Init(Entity* this) {
unknownParameters = &MineralWaterSourceParameters[this->type];
this->type2 = unknownParameters->field_0x00;
this->field_0x40 = unknownParameters->field_0x03;
this->hurtType = unknownParameters->field_0x03;
this->hitbox->width = unknownParameters->field_0x01;
this->hitbox->height = unknownParameters->field_0x02;
this->flags |= 0x80;
COLLISION_ON(this);
this->field_0x3c = 7;
this->damageType = 145;
this->hitType = 145;
this->flags2 = 2;
this->action = 1;
src/object/object49.c
+3 -3
View File
@@ -188,14 +188,14 @@ void sub_0808F3DC(Entity* this) {
return;
}
} else {
this->damageType = this->attachedEntity->damageType;
this->attachedEntity->damageType = 0x7E;
this->hitType = this->attachedEntity->hitType;
this->attachedEntity->hitType = 0x7E;
}
ResolveEntityOnTop(this->attachedEntity, this);
} else {
if (*(u32*)&this->parent->field_0x74 == 0) {
if (this->type == 8) {
this->attachedEntity->damageType = this->damageType;
this->attachedEntity->hitType = this->hitType;
}
DeleteThisEntity();
}
src/object/object9E.c
+3 -3
View File
@@ -16,13 +16,13 @@ void Object9E(Entity* this) {
this->action = 1;
this->spritePriority.b0 = 6;
if (this->type == 0) {
this->flags = this->flags | 0x80;
COLLISION_ON(this);
this->frameIndex = 1;
layer = &this->collisionLayer;
*layer = 1;
this->field_0x3c = 7;
this->field_0x40 = 0x48;
this->damageType = 0x7a;
this->hurtType = 0x48;
this->hitType = 0x7a;
this->flags2 = 1;
this->hitbox = &gUnk_080FD168;
tilePos = COORD_TO_TILE(this);
src/object/pot.c
+5 -5
View File
@@ -37,10 +37,10 @@ void sub_0808222C(Entity* this) {
this->speed = 0x80;
this->y.HALF.HI += 3;
this->field_0x16 = 0;
this->flags |= 0x80;
COLLISION_ON(this);
this->currentHealth = 1;
this->field_0x3c = 7;
this->damageType = 0x6E;
this->hitType = 0x6E;
this->flags2 = 0x84;
this->field_0x1c = 0x12;
if (this->collisionLayer == 0) {
@@ -71,7 +71,7 @@ void sub_08082310(Entity* this) {
this->spriteOffsetY = 0;
this->spriteSettings.b.shadow = 1;
this->spritePriority.b1 = 3;
this->flags &= 0x7F;
COLLISION_OFF(this);
sub_08082824(this);
break;
default:
@@ -118,10 +118,10 @@ void sub_080824F8(Entity* this) {
}
void sub_08082510(Entity* this) {
this->flags |= 0x80;
COLLISION_ON(this);
this->hitbox = &gUnk_080FD340;
this->field_0x3c = 7;
this->damageType = 1;
this->hitType = 1;
this->flags2 = gPlayerEntity.flags2;
this->spriteOffsetY = 0;
SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);
src/object/warpPoint.c
+1 -1
View File
@@ -41,7 +41,7 @@ void sub_0808B474(Entity* this) {
this->palette.b.b0 = tmp;
this->spritePriority.b0 = 6;
this->hitbox = &gUnk_080FD168;
this->scriptedScene = 3;
this->updateConditions = 3;
InitializeAnimation(this, 0);
if (CheckFlags(this->field_0x86.HWORD)) {
sub_0808B830(this);