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
assets/xml/archives/icon_item_static.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<Texture Name="gItemIconMagicBeansTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000" />
<Texture Name="gItemIconSlingshotTex" OutName="slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000" />
<Texture Name="gItemIconPowderKegTex" OutName="powder_keg_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000" />
<Texture Name="gItemIconPictoBoxTex" OutName="picto_box_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000" />
<Texture Name="gItemIconPictographBoxTex" OutName="picto_box_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000" />
<Texture Name="gItemIconLensofTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000" />
<Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000" />
<Texture Name="gItemIconGreatFairysSwordTex" OutName="great_fairys_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000" />
assets/xml/archives/item_name_static.xml
+153 -120
View File
@@ -1,124 +1,157 @@
<Root>
<!-- Item Names. Must be ia4 128x16 and ordered following `ItemId` -->
<File Name="item_name_static.unarchive">
<Blob Name="item_name_static_Blob_000000" Size="0x0400" Offset="0x0" />
<Blob Name="item_name_static_Blob_000400" Size="0x0400" Offset="0x400" />
<Blob Name="item_name_static_Blob_000800" Size="0x0400" Offset="0x800" />
<Blob Name="item_name_static_Blob_000C00" Size="0x0400" Offset="0xC00" />
<Blob Name="item_name_static_Blob_001000" Size="0x0400" Offset="0x1000" />
<Blob Name="item_name_static_Blob_001400" Size="0x0400" Offset="0x1400" />
<Blob Name="item_name_static_Blob_001800" Size="0x0400" Offset="0x1800" />
<Blob Name="item_name_static_Blob_001C00" Size="0x0400" Offset="0x1C00" />
<Blob Name="item_name_static_Blob_002000" Size="0x0400" Offset="0x2000" />
<Blob Name="item_name_static_Blob_002400" Size="0x0400" Offset="0x2400" />
<Blob Name="item_name_static_Blob_002800" Size="0x0400" Offset="0x2800" />
<Blob Name="item_name_static_Blob_002C00" Size="0x0400" Offset="0x2C00" />
<Blob Name="item_name_static_Blob_003000" Size="0x0400" Offset="0x3000" />
<Blob Name="item_name_static_Blob_003400" Size="0x0400" Offset="0x3400" />
<Blob Name="item_name_static_Blob_003800" Size="0x0400" Offset="0x3800" />
<Blob Name="item_name_static_Blob_003C00" Size="0x0400" Offset="0x3C00" />
<Blob Name="item_name_static_Blob_004000" Size="0x0400" Offset="0x4000" />
<Blob Name="item_name_static_Blob_004400" Size="0x0400" Offset="0x4400" />
<Blob Name="item_name_static_Blob_004800" Size="0x0400" Offset="0x4800" />
<Blob Name="item_name_static_Blob_004C00" Size="0x0400" Offset="0x4C00" />
<Blob Name="item_name_static_Blob_005000" Size="0x0400" Offset="0x5000" />
<Blob Name="item_name_static_Blob_005400" Size="0x0400" Offset="0x5400" />
<Blob Name="item_name_static_Blob_005800" Size="0x0400" Offset="0x5800" />
<Blob Name="item_name_static_Blob_005C00" Size="0x0400" Offset="0x5C00" />
<Blob Name="item_name_static_Blob_006000" Size="0x0400" Offset="0x6000" />
<Blob Name="item_name_static_Blob_006400" Size="0x0400" Offset="0x6400" />
<Blob Name="item_name_static_Blob_006800" Size="0x0400" Offset="0x6800" />
<Blob Name="item_name_static_Blob_006C00" Size="0x0400" Offset="0x6C00" />
<Blob Name="item_name_static_Blob_007000" Size="0x0400" Offset="0x7000" />
<Blob Name="item_name_static_Blob_007400" Size="0x0400" Offset="0x7400" />
<Blob Name="item_name_static_Blob_007800" Size="0x0400" Offset="0x7800" />
<Blob Name="item_name_static_Blob_007C00" Size="0x0400" Offset="0x7C00" />
<Blob Name="item_name_static_Blob_008000" Size="0x0400" Offset="0x8000" />
<Blob Name="item_name_static_Blob_008400" Size="0x0400" Offset="0x8400" />
<Blob Name="item_name_static_Blob_008800" Size="0x0400" Offset="0x8800" />
<Blob Name="item_name_static_Blob_008C00" Size="0x0400" Offset="0x8C00" />
<Blob Name="item_name_static_Blob_009000" Size="0x0400" Offset="0x9000" />
<Blob Name="item_name_static_Blob_009400" Size="0x0400" Offset="0x9400" />
<Blob Name="item_name_static_Blob_009800" Size="0x0400" Offset="0x9800" />
<Blob Name="item_name_static_Blob_009C00" Size="0x0400" Offset="0x9C00" />
<Blob Name="item_name_static_Blob_00A000" Size="0x0400" Offset="0xA000" />
<Blob Name="item_name_static_Blob_00A400" Size="0x0400" Offset="0xA400" />
<Blob Name="item_name_static_Blob_00A800" Size="0x0400" Offset="0xA800" />
<Blob Name="item_name_static_Blob_00AC00" Size="0x0400" Offset="0xAC00" />
<Blob Name="item_name_static_Blob_00B000" Size="0x0400" Offset="0xB000" />
<Blob Name="item_name_static_Blob_00B400" Size="0x0400" Offset="0xB400" />
<Blob Name="item_name_static_Blob_00B800" Size="0x0400" Offset="0xB800" />
<Blob Name="item_name_static_Blob_00BC00" Size="0x0400" Offset="0xBC00" />
<Blob Name="item_name_static_Blob_00C000" Size="0x0400" Offset="0xC000" />
<Blob Name="item_name_static_Blob_00C400" Size="0x0400" Offset="0xC400" />
<Blob Name="item_name_static_Blob_00C800" Size="0x0400" Offset="0xC800" />
<Blob Name="item_name_static_Blob_00CC00" Size="0x0400" Offset="0xCC00" />
<Blob Name="item_name_static_Blob_00D000" Size="0x0400" Offset="0xD000" />
<Blob Name="item_name_static_Blob_00D400" Size="0x0400" Offset="0xD400" />
<Blob Name="item_name_static_Blob_00D800" Size="0x0400" Offset="0xD800" />
<Blob Name="item_name_static_Blob_00DC00" Size="0x0400" Offset="0xDC00" />
<Blob Name="item_name_static_Blob_00E000" Size="0x0400" Offset="0xE000" />
<Blob Name="item_name_static_Blob_00E400" Size="0x0400" Offset="0xE400" />
<Blob Name="item_name_static_Blob_00E800" Size="0x0400" Offset="0xE800" />
<Blob Name="item_name_static_Blob_00EC00" Size="0x0400" Offset="0xEC00" />
<Blob Name="item_name_static_Blob_00F000" Size="0x0400" Offset="0xF000" />
<Blob Name="item_name_static_Blob_00F400" Size="0x0400" Offset="0xF400" />
<Blob Name="item_name_static_Blob_00F800" Size="0x0400" Offset="0xF800" />
<Blob Name="item_name_static_Blob_00FC00" Size="0x0400" Offset="0xFC00" />
<Blob Name="item_name_static_Blob_010000" Size="0x0400" Offset="0x10000" />
<Blob Name="item_name_static_Blob_010400" Size="0x0400" Offset="0x10400" />
<Blob Name="item_name_static_Blob_010800" Size="0x0400" Offset="0x10800" />
<Blob Name="item_name_static_Blob_010C00" Size="0x0400" Offset="0x10C00" />
<Blob Name="item_name_static_Blob_011000" Size="0x0400" Offset="0x11000" />
<Blob Name="item_name_static_Blob_011400" Size="0x0400" Offset="0x11400" />
<Blob Name="item_name_static_Blob_011800" Size="0x0400" Offset="0x11800" />
<Blob Name="item_name_static_Blob_011C00" Size="0x0400" Offset="0x11C00" />
<Blob Name="item_name_static_Blob_012000" Size="0x0400" Offset="0x12000" />
<Blob Name="item_name_static_Blob_012400" Size="0x0400" Offset="0x12400" />
<Blob Name="item_name_static_Blob_012800" Size="0x0400" Offset="0x12800" />
<Blob Name="item_name_static_Blob_012C00" Size="0x0400" Offset="0x12C00" />
<Blob Name="item_name_static_Blob_013000" Size="0x0400" Offset="0x13000" />
<Blob Name="item_name_static_Blob_013400" Size="0x0400" Offset="0x13400" />
<Blob Name="item_name_static_Blob_013800" Size="0x0400" Offset="0x13800" />
<Blob Name="item_name_static_Blob_013C00" Size="0x0400" Offset="0x13C00" />
<Blob Name="item_name_static_Blob_014000" Size="0x0400" Offset="0x14000" />
<Blob Name="item_name_static_Blob_014400" Size="0x0400" Offset="0x14400" />
<Blob Name="item_name_static_Blob_014800" Size="0x0400" Offset="0x14800" />
<Blob Name="item_name_static_Blob_014C00" Size="0x0400" Offset="0x14C00" />
<Blob Name="item_name_static_Blob_015000" Size="0x0400" Offset="0x15000" />
<Blob Name="item_name_static_Blob_015400" Size="0x0400" Offset="0x15400" />
<Blob Name="item_name_static_Blob_015800" Size="0x0400" Offset="0x15800" />
<Blob Name="item_name_static_Blob_015C00" Size="0x0400" Offset="0x15C00" />
<Blob Name="item_name_static_Blob_016000" Size="0x0400" Offset="0x16000" />
<Blob Name="item_name_static_Blob_016400" Size="0x0400" Offset="0x16400" />
<Blob Name="item_name_static_Blob_016800" Size="0x0400" Offset="0x16800" />
<Blob Name="item_name_static_Blob_016C00" Size="0x0400" Offset="0x16C00" />
<Blob Name="item_name_static_Blob_017000" Size="0x0400" Offset="0x17000" />
<Blob Name="item_name_static_Blob_017400" Size="0x0400" Offset="0x17400" />
<Blob Name="item_name_static_Blob_017800" Size="0x0400" Offset="0x17800" />
<Blob Name="item_name_static_Blob_017C00" Size="0x0400" Offset="0x17C00" />
<Blob Name="item_name_static_Blob_018000" Size="0x0400" Offset="0x18000" />
<Blob Name="item_name_static_Blob_018400" Size="0x0400" Offset="0x18400" />
<Blob Name="item_name_static_Blob_018800" Size="0x0400" Offset="0x18800" />
<Blob Name="item_name_static_Blob_018C00" Size="0x0400" Offset="0x18C00" />
<Blob Name="item_name_static_Blob_019000" Size="0x0400" Offset="0x19000" />
<Blob Name="item_name_static_Blob_019400" Size="0x0400" Offset="0x19400" />
<Blob Name="item_name_static_Blob_019800" Size="0x0400" Offset="0x19800" />
<Blob Name="item_name_static_Blob_019C00" Size="0x0400" Offset="0x19C00" />
<Blob Name="item_name_static_Blob_01A000" Size="0x0400" Offset="0x1A000" />
<Blob Name="item_name_static_Blob_01A400" Size="0x0400" Offset="0x1A400" />
<Blob Name="item_name_static_Blob_01A800" Size="0x0400" Offset="0x1A800" />
<Blob Name="item_name_static_Blob_01AC00" Size="0x0400" Offset="0x1AC00" />
<Blob Name="item_name_static_Blob_01B000" Size="0x0400" Offset="0x1B000" />
<Blob Name="item_name_static_Blob_01B400" Size="0x0400" Offset="0x1B400" />
<Blob Name="item_name_static_Blob_01B800" Size="0x0400" Offset="0x1B800" />
<Blob Name="item_name_static_Blob_01BC00" Size="0x0400" Offset="0x1BC00" />
<Blob Name="item_name_static_Blob_01C000" Size="0x0400" Offset="0x1C000" />
<Blob Name="item_name_static_Blob_01C400" Size="0x0400" Offset="0x1C400" />
<Blob Name="item_name_static_Blob_01C800" Size="0x0400" Offset="0x1C800" />
<Blob Name="item_name_static_Blob_01CC00" Size="0x0400" Offset="0x1CC00" />
<Blob Name="item_name_static_Blob_01D000" Size="0x0400" Offset="0x1D000" />
<Blob Name="item_name_static_Blob_01D400" Size="0x0400" Offset="0x1D400" />
<Blob Name="item_name_static_Blob_01D800" Size="0x0400" Offset="0x1D800" />
<Blob Name="item_name_static_Blob_01DC00" Size="0x0400" Offset="0x1DC00" />
<!-- Main items -->
<Texture Name="gItemNameOcarinaOfTimeENGTex" OutName="item_name_ocarina_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x0" /> <!-- ITEM_OCARINA_OF_TIME -->
<Texture Name="gItemNameHerosBowENGTex" OutName="item_name_heros_bow_eng" Format="ia4" Width="128" Height="16" Offset="0x400" /> <!-- ITEM_BOW -->
<Texture Name="gItemNameFireArrowENGTex" OutName="item_name_fire_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x800" /> <!-- ITEM_ARROW_FIRE -->
<Texture Name="gItemNameIceArrowENGTex" OutName="item_name_ice_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0xC00" /> <!-- ITEM_ARROW_ICE -->
<Texture Name="gItemNameLightArrowENGTex" OutName="item_name_light_arrow_eng" Format="ia4" Width="128" Height="16" Offset="0x1000" /> <!-- ITEM_ARROW_LIGHT -->
<Texture Name="gItemNameFairyOcarinaJPNTex" OutName="item_name_fairy_ocarina_jpn" Format="ia4" Width="128" Height="16" Offset="0x1400" /> <!-- ITEM_OCARINA_FAIRY -->
<Texture Name="gItemNameBombENGTex" OutName="item_name_bomb_eng" Format="ia4" Width="128" Height="16" Offset="0x1800" /> <!-- ITEM_BOMB -->
<Texture Name="gItemNameBombchuENGTex" OutName="item_name_bombchu_eng" Format="ia4" Width="128" Height="16" Offset="0x1C00" /> <!-- ITEM_BOMBCHU -->
<Texture Name="gItemNameDekuStickENGTex" OutName="item_name_deku_stick_eng" Format="ia4" Width="128" Height="16" Offset="0x2000" /> <!-- ITEM_DEKU_STICK -->
<Texture Name="gItemNameDekuNutENGTex" OutName="item_name_deku_nut_eng" Format="ia4" Width="128" Height="16" Offset="0x2400" /> <!-- ITEM_DEKU_NUT -->
<Texture Name="gItemNameMagicBeansENGTex" OutName="item_name_magic_beans_eng" Format="ia4" Width="128" Height="16" Offset="0x2800" /> <!-- ITEM_MAGIC_BEANS -->
<!-- Swapped with slingshot -->
<Texture Name="gItemNameLongshotJPNTex" OutName="item_name_longshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x2C00" /> <!-- ITEM_SLINGSHOT -->
<Texture Name="gItemNamePowderKegENGTex" OutName="item_name_powder_keg_eng" Format="ia4" Width="128" Height="16" Offset="0x3000" /> <!-- ITEM_POWDER_KEG -->
<Texture Name="gItemNamePictographBoxENGTex" OutName="item_name_pictograph_box_eng" Format="ia4" Width="128" Height="16" Offset="0x3400" /> <!-- ITEM_PICTOGRAPH_BOX -->
<Texture Name="gItemNameLensOfTruthENGTex" OutName="item_name_lens_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0x3800" /> <!-- ITEM_LENS_OF_TRUTH -->
<Texture Name="gItemNameHookshotENGTex" OutName="item_name_hookshot_eng" Format="ia4" Width="128" Height="16" Offset="0x3C00" /> <!-- ITEM_HOOKSHOT -->
<Texture Name="gItemNameGreatFairysSwordENGTex" OutName="item_name_great_fairys_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x4000" /> <!-- ITEM_SWORD_GREAT_FAIRY -->
<!-- Swapped with longshot -->
<Texture Name="gItemNameFairySlingshotJPNTex" OutName="item_name_fairy_slingshot_jpn" Format="ia4" Width="128" Height="16" Offset="0x4400" /> <!-- ITEM_LONGSHOT -->
<!-- Bottled items -->
<Texture Name="gItemNameEmptyBottleENGTex" OutName="item_name_empty_bottle_eng" Format="ia4" Width="128" Height="16" Offset="0x4800" /> <!-- ITEM_BOTTLE -->
<Texture Name="gItemNameRedPotionENGTex" OutName="item_name_red_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x4C00" /> <!-- ITEM_POTION_RED -->
<Texture Name="gItemNameGreenPotionENGTex" OutName="item_name_green_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5000" /> <!-- ITEM_POTION_GREEN -->
<Texture Name="gItemNameBluePotionENGTex" OutName="item_name_blue_potion_eng" Format="ia4" Width="128" Height="16" Offset="0x5400" /> <!-- ITEM_POTION_BLUE -->
<Texture Name="gItemNameFairyENGTex" OutName="item_name_fairy_eng" Format="ia4" Width="128" Height="16" Offset="0x5800" /> <!-- ITEM_FAIRY -->
<Texture Name="gItemNameDekuPrincessENGTex" OutName="item_name_deku_princess_eng" Format="ia4" Width="128" Height="16" Offset="0x5C00" /> <!-- ITEM_DEKU_PRINCESS -->
<Texture Name="gItemNameFullMilkENGTex" OutName="item_name_full_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6000" /> <!-- ITEM_MILK_BOTTLE -->
<Texture Name="gItemNameHalfMilkENGTex" OutName="item_name_half_milk_eng" Format="ia4" Width="128" Height="16" Offset="0x6400" /> <!-- ITEM_MILK_HALF -->
<Texture Name="gItemNameFishENGTex" OutName="item_name_fish_eng" Format="ia4" Width="128" Height="16" Offset="0x6800" /> <!-- ITEM_FISH -->
<Texture Name="gItemNameBugENGTex" OutName="item_name_bug_eng" Format="ia4" Width="128" Height="16" Offset="0x6C00" /> <!-- ITEM_BUG -->
<Texture Name="gItemNameBlueFireENGTex" OutName="item_name_blue_fire_eng" Format="ia4" Width="128" Height="16" Offset="0x7000" /> <!-- ITEM_BLUE_FIRE -->
<Texture Name="gItemNamePoeENGTex" OutName="item_name_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7400" /> <!-- ITEM_POE -->
<Texture Name="gItemNameBigPoeENGTex" OutName="item_name_big_poe_eng" Format="ia4" Width="128" Height="16" Offset="0x7800" /> <!-- ITEM_BIG_POE -->
<Texture Name="gItemNameSpringWaterENGTex" OutName="item_name_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x7C00" /> <!-- ITEM_SPRING_WATER -->
<Texture Name="gItemNameHotSpringWaterENGTex" OutName="item_name_hot_spring_water_eng" Format="ia4" Width="128" Height="16" Offset="0x8000" /> <!-- ITEM_HOT_SPRING_WATER -->
<Texture Name="gItemNameZoraEggENGTex" OutName="item_name_zora_egg_eng" Format="ia4" Width="128" Height="16" Offset="0x8400" /> <!-- ITEM_ZORA_EGG -->
<Texture Name="gItemNameGoldDustENGTex" OutName="item_name_gold_dust_eng" Format="ia4" Width="128" Height="16" Offset="0x8800" /> <!-- ITEM_GOLD_DUST -->
<Texture Name="gItemNameMagicalMushroomENGTex" OutName="item_name_magical_mushroom_eng" Format="ia4" Width="128" Height="16" Offset="0x8C00" /> <!-- ITEM_MUSHROOM -->
<Texture Name="gItemNameSeaHorseENGTex" OutName="item_name_sea_horse_eng" Format="ia4" Width="128" Height="16" Offset="0x9000" /> <!-- ITEM_SEAHORSE -->
<Texture Name="gItemNameChateauRomaniENGTex" OutName="item_name_chateau_romani_eng" Format="ia4" Width="128" Height="16" Offset="0x9400" /> <!-- ITEM_CHATEAU -->
<Texture Name="gItemNameHylianLoachJPNTex" OutName="item_name_hylian_loach_jpn" Format="ia4" Width="128" Height="16" Offset="0x9800" /> <!-- ITEM_HYLIAN_LOACH -->
<Texture Name="gItemNameObabasDrinkJPNTex" OutName="item_name_obabas_drink_jpn" Format="ia4" Width="128" Height="16" Offset="0x9C00" /> <!-- ITEM_OBABA_DRINK -->
<!-- Trade Items -->
<Texture Name="gItemNameMoonsTearENGTex" OutName="item_name_moons_tear_eng" Format="ia4" Width="128" Height="16" Offset="0xA000" /> <!-- ITEM_MOONS_TEAR -->
<Texture Name="gItemNameLandTitleDeedENGTex" OutName="item_name_land_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA400" /> <!-- ITEM_DEED_LAND -->
<Texture Name="gItemNameSwampTitleDeedENGTex" OutName="item_name_swamp_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xA800" /> <!-- ITEM_DEED_SWAMP -->
<Texture Name="gItemNameMountainTitleDeedENGTex" OutName="item_name_mountain_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xAC00" /> <!-- ITEM_DEED_MOUNTAIN -->
<Texture Name="gItemNameOceanTitleDeedENGTex" OutName="item_name_ocean_title_deed_eng" Format="ia4" Width="128" Height="16" Offset="0xB000" /> <!-- ITEM_DEED_OCEAN -->
<Texture Name="gItemNameRoomKeyENGTex" OutName="item_name_room_key_eng" Format="ia4" Width="128" Height="16" Offset="0xB400" /> <!-- ITEM_ROOM_KEY -->
<Texture Name="gItemNameSpecialDeliveryToMamaENGTex" OutName="item_name_special_delivery_to_mama_eng" Format="ia4" Width="128" Height="16" Offset="0xB800" /> <!-- ITEM_LETTER_MAMA -->
<Texture Name="gItemNameLetterToKafeiENGTex" OutName="item_name_letter_to_kafei_eng" Format="ia4" Width="128" Height="16" Offset="0xBC00" /> <!-- ITEM_LETTER_TO_KAFEI -->
<Texture Name="gItemNamePendantOfMemoriesENGTex" OutName="item_name_pendant_of_memories_eng" Format="ia4" Width="128" Height="16" Offset="0xC000" /> <!-- ITEM_PENDANT_OF_MEMORIES -->
<!-- Translates to Moon's Stone? Slightly different than the japanese translation of Moon's Tear. Replaces Tear with Stone, the same character used in Stone's Mask -->
<Texture Name="gItemNameMoonsStoneJPNTex" OutName="item_name_moons_stone_jpn" Format="ia4" Width="128" Height="16" Offset="0xC400" /> <!-- ITEM_TINGLE_MAP -->
<!-- Masks -->
<Texture Name="gItemNameDekuMaskENGTex" OutName="item_name_deku_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xC800" /> <!-- ITEM_MASK_DEKU -->
<Texture Name="gItemNameGoronMaskENGTex" OutName="item_name_goron_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xCC00" /> <!-- ITEM_MASK_GORON -->
<Texture Name="gItemNameZoraMaskENGTex" OutName="item_name_zora_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD000" /> <!-- ITEM_MASK_ZORA -->
<Texture Name="gItemNameFierceDeitysMaskENGTex" OutName="item_name_fierce_deitys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xD400" /> <!-- ITEM_MASK_FIERCE_DEITY -->
<Texture Name="gItemNameMaskOfTruthENGTex" OutName="item_name_mask_of_truth_eng" Format="ia4" Width="128" Height="16" Offset="0xD800" /> <!-- ITEM_MASK_TRUTH -->
<Texture Name="gItemNameKafeisMaskENGTex" OutName="item_name_kafeis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xDC00" /> <!-- ITEM_MASK_KAFEIS_MASK -->
<Texture Name="gItemNameAllNightMaskENGTex" OutName="item_name_all_night_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE000" /> <!-- ITEM_MASK_ALL_NIGHT -->
<Texture Name="gItemNameBunnyHoodENGTex" OutName="item_name_bunny_hood_eng" Format="ia4" Width="128" Height="16" Offset="0xE400" /> <!-- ITEM_MASK_BUNNY -->
<Texture Name="gItemNameKeatonMaskENGTex" OutName="item_name_keaton_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xE800" /> <!-- ITEM_MASK_KEATON -->
<Texture Name="gItemNameGarosMaskENGTex" OutName="item_name_garos_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xEC00" /> <!-- ITEM_MASK_GARO -->
<Texture Name="gItemNameRomanisMaskENGTex" OutName="item_name_romanis_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF000" /> <!-- ITEM_MASK_ROMANI -->
<Texture Name="gItemNameCircusLeadersMaskENGTex" OutName="item_name_circus_leaders_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xF400" /> <!-- ITEM_MASK_CIRCUS_LEADER -->
<Texture Name="gItemNamePostmansHatENGTex" OutName="item_name_postmans_hat_eng" Format="ia4" Width="128" Height="16" Offset="0xF800" /> <!-- ITEM_MASK_POSTMAN -->
<Texture Name="gItemNameCouplesMaskENGTex" OutName="item_name_couples_mask_eng" Format="ia4" Width="128" Height="16" Offset="0xFC00" /> <!-- ITEM_MASK_COUPLE -->
<Texture Name="gItemNameGreatFairysMaskENGTex" OutName="item_name_great_fairys_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10000" /> <!-- ITEM_MASK_GREAT_FAIRY -->
<Texture Name="gItemNameGibdoMaskENGTex" OutName="item_name_gibdo_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10400" /> <!-- ITEM_MASK_GIBDO -->
<Texture Name="gItemNameDonGerosMaskENGTex" OutName="item_name_don_geros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10800" /> <!-- ITEM_MASK_DON_GERO -->
<Texture Name="gItemNameKamarosMaskENGTex" OutName="item_name_kamaros_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x10C00" /> <!-- ITEM_MASK_KAMARO -->
<Texture Name="gItemNameCaptainsHatENGTex" OutName="item_name_captains_hat_eng" Format="ia4" Width="128" Height="16" Offset="0x11000" /> <!-- ITEM_MASK_CAPTAIN -->
<Texture Name="gItemNameStoneMaskENGTex" OutName="item_name_stone_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11400" /> <!-- ITEM_MASK_STONE -->
<Texture Name="gItemNameBremenMaskENGTex" OutName="item_name_bremen_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11800" /> <!-- ITEM_MASK_BREMEN -->
<Texture Name="gItemNameBlastMaskENGTex" OutName="item_name_blast_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x11C00" /> <!-- ITEM_MASK_BLAST -->
<Texture Name="gItemNameMaskOfScentsENGTex" OutName="item_name_mask_of_scents_eng" Format="ia4" Width="128" Height="16" Offset="0x12000" /> <!-- ITEM_MASK_SCENTS -->
<Texture Name="gItemNameGiantsMaskENGTex" OutName="item_name_giants_mask_eng" Format="ia4" Width="128" Height="16" Offset="0x12400" /> <!-- ITEM_MASK_GIANT -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameWindMedallionJPNTex" OutName="item_name_wind_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12800" /> <!-- ITEM_BOW_FIRE -->
<Texture Name="gItemNameFireMedallionJPNTex" OutName="item_name_fire_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x12C00" /> <!-- ITEM_BOW_ICE -->
<Texture Name="gItemNameIceMedallionJPNTex" OutName="item_name_ice_medallion_jpn" Format="ia4" Width="128" Height="16" Offset="0x13000" /> <!-- ITEM_BOW_LIGHT -->
<!-- Equipment -->
<Texture Name="gItemNameKokiriSwordENGTex" OutName="item_name_kokiri_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13400" /> <!-- ITEM_SWORD_KOKIRI -->
<Texture Name="gItemNameRazorSwordENGTex" OutName="item_name_razor_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13800" /> <!-- ITEM_SWORD_RAZOR -->
<Texture Name="gItemNameGildedSwordENGTex" OutName="item_name_gilded_sword_eng" Format="ia4" Width="128" Height="16" Offset="0x13C00" /> <!-- ITEM_SWORD_GILDED -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameBrokenGiantsKnifeJPNTex" OutName="item_name_broken_giants_knife_jpn" Format="ia4" Width="128" Height="16" Offset="0x14000" /> <!-- ITEM_SWORD_DEITY -->
<Texture Name="gItemNameHerosShieldENGTex" OutName="item_name_heros_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14400" /> <!-- ITEM_SHIELD_HERO -->
<Texture Name="gItemNameMirrorShieldENGTex" OutName="item_name_mirror_shield_eng" Format="ia4" Width="128" Height="16" Offset="0x14800" /> <!-- ITEM_SHIELD_MIRROR -->
<!-- Upgrades -->
<Texture Name="gItemNameQuiver30ENGTex" OutName="item_name_quiver_30_eng" Format="ia4" Width="128" Height="16" Offset="0x14C00" /> <!-- ITEM_QUIVER_30 -->
<Texture Name="gItemNameQuiver40ENGTex" OutName="item_name_quiver_40_eng" Format="ia4" Width="128" Height="16" Offset="0x15000" /> <!-- ITEM_QUIVER_40 -->
<Texture Name="gItemNameQuiver50ENGTex" OutName="item_name_quiver_50_eng" Format="ia4" Width="128" Height="16" Offset="0x15400" /> <!-- ITEM_QUIVER_50 -->
<Texture Name="gItemNameBombBag20ENGTex" OutName="item_name_bomb_bag_20_eng" Format="ia4" Width="128" Height="16" Offset="0x15800" /> <!-- ITEM_BOMB_BAG_20 -->
<Texture Name="gItemNameBombBag30ENGTex" OutName="item_name_bomb_bag_30_eng" Format="ia4" Width="128" Height="16" Offset="0x15C00" /> <!-- ITEM_BOMB_BAG_30 -->
<Texture Name="gItemNameBombBag40ENGTex" OutName="item_name_bomb_bag_40_eng" Format="ia4" Width="128" Height="16" Offset="0x16000" /> <!-- ITEM_BOMB_BAG_40 -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameBigKey1JPNTex" OutName="item_name_big_key_1_jpn" Format="ia4" Width="128" Height="16" Offset="0x16400" /> <!-- ITEM_WALLET_DEFAULT -->
<Texture Name="gItemNameBigKey2JPNTex" OutName="item_name_big_key_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x16800" /> <!-- ITEM_WALLET_ADULT -->
<Texture Name="gItemNameBigKey3JPNTex" OutName="item_name_big_key_3_jpn" Format="ia4" Width="128" Height="16" Offset="0x16C00" /> <!-- ITEM_WALLET_GIANT -->
<Texture Name="gItemNameBigKey4JPNTex" OutName="item_name_big_key_4_jpn" Format="ia4" Width="128" Height="16" Offset="0x17000" /> <!-- ITEM_FISHING_ROD -->
<!-- Boss remains -->
<Texture Name="gItemNameOdolwasRemainsENGTex" OutName="item_name_odolwas_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17400" /> <!-- ITEM_REMAINS_ODOLWA -->
<Texture Name="gItemNameGohtsRemainsENGTex" OutName="item_name_gohts_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17800" /> <!-- ITEM_REMAINS_GOHT -->
<Texture Name="gItemNameGyorgsRemainsENGTex" OutName="item_name_gyorgs_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x17C00" /> <!-- ITEM_REMAINS_GYORG -->
<Texture Name="gItemNameTwinmoldsRemainsENGTex" OutName="item_name_twinmolds_remains_eng" Format="ia4" Width="128" Height="16" Offset="0x18000" /> <!-- ITEM_REMAINS_TWINMOLD -->
<!-- Songs -->
<Texture Name="gItemNameSonataOfAwakeningENGTex" OutName="item_name_sonata_of_awakening_eng" Format="ia4" Width="128" Height="16" Offset="0x18400" /> <!-- ITEM_SONG_SONATA -->
<Texture Name="gItemNameGoronLullabyENGTex" OutName="item_name_goron_lullaby_eng" Format="ia4" Width="128" Height="16" Offset="0x18800" /> <!-- ITEM_SONG_LULLABY -->
<Texture Name="gItemNameNewWaveBossaNovaENGTex" OutName="item_name_new_wave_bossa_nova_eng" Format="ia4" Width="128" Height="16" Offset="0x18C00" /> <!-- ITEM_SONG_NOVA -->
<Texture Name="gItemNameElegyOfEmptynessENGTex" OutName="item_name_elegy_of_emptiness_eng" Format="ia4" Width="128" Height="16" Offset="0x19000" /> <!-- ITEM_SONG_ELEGY -->
<Texture Name="gItemNameOathToOrderENGTex" OutName="item_name_oath_to_order_eng" Format="ia4" Width="128" Height="16" Offset="0x19400" /> <!-- ITEM_SONG_OATH -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameNocturneOfShadowJPNTex" OutName="item_name_nocturne_of_shadow_jpn" Format="ia4" Width="128" Height="16" Offset="0x19800" /> <!-- ITEM_SONG_SARIA -->
<Texture Name="gItemNameSongOfTimeENGTex" OutName="item_name_song_of_time_eng" Format="ia4" Width="128" Height="16" Offset="0x19C00" /> <!-- ITEM_SONG_TIME -->
<Texture Name="gItemNameSongOfHealingENGTex" OutName="item_name_song_of_healing_eng" Format="ia4" Width="128" Height="16" Offset="0x1A000" /> <!-- ITEM_SONG_HEALING -->
<Texture Name="gItemNameEponasSongENGTex" OutName="item_name_eponas_song_eng" Format="ia4" Width="128" Height="16" Offset="0x1A400" /> <!-- ITEM_SONG_EPONA -->
<Texture Name="gItemNameSongOfSoaringENGTex" OutName="item_name_song_of_soaring_eng" Format="ia4" Width="128" Height="16" Offset="0x1A800" /> <!-- ITEM_SONG_SOARING -->
<Texture Name="gItemNameSongOfStormsENGTex" OutName="item_name_song_of_storms_eng" Format="ia4" Width="128" Height="16" Offset="0x1AC00" /> <!-- ITEM_SONG_STORMS -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameSunsSongJPNTex" OutName="item_name_suns_song_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B000" /> <!-- ITEM_SONG_SUN -->
<!-- Misc -->
<Texture Name="gItemNameBombersNotebookENGTex" OutName="item_name_bombers_notebook_eng" Format="ia4" Width="128" Height="16" Offset="0x1B400" /> <!-- ITEM_BOMBERS_NOTEBOOK -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameGoldSkulltulaJPNTex" OutName="item_name_gold_skulltula_jpn" Format="ia4" Width="128" Height="16" Offset="0x1B800" /> <!-- ITEM_SKULL_TOKEN -->
<Texture Name="gItemNamePieceOfHeartENGTex" OutName="item_name_piece_of_heart_eng" Format="ia4" Width="128" Height="16" Offset="0x1BC00" /> <!-- ITEM_HEART_CONTAINER, Piece of Heart? -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNamePieceOfHeartJPNTex" OutName="item_name_piece_of_heart_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C000" /> <!-- ITEM_HEART_PIECE -->
<!-- Identical to gItemNameSunsSongJPNTex -->
<Texture Name="gItemNameSunsSong2JPNTex" OutName="item_name_suns_song_2_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C400" /> <!-- ITEM_71 -->
<!-- Unused remnants from OoT -->
<Texture Name="gItemNameSongOfTimeJPNTex" OutName="item_name_song_of_time_jpn" Format="ia4" Width="128" Height="16" Offset="0x1C800" /> <!-- ITEM_72 -->
<Texture Name="gItemNameLullabyIntroENGTex" OutName="item_name_lullaby_intro_eng" Format="ia4" Width="128" Height="16" Offset="0x1CC00" /> <!-- ITEM_SONG_LULLABY_INTRO -->
<Texture Name="gItemNameBigKeyENGTex" OutName="item_name_big_key_eng" Format="ia4" Width="128" Height="16" Offset="0x1D000" /> <!-- ITEM_KEY_BOSS -->
<Texture Name="gItemNameCompassENGTex" OutName="item_name_compass_eng" Format="ia4" Width="128" Height="16" Offset="0x1D400" /> <!-- ITEM_COMPASS -->
<Texture Name="gItemNameDungeonMapENGTex" OutName="item_name_dungeon_map_eng" Format="ia4" Width="128" Height="16" Offset="0x1D800" /> <!-- ITEM_DUNGEON_MAP -->
<Texture Name="gItemNameStrayFairiesENGTex" OutName="item_name_stray_fairies_eng" Format="ia4" Width="128" Height="16" Offset="0x1DC00" /> <!-- ITEM_STRAY_FAIRIES -->
</File>
</Root>
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,
src/code/code_8012EC80.c
+23 -23
View File
@@ -98,7 +98,7 @@ u32 gGsFlagsShift[] = {
};
TexturePtr gItemIcons[] = {
gItemIconOcarinaOfTimeTex, // ITEM_OCARINA
gItemIconOcarinaOfTimeTex, // ITEM_OCARINA_OF_TIME
gItemIconBowTex, // ITEM_BOW
gItemIconFireArrowTex, // ITEM_ARROW_FIRE
gItemIconIceArrowTex, // ITEM_ARROW_ICE
@@ -106,13 +106,13 @@ TexturePtr gItemIcons[] = {
gItemIconFairyOcarinaTex, // ITEM_OCARINA_FAIRY
gItemIconBombTex, // ITEM_BOMB
gItemIconBombchuTex, // ITEM_BOMBCHU
gItemIconDekuStickTex, // ITEM_STICK
gItemIconDekuNutTex, // ITEM_NUT
gItemIconDekuStickTex, // ITEM_DEKU_STICK
gItemIconDekuNutTex, // ITEM_DEKU_NUT
gItemIconMagicBeansTex, // ITEM_MAGIC_BEANS
gItemIconSlingshotTex, // ITEM_SLINGSHOT
gItemIconPowderKegTex, // ITEM_POWDER_KEG
gItemIconPictoBoxTex, // ITEM_PICTO_BOX
gItemIconLensofTruthTex, // ITEM_LENS
gItemIconPictographBoxTex, // ITEM_PICTOGRAPH_BOX
gItemIconLensofTruthTex, // ITEM_LENS_OF_TRUTH
gItemIconHookshotTex, // ITEM_HOOKSHOT
gItemIconGreatFairysSwordTex, // ITEM_SWORD_GREAT_FAIRY
gItemIconLongshotTex, // ITEM_LONGSHOT
@@ -172,9 +172,9 @@ TexturePtr gItemIcons[] = {
gItemIconBlastMaskTex, // ITEM_MASK_BLAST
gItemIconMaskOfScentsTex, // ITEM_MASK_SCENTS
gItemIconGiantsMaskTex, // ITEM_MASK_GIANT
gItemIconBowFireTex, // ITEM_BOW_ARROW_FIRE
gItemIconBowIceTex, // ITEM_BOW_ARROW_ICE
gItemIconBowLightTex, // ITEM_BOW_ARROW_LIGHT
gItemIconBowFireTex, // ITEM_BOW_FIRE
gItemIconBowIceTex, // ITEM_BOW_ICE
gItemIconBowLightTex, // ITEM_BOW_LIGHT
gItemIconKokiriSwordTex, // ITEM_SWORD_KOKIRI
gItemIconRazorSwordTex, // ITEM_SWORD_RAZOR
gItemIconGildedSwordTex, // ITEM_SWORD_GILDED
@@ -219,8 +219,8 @@ TexturePtr gItemIcons[] = {
gQuestIconCompassTex, // ITEM_DUNGEON_MAP
gQuestIconGoldSkulltula2Tex, // ITEM_STRAY_FAIRIES
gQuestIconSmallKeyTex, // ITEM_KEY_SMALL
gQuestIconSmallMagicJarTex, // ITEM_MAGIC_SMALL
gQuestIconBigMagicJarTex, // ITEM_MAGIC_LARGE
gQuestIconSmallMagicJarTex, // ITEM_MAGIC_JAR_SMALL
gQuestIconBigMagicJarTex, // ITEM_MAGIC_JAR_BIG
gItemIconHeartPiece1Tex, // ITEM_HEART_PIECE_2
gItemIconHeartPiece2Tex, // ITEM_INVALID_1
gItemIconHeartPiece3Tex, // ITEM_INVALID_2
@@ -233,7 +233,7 @@ TexturePtr gItemIcons[] = {
// Used to map item IDs to inventory slots
u8 gItemSlots[] = {
SLOT_OCARINA, // ITEM_OCARINA
SLOT_OCARINA, // ITEM_OCARINA_OF_TIME
SLOT_BOW, // ITEM_BOW
SLOT_ARROW_FIRE, // ITEM_ARROW_FIRE
SLOT_ARROW_ICE, // ITEM_ARROW_ICE
@@ -241,13 +241,13 @@ u8 gItemSlots[] = {
SLOT_TRADE_DEED, // ITEM_OCARINA_FAIRY
SLOT_BOMB, // ITEM_BOMB
SLOT_BOMBCHU, // ITEM_BOMBCHU
SLOT_STICK, // ITEM_STICK
SLOT_NUT, // ITEM_NUT
SLOT_DEKU_STICK, // ITEM_DEKU_STICK
SLOT_DEKU_NUT, // ITEM_DEKU_NUT
SLOT_MAGIC_BEANS, // ITEM_MAGIC_BEANS
SLOT_TRADE_KEY_MAMA, // ITEM_SLINGSHOT
SLOT_POWDER_KEG, // ITEM_POWDER_KEG
SLOT_PICTO_BOX, // ITEM_PICTO_BOX
SLOT_LENS, // ITEM_LENS
SLOT_PICTOGRAPH_BOX, // ITEM_PICTOGRAPH_BOX
SLOT_LENS_OF_TRUTH, // ITEM_LENS_OF_TRUTH
SLOT_HOOKSHOT, // ITEM_HOOKSHOT
SLOT_SWORD_GREAT_FAIRY, // ITEM_SWORD_GREAT_FAIRY
SLOT_BOTTLE_1, // ITEM_LONGSHOT
@@ -307,13 +307,13 @@ u8 gItemSlots[] = {
SLOT_MASK_BLAST, // ITEM_MASK_BLAST
SLOT_MASK_SCENTS, // ITEM_MASK_SCENTS
SLOT_MASK_GIANT, // ITEM_MASK_GIANT
SLOT_BOW, // ITEM_BOW_ARROW_FIRE
SLOT_BOW, // ITEM_BOW_ARROW_ICE
SLOT_BOW, // ITEM_BOW_ARROW_LIGHT
SLOT_BOW, // ITEM_BOW_FIRE
SLOT_BOW, // ITEM_BOW_ICE
SLOT_BOW, // ITEM_BOW_LIGHT
};
s16 gItemPrices[] = {
0, // ITEM_OCARINA
0, // ITEM_OCARINA_OF_TIME
0, // ITEM_BOW
0, // ITEM_ARROW_FIRE
0, // ITEM_ARROW_ICE
@@ -321,13 +321,13 @@ s16 gItemPrices[] = {
0, // ITEM_OCARINA_FAIRY
0, // ITEM_BOMB
0, // ITEM_BOMBCHU
0, // ITEM_STICK
0, // ITEM_NUT
0, // ITEM_DEKU_STICK
0, // ITEM_DEKU_NUT
0, // ITEM_MAGIC_BEANS
0, // ITEM_SLINGSHOT
0, // ITEM_POWDER_KEG
0, // ITEM_PICTO_BOX
0, // ITEM_LENS
0, // ITEM_PICTOGRAPH_BOX
0, // ITEM_LENS_OF_TRUTH
0, // ITEM_HOOKSHOT
0, // ITEM_SWORD_GREAT_FAIRY
0, // ITEM_LONGSHOT
src/code/z_draw.c
+5 -5
View File
@@ -154,7 +154,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawOpa01, { gGiBremenMaskDL, gGiBremenMaskEmptyDL } },
// GID_MASK_ALL_NIGHT, OBJECT_GI_MASK06
{ GetItem_DrawOpa0Xlu1, { gGiAllNightMaskEyesDL, gGiAllNightMaskFaceDL } },
// GID_NUTS, OBJECT_GI_NUTS
// GID_DEKU_NUTS, OBJECT_GI_NUTS
{ GetItem_DrawDekuNuts, { gGiNutDL } },
// GID_HEART_CONTAINER, OBJECT_GI_HEARTS
{ GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartContainerDL } },
@@ -172,13 +172,13 @@ static DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawUpgrades, { gGiBombBagDL, gGiBombBag30BagColorDL, gGiBombBag30RingColorDL, gGiBombBagRingDL } },
// GID_BOMB_BAG_40, OBJECT_GI_BOMBPOUCH
{ GetItem_DrawUpgrades, { gGiBombBagDL, gGiBombBag40BagColorDL, gGiBombBag40RingColorDL, gGiBombBagRingDL } },
// GID_STICK, OBJECT_GI_STICK
// GID_DEKU_STICK, OBJECT_GI_STICK
{ GetItem_DrawOpa0, { gGiStickDL } },
// GID_DUNGEON_MAP, OBJECT_GI_MAP
{ GetItem_DrawOpa0, { gGiDungeonMapDL } },
// GID_MAGIC_SMALL, OBJECT_GI_MAGICPOT
// GID_MAGIC_JAR_SMALL, OBJECT_GI_MAGICPOT
{ GetItem_DrawOpa0, { gGiMagicJarSmallDL } },
// GID_MAGIC_LARGE, OBJECT_GI_MAGICPOT
// GID_MAGIC_JAR_BIG, OBJECT_GI_MAGICPOT
{ GetItem_DrawOpa0, { gGiMagicJarLargeDL } },
// GID_BOMB, OBJECT_GI_BOMB_1
{ GetItem_DrawOpa0, { gGiBombDL } },
@@ -367,7 +367,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawOpa01, { gGiGiantMaskEmptyDL, gGiGiantMaskDL } },
// GID_CHATEAU, OBJECT_GI_BOTTLE_21
{ GetItem_DrawOpa0Xlu1, { gGiChateauRomaniBottleEmptyDL, gGiChateauRomaniBottleDL } },
// GID_PICTO_BOX, OBJECT_GI_CAMERA
// GID_PICTOGRAPH_BOX, OBJECT_GI_CAMERA
{ GetItem_DrawOpa0Xlu1, { gGiPictoBoxFrameDL, gGiPictoBoxBodyAndLensDL } },
// GID_MASK_FIERCE_DEITY, OBJECT_GI_MASK03
{ GetItem_DrawOpa01, { gGiFierceDeityMaskFaceDL, gGiFierceDeityMaskHairAndHatDL } },
src/code/z_elf_message.c
+1 -1
View File
@@ -13,7 +13,7 @@
* Gets the relevant text ID for Tatl hints in first cycle.
*/
u16 QuestHint_GetTatlTextId(PlayState* play) {
if (INV_CONTENT(ITEM_OCARINA) == ITEM_OCARINA) {
if (INV_CONTENT(ITEM_OCARINA_OF_TIME) == ITEM_OCARINA_OF_TIME) {
return 0;
}
src/code/z_en_item00.c
+310 -93
View File
File diff suppressed because it is too large Load Diff
src/code/z_fireobj.c
+1 -1
View File
@@ -112,7 +112,7 @@ void FireObj_UpdateStateTransitions(PlayState* play, FireObj* fire) {
(waterY - fire->position.y > 6500.0f * fire->yScale)) {
FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_NOT_LIT);
}
if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_STICK)) {
if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_DEKU_STICK)) {
Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &fire->position, &dist);
if (Math3D_LengthSquared(&dist) < SQ(20.0f)) {
sp40 = true;
src/code/z_parameter.c
+122 -122
View File
@@ -104,25 +104,25 @@ s16 sMagicBorderRatio = 2;
s16 sMagicBorderStep = 1;
s16 sExtraItemBases[] = {
ITEM_STICK, // ITEM_STICKS_5
ITEM_STICK, // ITEM_STICKS_10
ITEM_NUT, // ITEM_NUTS_5
ITEM_NUT, // ITEM_NUTS_10
ITEM_BOMB, // ITEM_BOMBS_5
ITEM_BOMB, // ITEM_BOMBS_10
ITEM_BOMB, // ITEM_BOMBS_20
ITEM_BOMB, // ITEM_BOMBS_30
ITEM_BOW, // ITEM_ARROWS_10
ITEM_BOW, // ITEM_ARROWS_30
ITEM_BOW, // ITEM_ARROWS_40
ITEM_BOMBCHU, // ITEM_ARROWS_50 !@bug this data is missing an ITEM_BOW, offsetting the rest by 1
ITEM_BOMBCHU, // ITEM_BOMBCHUS_20
ITEM_BOMBCHU, // ITEM_BOMBCHUS_10
ITEM_BOMBCHU, // ITEM_BOMBCHUS_1
ITEM_STICK, // ITEM_BOMBCHUS_5
ITEM_STICK, // ITEM_STICK_UPGRADE_20
ITEM_NUT, // ITEM_STICK_UPGRADE_30
ITEM_NUT, // ITEM_NUT_UPGRADE_30
ITEM_DEKU_STICK, // ITEM_DEKU_STICKS_5
ITEM_DEKU_STICK, // ITEM_DEKU_STICKS_10
ITEM_DEKU_NUT, // ITEM_DEKU_NUTS_5
ITEM_DEKU_NUT, // ITEM_DEKU_NUTS_10
ITEM_BOMB, // ITEM_BOMBS_5
ITEM_BOMB, // ITEM_BOMBS_10
ITEM_BOMB, // ITEM_BOMBS_20
ITEM_BOMB, // ITEM_BOMBS_30
ITEM_BOW, // ITEM_ARROWS_10
ITEM_BOW, // ITEM_ARROWS_30
ITEM_BOW, // ITEM_ARROWS_40
ITEM_BOMBCHU, // ITEM_ARROWS_50 !@bug this data is missing an ITEM_BOW, offsetting the rest by 1
ITEM_BOMBCHU, // ITEM_BOMBCHUS_20
ITEM_BOMBCHU, // ITEM_BOMBCHUS_10
ITEM_BOMBCHU, // ITEM_BOMBCHUS_1
ITEM_DEKU_STICK, // ITEM_BOMBCHUS_5
ITEM_DEKU_STICK, // ITEM_DEKU_STICK_UPGRADE_20
ITEM_DEKU_NUT, // ITEM_DEKU_STICK_UPGRADE_30
ITEM_DEKU_NUT, // ITEM_DEKU_NUT_UPGRADE_30
};
s16 sEnvHazard = PLAYER_ENV_HAZARD_NONE;
@@ -1707,7 +1707,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
if (CHECK_EVENTINF(EVENTINF_41)) {
// Related to swamp boat (non-minigame)?
for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
if ((GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX) || (msgCtx->msgMode != 0)) {
if ((GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX) || (msgCtx->msgMode != 0)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
restoreHudVisibility = true;
}
@@ -1792,8 +1792,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} else if (CHECK_EVENTINF(EVENTINF_34)) {
// Deku playground minigame
if (player->stateFlags3 & PLAYER_STATE3_1000000) {
if (gSaveContext.save.saveInfo.inventory.items[SLOT_NUT] == ITEM_NUT) {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT;
if (gSaveContext.save.saveInfo.inventory.items[SLOT_DEKU_NUT] == ITEM_DEKU_NUT) {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
Interface_LoadItemIconImpl(play, EQUIP_SLOT_B);
} else {
gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED;
@@ -1820,9 +1820,9 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
}
} else if (player->stateFlags3 & PLAYER_STATE3_1000000) {
// Nuts on B (from flying as Deku Link)
if (gSaveContext.save.saveInfo.inventory.items[SLOT_NUT] == ITEM_NUT) {
if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NUT) {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT;
if (gSaveContext.save.saveInfo.inventory.items[SLOT_DEKU_NUT] == ITEM_DEKU_NUT) {
if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_DEKU_NUT) {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
Interface_LoadItemIconImpl(play, EQUIP_SLOT_B);
gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED;
restoreHudVisibility = true;
@@ -1838,7 +1838,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
}
} else if (!gSaveContext.save.saveInfo.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) &&
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NUT)) {
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_DEKU_NUT)) {
// Nuts on B (as Deku Link)
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_FD;
gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED;
@@ -1909,7 +1909,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} else if (player->stateFlags1 & PLAYER_STATE1_200000) {
// First person view
for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_LENS) {
if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_LENS_OF_TRUTH) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
restoreHudVisibility = true;
}
@@ -2077,7 +2077,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
(GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) {
(GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA_OF_TIME)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
restoreHudVisibility = true;
}
@@ -2088,7 +2088,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
(GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) {
(GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA_OF_TIME)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
restoreHudVisibility = true;
}
@@ -2115,14 +2115,14 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
}
if (interfaceCtx->restrictions.pictoBox != 0) {
if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) {
if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTOGRAPH_BOX) {
if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED
restoreHudVisibility = true;
}
gSaveContext.buttonStatus[i] = BTN_DISABLED;
}
} else if (interfaceCtx->restrictions.pictoBox == 0) {
if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) {
if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTOGRAPH_BOX) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
restoreHudVisibility = true;
}
@@ -2135,10 +2135,10 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA_OF_TIME) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) {
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
if ((gSaveContext.buttonStatus[i] == BTN_ENABLED)) {
restoreHudVisibility = true;
@@ -2150,10 +2150,10 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA_OF_TIME) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) {
(GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
if ((gSaveContext.buttonStatus[i] == BTN_DISABLED)) {
restoreHudVisibility = true;
@@ -2517,8 +2517,8 @@ u8 Item_Give(PlayState* play, u8 item) {
u8 slot;
slot = SLOT(item);
if (item >= ITEM_STICKS_5) {
slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
if (item >= ITEM_DEKU_STICKS_5) {
slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]);
}
if (item == ITEM_SKULL_TOKEN) {
@@ -2642,84 +2642,84 @@ u8 Item_Give(PlayState* play, u8 item) {
Inventory_ChangeUpgrade(UPG_WALLET, 2);
return ITEM_NONE;
} else if (item == ITEM_STICK_UPGRADE_20) {
if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
INV_CONTENT(ITEM_STICK) = ITEM_STICK;
} else if (item == ITEM_DEKU_STICK_UPGRADE_20) {
if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
INV_CONTENT(ITEM_DEKU_STICK) = ITEM_DEKU_STICK;
}
Inventory_ChangeUpgrade(UPG_STICKS, 2);
AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2);
Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 2);
AMMO(ITEM_DEKU_STICK) = CAPACITY(UPG_DEKU_STICKS, 2);
return ITEM_NONE;
} else if (item == ITEM_STICK_UPGRADE_30) {
if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
INV_CONTENT(ITEM_STICK) = ITEM_STICK;
} else if (item == ITEM_DEKU_STICK_UPGRADE_30) {
if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
INV_CONTENT(ITEM_DEKU_STICK) = ITEM_DEKU_STICK;
}
Inventory_ChangeUpgrade(UPG_STICKS, 3);
AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3);
Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 3);
AMMO(ITEM_DEKU_STICK) = CAPACITY(UPG_DEKU_STICKS, 3);
return ITEM_NONE;
} else if (item == ITEM_NUT_UPGRADE_30) {
if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
INV_CONTENT(ITEM_NUT) = ITEM_NUT;
} else if (item == ITEM_DEKU_NUT_UPGRADE_30) {
if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
INV_CONTENT(ITEM_DEKU_NUT) = ITEM_DEKU_NUT;
}
Inventory_ChangeUpgrade(UPG_NUTS, 2);
AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2);
Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 2);
AMMO(ITEM_DEKU_NUT) = CAPACITY(UPG_DEKU_NUTS, 2);
return ITEM_NONE;
} else if (item == ITEM_NUT_UPGRADE_40) {
if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
INV_CONTENT(ITEM_NUT) = ITEM_NUT;
} else if (item == ITEM_DEKU_NUT_UPGRADE_40) {
if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
INV_CONTENT(ITEM_DEKU_NUT) = ITEM_DEKU_NUT;
}
Inventory_ChangeUpgrade(UPG_NUTS, 3);
AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3);
Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 3);
AMMO(ITEM_DEKU_NUT) = CAPACITY(UPG_DEKU_NUTS, 3);
return ITEM_NONE;
} else if (item == ITEM_STICK) {
if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
Inventory_ChangeUpgrade(UPG_STICKS, 1);
AMMO(ITEM_STICK) = 1;
} else if (item == ITEM_DEKU_STICK) {
if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 1);
AMMO(ITEM_DEKU_STICK) = 1;
} else {
AMMO(ITEM_STICK)++;
if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
AMMO(ITEM_DEKU_STICK)++;
if (AMMO(ITEM_DEKU_STICK) > CUR_CAPACITY(UPG_DEKU_STICKS)) {
AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
}
}
} else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) {
if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
Inventory_ChangeUpgrade(UPG_STICKS, 1);
AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5];
} else if ((item == ITEM_DEKU_STICKS_5) || (item == ITEM_DEKU_STICKS_10)) {
if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 1);
AMMO(ITEM_DEKU_STICK) = sAmmoRefillCounts[item - ITEM_DEKU_STICKS_5];
} else {
AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5];
if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
AMMO(ITEM_DEKU_STICK) += sAmmoRefillCounts[item - ITEM_DEKU_STICKS_5];
if (AMMO(ITEM_DEKU_STICK) > CUR_CAPACITY(UPG_DEKU_STICKS)) {
AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
}
}
item = ITEM_STICK;
item = ITEM_DEKU_STICK;
} else if (item == ITEM_NUT) {
if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
Inventory_ChangeUpgrade(UPG_NUTS, 1);
AMMO(ITEM_NUT) = 1;
} else if (item == ITEM_DEKU_NUT) {
if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
AMMO(ITEM_DEKU_NUT) = 1;
} else {
AMMO(ITEM_NUT)++;
if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
AMMO(ITEM_DEKU_NUT)++;
if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) {
AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
}
}
} else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) {
if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
Inventory_ChangeUpgrade(UPG_NUTS, 1);
AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
} else if ((item == ITEM_DEKU_NUTS_5) || (item == ITEM_DEKU_NUTS_10)) {
if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
} else {
AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) {
AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
}
}
item = ITEM_NUT;
item = ITEM_DEKU_NUT;
} else if (item == ITEM_POWDER_KEG) {
if (INV_CONTENT(ITEM_POWDER_KEG) != ITEM_POWDER_KEG) {
@@ -2782,8 +2782,8 @@ u8 Item_Give(PlayState* play, u8 item) {
}
return ITEM_BOW;
} else if (item == ITEM_OCARINA) {
INV_CONTENT(ITEM_OCARINA) = ITEM_OCARINA;
} else if (item == ITEM_OCARINA_OF_TIME) {
INV_CONTENT(ITEM_OCARINA_OF_TIME) = ITEM_OCARINA_OF_TIME;
return ITEM_NONE;
} else if (item == ITEM_MAGIC_BEANS) {
@@ -2805,7 +2805,7 @@ u8 Item_Give(PlayState* play, u8 item) {
Health_ChangeBy(play, 0x10);
return item;
} else if (item == ITEM_MAGIC_SMALL) {
} else if (item == ITEM_MAGIC_JAR_SMALL) {
Magic_Add(play, MAGIC_NORMAL_METER / 2);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
SET_WEEKEVENTREG(WEEKEVENTREG_12_80);
@@ -2813,7 +2813,7 @@ u8 Item_Give(PlayState* play, u8 item) {
}
return item;
} else if (item == ITEM_MAGIC_LARGE) {
} else if (item == ITEM_MAGIC_JAR_BIG) {
Magic_Add(play, MAGIC_NORMAL_METER);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
SET_WEEKEVENTREG(WEEKEVENTREG_12_80);
@@ -2941,8 +2941,8 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
u8 bottleSlot;
slot = SLOT(item);
if (item >= ITEM_STICKS_5) {
slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
if (item >= ITEM_DEKU_STICKS_5) {
slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]);
}
if (item == ITEM_SKULL_TOKEN) {
@@ -2969,8 +2969,8 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
} else if (item == ITEM_KEY_SMALL) {
return ITEM_NONE;
} else if ((item == ITEM_OCARINA) || (item == ITEM_BOMBCHU) || (item == ITEM_HOOKSHOT) || (item == ITEM_LENS) ||
(item == ITEM_SWORD_GREAT_FAIRY) || (item == ITEM_PICTO_BOX)) {
} else if ((item == ITEM_OCARINA_OF_TIME) || (item == ITEM_BOMBCHU) || (item == ITEM_HOOKSHOT) ||
(item == ITEM_LENS_OF_TRUTH) || (item == ITEM_SWORD_GREAT_FAIRY) || (item == ITEM_PICTOGRAPH_BOX)) {
if (INV_CONTENT(item) == ITEM_NONE) {
return ITEM_NONE;
}
@@ -3004,7 +3004,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
}
return 0;
} else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) {
} else if ((item >= ITEM_DEKU_STICK_UPGRADE_20) && (item <= ITEM_DEKU_NUT_UPGRADE_40)) {
return ITEM_NONE;
} else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) {
@@ -3025,7 +3025,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
} else if (item == ITEM_RECOVERY_HEART) {
return ITEM_RECOVERY_HEART;
} else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
} else if ((item == ITEM_MAGIC_JAR_SMALL) || (item == ITEM_MAGIC_JAR_BIG)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
return ITEM_NONE;
}
@@ -3295,22 +3295,22 @@ void Rupees_ChangeBy(s16 rupeeChange) {
}
void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
if (item == ITEM_STICK) {
AMMO(ITEM_STICK) += ammoChange;
if (item == ITEM_DEKU_STICK) {
AMMO(ITEM_DEKU_STICK) += ammoChange;
if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) {
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
} else if (AMMO(ITEM_STICK) < 0) {
AMMO(ITEM_STICK) = 0;
if (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS)) {
AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
} else if (AMMO(ITEM_DEKU_STICK) < 0) {
AMMO(ITEM_DEKU_STICK) = 0;
}
} else if (item == ITEM_NUT) {
AMMO(ITEM_NUT) += ammoChange;
} else if (item == ITEM_DEKU_NUT) {
AMMO(ITEM_DEKU_NUT) += ammoChange;
if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) {
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
} else if (AMMO(ITEM_NUT) < 0) {
AMMO(ITEM_NUT) = 0;
if (AMMO(ITEM_DEKU_NUT) >= CUR_CAPACITY(UPG_DEKU_NUTS)) {
AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
} else if (AMMO(ITEM_DEKU_NUT) < 0) {
AMMO(ITEM_DEKU_NUT) = 0;
}
} else if (item == ITEM_BOMBCHU) {
@@ -3665,9 +3665,9 @@ void Magic_Update(PlayState* play) {
if ((gSaveContext.save.saveInfo.playerData.magic == 0) ||
((Player_GetEnvironmentalHazard(play) >= PLAYER_ENV_HAZARD_UNDERWATER_FLOOR) &&
(Player_GetEnvironmentalHazard(play) <= PLAYER_ENV_HAZARD_UNDERWATER_FREE)) ||
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) != ITEM_LENS) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) ||
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) != ITEM_LENS_OF_TRUTH) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS_OF_TRUTH) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS_OF_TRUTH)) ||
!play->actorCtx.lensActive) {
// Deactivate Lens of Truth and set magic state to idle
play->actorCtx.lensActive = false;
@@ -4010,17 +4010,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
i = ((void)0, GET_CUR_FORM_BTN_ITEM(button));
if ((i == ITEM_STICK) || (i == ITEM_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) || (i == ITEM_BOMBCHU) || (i == ITEM_POWDER_KEG) ||
(i == ITEM_MAGIC_BEANS) || (i == ITEM_PICTO_BOX)) {
if ((i == ITEM_DEKU_STICK) || (i == ITEM_DEKU_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
((i >= ITEM_BOW_FIRE) && (i <= ITEM_BOW_LIGHT)) || (i == ITEM_BOMBCHU) || (i == ITEM_POWDER_KEG) ||
(i == ITEM_MAGIC_BEANS) || (i == ITEM_PICTOGRAPH_BOX)) {
if ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) {
if ((i >= ITEM_BOW_FIRE) && (i <= ITEM_BOW_LIGHT)) {
i = ITEM_BOW;
}
ammo = AMMO(i);
if (i == ITEM_PICTO_BOX) {
if (i == ITEM_PICTOGRAPH_BOX) {
if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) {
ammo = 0;
} else {
@@ -4036,10 +4036,10 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
ammo = play->unk_1887C - 1;
} else if (((i == ITEM_BOW) && (AMMO(i) == CUR_CAPACITY(UPG_QUIVER))) ||
((i == ITEM_BOMB) && (AMMO(i) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
((i == ITEM_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_STICKS))) ||
((i == ITEM_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_NUTS))) ||
((i == ITEM_DEKU_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_DEKU_STICKS))) ||
((i == ITEM_DEKU_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_DEKU_NUTS))) ||
((i == ITEM_BOMBCHU) && (AMMO(i) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
((i == ITEM_POWDER_KEG) && (ammo == 1)) || ((i == ITEM_PICTO_BOX) && (ammo == 1)) ||
((i == ITEM_POWDER_KEG) && (ammo == 1)) || ((i == ITEM_PICTOGRAPH_BOX) && (ammo == 1)) ||
((i == ITEM_MAGIC_BEANS) && (ammo == 20))) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, alpha);
}
@@ -4090,7 +4090,7 @@ void Interface_DrawBButtonIcons(PlayState* play) {
((BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) < ITEM_SWORD_KOKIRI) ||
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) > ITEM_SWORD_GILDED)) &&
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) &&
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NUT))) {
(BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_DEKU_NUT))) {
if ((player->transformation == PLAYER_FORM_FIERCE_DEITY) || (player->transformation == PLAYER_FORM_HUMAN)) {
if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) {
Interface_DrawItemIconTexture(play, interfaceCtx->iconItemSegment, EQUIP_SLOT_B);
@@ -6950,7 +6950,7 @@ void Interface_Update(PlayState* play) {
gSaveContext.magicFillTarget = gSaveContext.save.saveInfo.playerData.magic;
gSaveContext.save.saveInfo.playerData.magic = 0;
gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY;
BUTTON_ITEM_EQUIP(PLAYER_FORM_DEKU, EQUIP_SLOT_B) = ITEM_NUT;
BUTTON_ITEM_EQUIP(PLAYER_FORM_DEKU, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
}
Magic_Update(play);
src/code/z_play.c
+1 -1
View File
@@ -2149,7 +2149,7 @@ void Play_Init(GameState* thisx) {
}
// "First cycle" Termina Field
if (INV_CONTENT(ITEM_OCARINA) != ITEM_OCARINA) {
if (INV_CONTENT(ITEM_OCARINA_OF_TIME) != ITEM_OCARINA_OF_TIME) {
if ((scene == ENTR_SCENE_TERMINA_FIELD) &&
(((void)0, gSaveContext.save.entrance) != ENTRANCE(TERMINA_FIELD, 10))) {
gSaveContext.nextCutsceneIndex = 0xFFF4;
src/code/z_player_lib.c
+12 -12
View File
@@ -655,12 +655,12 @@ PlayerItemAction func_80123810(PlayState* play) {
u8 sActionModelGroups[PLAYER_IA_MAX] = {
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NONE
PLAYER_MODELGROUP_13, // PLAYER_IA_LAST_USED
PLAYER_MODELGROUP_STICK, // PLAYER_IA_FISHING_ROD
PLAYER_MODELGROUP_DEKU_STICK, // PLAYER_IA_FISHING_ROD
PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_KOKIRI
PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_RAZOR
PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_GILDED
PLAYER_MODELGROUP_TWO_HAND_SWORD, // PLAYER_IA_SWORD_TWO_HANDED
PLAYER_MODELGROUP_STICK, // PLAYER_IA_STICK
PLAYER_MODELGROUP_DEKU_STICK, // PLAYER_IA_DEKU_STICK
PLAYER_MODELGROUP_ZORA_FINS, // PLAYER_IA_ZORA_FINS
PLAYER_MODELGROUP_BOW, // PLAYER_IA_BOW
PLAYER_MODELGROUP_BOW, // PLAYER_IA_BOW_FIRE
@@ -671,8 +671,8 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_POWDER_KEG
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_BOMBCHU
PLAYER_MODELGROUP_8, // PLAYER_IA_11
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NUT
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_PICTO_BOX
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEKU_NUT
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_PICTOGRAPH_BOX
PLAYER_MODELGROUP_INSTRUMENT, // PLAYER_IA_OCARINA
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_EMPTY
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FISH
@@ -735,7 +735,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_GORON
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_ZORA
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_DEKU
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LENS
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LENS_OF_TRUTH
};
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerItemAction itemAction) {
@@ -808,7 +808,7 @@ PlayerModelIndices gPlayerModelTypes[PLAYER_MODELGROUP_MAX] = {
/* PLAYER_MODELGROUP_HOOKSHOT */
{ PLAYER_ANIMTYPE_4, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_HOOKSHOT, PLAYER_MODELTYPE_SHEATH_14,
PLAYER_MODELTYPE_WAIST },
/* PLAYER_MODELGROUP_STICK */
/* PLAYER_MODELGROUP_DEKU_STICK */
{ PLAYER_ANIMTYPE_3, PLAYER_MODELTYPE_LH_CLOSED, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_14,
PLAYER_MODELTYPE_WAIST },
/* PLAYER_MODELGROUP_INSTRUMENT */
@@ -1367,7 +1367,7 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y
Vec3f diff;
s32 pad;
if ((player->heldItemAction == PLAYER_IA_STICK) && (player->unk_B28 != 0)) {
if ((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (player->unk_B28 != 0)) {
Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, pos, &diff);
return (SQXZ(diff) <= SQ(xzRange)) && (0.0f <= diff.y) && (diff.y <= yRange);
}
@@ -1446,7 +1446,7 @@ PlayerMeleeWeapon Player_GetMeleeWeaponHeld(Player* player) {
s32 Player_IsHoldingTwoHandedWeapon(Player* player) {
// Relies on the itemActions for two-handed weapons being contiguous.
if ((player->heldItemAction >= PLAYER_IA_SWORD_TWO_HANDED) && (player->heldItemAction <= PLAYER_IA_STICK)) {
if ((player->heldItemAction >= PLAYER_IA_SWORD_TWO_HANDED) && (player->heldItemAction <= PLAYER_IA_DEKU_STICK)) {
return true;
}
@@ -3291,7 +3291,7 @@ s32 func_80128640(PlayState* play, Player* player, Gfx* dlist) {
CLOSE_DISPS(play->state.gfxCtx);
}
} else if (player->itemAction == PLAYER_IA_STICK) {
} else if (player->itemAction == PLAYER_IA_DEKU_STICK) {
OPEN_DISPS(play->state.gfxCtx);
Matrix_Push();
@@ -3415,17 +3415,17 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
3000.0f, // PLAYER_MELEEWEAPON_SWORD_RAZOR
4000.0f, // PLAYER_MELEEWEAPON_SWORD_GILDED
5500.0f, // PLAYER_MELEEWEAPON_SWORD_TWO_HANDED
-1.0f, // PLAYER_MELEEWEAPON_STICK
-1.0f, // PLAYER_MELEEWEAPON_DEKU_STICK
2500.0f, // PLAYER_MELEEWEAPON_ZORA_FINS
};
if ((player->transformation == PLAYER_FORM_FIERCE_DEITY) ||
((player->transformation != PLAYER_FORM_ZORA) &&
((player->itemAction == PLAYER_IA_STICK) ||
((player->itemAction == PLAYER_IA_DEKU_STICK) ||
((player->meleeWeaponState != PLAYER_MELEE_WEAPON_STATE_0) &&
(player->meleeWeaponAnimation != PLAYER_MWA_GORON_PUNCH_RIGHT) &&
(player->meleeWeaponAnimation != PLAYER_MWA_GORON_PUNCH_BUTT))))) {
if (player->itemAction == PLAYER_IA_STICK) {
if (player->itemAction == PLAYER_IA_DEKU_STICK) {
D_801C0994->x = player->unk_B0C * 5000.0f;
} else {
D_801C0994->x = sMeleeWeaponLengths[Player_GetMeleeWeaponHeld(player)];
src/code/z_sram_NES.c
+39 -39
View File
@@ -267,30 +267,30 @@ u32 gSramSlotOffsets[] = {
};
u8 gAmmoItems[] = {
ITEM_NONE, // SLOT_OCARINA
ITEM_BOW, // SLOT_BOW
ITEM_NONE, // SLOT_ARROW_FIRE
ITEM_NONE, // SLOT_ARROW_ICE
ITEM_NONE, // SLOT_ARROW_LIGHT
ITEM_NONE, // SLOT_TRADE_DEED
ITEM_BOMB, // SLOT_BOMB
ITEM_BOMBCHU, // SLOT_BOMBCHU
ITEM_STICK, // SLOT_STICK
ITEM_NUT, // SLOT_NUT
ITEM_MAGIC_BEANS, // SLOT_MAGIC_BEANS
ITEM_NONE, // SLOT_TRADE_KEY_MAMA
ITEM_POWDER_KEG, // SLOT_POWDER_KEG
ITEM_PICTO_BOX, // SLOT_PICTO_BOX
ITEM_NONE, // SLOT_LENS
ITEM_NONE, // SLOT_HOOKSHOT
ITEM_NONE, // SLOT_SWORD_GREAT_FAIRY
ITEM_NONE, // SLOT_TRADE_COUPLE
ITEM_NONE, // SLOT_BOTTLE_1
ITEM_NONE, // SLOT_BOTTLE_2
ITEM_NONE, // SLOT_BOTTLE_3
ITEM_NONE, // SLOT_BOTTLE_4
ITEM_NONE, // SLOT_BOTTLE_5
ITEM_NONE, // SLOT_BOTTLE_6
ITEM_NONE, // SLOT_OCARINA
ITEM_BOW, // SLOT_BOW
ITEM_NONE, // SLOT_ARROW_FIRE
ITEM_NONE, // SLOT_ARROW_ICE
ITEM_NONE, // SLOT_ARROW_LIGHT
ITEM_NONE, // SLOT_TRADE_DEED
ITEM_BOMB, // SLOT_BOMB
ITEM_BOMBCHU, // SLOT_BOMBCHU
ITEM_DEKU_STICK, // SLOT_DEKU_STICK
ITEM_DEKU_NUT, // SLOT_DEKU_NUT
ITEM_MAGIC_BEANS, // SLOT_MAGIC_BEANS
ITEM_NONE, // SLOT_TRADE_KEY_MAMA
ITEM_POWDER_KEG, // SLOT_POWDER_KEG
ITEM_PICTOGRAPH_BOX, // SLOT_PICTOGRAPH_BOX
ITEM_NONE, // SLOT_LENS_OF_TRUTH
ITEM_NONE, // SLOT_HOOKSHOT
ITEM_NONE, // SLOT_SWORD_GREAT_FAIRY
ITEM_NONE, // SLOT_TRADE_COUPLE
ITEM_NONE, // SLOT_BOTTLE_1
ITEM_NONE, // SLOT_BOTTLE_2
ITEM_NONE, // SLOT_BOTTLE_3
ITEM_NONE, // SLOT_BOTTLE_4
ITEM_NONE, // SLOT_BOTTLE_5
ITEM_NONE, // SLOT_BOTTLE_6
};
// Stores flash start page number
@@ -506,14 +506,14 @@ void Sram_SaveEndOfCycle(PlayState* play) {
SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO);
}
}
if (INV_CONTENT(ITEM_NUT) == ITEM_NUT) {
item = INV_CONTENT(ITEM_NUT);
if (INV_CONTENT(ITEM_DEKU_NUT) == ITEM_DEKU_NUT) {
item = INV_CONTENT(ITEM_DEKU_NUT);
if (AMMO(item) != 0) {
SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO);
}
}
if (INV_CONTENT(ITEM_STICK) == ITEM_STICK) {
item = INV_CONTENT(ITEM_STICK);
if (INV_CONTENT(ITEM_DEKU_STICK) == ITEM_DEKU_STICK) {
item = INV_CONTENT(ITEM_DEKU_STICK);
if (AMMO(item) != 0) {
SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO);
}
@@ -527,7 +527,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
for (i = 0; i < ARRAY_COUNT(gAmmoItems); i++) {
if (gAmmoItems[i] != ITEM_NONE) {
if ((gSaveContext.save.saveInfo.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTO_BOX)) {
if ((gSaveContext.save.saveInfo.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTOGRAPH_BOX)) {
item = gSaveContext.save.saveInfo.inventory.items[i];
AMMO(item) = 0;
}
@@ -607,7 +607,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
if ((GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR) && (GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES)) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
Interface_LoadItemIconImpl(play, j);
}
@@ -884,10 +884,10 @@ SavePlayerData sSaveDebugPlayerData = {
ItemEquips sSaveDebugItemEquips = {
{
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_POTION_RED, ITEM_OCARINA },
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_GORON, ITEM_OCARINA },
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_ZORA, ITEM_OCARINA },
{ ITEM_NUT, ITEM_NUT, ITEM_MASK_DEKU, ITEM_OCARINA },
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_POTION_RED, ITEM_OCARINA_OF_TIME },
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_GORON, ITEM_OCARINA_OF_TIME },
{ ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_ZORA, ITEM_OCARINA_OF_TIME },
{ ITEM_DEKU_NUT, ITEM_DEKU_NUT, ITEM_MASK_DEKU, ITEM_OCARINA_OF_TIME },
},
{
{ SLOT_OCARINA, SLOT_BOW, SLOT_BOTTLE_2, SLOT_OCARINA },
@@ -901,7 +901,7 @@ ItemEquips sSaveDebugItemEquips = {
Inventory sSaveDebugInventory = {
// items
{
ITEM_OCARINA,
ITEM_OCARINA_OF_TIME,
ITEM_BOW,
ITEM_ARROW_FIRE,
ITEM_ARROW_ICE,
@@ -909,13 +909,13 @@ Inventory sSaveDebugInventory = {
ITEM_MOONS_TEAR,
ITEM_BOMB,
ITEM_BOMBCHU,
ITEM_STICK,
ITEM_NUT,
ITEM_DEKU_STICK,
ITEM_DEKU_NUT,
ITEM_MAGIC_BEANS,
ITEM_ROOM_KEY,
ITEM_POWDER_KEG,
ITEM_PICTO_BOX,
ITEM_LENS,
ITEM_PICTOGRAPH_BOX,
ITEM_LENS_OF_TRUTH,
ITEM_HOOKSHOT,
ITEM_SWORD_GREAT_FAIRY,
ITEM_LETTER_TO_KAFEI,
src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
+1 -1
View File
@@ -450,7 +450,7 @@ void func_809CEBC0(BgSpdweb* this, PlayState* play) {
this->dyna.actor.world.pos.z;
}
func_809CEE74(this);
} else if ((player->heldItemAction == PLAYER_IA_STICK) && (player->unk_B28 != 0)) {
} else if ((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (player->unk_B28 != 0)) {
Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &this->dyna.actor.world.pos, &sp3C);
sp38 = Math_SinS(-this->dyna.actor.shape.rot.x);
sp34 = Math_CosS(-this->dyna.actor.shape.rot.x);
src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
+1 -1
View File
@@ -148,7 +148,7 @@ void DmChar02_Update(Actor* thisx, PlayState* play) {
this->unk_2F0 = this->unk_2F0;
this->actionFunc(this, play);
if (!Actor_HasParent(&this->actor, play)) {
Actor_OfferGetItem(&this->actor, play, GI_OCARINA, 30.0f, 80.0f);
Actor_OfferGetItem(&this->actor, play, GI_OCARINA_OF_TIME, 30.0f, 80.0f);
} else {
gSaveContext.save.playerForm = PLAYER_FORM_HUMAN;
Actor_Kill(&this->actor);
src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
+1 -1
View File
@@ -178,7 +178,7 @@ void ElfMsg6_Init(Actor* thisx, PlayState* play) {
break;
case 2:
if (INV_CONTENT(ITEM_OCARINA) == ITEM_OCARINA) {
if (INV_CONTENT(ITEM_OCARINA_OF_TIME) == ITEM_OCARINA_OF_TIME) {
Actor_Kill(&this->actor);
return;
}
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+1 -1
View File
@@ -2601,7 +2601,7 @@ void EnBigslime_ApplyDamageEffectBigslime(EnBigslime* this, PlayState* play) {
if (randFloat < 0.15f) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_ARROWS_10);
} else if (randFloat < 0.3f) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_MAGIC_SMALL);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_MAGIC_JAR_SMALL);
}
this->itemDropTimer = 40;
}
src/overlays/actors/ovl_En_Butte/z_en_butte.c
+3 -3
View File
@@ -286,7 +286,7 @@ void func_8091C794(EnButte* this, PlayState* play) {
func_8091C0A0(this, &D_8091D324[this->unk_24E]);
}
if ((ENBUTTE_GET_1(&this->actor) == ENBUTTE_1) && (player->heldItemAction == PLAYER_IA_STICK) &&
if ((ENBUTTE_GET_1(&this->actor) == ENBUTTE_1) && (player->heldItemAction == PLAYER_IA_DEKU_STICK) &&
(this->unk_252 <= 0) &&
((Math3D_XZDistanceSquared(player->actor.world.pos.x, player->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z) < SQ(120.0f)) ||
@@ -355,8 +355,8 @@ void func_8091CBB4(EnButte* this, PlayState* play) {
distSq = Math3D_XZDistanceSquared(this->actor.world.pos.x, this->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z);
if ((player->heldItemAction != PLAYER_IA_STICK) || !(fabsf(player->actor.speed) < 1.8f) || (this->unk_252 > 0) ||
!(distSq < SQ(320.0f))) {
if ((player->heldItemAction != PLAYER_IA_DEKU_STICK) || !(fabsf(player->actor.speed) < 1.8f) ||
(this->unk_252 > 0) || !(distSq < SQ(320.0f))) {
func_8091C748(this);
} else if ((distSq > SQ(240.0f)) &&
(Math3D_XZDistanceSquared(player->meleeWeaponInfo[0].tip.x, player->meleeWeaponInfo[0].tip.z,
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+4 -4
View File
@@ -914,10 +914,10 @@ void EnDekubaba_ShrinkDie(EnDekubaba* this, PlayState* play) {
(s32)(this->size * 100.0f));
if (!this->actor.dropFlag) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_NUTS_1);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_DEKU_NUTS_1);
if (this->actor.params == DEKUBABA_BIG) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_NUTS_1);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_NUTS_1);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_DEKU_NUTS_1);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_DEKU_NUTS_1);
}
} else {
Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0x30);
@@ -1059,7 +1059,7 @@ void EnDekubaba_DeadStickDrop(EnDekubaba* this, PlayState* play) {
return;
}
Actor_OfferGetItemNearby(&this->actor, play, GI_STICKS_1);
Actor_OfferGetItemNearby(&this->actor, play, GI_DEKU_STICKS_1);
}
/* Update and associated functions */

Some files were not shown because too many files have changed in this diff Show More