Skip to content

Commit 8e4ef92

Browse files
hytopouloshytopoulos
committed
fix fake match
1 parent acc75c2 commit 8e4ef92

20 files changed

+99
-101
lines changed

‎include/player.h

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -234,23 +234,21 @@ typedef struct {
234234
} PlayerMacroEntry;
235235

236236
typedef enum {
237-
PLAYER_INPUT_1 = 0x1, // A
238-
PLAYER_INPUT_2 = 0x2, // B
239-
PLAYER_INPUT_8 = 0x8, // A sub_080782C0, sub_0807953C, PlayerUpdateSwimming, sub_08076518. ItemForSale_Action2
240-
PLAYER_INPUT_10 = 0x10, // B sub_0807953C, ToggleDiving, sub_08076518, ItemForSale_Action2
241-
PLAYER_INPUT_20 = 0x20, // R sub_0807953C
242-
PLAYER_INPUT_40 = 0x40, // A CrenelBeanSprout_Action1
243-
PLAYER_INPUT_80 =
237+
INPUT_USE_ITEM1 = 0x1, // A
238+
INPUT_USE_ITEM2 = 0x2, // B
239+
INPUT_INTERACT = 0x8, // A sub_080782C0, sub_0807953C, PlayerUpdateSwimming, sub_08076518. ItemForSale_Action2
240+
INPUT_CANCEL = 0x10, // B sub_0807953C, ToggleDiving, sub_08076518, ItemForSale_Action2
241+
INPUT_CONTEXT = 0x20, // R sub_0807953C
242+
INPUT_40 = 0x40, // A CrenelBeanSprout_Action1
243+
INPUT_ACTION =
244244
0x80, // R sub_08073584, IsPreventedFromUsingItem, sub_080782C0, CrenelBeanSprout_Action1, ItemForSale_Action2
245-
PLAYER_INPUT_RIGHT = 0x100,
246-
PLAYER_INPUT_LEFT = 0x200,
247-
PLAYER_INPUT_UP = 0x400,
248-
PLAYER_INPUT_DOWN = 0x800,
249-
PLAYER_INPUT_ANY_DIRECTION = 0xf00,
250-
PLAYER_INPUT_1000 = 0x1000, // L, where is it set? sub_080782C0
251-
PLAYER_INPUT_8000 = 0x8000, // R, IsTryingToPickupObject, sub_08076518
252-
253-
// TODO What is the result of u32 result = (s32) - (keys & 0x200) >> 0x1f & 0x1000;?
245+
INPUT_RIGHT = 0x100,
246+
INPUT_LEFT = 0x200,
247+
INPUT_UP = 0x400,
248+
INPUT_DOWN = 0x800,
249+
INPUT_ANY_DIRECTION = 0xf00,
250+
INPUT_FUSE = 0x1000, // L, where is it set? sub_080782C0
251+
INPUT_LIFT_THROW = 0x8000, // R, IsTryingToPickupObject, sub_08076518
254252
} PlayerInputState;
255253

256254
typedef struct {
@@ -357,7 +355,7 @@ typedef struct {
357355
/*0x09*/ u8 _hasAllFigurines;
358356
/*0x0a*/ u8 charm;
359357
/*0x0b*/ u8 picolyteType;
360-
/*0x0c*/ u8 itemButtons[2];
358+
/*0x0c*/ u8 equipped[2];
361359
/*0x0e*/ u8 bottles[4];
362360
/*0x12*/ u8 effect;
363361
/*0x13*/ u8 hasAllFigurines;

‎src/beanstalkSubtask.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ u32 UpdatePlayerCollision(void) {
312312
return 0;
313313
}
314314
gUnk_0200AF00.rActionInteractTile = R_ACTION_READ;
315-
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_40)) == 0) {
315+
if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_40)) == 0) {
316316
return 0;
317317
}
318318
gPlayerState.mobility = 1;
@@ -326,7 +326,7 @@ u32 UpdatePlayerCollision(void) {
326326
return 0;
327327
}
328328
gUnk_0200AF00.rActionInteractTile = R_ACTION_OPEN;
329-
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0) {
329+
if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_INTERACT)) == 0) {
330330
return 0;
331331
}
332332
gPlayerState.mobility = 1;
@@ -337,7 +337,7 @@ u32 UpdatePlayerCollision(void) {
337337
return 0;
338338
}
339339
gUnk_0200AF00.rActionInteractTile = R_ACTION_OPEN;
340-
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0) {
340+
if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_INTERACT)) == 0) {
341341
return 0;
342342
}
343343
gPlayerState.mobility = 1;

‎src/code_0805EC04.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,40 +144,40 @@ void UpdatePlayerInput(void) {
144144
gPlayerState.playerInput.heldInput = state;
145145
gPlayerState.playerInput.newInput = state & prevState;
146146
// Calculate the direction from the currently held input.
147-
gPlayerState.direction = gUnk_08109202[(state & PLAYER_INPUT_ANY_DIRECTION) >> 8];
147+
gPlayerState.direction = gUnk_08109202[(state & INPUT_ANY_DIRECTION) >> 8];
148148
}
149149

150150
u32 ConvInputToState(u32 keys) {
151151
u32 result;
152152
if (keys & L_BUTTON) {
153-
result = 0x1000;
153+
result = INPUT_FUSE;
154154
} else {
155155
result = 0;
156156
}
157157
if (keys & R_BUTTON) {
158-
result |= PLAYER_INPUT_20;
159-
result |= PLAYER_INPUT_8000;
160-
result |= PLAYER_INPUT_80;
158+
result |= INPUT_CONTEXT;
159+
result |= INPUT_LIFT_THROW;
160+
result |= INPUT_ACTION;
161161
}
162162
if (keys & A_BUTTON) {
163-
result |= PLAYER_INPUT_8;
164-
result |= PLAYER_INPUT_40 | PLAYER_INPUT_1;
163+
result |= INPUT_INTERACT;
164+
result |= INPUT_40 | INPUT_USE_ITEM1;
165165
}
166166
if (keys & B_BUTTON) {
167-
result |= PLAYER_INPUT_10;
168-
result |= PLAYER_INPUT_2;
167+
result |= INPUT_CANCEL;
168+
result |= INPUT_USE_ITEM2;
169169
}
170170
if (keys & DPAD_RIGHT) {
171-
result |= PLAYER_INPUT_RIGHT;
171+
result |= INPUT_RIGHT;
172172
}
173173
if (keys & DPAD_LEFT) {
174-
result |= PLAYER_INPUT_LEFT;
174+
result |= INPUT_LEFT;
175175
}
176176
if (keys & DPAD_UP) {
177-
result |= PLAYER_INPUT_UP;
177+
result |= INPUT_UP;
178178
}
179179
if (keys & DPAD_DOWN) {
180-
result |= PLAYER_INPUT_DOWN;
180+
result |= INPUT_DOWN;
181181
}
182182
return result;
183183
}

‎src/enemy/likeLike.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ void sub_080281A0(LikeLikeEntity* this) {
260260
bool32 LikeLike_StealItem(u32 item) {
261261
bool32 ret = FALSE;
262262
if (GetInventoryValue(item) == 1) {
263-
if (ItemIsShield(gSave.stats.itemButtons[SLOT_A])) {
264-
gSave.stats.itemButtons[SLOT_A] = ITEM_NONE;
263+
if (ItemIsShield(gSave.stats.equipped[SLOT_A])) {
264+
gSave.stats.equipped[SLOT_A] = ITEM_NONE;
265265
}
266266

267-
if (ItemIsShield(gSave.stats.itemButtons[SLOT_B])) {
268-
gSave.stats.itemButtons[SLOT_B] = ITEM_NONE;
267+
if (ItemIsShield(gSave.stats.equipped[SLOT_B])) {
268+
gSave.stats.equipped[SLOT_B] = ITEM_NONE;
269269
}
270270

271271
SetInventoryValue(item, 0);

‎src/item/itemPegasusBoots.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ void sub_08076964(ItemBehavior* this, u32 index) {
107107
SetItemAnim(this, 0x298);
108108
entity = CreatePlayerItemWithParent(this, PLAYER_ITEM_DASH_SWORD);
109109
if (entity != NULL) {
110-
if (ItemIsSword(gSave.stats.itemButtons[SLOT_A]) != 0) {
111-
uVar3 = gSave.stats.itemButtons[SLOT_A];
110+
if (ItemIsSword(gSave.stats.equipped[SLOT_A]) != 0) {
111+
uVar3 = gSave.stats.equipped[SLOT_A];
112112
} else {
113-
uVar3 = gSave.stats.itemButtons[SLOT_B];
113+
uVar3 = gSave.stats.equipped[SLOT_B];
114114
}
115115
entity->field_0x68.HALF.LO = uVar3;
116116
return;

‎src/item/itemTryPickupObject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void sub_08076518(ItemBehavior* this, u32 index) {
164164
if (gPlayerEntity.knockbackDuration != 0) {
165165
PlayerCancelHoldItem(this, index);
166166
} else {
167-
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_8000 | PLAYER_INPUT_10 | PLAYER_INPUT_8)) != 0) {
167+
if ((gPlayerState.playerInput.newInput & (INPUT_LIFT_THROW | INPUT_CANCEL | INPUT_INTERACT)) != 0) {
168168
sub_0806F948(&gPlayerEntity);
169169
gPlayerState.heldObject = 5;
170170
this->field_0x18->subAction = 2;

‎src/itemUtils.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ void ModArrows(s32 arrows) {
255255
EquipSlot IsItemEquipped(u32 itemId) {
256256
EquipSlot equipSlot;
257257

258-
if (itemId == gSave.stats.itemButtons[SLOT_A]) {
258+
if (itemId == gSave.stats.equipped[SLOT_A]) {
259259
equipSlot = EQUIP_SLOT_A;
260-
} else if (itemId == gSave.stats.itemButtons[SLOT_B]) {
260+
} else if (itemId == gSave.stats.equipped[SLOT_B]) {
261261
equipSlot = EQUIP_SLOT_B;
262262
} else {
263263
equipSlot = EQUIP_SLOT_NONE;
@@ -273,17 +273,17 @@ void PutItemOnSlot(u32 itemId) {
273273
}
274274
if (itemId2 - 1 < 0x1f) {
275275
equipSlot = EQUIP_SLOT_NONE;
276-
if (gSave.stats.itemButtons[SLOT_A] == ITEM_NONE) {
276+
if (gSave.stats.equipped[SLOT_A] == ITEM_NONE) {
277277
equipSlot = EQUIP_SLOT_A;
278-
} else if (gSave.stats.itemButtons[SLOT_B] == ITEM_NONE) {
278+
} else if (gSave.stats.equipped[SLOT_B] == ITEM_NONE) {
279279
equipSlot = EQUIP_SLOT_B;
280280
}
281281
if (equipSlot == EQUIP_SLOT_NONE) {
282282
u32 temp = gItemMetaData[itemId2].menuSlot;
283-
if (temp == gItemMetaData[gSave.stats.itemButtons[SLOT_A]].menuSlot) {
283+
if (temp == gItemMetaData[gSave.stats.equipped[SLOT_A]].menuSlot) {
284284
equipSlot = EQUIP_SLOT_A;
285285
} else {
286-
if (temp == gItemMetaData[gSave.stats.itemButtons[SLOT_B]].menuSlot) {
286+
if (temp == gItemMetaData[gSave.stats.equipped[SLOT_B]].menuSlot) {
287287
equipSlot = EQUIP_SLOT_B;
288288
}
289289
}
@@ -302,13 +302,13 @@ void ForceEquipItem(u32 itemId, u32 equipSlot) {
302302

303303
if ((itemId - 1 < 0x1f) && (equipSlot < EQUIP_SLOT_NONE)) {
304304
otherItemSlot = equipSlot == EQUIP_SLOT_A;
305-
replacedItem = gSave.stats.itemButtons[equipSlot];
306-
otherItem = gSave.stats.itemButtons[otherItemSlot];
305+
replacedItem = gSave.stats.equipped[equipSlot];
306+
otherItem = gSave.stats.equipped[otherItemSlot];
307307
if (gItemMetaData[otherItem].menuSlot == gItemMetaData[itemId].menuSlot) {
308308
otherItem = replacedItem;
309309
}
310-
gSave.stats.itemButtons[equipSlot] = itemId;
311-
gSave.stats.itemButtons[otherItemSlot] = otherItem;
310+
gSave.stats.equipped[equipSlot] = itemId;
311+
gSave.stats.equipped[otherItemSlot] = otherItem;
312312
gUnk_0200AF00.unk_13 = 0x7f;
313313
gUnk_0200AF00.unk_14 = 0x7f;
314314
}

‎src/manager/miscManager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void MiscManager_TypeB(MiscManager* this) {
364364

365365
bool32 sub_080593CC(MiscManager* this) {
366366
if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.animationState == 0 &&
367-
(gPlayerState.playerInput.heldInput & PLAYER_INPUT_ANY_DIRECTION) == PLAYER_INPUT_UP) {
367+
(gPlayerState.playerInput.heldInput & INPUT_ANY_DIRECTION) == INPUT_UP) {
368368
return EntityWithinDistance(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6);
369369
}
370370
return FALSE;

‎src/menu/pauseMenu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,14 +529,14 @@ void PauseMenu_ItemMenu_Draw(void) {
529529
gOamCmd._8 = 0x800;
530530
DrawDirect(sub_080A5384_draw_constant0, 0x22);
531531
}
532-
i = GetMenuSlotForItem(gSave.stats.itemButtons[SLOT_A]);
532+
i = GetMenuSlotForItem(gSave.stats.equipped[SLOT_A]);
533533
if (i < MENU_SLOT_COUNT) {
534534
entry = &gItemMenuTable[i];
535535
gOamCmd.x = entry->x;
536536
gOamCmd.y = entry->y;
537537
DrawDirect(sub_080A5384_draw_constant0, 3);
538538
}
539-
i = GetMenuSlotForItem(gSave.stats.itemButtons[SLOT_B]);
539+
i = GetMenuSlotForItem(gSave.stats.equipped[SLOT_B]);
540540
if (i < MENU_SLOT_COUNT) {
541541
entry = &gItemMenuTable[i];
542542
gOamCmd.x = entry->x;

‎src/npc/bigGoron.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ void sub_0806D5D4(void) {
434434
InitBiggoronTimer();
435435
equipSlot = IsItemEquipped(ITEM_SHIELD);
436436
if (equipSlot != EQUIP_SLOT_NONE) {
437-
gSave.stats.itemButtons[equipSlot] = ITEM_NONE;
437+
gSave.stats.equipped[equipSlot] = ITEM_NONE;
438438
}
439439
SetInventoryValue(ITEM_SHIELD, 0);
440440
}

‎src/npc/bladeBrothers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ void BladeBrothers_StartPlayerDemonstration(Entity* this, ScriptExecutionContext
339339
}
340340

341341
void sub_08068BB4(BladeBrothersEntity* this) {
342-
u32 item = gSave.stats.itemButtons[SLOT_A];
342+
u32 item = gSave.stats.equipped[SLOT_A];
343343

344344
this->itemSlotA = item;
345-
item = gSave.stats.itemButtons[SLOT_B];
345+
item = gSave.stats.equipped[SLOT_B];
346346
this->itemSlotB = item;
347347
}
348348

‎src/npc/npc4E.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ Item NPC4E_GetItemWithSwordUpgraded(Item itemId) {
186186
}
187187

188188
void NPC4E_SaveEquippedItems(NPC4EEntity* this) {
189-
this->unk_68 = gSave.stats.itemButtons[SLOT_A];
190-
this->unk_69 = gSave.stats.itemButtons[SLOT_B];
189+
this->unk_68 = gSave.stats.equipped[SLOT_A];
190+
this->unk_69 = gSave.stats.equipped[SLOT_B];
191191
}
192192

193193
void NPC4E_RestoreEquippedItems(NPC4EEntity* this) {

‎src/object/crenelBeanSprout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
179179
RestorePrevTileEntity(0xdc, super->collisionLayer);
180180
sub_08096A78(this);
181181
}
182-
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_40)) == 0) {
182+
if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_40)) == 0) {
183183
return;
184184
}
185185
if (gUnk_0200AF00.rActionPlayerState != R_ACTION_THROW) {

‎src/object/houseDoorExterior.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void sub_0808692C(HouseDoorExteriorEntity* this) {
184184
static u8 sub_08086954(HouseDoorExteriorEntity* this) {
185185
if (sub_0800445C(super)) {
186186
if (GetAnimationStateInRectRadius(super, 6, 20) >= 0 && gPlayerEntity.animationState == 0 &&
187-
(u16)gPlayerState.playerInput.heldInput == PLAYER_INPUT_UP && gPlayerState.jump_status == 0) {
187+
(u16)gPlayerState.playerInput.heldInput == INPUT_UP && gPlayerState.jump_status == 0) {
188188
super->timer--;
189189
}
190190
} else {

‎src/object/itemForSale.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ void ItemForSale_Action2(ItemForSaleEntity* this) {
118118
ptr = sub_080784E4();
119119
if (((*(int*)(ptr + 8) == 0) || ((*(u8*)(ptr + 1) != 1 || (gUnk_0200AF00.rActionPlayerState = R_ACTION_SPEAK,
120120
(gPlayerState.playerInput.newInput &
121-
(PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0)))) &&
122-
((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_10 | PLAYER_INPUT_8)) != 0)) {
121+
(INPUT_ACTION | INPUT_INTERACT)) == 0)))) &&
122+
((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_CANCEL | INPUT_INTERACT)) != 0)) {
123123
sub_080819B4(this);
124124
}
125125
}

‎src/object/linkHoldingItem.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ void LinkHoldingItem_Action2(LinkHoldingItemEntity* this) {
123123
}
124124

125125
void LinkHoldingItem_Action3(LinkHoldingItemEntity* this) {
126-
u32 tmp;
127-
if ((super->parent)->action == 8) {
126+
u32 bottle_no;
127+
if (super->parent->action == PLAYER_ITEMGET) {
128128
return;
129129
}
130130
switch (super->timer) {
@@ -149,9 +149,9 @@ void LinkHoldingItem_Action3(LinkHoldingItemEntity* this) {
149149
ModHealth(160);
150150
break;
151151
case 3:
152-
tmp = GetBottleContaining(super->type);
153-
if (tmp != 0) {
154-
gSave.stats.itemButtons[tmp + 1] = ITEM_BOTTLE_EMPTY;
152+
bottle_no = GetBottleContaining(super->type);
153+
if (bottle_no != 0) {
154+
gSave.stats.bottles[bottle_no - 1] = ITEM_BOTTLE_EMPTY;
155155
} else {
156156
SetInventoryValue(super->type, ITEM_GREEN_SWORD);
157157
}

‎src/player.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,7 +2747,7 @@ static void sub_08073504(Entity* this) {
27472747
static void sub_08073584(Entity* this) {
27482748
u32 state, dir, idx;
27492749

2750-
if ((gPlayerState.playerInput.newInput & PLAYER_INPUT_80) || this->iframes > 0 || gPlayerState.field_0x3c ||
2750+
if ((gPlayerState.playerInput.newInput & INPUT_ACTION) || this->iframes > 0 || gPlayerState.field_0x3c ||
27512751
(gPlayerState.flags & PL_PARACHUTE) == 0) {
27522752
gPlayerState.jump_status |= 0x40;
27532753
PlayerSetNormalAndCollide();
@@ -3441,10 +3441,10 @@ void SurfaceAction_14(Entity* this) {
34413441
void SurfaceAction_CloneTile(Entity* this) {
34423442
if (gPlayerState.chargeState.action == 4) {
34433443
u32 item, n, i;
3444-
if (ItemIsSword(gSave.stats.itemButtons[SLOT_A])) {
3445-
item = gSave.stats.itemButtons[SLOT_A];
3444+
if (ItemIsSword(gSave.stats.equipped[SLOT_A])) {
3445+
item = gSave.stats.equipped[SLOT_A];
34463446
} else {
3447-
item = gSave.stats.itemButtons[SLOT_B];
3447+
item = gSave.stats.equipped[SLOT_B];
34483448
}
34493449
switch (item) {
34503450
case 1:
@@ -3517,7 +3517,7 @@ void SurfaceAction_ShallowWater(Entity* this) {
35173517
this->spritePriority.b0 = 4;
35183518
gPlayerState.swim_state = 0;
35193519
}
3520-
if ((gPlayerState.playerInput.newInput & PLAYER_INPUT_ANY_DIRECTION) ||
3520+
if ((gPlayerState.playerInput.newInput & INPUT_ANY_DIRECTION) ||
35213521
gPlayerState.surfacePositionSameTimer == 1)
35223522
SoundReq(SFX_WATER_WALK);
35233523
}
@@ -3561,7 +3561,7 @@ void SurfaceAction_Swamp(Entity* this) {
35613561
CreateObjectWithParent(this, OBJECT_70, 0, 0);
35623562
CreateFx(this, FX_GREEN_SPLASH, 0);
35633563
SoundReq(SFX_161);
3564-
} else if ((gPlayerState.playerInput.newInput & PLAYER_INPUT_ANY_DIRECTION) != 0) {
3564+
} else if ((gPlayerState.playerInput.newInput & INPUT_ANY_DIRECTION) != 0) {
35653565
SoundReq(SFX_161);
35663566
} else if ((gRoomTransition.frameCount & 0xf) == 0) {
35673567
SoundReq(SFX_161);
@@ -3717,7 +3717,7 @@ void SurfaceAction_Dust(Entity* this) {
37173717
if (!sub_080741C4()) {
37183718
gPlayerState.speed_modifier -= 128;
37193719
if (gPlayerState.surfacePositionSameTimer == 1 ||
3720-
(gPlayerState.playerInput.newInput & PLAYER_INPUT_ANY_DIRECTION) != 0) {
3720+
(gPlayerState.playerInput.newInput & INPUT_ANY_DIRECTION) != 0) {
37213721
if (gPlayerState.floor_type == SURFACE_DUST)
37223722
CreateObjectWithParent(this, DIRT_PARTICLE, 1, 0);
37233723
else

‎src/playerItem/playerItemBomb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ void PlayerItemBomb_Action1(PlayerItemBombEntity* this) {
113113
}
114114
switch (IsItemEquipped(ITEM_REMOTE_BOMBS)) {
115115
case EQUIP_SLOT_A:
116-
input = PLAYER_INPUT_1;
116+
input = INPUT_USE_ITEM1;
117117
break;
118118
case EQUIP_SLOT_B:
119-
input = PLAYER_INPUT_2;
119+
input = INPUT_USE_ITEM2;
120120
break;
121121
case EQUIP_SLOT_NONE:
122122
input = 0;

0 commit comments

Comments
 (0)