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

Rename objects

Browse Source
This commit is contained in:
octorock
2022-07-23 12:43:43 +02:00
parent ccba86d292
commit 852effa474
671 changed files with 5779 additions and 5277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItemBomb.c
+6 -6
View File
@@ -45,7 +45,7 @@ void PlayerItemBomb(PlayerItemBombEntity* this) {
if (uVar1 != 0x03) {
if (super->timer != 0) {
if (*(u8*)&this->unk_68 == 7) {
super->timer -= 1;
super->timer--;
}
if (super->timer == 0) {
super->subtimer = 80;
@@ -105,16 +105,16 @@ void sub_0801B2CC(PlayerItemBombEntity* this) {
}
switch (IsItemEquipped(ITEM_REMOTE_BOMBS)) {
case 0:
unaff_r5 = 1;
unaff_r5 = PLAYER_INPUT_1;
break;
case 1:
unaff_r5 = 2;
unaff_r5 = PLAYER_INPUT_2;
break;
case 2:
unaff_r5 = 0;
break;
}
if ((unaff_r5 & gPlayerState.field_0x92) != 0) {
if ((gPlayerState.playerInput.field_0x92 & unaff_r5) != 0) {
super->timer = 0;
super->subtimer = 1;
}
@@ -125,7 +125,7 @@ void sub_0801B318(PlayerItemBombEntity* this) {
}
void sub_0801B330(PlayerItemBombEntity* this) {
super->subAction += 1;
super->subAction++;
sub_08079BD8(super);
}
@@ -138,7 +138,7 @@ void sub_0801B354(PlayerItemBombEntity* this) {
}
void sub_0801B368(PlayerItemBombEntity* this) {
super->action -= 1;
super->action--;
super->subAction = 0;
if (0x3c < super->timer) {
super->timer = 60;
src/playerItem/playerItemBoomerang.c
+2 -2
View File
@@ -193,7 +193,7 @@ void sub_0801B680(Entity* this) {
void sub_0801B7A8(Entity* this) {
sub_0801B804(this);
if (this->timer != 0) {
this->timer -= 1;
this->timer--;
} else {
sub_0801B864(this);
if (this->speed < 0x280) {
@@ -224,7 +224,7 @@ void sub_0801B804(Entity* this) {
break;
}
if ((uVar1 & gPlayerState.field_0x90) == 0) {
if ((uVar1 & gPlayerState.playerInput.field_0x90) == 0) {
this->field_0x80.HALF.LO = 1;
gPlayerState.field_0xa &= 0x7f;
gPlayerState.keepFacing &= 0x7f;
src/playerItem/playerItemBottle.c
+7 -7
View File
@@ -168,13 +168,13 @@ void PlayerItemBottle_UseOther(Entity* this) {
}
switch (this->field_0x6e.HALF.HI) {
case ITEM_BOTTLE_WATER:
CreateObjectWithParent(this, OBJECT_68, 0, 0);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 0, 0);
break;
case ITEM_BOTTLE_MINERAL_WATER:
CreateObjectWithParent(this, OBJECT_68, 1, 1);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 1, 1);
break;
case ITEM_BOTTLE_FAIRY:
CreateObjectWithParent(this, OBJECT_68, 2, 2);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 2, 2);
ModHealth(0x20);
break;
case BOTTLE_CHARM_NAYRU:
@@ -188,20 +188,20 @@ void PlayerItemBottle_UseOther(Entity* this) {
if (gPlayerEntity.frame == 2) {
switch (this->field_0x6e.HALF.HI) {
case ITEM_BOTTLE_WATER:
CreateObjectWithParent(this, OBJECT_68, 0, 0);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 0, 0);
break;
case ITEM_BOTTLE_MINERAL_WATER:
CreateObjectWithParent(this, OBJECT_68, 1, 1);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 1, 1);
break;
}
}
if (gPlayerEntity.frame == 3) {
switch (this->field_0x6e.HALF.HI) {
case ITEM_BOTTLE_WATER:
CreateObjectWithParent(this, OBJECT_68, 0, 0);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 0, 0);
break;
case ITEM_BOTTLE_MINERAL_WATER:
CreateObjectWithParent(this, OBJECT_68, 1, 0);
CreateObjectWithParent(this, LINK_EMPTYING_BOTTLE, 1, 0);
break;
}
}
src/playerItem/playerItemBow.c
+1 -1
View File
@@ -115,7 +115,7 @@ void sub_08018FE4(PlayerItemBowEntity* this) {
sub_08079BD8(super);
if (this->unk_68 == 0xa) {
this->unk_78 = 0x3c;
object = CreateObject(OBJECT_43, super->type, 1);
object = CreateObject(SWORD_PARTICLE, super->type, 1);
if (object != NULL) {
CopyPosition(super, object);
}
src/playerItem/playerItemGust.c
+2 -2
View File
@@ -96,7 +96,7 @@ static void sub_080ACC78(GustEntity* this) {
}
o = sub_08008782(super, 0xe, child_offsets[this->offset_iter], child_offsets[this->offset_iter + 1]);
if (o != NULL) {
child = CreateObject(OBJECT_11, o->type, o->type2);
child = CreateObject(BUSH, o->type, o->type2);
if (child != NULL) {
child->timer = o->timer;
child->x.HALF.HI = child_offsets[this->offset_iter] + super->x.HALF.HI;
@@ -118,7 +118,7 @@ static void sub_080ACC78(GustEntity* this) {
} else {
this->timer = gUnk_0812AABC[super->type];
}
child = CreateObject(OBJECT_17, 0, 0);
child = CreateObject(GUST_JAR_PARTICLE, 0, 0);
if (child == NULL) {
return;
}
src/playerItem/playerItemGustJar.c
+1 -1
View File
@@ -118,7 +118,7 @@ void PlayerItemGustJar_Action2(Entity* this) {
void PlayerItemGustJar_Action3(Entity* this) {
switch (gPlayerState.field_0x1c & 0xf) {
case 6:
this->action += 1;
this->action++;
InitAnimationForceUpdate(this, (gPlayerEntity.animationState >> 1) + 4);
break;
case 1:
src/playerItem/playerItemLantern.c
+1 -1
View File
@@ -59,7 +59,7 @@ void sub_08054AC8(Entity* this) {
if (IsItemEquipped(ITEM_LANTERN_ON) < 2) {
if (((this->frameIndex != 0xff) && (gPlayerEntity.spriteSettings.draw != 0)) && (this->timer-- == 0)) {
this->timer = 4;
object = CreateObject(OBJECT_45, 0, 0x10);
object = CreateObject(LAMP_PARTICLE, 0, 0x10);
if (object != NULL) {
PositionRelative(this, object, 0, Q_16_16(2.0));
object->spritePriority.b0 = this->spritePriority.b0;
src/playerItem/playerItemSwordBeam.c
+3 -3
View File
@@ -50,11 +50,11 @@ void sub_08019498(Entity* this) {
break;
case 2:
this->spriteSettings.flipX = 1;
this->x.HALF.HI += 1;
this->x.HALF.HI++;
this->y.HALF.HI += -4;
break;
case 6:
this->x.HALF.HI -= 1;
this->x.HALF.HI--;
this->y.HALF.HI += -4;
break;
}
@@ -100,7 +100,7 @@ void sub_08019644(Entity* this) {
*(int*)&this->field_0x74 = iVar1;
if (iVar1 == 0) {
*(int*)&this->field_0x74 = 2;
this->field_0x70.WORD += 1;
this->field_0x70.WORD++;
if (gUnk_080B4400[this->field_0x70.WORD] == 0xff) {
this->field_0x70.WORD = iVar1;
}