new item code

This commit is contained in:
MelonSpeedruns
2026-04-24 16:01:15 -04:00
parent 5fab665f21
commit c42d10a74b
10 changed files with 46 additions and 19 deletions
+1
View File
@@ -2383,6 +2383,7 @@ public:
void setGroundFishingRodActor();
int procFishingCastInit();
int procFishingCast();
void procLensOfTruthOn();
int procFishingFoodInit();
int procFishingFood();
f32 getCrawlMoveAnmSpeed();
+2
View File
@@ -71,6 +71,7 @@ void item_func_WOOD_STICK();
void item_func_BOOMERANG();
void item_func_SPINNER();
void item_func_IRONBALL();
void item_func_LENS_OF_TRUTH();
void item_func_BOW();
void item_func_HOOKSHOT();
void item_func_HVY_BOOTS();
@@ -260,6 +261,7 @@ int item_getcheck_func_WOOD_STICK();
int item_getcheck_func_BOOMERANG();
int item_getcheck_func_SPINNER();
int item_getcheck_func_IRONBALL();
int item_getcheck_func_LENS_OF_TRUTH();
int item_getcheck_func_BOW();
int item_getcheck_func_HOOKSHOT();
int item_getcheck_func_HVY_BOOTS();
+1 -1
View File
@@ -317,7 +317,7 @@ enum {
/* 0xDE */ dItemNo_NOENTRY_222_e,
/* 0xDF */ dItemNo_NOENTRY_223_e,
/* 0xE0 */ dItemNo_POU_SPIRIT_e,
/* 0xE1 */ dItemNo_NOENTRY_225_e,
/* 0xE1 */ dItemNo_LENS_OF_TRUTH_e,
/* 0xE2 */ dItemNo_NOENTRY_226_e,
/* 0xE3 */ dItemNo_NOENTRY_227_e,
/* 0xE4 */ dItemNo_NOENTRY_228_e,
+2 -2
View File
@@ -86,8 +86,8 @@ public:
/* 0x047 */ u8 field_0x47;
/* 0x048 */ u8 mPoes;
/* 0x049 */ u8 mPoesCopy;
/* 0x04A */ u8 mItems[24];
/* 0x062 */ u8 mItemsCopy[24];
/* 0x04A */ u8 mItems[25];
/* 0x062 */ u8 mItemsCopy[25];
/* 0x07A */ u8 field_0x7a[24];
/* 0x092 */ u8 mSwords[4];
/* 0x096 */ u8 mShields[3];
+5 -4
View File
@@ -15,7 +15,7 @@ static const int MAX_SELECT_ITEM = 4;
static const int SELECT_ITEM_NUM = 2;
static const int MAX_EQUIPMENT = 6;
static const int MAX_EVENTS = 256;
static const int MAX_ITEM_SLOTS = 24;
static const int MAX_ITEM_SLOTS = 25;
static const int LIGHT_DROP_STAGE = 4;
static const int LETTER_INFO_BIT = 64;
static const int MAX_INSECT_NUM = 24;
@@ -75,7 +75,8 @@ enum ItemSlots {
/* 0x14 */ SLOT_20,
/* 0x15 */ SLOT_21,
/* 0x16 */ SLOT_22,
/* 0x17 */ SLOT_23
/* 0x17 */ SLOT_23,
/* 0x18 */ SLOT_24,
};
enum CollectItem {
@@ -349,8 +350,8 @@ public:
static const int BOMB_BAG_MAX = 3;
static const int BOTTLE_MAX = 4;
/* 0x00 */ u8 mItems[24];
/* 0x18 */ u8 mItemSlots[24];
/* 0x00 */ u8 mItems[25];
/* 0x18 */ u8 mItemSlots[25];
}; // Size: 0x30
class dSv_player_get_item_c {