izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

item_name_static documented and ItemId updates (#1304)

Browse Source 
* WIP

* map static

* finish english names

* jpn

* revert map name

* name prefix

* boss to big

* more comments

* item enums

* more items

* more

* PR Suggestions

* PR Suggestion
This commit is contained in:
engineer124
2023-07-04 09:52:36 -04:00
committed by GitHub
parent 0f572acbda
commit 857a0cfdaf
44 changed files with 964 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+5 -5
View File
@@ -208,10 +208,10 @@ typedef enum Item00Type {
/* 0x09 */ ITEM00_ARROWS_40,
/* 0x0A */ ITEM00_ARROWS_50,
/* 0x0B */ ITEM00_BOMBS_B,
/* 0x0C */ ITEM00_NUTS_1,
/* 0x0D */ ITEM00_STICK,
/* 0x0E */ ITEM00_MAGIC_LARGE,
/* 0x0F */ ITEM00_MAGIC_SMALL,
/* 0x0C */ ITEM00_DEKU_NUTS_1,
/* 0x0D */ ITEM00_DEKU_STICK,
/* 0x0E */ ITEM00_MAGIC_JAR_BIG,
/* 0x0F */ ITEM00_MAGIC_JAR_SMALL,
/* 0x10 */ ITEM00_MASK,
/* 0x11 */ ITEM00_SMALL_KEY,
/* 0x12 */ ITEM00_FLEXIBLE,
@@ -219,7 +219,7 @@ typedef enum Item00Type {
/* 0x14 */ ITEM00_RUPEE_PURPLE,
/* 0x15 */ ITEM00_3_HEARTS,
/* 0x16 */ ITEM00_SHIELD_HERO,
/* 0x17 */ ITEM00_NUTS_10,
/* 0x17 */ ITEM00_DEKU_NUTS_10,
/* 0x18 */ ITEM00_NOTHING,
/* 0x19 */ ITEM00_BOMBS_0,
/* 0x1A */ ITEM00_BIG_FAIRY,
include/z64item.h
+38 -38
View File
@@ -44,8 +44,8 @@ typedef enum {
/* 3 */ UPG_SCALE,
/* 4 */ UPG_WALLET,
/* 5 */ UPG_BULLET_BAG,
/* 6 */ UPG_STICKS,
/* 7 */ UPG_NUTS
/* 6 */ UPG_DEKU_STICKS,
/* 7 */ UPG_DEKU_NUTS
} UpgradeType;
typedef enum {
@@ -100,13 +100,13 @@ typedef enum {
/* 0x05 */ SLOT_TRADE_DEED,
/* 0x06 */ SLOT_BOMB,
/* 0x07 */ SLOT_BOMBCHU,
/* 0x08 */ SLOT_STICK,
/* 0x09 */ SLOT_NUT,
/* 0x08 */ SLOT_DEKU_STICK,
/* 0x09 */ SLOT_DEKU_NUT,
/* 0x0A */ SLOT_MAGIC_BEANS,
/* 0x0B */ SLOT_TRADE_KEY_MAMA,
/* 0x0C */ SLOT_POWDER_KEG,
/* 0x0D */ SLOT_PICTO_BOX,
/* 0x0E */ SLOT_LENS,
/* 0x0D */ SLOT_PICTOGRAPH_BOX,
/* 0x0E */ SLOT_LENS_OF_TRUTH,
/* 0x0F */ SLOT_HOOKSHOT,
/* 0x10 */ SLOT_SWORD_GREAT_FAIRY,
/* 0x11 */ SLOT_TRADE_COUPLE,
@@ -144,7 +144,7 @@ typedef enum {
} InventorySlot;
typedef enum ItemId {
/* 0x00 */ ITEM_OCARINA,
/* 0x00 */ ITEM_OCARINA_OF_TIME,
/* 0x01 */ ITEM_BOW,
/* 0x02 */ ITEM_ARROW_FIRE,
/* 0x03 */ ITEM_ARROW_ICE,
@@ -152,13 +152,13 @@ typedef enum ItemId {
/* 0x05 */ ITEM_OCARINA_FAIRY,
/* 0x06 */ ITEM_BOMB,
/* 0x07 */ ITEM_BOMBCHU,
/* 0x08 */ ITEM_STICK,
/* 0x09 */ ITEM_NUT,
/* 0x08 */ ITEM_DEKU_STICK,
/* 0x09 */ ITEM_DEKU_NUT,
/* 0x0A */ ITEM_MAGIC_BEANS,
/* 0x0B */ ITEM_SLINGSHOT,
/* 0x0C */ ITEM_POWDER_KEG,
/* 0x0D */ ITEM_PICTO_BOX,
/* 0x0E */ ITEM_LENS,
/* 0x0D */ ITEM_PICTOGRAPH_BOX,
/* 0x0E */ ITEM_LENS_OF_TRUTH,
/* 0x0F */ ITEM_HOOKSHOT,
/* 0x10 */ ITEM_SWORD_GREAT_FAIRY,
/* 0x11 */ ITEM_LONGSHOT, // OoT Leftover
@@ -218,9 +218,9 @@ typedef enum ItemId {
/* 0x47 */ ITEM_MASK_BLAST,
/* 0x48 */ ITEM_MASK_SCENTS,
/* 0x49 */ ITEM_MASK_GIANT,
/* 0x4A */ ITEM_BOW_ARROW_FIRE,
/* 0x4B */ ITEM_BOW_ARROW_ICE,
/* 0x4C */ ITEM_BOW_ARROW_LIGHT,
/* 0x4A */ ITEM_BOW_FIRE,
/* 0x4B */ ITEM_BOW_ICE,
/* 0x4C */ ITEM_BOW_LIGHT,
/* 0x4D */ ITEM_SWORD_KOKIRI,
/* 0x4E */ ITEM_SWORD_RAZOR,
/* 0x4F */ ITEM_SWORD_GILDED,
@@ -265,8 +265,8 @@ typedef enum ItemId {
/* 0x76 */ ITEM_DUNGEON_MAP,
/* 0x77 */ ITEM_STRAY_FAIRIES,
/* 0x78 */ ITEM_KEY_SMALL,
/* 0x79 */ ITEM_MAGIC_SMALL,
/* 0x7A */ ITEM_MAGIC_LARGE,
/* 0x79 */ ITEM_MAGIC_JAR_SMALL,
/* 0x7A */ ITEM_MAGIC_JAR_BIG,
/* 0x7B */ ITEM_HEART_PIECE_2,
/* 0x7C */ ITEM_INVALID_1,
/* 0x7D */ ITEM_INVALID_2,
@@ -283,10 +283,10 @@ typedef enum ItemId {
/* 0x88 */ ITEM_RUPEE_PURPLE,
/* 0x89 */ ITEM_RUPEE_SILVER,
/* 0x8A */ ITEM_RUPEE_HUGE,
/* 0x8B */ ITEM_STICKS_5,
/* 0x8C */ ITEM_STICKS_10,
/* 0x8D */ ITEM_NUTS_5,
/* 0x8E */ ITEM_NUTS_10,
/* 0x8B */ ITEM_DEKU_STICKS_5,
/* 0x8C */ ITEM_DEKU_STICKS_10,
/* 0x8D */ ITEM_DEKU_NUTS_5,
/* 0x8E */ ITEM_DEKU_NUTS_10,
/* 0x8F */ ITEM_BOMBS_5,
/* 0x90 */ ITEM_BOMBS_10,
/* 0x91 */ ITEM_BOMBS_20,
@@ -299,10 +299,10 @@ typedef enum ItemId {
/* 0x98 */ ITEM_BOMBCHUS_10,
/* 0x99 */ ITEM_BOMBCHUS_1,
/* 0x9A */ ITEM_BOMBCHUS_5,
/* 0x9B */ ITEM_STICK_UPGRADE_20,
/* 0x9C */ ITEM_STICK_UPGRADE_30,
/* 0x9D */ ITEM_NUT_UPGRADE_30,
/* 0x9E */ ITEM_NUT_UPGRADE_40,
/* 0x9B */ ITEM_DEKU_STICK_UPGRADE_20,
/* 0x9C */ ITEM_DEKU_STICK_UPGRADE_30,
/* 0x9D */ ITEM_DEKU_NUT_UPGRADE_30,
/* 0x9E */ ITEM_DEKU_NUT_UPGRADE_40,
/* 0x9F */ ITEM_CHATEAU_2,
/* 0xA0 */ ITEM_MILK,
/* 0xA1 */ ITEM_GOLD_DUST_2,
@@ -353,8 +353,8 @@ typedef enum GetItemId {
/* 0x0B */ GI_0B,
/* 0x0C */ GI_HEART_PIECE,
/* 0x0D */ GI_HEART_CONTAINER,
/* 0x0E */ GI_MAGIC_SMALL,
/* 0x0F */ GI_MAGIC_LARGE,
/* 0x0E */ GI_MAGIC_JAR_SMALL,
/* 0x0F */ GI_MAGIC_JAR_BIG,
/* 0x10 */ GI_10,
/* 0x11 */ GI_STRAY_FAIRY,
/* 0x12 */ GI_12,
@@ -364,7 +364,7 @@ typedef enum GetItemId {
/* 0x16 */ GI_BOMBS_10,
/* 0x17 */ GI_BOMBS_20,
/* 0x18 */ GI_BOMBS_30,
/* 0x19 */ GI_STICKS_1,
/* 0x19 */ GI_DEKU_STICKS_1,
/* 0x1A */ GI_BOMBCHUS_10,
/* 0x1B */ GI_BOMB_BAG_20,
/* 0x1C */ GI_BOMB_BAG_30,
@@ -379,9 +379,9 @@ typedef enum GetItemId {
/* 0x25 */ GI_ARROW_FIRE,
/* 0x26 */ GI_ARROW_ICE,
/* 0x27 */ GI_ARROW_LIGHT,
/* 0x28 */ GI_NUTS_1,
/* 0x29 */ GI_NUTS_5,
/* 0x2A */ GI_NUTS_10,
/* 0x28 */ GI_DEKU_NUTS_1,
/* 0x29 */ GI_DEKU_NUTS_5,
/* 0x2A */ GI_DEKU_NUTS_10,
/* 0x2B */ GI_2B,
/* 0x2C */ GI_2C,
/* 0x2D */ GI_2D,
@@ -405,8 +405,8 @@ typedef enum GetItemId {
/* 0x3F */ GI_COMPASS,
/* 0x40 */ GI_40,
/* 0x41 */ GI_HOOKSHOT,
/* 0x42 */ GI_LENS,
/* 0x43 */ GI_PICTO_BOX,
/* 0x42 */ GI_LENS_OF_TRUTH,
/* 0x43 */ GI_PICTOGRAPH_BOX,
/* 0x44 */ GI_44,
/* 0x45 */ GI_45,
/* 0x46 */ GI_46,
@@ -415,7 +415,7 @@ typedef enum GetItemId {
/* 0x49 */ GI_49,
/* 0x4A */ GI_4A,
/* 0x4B */ GI_4B,
/* 0x4C */ GI_OCARINA,
/* 0x4C */ GI_OCARINA_OF_TIME,
/* 0x4D */ GI_4D,
/* 0x4E */ GI_4E,
/* 0x4F */ GI_4F,
@@ -547,7 +547,7 @@ typedef enum GetItemDrawId {
/* 0x0E */ GID_MASK_CIRCUS_LEADER,
/* 0x0F */ GID_MASK_BREMEN,
/* 0x10 */ GID_MASK_ALL_NIGHT,
/* 0x11 */ GID_NUTS,
/* 0x11 */ GID_DEKU_NUTS,
/* 0x12 */ GID_HEART_CONTAINER,
/* 0x13 */ GID_HEART_PIECE,
/* 0x14 */ GID_QUIVER_30,
@@ -556,10 +556,10 @@ typedef enum GetItemDrawId {
/* 0x17 */ GID_BOMB_BAG_20,
/* 0x18 */ GID_BOMB_BAG_30,
/* 0x19 */ GID_BOMB_BAG_40,
/* 0x1A */ GID_STICK,
/* 0x1A */ GID_DEKU_STICK,
/* 0x1B */ GID_DUNGEON_MAP,
/* 0x1C */ GID_MAGIC_SMALL,
/* 0x1D */ GID_MAGIC_LARGE,
/* 0x1C */ GID_MAGIC_JAR_SMALL,
/* 0x1D */ GID_MAGIC_JAR_BIG,
/* 0x1E */ GID_BOMB,
/* 0x1F */ GID_STONE_OF_AGONY,
/* 0x20 */ GID_WALLET_ADULT,
@@ -646,7 +646,7 @@ typedef enum GetItemDrawId {
/* 0x71 */ GID_MASK_POSTMAN,
/* 0x72 */ GID_MASK_GIANT,
/* 0x73 */ GID_CHATEAU,
/* 0x74 */ GID_PICTO_BOX,
/* 0x74 */ GID_PICTOGRAPH_BOX,
/* 0x75 */ GID_MASK_FIERCE_DEITY,
/* 0x76 */ GID_MAX
} GetItemDrawId;
include/z64player.h
+6 -6
View File
@@ -61,7 +61,7 @@ typedef enum PlayerItemAction {
/* 0x04 */ PLAYER_IA_SWORD_RAZOR,
/* 0x05 */ PLAYER_IA_SWORD_GILDED,
/* 0x06 */ PLAYER_IA_SWORD_TWO_HANDED,
/* 0x07 */ PLAYER_IA_STICK,
/* 0x07 */ PLAYER_IA_DEKU_STICK,
/* 0x08 */ PLAYER_IA_ZORA_FINS,
/* 0x09 */ PLAYER_IA_BOW,
/* 0x0A */ PLAYER_IA_BOW_FIRE,
@@ -73,8 +73,8 @@ typedef enum PlayerItemAction {
/* 0x0F */ PLAYER_IA_POWDER_KEG,
/* 0x10 */ PLAYER_IA_BOMBCHU,
/* 0x11 */ PLAYER_IA_11,
/* 0x12 */ PLAYER_IA_NUT,
/* 0x13 */ PLAYER_IA_PICTO_BOX,
/* 0x12 */ PLAYER_IA_DEKU_NUT,
/* 0x13 */ PLAYER_IA_PICTOGRAPH_BOX,
/* 0x14 */ PLAYER_IA_OCARINA,
/* 0x15 */ PLAYER_IA_BOTTLE_MIN,
/* 0x15 */ PLAYER_IA_BOTTLE_EMPTY = PLAYER_IA_BOTTLE_MIN,
@@ -141,7 +141,7 @@ typedef enum PlayerItemAction {
/* 0x50 */ PLAYER_IA_MASK_ZORA,
/* 0x51 */ PLAYER_IA_MASK_DEKU,
/* 0x51 */ PLAYER_IA_MASK_MAX = PLAYER_IA_MASK_DEKU,
/* 0x52 */ PLAYER_IA_LENS,
/* 0x52 */ PLAYER_IA_LENS_OF_TRUTH,
/* 0x53 */ PLAYER_IA_MAX
} PlayerItemAction;
@@ -165,7 +165,7 @@ typedef enum PlayerMeleeWeapon {
/* 2 */ PLAYER_MELEEWEAPON_SWORD_RAZOR = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_RAZOR),
/* 3 */ PLAYER_MELEEWEAPON_SWORD_GILDED = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_GILDED),
/* 4 */ PLAYER_MELEEWEAPON_SWORD_TWO_HANDED = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_TWO_HANDED),
/* 5 */ PLAYER_MELEEWEAPON_STICK = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_STICK),
/* 5 */ PLAYER_MELEEWEAPON_DEKU_STICK = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_DEKU_STICK),
/* 6 */ PLAYER_MELEEWEAPON_ZORA_FINS = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_ZORA_FINS),
/* 7 */ PLAYER_MELEEWEAPON_MAX
} PlayerMeleeWeapon;
@@ -414,7 +414,7 @@ typedef enum PlayerModelGroup {
/* 7 */ PLAYER_MODELGROUP_EXPLOSIVES,
/* 8 */ PLAYER_MODELGROUP_8,
/* 9 */ PLAYER_MODELGROUP_HOOKSHOT,
/* 10 */ PLAYER_MODELGROUP_STICK,
/* 10 */ PLAYER_MODELGROUP_DEKU_STICK,
/* 11 */ PLAYER_MODELGROUP_INSTRUMENT,
/* 12 */ PLAYER_MODELGROUP_BOTTLE,
/* 13 */ PLAYER_MODELGROUP_13,