mirror of
https://github.com/zeldaret/tmc
synced 2026-06-04 02:47:05 -04:00
format
This commit is contained in:
+2
-2
@@ -1284,8 +1284,8 @@ static void InitRoomTransition(void) {
|
||||
bool32 CanDispEzloMessage(void) {
|
||||
s32 tmp = PL_STATE_WALK;
|
||||
|
||||
if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gPauseMenuOptions.disabled ||
|
||||
gUnk_0200AF00.unk_1)
|
||||
if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED ||
|
||||
gPauseMenuOptions.disabled || gUnk_0200AF00.unk_1)
|
||||
return 0;
|
||||
|
||||
if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item ||
|
||||
|
||||
@@ -42,7 +42,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
|
||||
Entity* child = super->child;
|
||||
if ((this->unk_6c == child->kind) || (this->unk_6e == child->id)) {
|
||||
if (child->action != 2) {
|
||||
sub_08079184();
|
||||
PlayerDropHeldObject();
|
||||
DeleteThisEntity();
|
||||
} else {
|
||||
if ((gPlayerState.heldObject == 0) || ((gNewPlayerEntity.unk_79 & 0x7f) != 0)) {
|
||||
@@ -54,7 +54,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sub_08079184();
|
||||
PlayerDropHeldObject();
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
@@ -204,7 +204,7 @@ void sub_080AD27C(PlayerItem13Entity* this) {
|
||||
super->flags |= 0x80;
|
||||
sub_0801766C(super);
|
||||
} else {
|
||||
sub_08079184();
|
||||
PlayerDropHeldObject();
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -569,7 +569,7 @@ void PlayerCancelHoldItem(ItemBehavior* beh, u32 arg1) {
|
||||
* Check if player state believes the held item is valid?
|
||||
* If it's not delete the item?
|
||||
*/
|
||||
bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk) {
|
||||
bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk) {
|
||||
u32 temp;
|
||||
if (gPlayerState.heldObject == 0) {
|
||||
PlayerCancelHoldItem(arg0, unk);
|
||||
|
||||
Reference in New Issue
Block a user