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

identify some functions

Browse Source
This commit is contained in:
theo3
2022-03-28 12:06:05 -07:00
parent c86ada3e3d
commit a9784e96ba
86 changed files with 357 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item/itemOcarina.c
+2 -2
View File
@@ -24,7 +24,7 @@ void OcarinaUse(ItemBehavior* this, u32 arg1) {
gPlayerEntity.field_0x7a.HWORD = 2;
gPlayerState.flags |= PL_USE_OCARINA;
gPlayerState.field_0x27[0] = -1;
gUnk_02034490.unk0 = 1;
gPauseMenuOptions.disabled = 1;
gPlayerState.field_0xa = (8 >> arg1) | gPlayerState.field_0xa;
gPlayerState.keepFacing = (8 >> arg1) | gPlayerState.keepFacing;
ResetPlayerVelocity();
@@ -41,7 +41,7 @@ NONMATCH("asm/non_matching/ocarina/OcarinaUpdate.inc", void OcarinaUpdate(ItemBe
gPlayerEntity.flags |= ENT_COLLIDE;
gPlayerState.flags &= ~PL_USE_OCARINA;
gPlayerState.field_0x27[0] = 0;
gUnk_02034490.unk0 = 0;
gPauseMenuOptions.disabled = 0;
CreateBird();
ResetPlayerEventPriority();
DeletePlayerItem(this, arg1);
src/item/itemTryPickupObject.c
+3 -5
View File
@@ -3,8 +3,6 @@
extern void (*const gUnk_0811BDB4[])(ItemBehavior*, u32);
u32 sub_08077F64(ItemBehavior* arg0, u32 unk);
void ItemTryPickupObject(ItemBehavior* this, u32 arg1) {
gUnk_0811BDB4[this->stateID](this, arg1);
}
@@ -24,7 +22,7 @@ void sub_08076488(ItemBehavior* this, u32 arg1) {
s32 iVar2;
if (this->field_0x5[2] == 0) {
if (sub_08077F64(this, arg1) != 0) {
if (PlayerTryDropItem(this, arg1) != 0) {
if (((*(u8*)((this->field_0x18) + 0x16) & 0xf0) == 0x10) && ((gRoomTransition.frameCount & 1U) != 0)) {
return;
}
@@ -48,9 +46,9 @@ void sub_08076488(ItemBehavior* this, u32 arg1) {
ASM_FUNC("asm/non_matching/itemTryPickupObject/sub_08076518.inc", void sub_08076518(ItemBehavior* this, u32 arg1))
void sub_080765E0(ItemBehavior* this, u32 arg1) {
if (sub_08077F64(this, arg1) != 0) {
if (PlayerTryDropItem(this, arg1) != 0) {
if ((this->field_0x5[9] & 0x80) != 0) {
sub_08077F50(this, arg1);
PlayerCancelHoldItem(this, arg1);
} else {
UpdateItemAnim(this);
}