Skip to content

Commit

Permalink
hopefully fixes clang-format?
Browse files Browse the repository at this point in the history
  • Loading branch information
zodiac-ill committed Jan 2, 2025
1 parent 6c543eb commit 9a95282
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions mm/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
Original file line number Diff line number Diff line change
Expand Up @@ -716,15 +716,15 @@ void EnTalkGibud_GetNextTextBoxId(EnTalkGibud* this, PlayState* play) {
s32 EnTalkGibud_PresentedItemMatchesRequest(EnTalkGibud* this, PlayState* play, PlayerItemAction presentedItemAction) {
EnTalkGibudRequestedItem* requestedItem = &sRequestedItemTable[this->requestedItemIndex];
if (GameInteractor_Should(VB_GIBDO_TRADE_SEQUENCE_ACCEPT_RED_POTION, false, requestedItem->itemAction,
presentedItemAction)) { // If requested Blue Potion but presented Red Potion, switch
// requested item to red potion
presentedItemAction)) { // If requested Blue Potion but presented Red Potion, switch
// requested item to red potion
requestedItem = &sRequestedItemTable[EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_POTION_RED];
}
if (requestedItem->itemAction == presentedItemAction) {
if (!requestedItem->isBottledItem) {
if ((AMMO(requestedItem->item) >= requestedItem->amount) ||
GameInteractor_Should(VB_GIBDO_TRADE_SEQUENCE_SUFFICIENT_QUANTITY_PRESENTED, false,
requestedItem->item)) {
if ((AMMO(requestedItem->item) >= requestedItem->amount) ||
GameInteractor_Should(VB_GIBDO_TRADE_SEQUENCE_SUFFICIENT_QUANTITY_PRESENTED, false,
requestedItem->item)) {
return EN_TALK_GIBUD_REQUESTED_ITEM_MET;
} else {
return EN_TALK_GIBUD_REQUESTED_ITEM_NOT_ENOUGH_AMMO;
Expand Down Expand Up @@ -842,8 +842,8 @@ void EnTalkGibud_Talk(EnTalkGibud* this, PlayState* play) {
// Remove the requested item/amount from the player's inventory
requestedItem = &sRequestedItemTable[this->requestedItemIndex];
if (GameInteractor_Should(VB_GIBDO_TRADE_SEQUENCE_DO_TRADE,
true)) { // We don't want to try to change their inventory if they don't
// need to trade anything
true)) { // We don't want to try to change their inventory if they don't
// need to trade anything
if (!requestedItem->isBottledItem) {
if (GameInteractor_Should(VB_GIBDO_TRADE_SEQUENCE_TAKE_MORE_THAN_ONE_ITEM, true)) {
Inventory_ChangeAmmo(requestedItem->item, -requestedItem->amount);
Expand Down

0 comments on commit 9a95282

Please sign in to comment.