falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

format

This commit is contained in:
theo3 2022-03-28 12:15:25 -07:00
parent c0eae31c2c
commit bfa69f594c
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/non_matching/itemTryPickupObject/sub_080762D8.inc
View File

@ -9,7 +9,7 @@
strb r1, [r4, #5] strb r1, [r4, #5]
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl PlayerTryDropItem bl PlayerTryDropObject
cmp r0, #0 cmp r0, #0
bne _080762F6 bne _080762F6
b _08076486 b _08076486

2
asm/non_matching/itemTryPickupObject/sub_08076518.inc
View File

@ -4,7 +4,7 @@
push {r7} push {r7}
adds r4, r0, #0 adds r4, r0, #0
mov r8, r1 mov r8, r1
bl PlayerTryDropItem bl PlayerTryDropObject
cmp r0, #0 cmp r0, #0
beq _080765D4 beq _080765D4
ldr r5, _0807655C @ =gPlayerState ldr r5, _0807655C @ =gPlayerState

2
include/player.h
View File

@ -374,7 +374,7 @@ void sub_080792D8(void);
u32 sub_08078F74(Entity*); u32 sub_08078F74(Entity*);
void sub_0807879C(Entity*); void sub_0807879C(Entity*);
void PlayerSetNormalAndCollide(void); void PlayerSetNormalAndCollide(void);
bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk); bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk);
// player.s // player.s
extern u32 PlayerCheckNEastTile(); extern u32 PlayerCheckNEastTile();

4
src/game.c
View File

@ -1284,8 +1284,8 @@ static void InitRoomTransition(void) {
bool32 CanDispEzloMessage(void) { bool32 CanDispEzloMessage(void) {
s32 tmp = PL_STATE_WALK; s32 tmp = PL_STATE_WALK;
if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gPauseMenuOptions.disabled || if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED ||
gUnk_0200AF00.unk_1) gPauseMenuOptions.disabled || gUnk_0200AF00.unk_1)
return 0; return 0;
if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item || if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item ||

6
src/playerItem/playerItem13.c
View File

@ -42,7 +42,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
Entity* child = super->child; Entity* child = super->child;
if ((this->unk_6c == child->kind) || (this->unk_6e == child->id)) { if ((this->unk_6c == child->kind) || (this->unk_6e == child->id)) {
if (child->action != 2) { if (child->action != 2) {
sub_08079184(); PlayerDropHeldObject();
DeleteThisEntity(); DeleteThisEntity();
} else { } else {
if ((gPlayerState.heldObject == 0) || ((gNewPlayerEntity.unk_79 & 0x7f) != 0)) { if ((gPlayerState.heldObject == 0) || ((gNewPlayerEntity.unk_79 & 0x7f) != 0)) {
@ -54,7 +54,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
} }
} }
} else { } else {
sub_08079184(); PlayerDropHeldObject();
DeleteThisEntity(); DeleteThisEntity();
} }
} }
@ -204,7 +204,7 @@ void sub_080AD27C(PlayerItem13Entity* this) {
super->flags |= 0x80; super->flags |= 0x80;
sub_0801766C(super); sub_0801766C(super);
} else { } else {
sub_08079184(); PlayerDropHeldObject();
DeleteThisEntity(); DeleteThisEntity();
} }
} }

2
src/playerUtils.c
View File

@ -569,7 +569,7 @@ void PlayerCancelHoldItem(ItemBehavior* beh, u32 arg1) {
* Check if player state believes the held item is valid? * Check if player state believes the held item is valid?
* If it's not delete the item? * If it's not delete the item?
*/ */
bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk) { bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk) {
u32 temp; u32 temp;
if (gPlayerState.heldObject == 0) { if (gPlayerState.heldObject == 0) {
PlayerCancelHoldItem(arg0, unk); PlayerCancelHoldItem(arg0, unk);