move J2D / JUTResFont (#144)

* move some JSystem and meter2_info stuff

* more J2D / JUTTexture / JUTPalette

* setup dScnKy_env_light_c

1 files changed, 326 insertions, 298 deletions

diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index e6cfc1e681..cf0cdeef5d 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -22,310 +22,335 @@
 #define ITEM_ZONE_MAX 0x20
 #define ITEM_ONE_ZONE_MAX 0x10
 
-enum Wallets { WALLET, BIG_WALLET, GIANT_WALLET };
+enum Wallets {
+    /* 0x0 */ WALLET,
+    /* 0x1 */ BIG_WALLET,
+    /* 0x2 */ GIANT_WALLET
+};
 
 enum ItemSlots {
-    SLOT_0,
-    SLOT_1,
-    SLOT_2,
-    SLOT_3,
-    SLOT_4,
-    SLOT_5,
-    SLOT_6,
-    SLOT_7,
-    SLOT_8,
-    SLOT_9,
-    SLOT_10,
-    SLOT_11,
-    SLOT_12,
-    SLOT_13,
-    SLOT_14,
-    SLOT_15,
-    SLOT_16,
-    SLOT_17,
-    SLOT_18,
-    SLOT_19,
-    SLOT_20,
-    SLOT_21,
-    SLOT_22,
-    SLOT_23
+    /* 0x00 */ SLOT_0,
+    /* 0x01 */ SLOT_1,
+    /* 0x02 */ SLOT_2,
+    /* 0x03 */ SLOT_3,
+    /* 0x04 */ SLOT_4,
+    /* 0x05 */ SLOT_5,
+    /* 0x06 */ SLOT_6,
+    /* 0x07 */ SLOT_7,
+    /* 0x08 */ SLOT_8,
+    /* 0x09 */ SLOT_9,
+    /* 0x0A */ SLOT_10,
+    /* 0x0B */ SLOT_11,
+    /* 0x0C */ SLOT_12,
+    /* 0x0D */ SLOT_13,
+    /* 0x0E */ SLOT_14,
+    /* 0x0F */ SLOT_15,
+    /* 0x10 */ SLOT_16,
+    /* 0x11 */ SLOT_17,
+    /* 0x12 */ SLOT_18,
+    /* 0x13 */ SLOT_19,
+    /* 0x14 */ SLOT_20,
+    /* 0x15 */ SLOT_21,
+    /* 0x16 */ SLOT_22,
+    /* 0x17 */ SLOT_23
 };
 
 enum ItemTable {
-    HEART,
-    GREEN_RUPEE,
-    BLUE_RUPEE,
-    YELLOW_RUPEE,
-    RED_RUPEE,
-    PURPLE_RUPEE,
-    ORANGE_RUPEE,
-    SILVER_RUPEE,
-    S_MAGIC,
-    L_MAGIC,
-    BOMB_5,
-    BOMB_10,
-    BOMB_20,
-    BOMB_30,
-    ARROW_10,
-    ARROW_20,
-    ARROW_30,
-    ARROW_1,
-    PACHINKO_SHOT,
-    noentry1,
-    noentry2,
-    noentry3,
-    WATER_BOMB_5,
-    WATER_BOMB_10,
-    WATER_BOMB_20,
-    WATER_BOMB_30,
-    BOMB_INSECT_5,
-    BOMB_INSECT_10,
-    BOMB_INSECT_20,
-    BOMB_INSECT_30,
-    RECOVERY_FAILY,
-    TRIPLE_HEART,
-    SMALL_KEY,
-    KAKERA_HEART,
-    UTAWA_HEART,
-    MAP,
-    COMPUS,
-    DUNGEON_EXIT,
-    BOSS_KEY,
-    DUNGEON_BACK,
-    SWORD,
-    MASTER_SWORD,
-    WOOD_SHIELD,
-    SHIELD,
-    HYLIA_SHIELD,
-    TKS_LETTER,
-    WEARS_CASUAL,
-    WEAR_KOKIRI,
-    ARMOR,
-    WEAR_ZORA,
-    MAGIC_LV1,
-    DUNGEON_EXIT_2,
-    WALLET_LV1,
-    WALLET_LV2,
-    WALLET_LV3,
-    noentry4,
-    noentry5,
-    noentry6,
-    noentry7,
-    noentry8,
-    noentry9,
-    ZORAS_JEWEL,
-    HAWK_EYE,
-    WOOD_STICK,
-    BOOMERANG,
-    SPINNER,
-    IRONBALL,
-    BOW,
-    HOOKSHOT,
-    HVY_BOOTS,
-    COPY_ROD,
-    W_HOOKSHOT,
-    KANTERA,
-    LIGHT_SWORD,
-    FISHING_ROD_1,
-    PACHINKO,
-    COPY_ROD_2,
-    noentry10,
-    noentry11,
-    BOMB_BAG_LV2,
-    BOMB_BAG_LV1,
-    BOMB_IN_BAG,
-    noentry12,
-    LIGHT_ARROW,
-    ARROW_LV1,
-    ARROW_LV2,
-    ARROW_LV3,
-    noentry13,
-    LURE_ROD,
-    BOMB_ARROW,
-    HAWK_ARROW,
-    BEE_ROD,
-    JEWEL_ROD,
-    WORM_ROD,
-    JEWEL_BEE_ROD,
-    JEWEL_WORM_ROD,
-    EMPTY_BOTTLE,
-    RED_BOTTLE,
-    GREEN_BOTTLE,
-    BLUE_BOTTLE,
-    MILK_BOTTLE,
-    HALF_MILK_BOTTLE,
-    OIL_BOTTLE,
-    WATER_BOTTLE,
-    OIL_BOTTLE_2,
-    RED_BOTTLE_2,
-    UGLY_SOUP,
-    HOT_SPRING,
-    FAIRY,
-    HOT_SPRING_2,
-    OIL2,
-    OIL,
-    NORMAL_BOMB,
-    WATER_BOMB,
-    POKE_BOMB,
-    FAIRY_DROP,
-    WORM,
-    DROP_BOTTLE,
-    BEE_CHILD,
-    CHUCHU_RARE,
-    CHUCHU_RED,
-    CHUCHU_BLUE,
-    CHUCHU_GREEN,
-    CHUCHU_YELLOW,
-    CHUCHU_PURPLE,
-    LV1_SOUP,
-    LV2_SOUP,
-    LV3_SOUP,
-    LETTER,
-    BILL,
-    WOOD_STATUE,
-    IRIAS_PENDANT,
-    HORSE_FLUTE,
-    noentry14,
-    noentry15,
-    noentry16,
-    noentry17,
-    noentry18,
-    noentry19,
-    noentry20,
-    noentry21,
-    noentry22,
-    noentry23,
-    noentry24,
-    RAFRELS_MEMO,
-    ASHS_SCRIBBLING,
-    noentry25,
-    noentry26,
-    noentry27,
-    noentry28,
-    noentry29,
-    noentry30,
-    noentry31,
-    noentry32,
-    noentry33,
-    noentry34,
-    CHUCHU_YELLOW2,
-    OIL_BOTTLE3,
-    SHOP_BEE_CHILD,
-    CHUCHU_BLACK,
-    LIGHT_DROP,
-    DROP_CONTAINER,
-    DROP_CONTAINER02,
-    DROP_CONTAINER03,
-    FILLED_CONTAINER,
-    MIRROR_PIECE_2,
-    MIRROR_PIECE_3,
-    MIRROR_PIECE_4,
-    noentry35,
-    noentry36,
-    noentry37,
-    noentry38,
-    noentry39,
-    noentry40,
-    noentry41,
-    noentry42,
-    SMELL_YELIA_POUCH,
-    SMELL_PUMPKIN,
-    SMELL_POH,
-    SMELL_FISH,
-    SMELL_CHILDREN,
-    SMELL_MEDICINE,
-    noentry43,
-    noentry44,
-    noentry45,
-    noentry46,
-    noentry47,
-    noentry48,
-    noentry49,
-    noentry50,
-    noentry51,
-    noentry52,
-    M_BEETLE,
-    F_BEETLE,
-    M_BUTTERFLY,
-    F_BUTTERFLY,
-    M_STAG_BEETLE,
-    F_STAG_BEETLE,
-    M_GRASSHOPPER,
-    F_GRASSHOPPER,
-    M_NANAFUSHI,
-    F_NANAFUSHI,
-    M_DANGOMUSHI,
-    F_DANGOMUSHI,
-    M_MANTIS,
-    F_MANTIS,
-    M_LADYBUG,
-    F_LADYBUG,
-    M_SNAIL,
-    F_SNAIL,
-    M_DRAGONFLY,
-    F_DRAGONFLY,
-    M_ANT,
-    F_ANT,
-    M_MAYFLY,
-    F_MAYFLY,
-    noentry53,
-    noentry54,
-    noentry55,
-    noentry56,
-    noentry57,
-    noentry58,
-    noentry59,
-    noentry60,
-    POU_SPIRIT,
-    noentry61,
-    noentry62,
-    noentry63,
-    noentry64,
-    noentry65,
-    noentry66,
-    noentry67,
-    noentry68,
-    ANCIENT_DOCUMENT,
-    AIR_LETTER,
-    ANCIENT_DOCUMENT2,
-    LV7_DUNGEON_EXIT,
-    LINKS_SAVINGS,
-    SMALL_KEY2,
-    POU_FIRE1,
-    POU_FIRE2,
-    POU_FIRE3,
-    POU_FIRE4,
-    BOSSRIDER_KEY,
-    TOMATO_PUREE,
-    TASTE,
-    LV5_BOSS_KEY,
-    SURFBOARD,
-    KANTERA2,
-    L2_KEY_PIECES1,
-    L2_KEY_PIECES2,
-    L2_KEY_PIECES3,
-    KEY_OF_CARAVAN,
-    LV2_BOSS_KEY,
-    KEY_OF_FILONE,
-    NO_ITEM
+    /* 0x00 */ HEART,
+    /* 0x01 */ GREEN_RUPEE,
+    /* 0x02 */ BLUE_RUPEE,
+    /* 0x03 */ YELLOW_RUPEE,
+    /* 0x04 */ RED_RUPEE,
+    /* 0x05 */ PURPLE_RUPEE,
+    /* 0x06 */ ORANGE_RUPEE,
+    /* 0x07 */ SILVER_RUPEE,
+    /* 0x08 */ S_MAGIC,
+    /* 0x09 */ L_MAGIC,
+    /* 0x0A */ BOMB_5,
+    /* 0x0B */ BOMB_10,
+    /* 0x0C */ BOMB_20,
+    /* 0x0D */ BOMB_30,
+    /* 0x0E */ ARROW_10,
+    /* 0x0F */ ARROW_20,
+    /* 0x10 */ ARROW_30,
+    /* 0x11 */ ARROW_1,
+    /* 0x12 */ PACHINKO_SHOT,
+    /* 0x13 */ noentry1,
+    /* 0x14 */ noentry2,
+    /* 0x15 */ noentry3,
+    /* 0x16 */ WATER_BOMB_5,
+    /* 0x17 */ WATER_BOMB_10,
+    /* 0x18 */ WATER_BOMB_20,
+    /* 0x19 */ WATER_BOMB_30,
+    /* 0x1A */ BOMB_INSECT_5,
+    /* 0x1B */ BOMB_INSECT_10,
+    /* 0x1C */ BOMB_INSECT_20,
+    /* 0x1D */ BOMB_INSECT_30,
+    /* 0x1E */ RECOVERY_FAILY,
+    /* 0x1F */ TRIPLE_HEART,
+    /* 0x20 */ SMALL_KEY,
+    /* 0x21 */ KAKERA_HEART,
+    /* 0x22 */ UTAWA_HEART,
+    /* 0x23 */ MAP,
+    /* 0x24 */ COMPUS,
+    /* 0x25 */ DUNGEON_EXIT,
+    /* 0x26 */ BOSS_KEY,
+    /* 0x27 */ DUNGEON_BACK,
+    /* 0x28 */ SWORD,
+    /* 0x29 */ MASTER_SWORD,
+    /* 0x2A */ WOOD_SHIELD,
+    /* 0x2B */ SHIELD,
+    /* 0x2C */ HYLIA_SHIELD,
+    /* 0x2D */ TKS_LETTER,
+    /* 0x2E */ WEARS_CASUAL,
+    /* 0x2F */ WEAR_KOKIRI,
+    /* 0x30 */ ARMOR,
+    /* 0x31 */ WEAR_ZORA,
+    /* 0x32 */ MAGIC_LV1,
+    /* 0x33 */ DUNGEON_EXIT_2,
+    /* 0x34 */ WALLET_LV1,
+    /* 0x35 */ WALLET_LV2,
+    /* 0x36 */ WALLET_LV3,
+    /* 0x37 */ noentry4,
+    /* 0x38 */ noentry5,
+    /* 0x39 */ noentry6,
+    /* 0x3A */ noentry7,
+    /* 0x3B */ noentry8,
+    /* 0x3C */ noentry9,
+    /* 0x3D */ ZORAS_JEWEL,
+    /* 0x3E */ HAWK_EYE,
+    /* 0x3F */ WOOD_STICK,
+    /* 0x40 */ BOOMERANG,
+    /* 0x41 */ SPINNER,
+    /* 0x42 */ IRONBALL,
+    /* 0x43 */ BOW,
+    /* 0x44 */ HOOKSHOT,
+    /* 0x45 */ HVY_BOOTS,
+    /* 0x46 */ COPY_ROD,
+    /* 0x47 */ W_HOOKSHOT,
+    /* 0x48 */ KANTERA,
+    /* 0x49 */ LIGHT_SWORD,
+    /* 0x4A */ FISHING_ROD_1,
+    /* 0x4B */ PACHINKO,
+    /* 0x4C */ COPY_ROD_2,
+    /* 0x4D */ noentry10,
+    /* 0x4E */ noentry11,
+    /* 0x4F */ BOMB_BAG_LV2,
+    /* 0x50 */ BOMB_BAG_LV1,
+    /* 0x51 */ BOMB_IN_BAG,
+    /* 0x52 */ noentry12,
+    /* 0x53 */ LIGHT_ARROW,
+    /* 0x54 */ ARROW_LV1,
+    /* 0x55 */ ARROW_LV2,
+    /* 0x56 */ ARROW_LV3,
+    /* 0x57 */ noentry13,
+    /* 0x58 */ LURE_ROD,
+    /* 0x59 */ BOMB_ARROW,
+    /* 0x5A */ HAWK_ARROW,
+    /* 0x5B */ BEE_ROD,
+    /* 0x5C */ JEWEL_ROD,
+    /* 0x5D */ WORM_ROD,
+    /* 0x5E */ JEWEL_BEE_ROD,
+    /* 0x5F */ JEWEL_WORM_ROD,
+    /* 0x60 */ EMPTY_BOTTLE,
+    /* 0x61 */ RED_BOTTLE,
+    /* 0x62 */ GREEN_BOTTLE,
+    /* 0x63 */ BLUE_BOTTLE,
+    /* 0x64 */ MILK_BOTTLE,
+    /* 0x65 */ HALF_MILK_BOTTLE,
+    /* 0x66 */ OIL_BOTTLE,
+    /* 0x67 */ WATER_BOTTLE,
+    /* 0x68 */ OIL_BOTTLE_2,
+    /* 0x69 */ RED_BOTTLE_2,
+    /* 0x6A */ UGLY_SOUP,
+    /* 0x6B */ HOT_SPRING,
+    /* 0x6C */ FAIRY,
+    /* 0x6D */ HOT_SPRING_2,
+    /* 0x6E */ OIL2,
+    /* 0x6F */ OIL,
+    /* 0x70 */ NORMAL_BOMB,
+    /* 0x71 */ WATER_BOMB,
+    /* 0x72 */ POKE_BOMB,
+    /* 0x73 */ FAIRY_DROP,
+    /* 0x74 */ WORM,
+    /* 0x75 */ DROP_BOTTLE,
+    /* 0x76 */ BEE_CHILD,
+    /* 0x77 */ CHUCHU_RARE,
+    /* 0x78 */ CHUCHU_RED,
+    /* 0x79 */ CHUCHU_BLUE,
+    /* 0x7A */ CHUCHU_GREEN,
+    /* 0x7B */ CHUCHU_YELLOW,
+    /* 0x7C */ CHUCHU_PURPLE,
+    /* 0x7D */ LV1_SOUP,
+    /* 0x7E */ LV2_SOUP,
+    /* 0x7F */ LV3_SOUP,
+    /* 0x80 */ LETTER,
+    /* 0x81 */ BILL,
+    /* 0x82 */ WOOD_STATUE,
+    /* 0x83 */ IRIAS_PENDANT,
+    /* 0x84 */ HORSE_FLUTE,
+    /* 0x85 */ noentry14,
+    /* 0x86 */ noentry15,
+    /* 0x87 */ noentry16,
+    /* 0x88 */ noentry17,
+    /* 0x89 */ noentry18,
+    /* 0x8A */ noentry19,
+    /* 0x8B */ noentry20,
+    /* 0x8C */ noentry21,
+    /* 0x8D */ noentry22,
+    /* 0x8E */ noentry23,
+    /* 0x8F */ noentry24,
+    /* 0x90 */ RAFRELS_MEMO,
+    /* 0x91 */ ASHS_SCRIBBLING,
+    /* 0x92 */ noentry25,
+    /* 0x93 */ noentry26,
+    /* 0x94 */ noentry27,
+    /* 0x95 */ noentry28,
+    /* 0x96 */ noentry29,
+    /* 0x97 */ noentry30,
+    /* 0x98 */ noentry31,
+    /* 0x99 */ noentry32,
+    /* 0x9A */ noentry33,
+    /* 0x9B */ noentry34,
+    /* 0x9C */ CHUCHU_YELLOW2,
+    /* 0x9D */ OIL_BOTTLE3,
+    /* 0x9E */ SHOP_BEE_CHILD,
+    /* 0x9F */ CHUCHU_BLACK,
+    /* 0xA0 */ LIGHT_DROP,
+    /* 0xA1 */ DROP_CONTAINER,
+    /* 0xA2 */ DROP_CONTAINER02,
+    /* 0xA3 */ DROP_CONTAINER03,
+    /* 0xA4 */ FILLED_CONTAINER,
+    /* 0xA5 */ MIRROR_PIECE_2,
+    /* 0xA6 */ MIRROR_PIECE_3,
+    /* 0xA7 */ MIRROR_PIECE_4,
+    /* 0xA8 */ noentry35,
+    /* 0xA9 */ noentry36,
+    /* 0xAA */ noentry37,
+    /* 0xAB */ noentry38,
+    /* 0xAC */ noentry39,
+    /* 0xAD */ noentry40,
+    /* 0xAE */ noentry41,
+    /* 0xAF */ noentry42,
+    /* 0xB0 */ SMELL_YELIA_POUCH,
+    /* 0xB1 */ SMELL_PUMPKIN,
+    /* 0xB2 */ SMELL_POH,
+    /* 0xB3 */ SMELL_FISH,
+    /* 0xB4 */ SMELL_CHILDREN,
+    /* 0xB5 */ SMELL_MEDICINE,
+    /* 0xB6 */ noentry43,
+    /* 0xB7 */ noentry44,
+    /* 0xB8 */ noentry45,
+    /* 0xB9 */ noentry46,
+    /* 0xBA */ noentry47,
+    /* 0xBB */ noentry48,
+    /* 0xBC */ noentry49,
+    /* 0xBD */ noentry50,
+    /* 0xBE */ noentry51,
+    /* 0xBF */ noentry52,
+    /* 0xC0 */ M_BEETLE,
+    /* 0xC1 */ F_BEETLE,
+    /* 0xC2 */ M_BUTTERFLY,
+    /* 0xC3 */ F_BUTTERFLY,
+    /* 0xC4 */ M_STAG_BEETLE,
+    /* 0xC5 */ F_STAG_BEETLE,
+    /* 0xC6 */ M_GRASSHOPPER,
+    /* 0xC7 */ F_GRASSHOPPER,
+    /* 0xC8 */ M_NANAFUSHI,
+    /* 0xC9 */ F_NANAFUSHI,
+    /* 0xCA */ M_DANGOMUSHI,
+    /* 0xCB */ F_DANGOMUSHI,
+    /* 0xCC */ M_MANTIS,
+    /* 0xCD */ F_MANTIS,
+    /* 0xCE */ M_LADYBUG,
+    /* 0xCF */ F_LADYBUG,
+    /* 0xD0 */ M_SNAIL,
+    /* 0xD1 */ F_SNAIL,
+    /* 0xD2 */ M_DRAGONFLY,
+    /* 0xD3 */ F_DRAGONFLY,
+    /* 0xD4 */ M_ANT,
+    /* 0xD5 */ F_ANT,
+    /* 0xD6 */ M_MAYFLY,
+    /* 0xD7 */ F_MAYFLY,
+    /* 0xD8 */ noentry53,
+    /* 0xD9 */ noentry54,
+    /* 0xDA */ noentry55,
+    /* 0xDB */ noentry56,
+    /* 0xDC */ noentry57,
+    /* 0xDD */ noentry58,
+    /* 0xDE */ noentry59,
+    /* 0xDF */ noentry60,
+    /* 0xE0 */ POU_SPIRIT,
+    /* 0xE1 */ noentry61,
+    /* 0xE2 */ noentry62,
+    /* 0xE3 */ noentry63,
+    /* 0xE4 */ noentry64,
+    /* 0xE5 */ noentry65,
+    /* 0xE6 */ noentry66,
+    /* 0xE7 */ noentry67,
+    /* 0xE8 */ noentry68,
+    /* 0xE9 */ ANCIENT_DOCUMENT,
+    /* 0xEA */ AIR_LETTER,
+    /* 0xEB */ ANCIENT_DOCUMENT2,
+    /* 0xEC */ LV7_DUNGEON_EXIT,
+    /* 0xED */ LINKS_SAVINGS,
+    /* 0xEE */ SMALL_KEY2,
+    /* 0xEF */ POU_FIRE1,
+    /* 0xF0 */ POU_FIRE2,
+    /* 0xF1 */ POU_FIRE3,
+    /* 0xF2 */ POU_FIRE4,
+    /* 0xF3 */ BOSSRIDER_KEY,
+    /* 0xF4 */ TOMATO_PUREE,
+    /* 0xF5 */ TASTE,
+    /* 0xF6 */ LV5_BOSS_KEY,
+    /* 0xF7 */ SURFBOARD,
+    /* 0xF8 */ KANTERA2,
+    /* 0xF9 */ L2_KEY_PIECES1,
+    /* 0xFA */ L2_KEY_PIECES2,
+    /* 0xFB */ L2_KEY_PIECES3,
+    /* 0xFC */ KEY_OF_CARAVAN,
+    /* 0xFD */ LV2_BOSS_KEY,
+    /* 0xFE */ KEY_OF_FILONE,
+    /* 0xFF */ NO_ITEM
 };
 
-enum CollectItem { COLLECT_CLOTHING, COLLECT_SWORD, COLLECT_SHIELD, COLLECT_SMELL, B_BUTTON_ITEM };
+enum CollectItem {
+    /* 0x0 */ COLLECT_CLOTHING,
+    /* 0x1 */ COLLECT_SWORD,
+    /* 0x2 */ COLLECT_SHIELD,
+    /* 0x3 */ COLLECT_SMELL,
+    /* 0x4 */ B_BUTTON_ITEM
+};
 
 enum Swords {
-    COLLECT_ORDON_SWORD,
-    COLLECT_MASTER_SWORD,
-    COLLECT_WOODEN_SWORD,
-    COLLECT_LIGHT_SWORD
+    /* 0x0 */ COLLECT_ORDON_SWORD,
+    /* 0x1 */ COLLECT_MASTER_SWORD,
+    /* 0x2 */ COLLECT_WOODEN_SWORD,
+    /* 0x3 */ COLLECT_LIGHT_SWORD
 };
 
-enum Shields { COLLECT_WOODEN_SHIELD, COLLECT_ORDON_SHIELD, COLLECT_HYLIAN_SHIELD };
+enum Shields {
+    /* 0x0 */ COLLECT_WOODEN_SHIELD,
+    /* 0x1 */ COLLECT_ORDON_SHIELD,
+    /* 0x2 */ COLLECT_HYLIAN_SHIELD
+};
 
-enum Armors { KOKIRI_CLOTHES_FLAG };
+enum Clothes {
+    /* 0x0 */ KOKIRI_CLOTHES_FLAG
+};
 
-enum LightDropStages { FARON_VESSEL, ELDIN_VESSEL, LANAYRU_VESSEL };
+enum LightDropStages {
+    /* 0x0 */ FARON_VESSEL,
+    /* 0x1 */ ELDIN_VESSEL,
+    /* 0x2 */ LANAYRU_VESSEL
+};
 
-enum ItemMax { ARROW_MAX, NORMAL_BOMB_MAX, WATER_BOMB_MAX, POKE_BOMB_MAX = 6 };
+enum ItemMax {
+    /* 0x0 */ ARROW_MAX,
+    /* 0x1 */ NORMAL_BOMB_MAX,
+    /* 0x2 */ WATER_BOMB_MAX,
+    /* 0x6 */ POKE_BOMB_MAX = 6
+};
 
 class dSv_player_status_a_c {
 public:
@@ -451,6 +476,7 @@ public:
     s16 getAngleY() { return mAngleY; }
     s8 getRoomNo() { return mRoomNo; }
     char getWarpAcceptStage() { return mWarpAcceptStage; }
+    void resetWarpAcceptStage() { mWarpAcceptStage = -1; }
 
 private:
     /* 0x00 */ cXyz mPos;
@@ -514,6 +540,7 @@ public:
     u8 addBottleNum(u8, s16);
     u8 getBottleNum(u8) const;
 
+    u8 getArrowNum() const { return mArrowNum; }
     void setArrowNum(u8 amount) { mArrowNum = amount; }
     u8 getPachinkoNum() const { return mPachinkoNum; }
     void setPachinkoNum(u8 num) { mPachinkoNum = num; }
@@ -680,6 +707,7 @@ public:
     dSv_light_drop_c& getLightDrop() { return mLightDrop; }
     dSv_player_get_item_c& getGetItem() { return mGetItem; }
     dSv_player_config_c& getConfig() { return mConfig; }
+    dSv_letter_info_c& getLetterInfo() { return mLetterInfo; }
 
 private:
     /* 0x000 */ dSv_player_status_a_c mPlayerStatusA;
@@ -704,14 +732,14 @@ private:
 class dSv_memBit_c {
 public:
     enum {
-        MAP,
-        COMPASS,
-        BOSS_KEY,
-        STAGE_BOSS_ENEMY,
-        STAGE_LIFE,
-        STAGE_BOSS_DEMO,
-        OOCCOO_NOTE,
-        STAGE_BOSS_ENEMY_2
+        /* 0x0 */ MAP,
+        /* 0x1 */ COMPASS,
+        /* 0x2 */ BOSS_KEY,
+        /* 0x3 */ STAGE_BOSS_ENEMY,
+        /* 0x4 */ STAGE_LIFE,
+        /* 0x5 */ STAGE_BOSS_DEMO,
+        /* 0x6 */ OOCCOO_NOTE,
+        /* 0x7 */ STAGE_BOSS_ENEMY_2
     };
 
     void init();