summaryrefslogtreecommitdiff
path: root/src/npc
diff options
context:
space:
mode:
Diffstat (limited to 'src/npc')
-rw-r--r--src/npc/beedle.c10
-rw-r--r--src/npc/bigGoron.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 68f6d30c..b9c562ee 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -6,6 +6,7 @@
#include "npc.h"
#include "game.h"
#include "functions.h"
+#include "item.h"
typedef struct {
s8 unk_00;
@@ -24,7 +25,14 @@ void sub_0806336C(Entity* this);
void sub_08063390(Entity* this);
static const u8 gUnk_0810C88C[] = {
- 0, 0x2d, 0x2c, 0x29, 0x2a, 0x2b, 0x2e, 0,
+ ITEM_NONE,
+ ITEM_BOTTLE_PICOLYTE_BLUE,
+ ITEM_BOTTLE_PICOLYTE_GREEN,
+ ITEM_BOTTLE_PICOLYTE_RED,
+ ITEM_BOTTLE_PICOLYTE_ORANGE,
+ ITEM_BOTTLE_PICOLYTE_YELLOW,
+ ITEM_BOTTLE_PICOLYTE_WHITE,
+ ITEM_NONE,
};
static const Hitbox gUnk_0810C894 = { 0, 0, { 0, 0, 0, 0 }, 16, 6 };
static const gUnk_0810C89C_struct gUnk_0810C89C[] = {
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index e7208579..e94a54ff 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -423,7 +423,7 @@ void sub_0806D5D4(void) {
InitBiggoronTimer();
itemSlot = IsItemEquipped(ITEM_SHIELD);
if (itemSlot != 2) {
- gSave.stats.itemButtons[itemSlot] = 0;
+ gSave.stats.itemButtons[itemSlot] = ITEM_NONE;
}
SetInventoryValue(ITEM_SHIELD, 0);
}