fairy test

inspectredc · Aug 31, 2023 · fc78198 · fc78198
1 parent 0e7c658
commit fc78198
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/soh/include/z64item.h b/soh/include/z64item.h
@@ -546,7 +546,8 @@ typedef enum {
     /* 0x1B */ EXCH_ITEM_POE,
     /* 0x1C */ EXCH_ITEM_BIG_POE,
     /* 0x1D */ EXCH_ITEM_LETTER_RUTO,
-    /* 0x1E */ EXCH_ITEM_MAX
+    /* 0x1E */ EXCH_ITEM_MAX,
+               EXCH_ITEM_FAIRY = 0x23,
 } ExchangeItemID;
 
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@@ -735,7 +735,7 @@ void func_80A70834(EnHy* this, PlayState* play) {
 
     if ((this->actor.params & 0x7F) == ENHY_TYPE_BOJ_5) {
         if (!Inventory_HasSpecificBottle(ITEM_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BUG) &&
-            !Inventory_HasSpecificBottle(ITEM_FISH)) {
+            !Inventory_HasSpecificBottle(ITEM_FISH) && (CVarGetInteger("gBeggarBuysFairy", 0) && !Inventory_HasSpecificBottle(ITEM_FAIRY))) {
             switch (func_8002F368(play)) {
                 case EXCH_ITEM_POE:
                 case EXCH_ITEM_BIG_POE:
@@ -759,6 +759,9 @@ void func_80A70834(EnHy* this, PlayState* play) {
                 case EXCH_ITEM_BUG:
                     this->actor.textId = 0x70F2;
                     break;
+                case EXCH_ITEM_FAIRY:
+                    this->actor.textId = 0x70F2;
+                    break;
                 default:
                     if (Player_GetMask(play) == PLAYER_MASK_NONE) {
                         this->actor.textId = 0x700C;

diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -5077,7 +5077,8 @@ s32 func_8083B040(Player* this, PlayState* play) {
                       ((this->itemAction > PLAYER_IA_BOTTLE_POE) ||
                        ((this->targetActor != NULL) &&
                         (((this->itemAction == PLAYER_IA_BOTTLE_POE) && (this->exchangeItemId == EXCH_ITEM_POE)) ||
-                         (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE))))))) {
+                         (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE)))))
+                         || (CVarGetInteger("gBeggarBuysFairy", 0) && sp28 == 11))) {
 
                     if ((play->actorCtx.titleCtx.delayTimer == 0) && (play->actorCtx.titleCtx.alpha == 0)) {
                         func_80835DE4(play, this, func_8084F104, 0);