Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions 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 23:52:36 +10:00 committed by GitHub
parent 0f572acbda
commit 857a0cfdaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 964 additions and 706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/xml/archives/icon_item_static.xml
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" />

273
assets/xml/archives/item_name_static.xml
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>

10
include/z64actor.h
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,

76
include/z64item.h
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;

12
include/z64player.h
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,

46
src/code/code_8012EC80.c
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

10
src/code/z_draw.c
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 } },

2
src/code/z_elf_message.c
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;
}

403
src/code/z_en_item00.c
View File

@ -146,17 +146,17 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
case ITEM00_BOMBS_A:
case ITEM00_BOMBS_B:
case ITEM00_NUTS_1:
case ITEM00_STICK:
case ITEM00_MAGIC_SMALL:
case ITEM00_NUTS_10:
case ITEM00_DEKU_NUTS_1:
case ITEM00_DEKU_STICK:
case ITEM00_MAGIC_JAR_SMALL:
case ITEM00_DEKU_NUTS_10:
case ITEM00_BOMBS_0:
Actor_SetScale(thisx, 0.03f);
this->unk154 = 0.03f;
shadowOffset = 320.0f;
break;
case ITEM00_MAGIC_LARGE:
case ITEM00_MAGIC_JAR_BIG:
Actor_SetScale(thisx, 4.5f * 0.01f);
this->unk154 = 4.5f * 0.01f;
shadowOffset = 320.0f;
@ -276,24 +276,24 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
Item_Give(play, ITEM_ARROWS_50);
break;
case ITEM00_MAGIC_LARGE:
Item_Give(play, ITEM_MAGIC_LARGE);
case ITEM00_MAGIC_JAR_BIG:
Item_Give(play, ITEM_MAGIC_JAR_BIG);
break;
case ITEM00_MAGIC_SMALL:
Item_Give(play, ITEM_MAGIC_SMALL);
case ITEM00_MAGIC_JAR_SMALL:
Item_Give(play, ITEM_MAGIC_JAR_SMALL);
break;
case ITEM00_SMALL_KEY:
Item_Give(play, ITEM_KEY_SMALL);
break;
case ITEM00_NUTS_1:
getItemId = GI_NUTS_1;
case ITEM00_DEKU_NUTS_1:
getItemId = GI_DEKU_NUTS_1;
break;
case ITEM00_NUTS_10:
getItemId = GI_NUTS_10;
case ITEM00_DEKU_NUTS_10:
getItemId = GI_DEKU_NUTS_10;
break;
default:
@ -328,7 +328,7 @@ void func_800A640C(EnItem00* this, PlayState* play) {
((this->actor.params == ITEM00_RECOVERY_HEART) && (this->unk152 < 0)) ||
(this->actor.params == ITEM00_HEART_PIECE) || (this->actor.params == ITEM00_HEART_CONTAINER)) {
this->actor.shape.rot.y = this->actor.shape.rot.y + 960;
} else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) &&
} else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_DEKU_NUTS_10) &&
(this->actor.params < ITEM00_BOMBS_0)) {
if (this->unk152 == -1) {
if (!Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x - 0x4000, 2, 3000, 1500)) {
@ -423,7 +423,7 @@ void func_800A6780(EnItem00* this, PlayState* play) {
if (this->actor.params <= ITEM00_RUPEE_RED) {
this->actor.shape.rot.y += 0x3C0;
} else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) &&
} else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_DEKU_NUTS_10) &&
(this->actor.params != ITEM00_BOMBS_0)) {
this->actor.world.rot.x -= 0x2BC;
this->actor.shape.rot.y += 0x190;
@ -570,16 +570,16 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
Item_Give(play, ITEM_RUPEE_HUGE);
break;
case ITEM00_STICK:
getItemId = GI_STICKS_1;
case ITEM00_DEKU_STICK:
getItemId = GI_DEKU_STICKS_1;
break;
case ITEM00_NUTS_1:
getItemId = GI_NUTS_1;
case ITEM00_DEKU_NUTS_1:
getItemId = GI_DEKU_NUTS_1;
break;
case ITEM00_NUTS_10:
getItemId = GI_NUTS_10;
case ITEM00_DEKU_NUTS_10:
getItemId = GI_DEKU_NUTS_10;
break;
case ITEM00_RECOVERY_HEART:
@ -624,12 +624,12 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
getItemId = GI_HEART_CONTAINER;
break;
case ITEM00_MAGIC_LARGE:
Item_Give(play, ITEM_MAGIC_LARGE);
case ITEM00_MAGIC_JAR_BIG:
Item_Give(play, ITEM_MAGIC_JAR_BIG);
break;
case ITEM00_MAGIC_SMALL:
Item_Give(play, ITEM_MAGIC_SMALL);
case ITEM00_MAGIC_JAR_SMALL:
Item_Give(play, ITEM_MAGIC_JAR_SMALL);
break;
case ITEM00_SHIELD_HERO:
@ -743,12 +743,12 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
case ITEM00_ARROWS_40:
case ITEM00_ARROWS_50:
case ITEM00_BOMBS_B:
case ITEM00_NUTS_1:
case ITEM00_STICK:
case ITEM00_MAGIC_LARGE:
case ITEM00_MAGIC_SMALL:
case ITEM00_DEKU_NUTS_1:
case ITEM00_DEKU_STICK:
case ITEM00_MAGIC_JAR_BIG:
case ITEM00_MAGIC_JAR_SMALL:
case ITEM00_SMALL_KEY:
case ITEM00_NUTS_10:
case ITEM00_DEKU_NUTS_10:
case ITEM00_BOMBS_0:
EnItem00_DrawSprite(this, play);
break;
@ -825,7 +825,7 @@ void EnItem00_DrawSprite(EnItem00* this, PlayState* play) {
POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP);
if (this->actor.params == ITEM00_NUTS_10) {
if (this->actor.params == ITEM00_DEKU_NUTS_10) {
texIndex = 6;
} else if (this->actor.params == ITEM00_BOMBS_0) {
texIndex = 1;
@ -886,7 +886,7 @@ s16 func_800A7650(s16 dropId) {
(((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) ||
(dropId == ITEM00_ARROWS_50)) &&
(INV_CONTENT(ITEM_BOW) == ITEM_NONE)) ||
(((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) &&
(((dropId == ITEM00_MAGIC_JAR_BIG) || (dropId == ITEM00_MAGIC_JAR_SMALL)) &&
(gSaveContext.save.saveInfo.playerData.magicLevel == 0))) {
return ITEM00_NO_DROP;
}
@ -1024,61 +1024,278 @@ Actor* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s32 params) {
}
u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = {
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A,
ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP,
ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_MASK,
ITEM00_MASK, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED,
ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10,
ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10,
ITEM00_ARROWS_30, ITEM00_ARROWS_30, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE,
ITEM00_MAGIC_LARGE, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_BOMBS_A,
ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A,
ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL,
ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL,
ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL,
ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE,
ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NUTS_1, ITEM00_NUTS_1,
ITEM00_NO_DROP, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_STICK,
ITEM00_STICK, ITEM00_NO_DROP, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP,
ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_30, ITEM00_BOMBS_A, ITEM00_NO_DROP,
ITEM00_STICK, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_MAGIC_SMALL,
ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_BLUE,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_BOMBS_A,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_GREEN,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_BOMBS_A,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN,
ITEM00_NO_DROP,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_RED,
ITEM00_NO_DROP,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_BOMBS_A,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_RUPEE_RED,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_30,
ITEM00_ARROWS_30,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_BOMBS_A,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_MAGIC_JAR_BIG,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_DEKU_NUTS_1,
ITEM00_DEKU_NUTS_1,
ITEM00_NO_DROP,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_DEKU_STICK,
ITEM00_DEKU_STICK,
ITEM00_NO_DROP,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_BLUE,
ITEM00_RUPEE_RED,
ITEM00_NO_DROP,
ITEM00_ARROWS_10,
ITEM00_ARROWS_10,
ITEM00_ARROWS_30,
ITEM00_BOMBS_A,
ITEM00_NO_DROP,
ITEM00_DEKU_STICK,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_FLEXIBLE,
ITEM00_RUPEE_GREEN,
ITEM00_RECOVERY_HEART,
ITEM00_RECOVERY_HEART,
ITEM00_MAGIC_JAR_SMALL,
ITEM00_MASK,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
ITEM00_NO_DROP,
};
u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = {
@ -1122,7 +1339,7 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
dropId = ITEM00_RECOVERY_HEART;
break;
case PLAYER_FORM_GORON:
dropId = ITEM00_MAGIC_SMALL;
dropId = ITEM00_MAGIC_JAR_SMALL;
break;
default:
dropId = ITEM00_RUPEE_GREEN;
@ -1169,13 +1386,13 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
} else if ((gSaveContext.save.saveInfo.playerData.magicLevel != 0) &&
(gSaveContext.save.saveInfo.playerData.magic == 0)) {
params = 0xD0;
dropId = ITEM00_MAGIC_LARGE;
dropId = ITEM00_MAGIC_JAR_BIG;
dropQuantity = 1;
} else if ((gSaveContext.save.saveInfo.playerData.magicLevel != 0) &&
((gSaveContext.save.saveInfo.playerData.magicLevel >> 1) >=
gSaveContext.save.saveInfo.playerData.magic)) {
params = 0xD0;
dropId = ITEM00_MAGIC_LARGE;
dropId = ITEM00_MAGIC_JAR_BIG;
dropQuantity = 1;
} else if (AMMO(ITEM_BOW) < 6) {
params = 0xA0;
@ -1230,10 +1447,10 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
s32 D_801AE194[32] = {
ITEM00_NO_DROP, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_RUPEE_RED,
ITEM00_RUPEE_PURPLE, ITEM00_NO_DROP, ITEM00_RUPEE_HUGE, ITEM00_COMPASS, ITEM00_MUSHROOM_CLOUD,
ITEM00_RECOVERY_HEART, ITEM00_3_HEARTS, ITEM00_HEART_PIECE, ITEM00_HEART_CONTAINER, ITEM00_MAGIC_SMALL,
ITEM00_MAGIC_LARGE, ITEM00_FLEXIBLE, ITEM00_BIG_FAIRY, ITEM00_NO_DROP, ITEM00_NUTS_10,
ITEM00_RECOVERY_HEART, ITEM00_3_HEARTS, ITEM00_HEART_PIECE, ITEM00_HEART_CONTAINER, ITEM00_MAGIC_JAR_SMALL,
ITEM00_MAGIC_JAR_BIG, ITEM00_FLEXIBLE, ITEM00_BIG_FAIRY, ITEM00_NO_DROP, ITEM00_DEKU_NUTS_10,
ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_STICK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_DEKU_STICK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP,
ITEM00_ARROWS_10, ITEM00_ARROWS_30,
};

2
src/code/z_fireobj.c
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;

244
src/code/z_parameter.c
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);

2
src/code/z_play.c
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;

24
src/code/z_player_lib.c
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)];

78
src/code/z_sram_NES.c
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,

2
src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
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);

2
src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
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);

2
src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
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;
}

2
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
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;
}

6
src/overlays/actors/ovl_En_Butte/z_en_butte.c
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,

8
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
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 */

26
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View File

@ -78,12 +78,12 @@ static ShopItemEntry sShopItemEntries[] = {
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
{ OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x06AE, 0x06AF, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
{ OBJECT_GI_STICK, GID_STICK, NULL, 1, 0x06B4, 0x06B5, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
{ OBJECT_GI_STICK, GID_DEKU_STICK, NULL, 1, 0x06B4, 0x06B5, GI_DEKU_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
EnGirlA_BuyFanfare },
{ OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_800B8050, 30, 0x06B8, 0x06B9, GI_ARROWS_30, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
{ OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0x06B0, 0x06B1, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
EnGirlA_BuyFanfare },
{ OBJECT_GI_NUTS, GID_DEKU_NUTS, func_800B8118, 10, 0x06B0, 0x06B1, GI_DEKU_NUTS_10, EnGirlA_CanBuyNuts,
EnGirlA_BuyNuts, EnGirlA_BuyFanfare },
{ OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x06AC, 0x06AD, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
{ OBJECT_GI_BOTTLE_04, GID_FAIRY, func_800B8050, 1, 0x06D3, 0x06D4, GI_FAIRY, EnGirlA_CanBuyFairy,
@ -94,9 +94,9 @@ static ShopItemEntry sShopItemEntries[] = {
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
{ OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0x06CF, 0x06D0, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
{ OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0x06CD, 0x06CE, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
EnGirlA_BuyFanfare },
{ OBJECT_GI_STICK, GID_STICK, NULL, 1, 0x06D1, 0x06D2, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
{ OBJECT_GI_NUTS, GID_DEKU_NUTS, func_800B8118, 10, 0x06CD, 0x06CE, GI_DEKU_NUTS_10, EnGirlA_CanBuyNuts,
EnGirlA_BuyNuts, EnGirlA_BuyFanfare },
{ OBJECT_GI_STICK, GID_DEKU_STICK, NULL, 1, 0x06D1, 0x06D2, GI_DEKU_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
EnGirlA_BuyFanfare },
{ OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x06CB, 0x06CC, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
@ -234,13 +234,13 @@ s32 EnGirlA_CanBuyArrows(PlayState* play, EnGirlA* this) {
}
s32 EnGirlA_CanBuyNuts(PlayState* play, EnGirlA* this) {
if ((CUR_CAPACITY(UPG_NUTS) != 0) && (CUR_CAPACITY(UPG_NUTS) <= AMMO(ITEM_NUT))) {
if ((CUR_CAPACITY(UPG_DEKU_NUTS) != 0) && (CUR_CAPACITY(UPG_DEKU_NUTS) <= AMMO(ITEM_DEKU_NUT))) {
return CANBUY_RESULT_NO_ROOM;
}
if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_NUT) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_1;
}
return CANBUY_RESULT_SUCCESS_2;
@ -257,13 +257,13 @@ s32 EnGirlA_CanBuyShieldHero(PlayState* play, EnGirlA* this) {
}
s32 EnGirlA_CanBuyStick(PlayState* play, EnGirlA* this) {
if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) {
if ((CUR_CAPACITY(UPG_DEKU_STICKS) != 0) && (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS))) {
return CANBUY_RESULT_NO_ROOM;
}
if (gSaveContext.save.saveInfo.playerData.rupees < play->msgCtx.unk1206C) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_STICK) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_1;
}
return CANBUY_RESULT_SUCCESS_2;
@ -415,11 +415,11 @@ void EnGirlA_BuyArrows(PlayState* play, EnGirlA* this) {
void EnGirlA_BuyNuts(PlayState* play, EnGirlA* this) {
switch (this->itemParams) {
case 5:
Item_Give(play, ITEM_NUTS_5);
Item_Give(play, ITEM_DEKU_NUTS_5);
break;
case 10:
Item_Give(play, ITEM_NUTS_10);
Item_Give(play, ITEM_DEKU_NUTS_10);
break;
default:
@ -434,7 +434,7 @@ void EnGirlA_BuyShieldHero(PlayState* play, EnGirlA* this) {
}
void EnGirlA_BuyStick(PlayState* play, EnGirlA* this) {
Item_Give(play, ITEM_STICK);
Item_Give(play, ITEM_DEKU_STICK);
Rupees_ChangeBy(-play->msgCtx.unk1206C);
}

4
src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
View File

@ -466,7 +466,7 @@ void EnKarebaba_ShrinkDie(EnKarebaba* this, PlayState* play) {
}
} else {
if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.0005f)) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_NUTS_1);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_DEKU_NUTS_1);
EnKarebaba_SetupDead(this);
} else {
EffectSsHahen_SpawnBurst(play, &this->actor.world.pos, 3.0f, 0, 12, 5, 1, HAHEN_OBJECT_DEFAULT, 10, NULL);
@ -499,7 +499,7 @@ void EnKarebaba_DeadItemDrop(EnKarebaba* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play) || (this->timer == 0)) {
EnKarebaba_SetupDead(this);
} else {
Actor_OfferGetItemNearby(&this->actor, play, GI_STICKS_1);
Actor_OfferGetItemNearby(&this->actor, play, GI_DEKU_STICKS_1);
}
}

2
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View File

@ -724,7 +724,7 @@ void EnNb_Update(Actor* thisx, PlayState* play) {
EnNb_UpdateSkelAnime(this);
func_80BC0800(this);
if (Actor_IsFacingPlayer(&this->actor, 0x38E0)) {
func_8013C964(&this->actor, play, this->unk_274, 30.0f, ITEM_OCARINA,
func_8013C964(&this->actor, play, this->unk_274, 30.0f, ITEM_OCARINA_OF_TIME,
this->stateFlags & (EN_NB_FLAG_1 | EN_NB_FLAG_2 | EN_NB_FLAG_4));
}
func_80BBFF24(this, play);

2
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View File

@ -157,7 +157,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
break;
case ENOWL_GET_TYPE_2:
if (gSaveContext.save.saveInfo.inventory.items[ITEM_LENS] == ITEM_LENS) {
if (gSaveContext.save.saveInfo.inventory.items[ITEM_LENS_OF_TRUTH] == ITEM_LENS_OF_TRUTH) {
Actor_Kill(&this->actor);
return;
}

2
src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
View File

@ -685,7 +685,7 @@ void EnScopenuts_Init(Actor* thisx, PlayState* play) {
EnScopenuts* this = THIS;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_74_40) &&
(gSaveContext.save.saveInfo.inventory.items[ITEM_OCARINA] == ITEM_NONE)) {
(gSaveContext.save.saveInfo.inventory.items[ITEM_OCARINA_OF_TIME] == ITEM_NONE)) {
Actor_Kill(&this->actor);
return;
}

2
src/overlays/actors/ovl_En_Shn/z_en_shn.c
View File

@ -293,7 +293,7 @@ s32 func_80AE68F0(EnShn* this, PlayState* play) {
if (this->unk_1D8 & 7) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->unk_1D8 &= ~0x180;
if (player->exchangeItemId == PLAYER_IA_PICTO_BOX) {
if (player->exchangeItemId == PLAYER_IA_PICTOGRAPH_BOX) {
this->unk_1D8 |= 0x80;
this->unk_2E4 = player->exchangeItemId;
} else if (player->exchangeItemId != PLAYER_IA_NONE) {

2
src/overlays/actors/ovl_En_Slime/z_en_slime.c
View File

@ -776,7 +776,7 @@ void EnSlime_Dead(EnSlime* this, PlayState* play) {
if (this->actor.params == EN_SLIME_TYPE_YELLOW) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_ARROWS_10);
} else if (this->actor.params == EN_SLIME_TYPE_GREEN) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_MAGIC_SMALL);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_MAGIC_JAR_SMALL);
} else if (this->actor.params == EN_SLIME_TYPE_RED) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_RECOVERY_HEART);
}

2
src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
View File

@ -205,7 +205,7 @@ static EnTalkGibudRequestedItem sRequestedItemTable[] = {
{ PLAYER_IA_BOTTLE_SPRING_WATER, ITEM_SPRING_WATER, 1, true },
{ PLAYER_IA_BOTTLE_FISH, ITEM_FISH, 1, true },
{ PLAYER_IA_BOTTLE_BUG, ITEM_BUG, 1, true },
{ PLAYER_IA_NUT, ITEM_NUT, 10, false },
{ PLAYER_IA_DEKU_NUT, ITEM_DEKU_NUT, 10, false },
{ PLAYER_IA_BOMB, ITEM_BOMB, 10, false },
{ PLAYER_IA_BOTTLE_HOT_SPRING_WATER, ITEM_HOT_SPRING_WATER, 1, true },
{ PLAYER_IA_BOTTLE_BIG_POE, ITEM_BIG_POE, 1, true },

2
src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c
View File

@ -149,7 +149,7 @@ void EnTanron1_Update(Actor* thisx, PlayState* play) {
break;
}
if ((player->heldItemAction == PLAYER_IA_STICK) && (player->unk_B28 != 0)) {
if ((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (player->unk_B28 != 0)) {
this->unk_14C.x = player->meleeWeaponInfo[0].tip.x;
this->unk_14C.y = player->meleeWeaponInfo[0].tip.y;
this->unk_14C.z = player->meleeWeaponInfo[0].tip.z;

2
src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c
View File

@ -462,7 +462,7 @@ void func_80BE5818(Actor* thisx, PlayState* play2) {
if (this->unk_1A0 == 0) {
Item_Give(play, ITEM_ARROWS_10);
} else {
Item_Give(play, ITEM_MAGIC_LARGE);
Item_Give(play, ITEM_MAGIC_JAR_BIG);
}
Actor_Kill(&this->actor);
Audio_PlaySfx(NA_SE_SY_GET_ITEM);

2
src/overlays/actors/ovl_En_Test3/z_en_test3.c
View File

@ -457,7 +457,7 @@ void EnTest3_Init(Actor* thisx, PlayState* play2) {
this->player.transformation = PLAYER_FORM_HUMAN;
this->player.ageProperties = &sAgeProperties;
this->player.heldItemAction = PLAYER_IA_NONE;
this->player.heldItemId = ITEM_OCARINA;
this->player.heldItemId = ITEM_OCARINA_OF_TIME;
Player_SetModelGroup(&this->player, 3);
play->playerInit(&this->player, play, &object_test3_Skel_00F7EC);

2
src/overlays/actors/ovl_En_Tsn/z_en_tsn.c
View File

@ -324,7 +324,7 @@ void func_80AE04FC(EnTsn* this, PlayState* play) {
if (itemAction > PLAYER_IA_NONE) {
Message_CloseTextbox(play);
this->actionFunc = func_80AE0704;
if (itemAction == PLAYER_IA_PICTO_BOX) {
if (itemAction == PLAYER_IA_PICTOGRAPH_BOX) {
if (CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) {
if (Snap_CheckFlag(PICTO_VALID_PIRATE_GOOD)) {
player->actor.textId = 0x107B;

2
src/overlays/actors/ovl_En_Zot/z_en_zot.c
View File

@ -961,7 +961,7 @@ void func_80B985EC(EnZot* this, PlayState* play) {
if (itemAction > PLAYER_IA_NONE) {
Message_CloseTextbox(play);
if ((itemAction == PLAYER_IA_PICTO_BOX) && CHECK_QUEST_ITEM(QUEST_PICTOGRAPH) &&
if ((itemAction == PLAYER_IA_PICTOGRAPH_BOX) && CHECK_QUEST_ITEM(QUEST_PICTOGRAPH) &&
Snap_CheckFlag(PICTO_VALID_LULU_HEAD)) {
if (Snap_CheckFlag(PICTO_VALID_LULU_RIGHT_ARM) && Snap_CheckFlag(PICTO_VALID_LULU_LEFT_ARM)) {
player->actor.textId = 0x12AE;

2
src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c
View File

@ -529,7 +529,7 @@ s32 func_80B30480(ObjSpidertent* this, PlayState* play, Vec3f* arg2) {
Vec3f sp58;
f32 sp54;
if (player->heldItemAction == PLAYER_IA_STICK) {
if (player->heldItemAction == PLAYER_IA_DEKU_STICK) {
if (player->unk_B28 > 0) {
for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) {
triNorm = &this->collider.elements[i].dim;

2
src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
View File

@ -197,7 +197,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
if (this->flameCollider.info.acHitInfo->toucher.dmgFlags & 0x820) {
interaction = OBJ_SYOKUDAI_INTERACTION_ARROW_FA;
}
} else if (player->heldItemAction == PLAYER_IA_STICK) {
} else if (player->heldItemAction == PLAYER_IA_DEKU_STICK) {
Vec3f stickTipSeparationVec;
Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &thisx->world.pos, &stickTipSeparationVec);

2
src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
View File

@ -69,7 +69,7 @@ void ObjYasi_Update(Actor* thisx, PlayState* play) {
dropPos.x = this->dyna.actor.world.pos.x;
dropPos.y = this->dyna.actor.world.pos.y + 280.0f;
dropPos.z = this->dyna.actor.world.pos.z;
Item_DropCollectible(play, &dropPos, ITEM00_NUTS_1);
Item_DropCollectible(play, &dropPos, ITEM00_DEKU_NUTS_1);
}
}
this->dyna.actor.home.rot.y = GET_PLAYER(play)->actor.shape.rot.y;

2
src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
View File

@ -158,7 +158,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) {
spawnPos.x = 700.0f;
spawnPos.y = -800.0f;
spawnPos.z = 7261.0f;
collectible = (EnItem00*)Item_DropCollectible(play, &spawnPos, ITEM00_MAGIC_LARGE);
collectible = (EnItem00*)Item_DropCollectible(play, &spawnPos, ITEM00_MAGIC_JAR_BIG);
if (collectible != NULL) {
collectible->unk152 = 0x1770;
collectible->actor.speed = 0.0f;

170
src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -2096,12 +2096,12 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
// GI_HEART_CONTAINER
GET_ITEM(ITEM_HEART_CONTAINER, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xD,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_LONG),
// GI_MAGIC_SMALL
GET_ITEM(ITEM_MAGIC_SMALL, OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL, 0xE,
GIFIELD(GIFIELD_20 | GIFIELD_40, ITEM00_MAGIC_SMALL), CHEST_ANIM_SHORT),
// GI_MAGIC_LARGE
GET_ITEM(ITEM_MAGIC_LARGE, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, 0xF,
GIFIELD(GIFIELD_20 | GIFIELD_40, ITEM00_MAGIC_LARGE), CHEST_ANIM_SHORT),
// GI_MAGIC_JAR_SMALL
GET_ITEM(ITEM_MAGIC_JAR_SMALL, OBJECT_GI_MAGICPOT, GID_MAGIC_JAR_SMALL, 0xE,
GIFIELD(GIFIELD_20 | GIFIELD_40, ITEM00_MAGIC_JAR_SMALL), CHEST_ANIM_SHORT),
// GI_MAGIC_JAR_BIG
GET_ITEM(ITEM_MAGIC_JAR_BIG, OBJECT_GI_MAGICPOT, GID_MAGIC_JAR_BIG, 0xF,
GIFIELD(GIFIELD_20 | GIFIELD_40, ITEM00_MAGIC_JAR_BIG), CHEST_ANIM_SHORT),
// GI_10
GET_ITEM(ITEM_RECOVERY_HEART, OBJECT_GI_HEART, GID_RECOVERY_HEART, 0x10, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
@ -2123,8 +2123,8 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
GET_ITEM(ITEM_BOMBS_20, OBJECT_GI_BOMB_1, GID_BOMB, 0x17, GIFIELD(GIFIELD_40, ITEM00_BOMBS_0), CHEST_ANIM_SHORT),
// GI_BOMBS_30
GET_ITEM(ITEM_BOMBS_30, OBJECT_GI_BOMB_1, GID_BOMB, 0x18, GIFIELD(GIFIELD_40, ITEM00_BOMBS_0), CHEST_ANIM_SHORT),
// GI_STICKS_1
GET_ITEM(ITEM_STICK, OBJECT_GI_STICK, GID_STICK, 0x19, GIFIELD(0, ITEM00_STICK), CHEST_ANIM_SHORT),
// GI_DEKU_STICKS_1
GET_ITEM(ITEM_DEKU_STICK, OBJECT_GI_STICK, GID_DEKU_STICK, 0x19, GIFIELD(0, ITEM00_DEKU_STICK), CHEST_ANIM_SHORT),
// GI_BOMBCHUS_10
GET_ITEM(ITEM_BOMBCHUS_10, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x1A, GIFIELD(GIFIELD_40 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
@ -2166,33 +2166,33 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
// GI_ARROW_LIGHT
GET_ITEM(ITEM_ARROW_LIGHT, OBJECT_GI_M_ARROW, GID_ARROW_LIGHT, 0x27,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_LONG),
// GI_NUTS_1
GET_ITEM(ITEM_NUT, OBJECT_GI_NUTS, GID_NUTS, 0x28, GIFIELD(0, ITEM00_NUTS_1), CHEST_ANIM_SHORT),
// GI_NUTS_5
GET_ITEM(ITEM_NUTS_5, OBJECT_GI_NUTS, GID_NUTS, 0x29, GIFIELD(0, ITEM00_NUTS_1), CHEST_ANIM_SHORT),
// GI_NUTS_10
GET_ITEM(ITEM_NUTS_10, OBJECT_GI_NUTS, GID_NUTS, 0x2A, GIFIELD(0, ITEM00_NUTS_1), CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_1
GET_ITEM(ITEM_DEKU_NUT, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x28, GIFIELD(0, ITEM00_DEKU_NUTS_1), CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_5
GET_ITEM(ITEM_DEKU_NUTS_5, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x29, GIFIELD(0, ITEM00_DEKU_NUTS_1), CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_10
GET_ITEM(ITEM_DEKU_NUTS_10, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x2A, GIFIELD(0, ITEM00_DEKU_NUTS_1), CHEST_ANIM_SHORT),
// GI_2B
GET_ITEM(ITEM_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_NUTS, 0x2B, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x2B,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_2C
GET_ITEM(ITEM_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_NUTS, 0x2C, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x2C,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_2D
GET_ITEM(ITEM_NUT_UPGRADE_40, OBJECT_GI_NUTS, GID_NUTS, 0x2D, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_NUT_UPGRADE_40, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x2D,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_BOMBCHUS_20
GET_ITEM(ITEM_BOMBCHUS_20, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x2E, GIFIELD(GIFIELD_40 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
// GI_2F
GET_ITEM(ITEM_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_STICK, 0x2F, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_DEKU_STICK, 0x2F,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_30
GET_ITEM(ITEM_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_STICK, 0x30, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_DEKU_STICK, 0x30,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_31
GET_ITEM(ITEM_STICK_UPGRADE_30, OBJECT_GI_STICK, GID_STICK, 0x31, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_SHORT),
GET_ITEM(ITEM_DEKU_STICK_UPGRADE_30, OBJECT_GI_STICK, GID_DEKU_STICK, 0x31,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
// GI_SHIELD_HERO
GET_ITEM(ITEM_SHIELD_HERO, OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, 0x32,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_SHORT),
@ -2240,14 +2240,14 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
// GI_HOOKSHOT
GET_ITEM(ITEM_HOOKSHOT, OBJECT_GI_HOOKSHOT, GID_HOOKSHOT, 0x41, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_LENS
GET_ITEM(ITEM_LENS, OBJECT_GI_GLASSES, GID_LENS, 0x42, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_PICTO_BOX
GET_ITEM(ITEM_PICTO_BOX, OBJECT_GI_CAMERA, GID_PICTO_BOX, 0x43, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
// GI_LENS_OF_TRUTH
GET_ITEM(ITEM_LENS_OF_TRUTH, OBJECT_GI_GLASSES, GID_LENS, 0x42, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_PICTOGRAPH_BOX
GET_ITEM(ITEM_PICTOGRAPH_BOX, OBJECT_GI_CAMERA, GID_PICTOGRAPH_BOX, 0x43,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_LONG),
// GI_44
GET_ITEM(ITEM_PICTO_BOX, OBJECT_UNSET_0, GID_NONE, 0x44, GIFIELD(0, ITEM00_RUPEE_GREEN), 0),
GET_ITEM(ITEM_PICTOGRAPH_BOX, OBJECT_UNSET_0, GID_NONE, 0x44, GIFIELD(0, ITEM00_RUPEE_GREEN), 0),
// GI_45
GET_ITEM(ITEM_RECOVERY_HEART, OBJECT_GI_HEART, GID_RECOVERY_HEART, 0x45, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
@ -2263,9 +2263,9 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
GET_ITEM(ITEM_NONE, OBJECT_UNSET_0, GID_NONE, 0x4A, 0, 0),
// GI_4B
GET_ITEM(ITEM_NONE, OBJECT_UNSET_0, GID_NONE, 0x4B, 0, 0),
// GI_OCARINA
GET_ITEM(ITEM_OCARINA, OBJECT_GI_OCARINA, GID_OCARINA, 0x4C, GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_OCARINA_OF_TIME
GET_ITEM(ITEM_OCARINA_OF_TIME, OBJECT_GI_OCARINA, GID_OCARINA, 0x4C,
GIFIELD(GIFIELD_20 | GIFIELD_NO_COLLECTIBLE, 0), CHEST_ANIM_LONG),
// GI_4D
GET_ITEM(ITEM_NONE, OBJECT_UNSET_0, GID_NONE, 0x4D, 0, 0),
// GI_4E
@ -2878,24 +2878,24 @@ void func_8082F470(PlayState* play, Player* this, PlayerItemAction itemAction) {
}
s8 sItemItemActions[] = {
PLAYER_IA_OCARINA, // ITEM_OCARINA,
PLAYER_IA_OCARINA, // ITEM_OCARINA_OF_TIME,
PLAYER_IA_BOW, // ITEM_BOW,
PLAYER_IA_BOW_FIRE, // ITEM_ARROW_FIRE,
PLAYER_IA_BOW_ICE, // ITEM_ARROW_ICE,
PLAYER_IA_BOW_LIGHT, // ITEM_ARROW_LIGHT,
PLAYER_IA_PICTO_BOX, // ITEM_OCARINA_FAIRY,
PLAYER_IA_PICTOGRAPH_BOX, // ITEM_OCARINA_FAIRY,
PLAYER_IA_BOMB, // ITEM_BOMB,
PLAYER_IA_BOMBCHU, // ITEM_BOMBCHU,
PLAYER_IA_STICK, // ITEM_STICK,
PLAYER_IA_NUT, // ITEM_NUT,
PLAYER_IA_DEKU_STICK, // ITEM_DEKU_STICK,
PLAYER_IA_DEKU_NUT, // ITEM_DEKU_NUT,
PLAYER_IA_MAGIC_BEANS, // ITEM_MAGIC_BEANS,
PLAYER_IA_PICTO_BOX, // ITEM_SLINGSHOT,
PLAYER_IA_PICTOGRAPH_BOX, // ITEM_SLINGSHOT,
PLAYER_IA_POWDER_KEG, // ITEM_POWDER_KEG,
PLAYER_IA_PICTO_BOX, // ITEM_PICTO_BOX,
PLAYER_IA_LENS, // ITEM_LENS,
PLAYER_IA_PICTOGRAPH_BOX, // ITEM_PICTOGRAPH_BOX,
PLAYER_IA_LENS_OF_TRUTH, // ITEM_LENS_OF_TRUTH,
PLAYER_IA_HOOKSHOT, // ITEM_HOOKSHOT,
PLAYER_IA_SWORD_TWO_HANDED, // ITEM_SWORD_GREAT_FAIRY,
PLAYER_IA_PICTO_BOX, // ITEM_LONGSHOT, // OoT Leftover
PLAYER_IA_PICTOGRAPH_BOX, // ITEM_LONGSHOT, // OoT Leftover
PLAYER_IA_BOTTLE_EMPTY, // ITEM_BOTTLE,
PLAYER_IA_BOTTLE_POTION_RED, // ITEM_POTION_RED,
PLAYER_IA_BOTTLE_POTION_GREEN, // ITEM_POTION_GREEN,
@ -2952,9 +2952,9 @@ s8 sItemItemActions[] = {
PLAYER_IA_MASK_BLAST, // ITEM_MASK_BLAST,
PLAYER_IA_MASK_SCENTS, // ITEM_MASK_SCENTS,
PLAYER_IA_MASK_GIANT, // ITEM_MASK_GIANT,
PLAYER_IA_BOW_FIRE, // ITEM_BOW_ARROW_FIRE,
PLAYER_IA_BOW_ICE, // ITEM_BOW_ARROW_ICE,
PLAYER_IA_BOW_LIGHT, // ITEM_BOW_ARROW_LIGHT,
PLAYER_IA_BOW_FIRE, // ITEM_BOW_FIRE,
PLAYER_IA_BOW_ICE, // ITEM_BOW_ICE,
PLAYER_IA_BOW_LIGHT, // ITEM_BOW_LIGHT,
PLAYER_IA_SWORD_KOKIRI, // ITEM_SWORD_KOKIRI,
PLAYER_IA_SWORD_RAZOR, // ITEM_SWORD_RAZOR,
PLAYER_IA_SWORD_GILDED, // ITEM_SWORD_GILDED,
@ -2986,7 +2986,7 @@ void func_8082F5A4(PlayState* play, Player* this) {
void func_8082F5C0(PlayState* play, Player* this) {
this->stateFlags1 |= PLAYER_STATE1_8;
if (this->heldItemAction == PLAYER_IA_NUT) {
if (this->heldItemAction == PLAYER_IA_DEKU_NUT) {
this->unk_B28 = -2;
} else {
this->unk_B28 = -1;
@ -3002,7 +3002,7 @@ PlayerFuncAC4 D_8085C9F0[PLAYER_IA_MAX] = {
func_808487B8, // PLAYER_IA_SWORD_RAZOR
func_808487B8, // PLAYER_IA_SWORD_GILDED
func_808487B8, // PLAYER_IA_SWORD_TWO_HANDED
func_80848780, // PLAYER_IA_STICK
func_80848780, // PLAYER_IA_DEKU_STICK
func_80848780, // PLAYER_IA_ZORA_FINS
func_80848B6C, // PLAYER_IA_BOW
func_80848B6C, // PLAYER_IA_BOW_FIRE
@ -3013,8 +3013,8 @@ PlayerFuncAC4 D_8085C9F0[PLAYER_IA_MAX] = {
func_808490B4, // PLAYER_IA_POWDER_KEG
func_808490B4, // PLAYER_IA_BOMBCHU
func_808491B4, // PLAYER_IA_11
func_80848B6C, // PLAYER_IA_NUT
func_80848780, // PLAYER_IA_PICTO_BOX
func_80848B6C, // PLAYER_IA_DEKU_NUT
func_80848780, // PLAYER_IA_PICTOGRAPH_BOX
func_80848780, // PLAYER_IA_OCARINA
func_80848780, // PLAYER_IA_BOTTLE_EMPTY
func_80848780, // PLAYER_IA_BOTTLE_FISH
@ -3077,7 +3077,7 @@ PlayerFuncAC4 D_8085C9F0[PLAYER_IA_MAX] = {
func_80848780, // PLAYER_IA_MASK_GORON
func_80848780, // PLAYER_IA_MASK_ZORA
func_80848780, // PLAYER_IA_MASK_DEKU
func_80848780, // PLAYER_IA_LENS
func_80848780, // PLAYER_IA_LENS_OF_TRUTH
};
// sPlayerItemActionInits?
@ -3089,7 +3089,7 @@ void (*D_8085CB3C[PLAYER_IA_MAX])(PlayState*, Player*) = {
func_8082F594, // PLAYER_IA_SWORD_RAZOR
func_8082F594, // PLAYER_IA_SWORD_GILDED
func_8082F594, // PLAYER_IA_SWORD_TWO_HANDED
func_8082F5A4, // PLAYER_IA_STICK
func_8082F5A4, // PLAYER_IA_DEKU_STICK
func_8082F8A0, // PLAYER_IA_ZORA_FINS
func_8082F5C0, // PLAYER_IA_BOW
func_8082F5C0, // PLAYER_IA_BOW_FIRE
@ -3100,8 +3100,8 @@ void (*D_8085CB3C[PLAYER_IA_MAX])(PlayState*, Player*) = {
Player_SpawnExplosive, // PLAYER_IA_POWDER_KEG
Player_SpawnExplosive, // PLAYER_IA_BOMBCHU
func_8082F8A0, // PLAYER_IA_11
func_8082F5C0, // PLAYER_IA_NUT
func_8082F594, // PLAYER_IA_PICTO_BOX
func_8082F5C0, // PLAYER_IA_DEKU_NUT
func_8082F594, // PLAYER_IA_PICTOGRAPH_BOX
func_8082F594, // PLAYER_IA_OCARINA
func_8082F594, // PLAYER_IA_BOTTLE_EMPTY
func_8082F594, // PLAYER_IA_BOTTLE_FISH
@ -3164,7 +3164,7 @@ void (*D_8085CB3C[PLAYER_IA_MAX])(PlayState*, Player*) = {
func_8082F594, // PLAYER_IA_MASK_GORON
func_8082F594, // PLAYER_IA_MASK_ZORA
func_8082F594, // PLAYER_IA_MASK_DEKU
func_8082F594, // PLAYER_IA_LENS
func_8082F594, // PLAYER_IA_LENS_OF_TRUTH
};
void func_8082F5FC(Player* this, Actor* actor) {
@ -3725,8 +3725,8 @@ void func_808304BC(Player* this, PlayState* play) {
// EN_ARROW ammo related?
s32 func_808305BC(PlayState* play, Player* this, ItemId* item, ArrowType* typeParam) {
if (this->heldItemAction == PLAYER_IA_NUT) {
*item = ITEM_NUT;
if (this->heldItemAction == PLAYER_IA_DEKU_NUT) {
*item = ITEM_DEKU_NUT;
*typeParam = (this->transformation == PLAYER_FORM_DEKU) ? ARROW_TYPE_DEKU_BUBBLE : ARROW_TYPE_SLINGSHOT;
} else {
*item = ITEM_BOW;
@ -4263,7 +4263,7 @@ void func_808318C0(PlayState* play) {
// Toggle Lens from a button press
void func_80831944(PlayState* play, Player* this) {
if (func_8012364C(play, this, func_8082FDC4()) == ITEM_LENS) {
if (func_8012364C(play, this, func_8082FDC4()) == ITEM_LENS_OF_TRUTH) {
func_808318C0(play);
}
}
@ -4291,7 +4291,7 @@ void func_80831990(PlayState* play, Player* this, ItemId item) {
(CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK_REQUESTED) && (itemAction != PLAYER_IA_NONE)) ||
(itemAction == PLAYER_IA_OCARINA) ||
((itemAction > PLAYER_IA_BOTTLE_MIN) && itemAction < PLAYER_IA_MASK_MIN) ||
((itemAction == PLAYER_IA_PICTO_BOX) && (this->talkActor != NULL) &&
((itemAction == PLAYER_IA_PICTOGRAPH_BOX) && (this->talkActor != NULL) &&
(this->exchangeItemId > PLAYER_IA_NONE))) {
if (var_v1) {
PlayerTransformation playerForm = (itemAction < PLAYER_IA_MASK_FIERCE_DEITY)
@ -4315,7 +4315,7 @@ void func_80831990(PlayState* play, Player* this, ItemId item) {
this->itemAction = itemAction;
this->unk_AA5 = PLAYER_UNKAA5_5;
}
} else if (((itemAction == PLAYER_IA_STICK) && (AMMO(ITEM_STICK) == 0)) ||
} else if (((itemAction == PLAYER_IA_DEKU_STICK) && (AMMO(ITEM_DEKU_STICK) == 0)) ||
(((play->unk_1887D != 0) || (play->unk_1887E != 0)) &&
(play->actorCtx.actorLists[ACTORCAT_EXPLOSIVES].length >= 5)) ||
((play->unk_1887D == 0) && (play->unk_1887E == 0) &&
@ -4323,15 +4323,15 @@ void func_80831990(PlayState* play, Player* this, ItemId item) {
((AMMO(sPlayerExplosiveInfo[explosiveType].itemId) == 0) ||
(play->actorCtx.actorLists[ACTORCAT_EXPLOSIVES].length >= 3)))) {
Audio_PlaySfx(NA_SE_SY_ERROR);
} else if (itemAction == PLAYER_IA_LENS) {
} else if (itemAction == PLAYER_IA_LENS_OF_TRUTH) {
func_808318C0(play);
} else if (itemAction == PLAYER_IA_PICTO_BOX) {
} else if (itemAction == PLAYER_IA_PICTOGRAPH_BOX) {
if (!func_80831814(this, play, PLAYER_UNKAA5_2)) {
Audio_PlaySfx(NA_SE_SY_ERROR);
}
} else if ((itemAction == PLAYER_IA_NUT) &&
} else if ((itemAction == PLAYER_IA_DEKU_NUT) &&
((this->transformation != PLAYER_FORM_DEKU) || (this->heldItemButton != 0))) {
if (AMMO(ITEM_NUT) != 0) {
if (AMMO(ITEM_DEKU_NUT) != 0) {
func_8083A658(play, this);
} else {
Audio_PlaySfx(NA_SE_SY_ERROR);
@ -4870,7 +4870,7 @@ s32 func_808333CC(Player* this) {
s8 temp2;
s32 i;
if (this->heldItemAction == PLAYER_IA_STICK) {
if (this->heldItemAction == PLAYER_IA_DEKU_STICK) {
return false;
}
@ -4965,7 +4965,7 @@ PlayerMeleeWeaponAnimation func_808335F4(Player* this) {
}
}
if (this->heldItemAction == PLAYER_IA_STICK) {
if (this->heldItemAction == PLAYER_IA_DEKU_STICK) {
meleeWeaponAnim = PLAYER_MWA_FORWARD_SLASH_1H;
}
}
@ -4994,7 +4994,7 @@ MeleeWeaponDamageInfo D_8085D09C[PLAYER_MELEEWEAPON_MAX] = {
{ DMG_SWORD, 4, 8, 2, 4 }, // PLAYER_MELEEWEAPON_SWORD_RAZOR
{ DMG_SWORD, 4, 8, 3, 6 }, // PLAYER_MELEEWEAPON_SWORD_GILDED
{ DMG_SWORD, 4, 8, 4, 8 }, // PLAYER_MELEEWEAPON_SWORD_TWO_HANDED
{ DMG_DEKU_STICK, 0, 0, 2, 4 }, // PLAYER_MELEEWEAPON_STICK
{ DMG_DEKU_STICK, 0, 0, 2, 4 }, // PLAYER_MELEEWEAPON_DEKU_STICK
{ DMG_ZORA_PUNCH, 1, 2, 0, 0 }, // PLAYER_MELEEWEAPON_ZORA_FINS
};
@ -7054,7 +7054,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_SWORD_RAZOR, // PLAYER_IA_SWORD_RAZOR
GI_SWORD_GILDED, // PLAYER_IA_SWORD_GILDED
GI_SWORD_GREAT_FAIRY, // PLAYER_IA_SWORD_TWO_HANDED
GI_STICKS_1, // PLAYER_IA_STICK
GI_DEKU_STICKS_1, // PLAYER_IA_DEKU_STICK
GI_SWORD_KOKIRI, // PLAYER_IA_ZORA_FINS
GI_QUIVER_30, // PLAYER_IA_BOW
GI_ARROW_FIRE, // PLAYER_IA_BOW_FIRE
@ -7065,9 +7065,9 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_POWDER_KEG, // PLAYER_IA_POWDER_KEG
GI_BOMBCHUS_10, // PLAYER_IA_BOMBCHU
GI_40, // PLAYER_IA_11
GI_NUTS_1, // PLAYER_IA_NUT
GI_PICTO_BOX, // PLAYER_IA_PICTO_BOX
GI_OCARINA, // PLAYER_IA_OCARINA
GI_DEKU_NUTS_1, // PLAYER_IA_DEKU_NUT
GI_PICTOGRAPH_BOX, // PLAYER_IA_PICTOGRAPH_BOX
GI_OCARINA_OF_TIME, // PLAYER_IA_OCARINA
GI_BOTTLE, // PLAYER_IA_BOTTLE_EMPTY
GI_FISH, // PLAYER_IA_BOTTLE_FISH
GI_75, // PLAYER_IA_BOTTLE_SPRING_WATER
@ -7129,7 +7129,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_MASK_GORON, // PLAYER_IA_MASK_GORON
GI_MASK_ZORA, // PLAYER_IA_MASK_ZORA
GI_MASK_DEKU, // PLAYER_IA_MASK_DEKU
GI_LENS, // PLAYER_IA_LENS
GI_LENS_OF_TRUTH, // PLAYER_IA_LENS_OF_TRUTH
};
PlayerAnimationHeader* D_8085D1F8[] = {
@ -7178,7 +7178,7 @@ s32 func_80838A90(Player* this, PlayState* play) {
}
gSaveContext.save.equippedMask = this->currentMask;
} else if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK_REQUESTED) ||
(this->itemAction == PLAYER_IA_PICTO_BOX) ||
(this->itemAction == PLAYER_IA_PICTOGRAPH_BOX) ||
((this->itemAction != this->unk_B2B) &&
((this->itemAction == PLAYER_IA_BOTTLE_BIG_POE) ||
((this->itemAction >= PLAYER_IA_BOTTLE_ZORA_EGG) &&
@ -7758,7 +7758,7 @@ s32 func_8083A580(Player* this, PlayState* play) {
if (!(this->stateFlags1 & PLAYER_STATE1_400000) &&
(Player_GetMeleeWeaponHeld(this) != PLAYER_MELEEWEAPON_NONE)) {
if ((this->unk_ADC > 0) && (((this->transformation == PLAYER_FORM_ZORA)) ||
((this->unk_ADC == 1) && (this->heldItemAction != PLAYER_IA_STICK)))) {
((this->unk_ADC == 1) && (this->heldItemAction != PLAYER_IA_DEKU_STICK)))) {
if (this->transformation == PLAYER_FORM_ZORA) {
func_80830E30(this, play);
} else {
@ -9671,13 +9671,13 @@ void Player_RequestQuakeAndRumble(PlayState* play, Player* this, u16 sfxId) {
}
void func_8083FEF4(PlayState* play, Player* this) {
Inventory_ChangeAmmo(ITEM_STICK, -1);
Inventory_ChangeAmmo(ITEM_DEKU_STICK, -1);
func_80831990(play, this, ITEM_NONE);
}
s32 func_8083FF30(PlayState* play, Player* this) {
if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_B0C > 0.5f)) {
if (AMMO(ITEM_STICK) != 0) {
if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_B0C > 0.5f)) {
if (AMMO(ITEM_DEKU_STICK) != 0) {
EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_RIGHT_HAND],
BINANG_ADD(this->actor.shape.rot.y, 0x8000));
this->unk_B0C = 0.5f;
@ -11265,7 +11265,7 @@ void func_808442D8(PlayState* play, Player* this) {
var_fa0 = 1.0f;
if (DECR(this->unk_B28) == 0) {
Inventory_ChangeAmmo(ITEM_STICK, -1);
Inventory_ChangeAmmo(ITEM_DEKU_STICK, -1);
this->unk_B28 = 1;
this->unk_B0C = 0.0f;
var_fa0 = 0.0f;
@ -11659,7 +11659,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
this->lightInfo.params.point.radius = -1;
}
if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_B28 != 0)) {
if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_B28 != 0)) {
func_808442D8(play, this);
} else if (this->heldItemAction == PLAYER_IA_FISHING_ROD) {
if (this->unk_B28 < 0) {
@ -12859,7 +12859,7 @@ s32 func_808482E0(PlayState* play, Player* this) {
Audio_PlayFanfare(seqId);
}
} else if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
if (this->getItemId == GI_OCARINA) {
if (this->getItemId == GI_OCARINA_OF_TIME) {
// zelda teaching song of time cs?
play->nextEntrance = ENTRANCE(CUTSCENE, 0);
gSaveContext.nextCutsceneIndex = 0xFFF2;
@ -12964,7 +12964,7 @@ s32 func_80848808(Player* this, PlayState* play) {
if (PlayerAnimation_Update(play, &this->unk_284) ||
((Player_ItemToItemAction(this, this->heldItemId) == this->heldItemAction) &&
(D_80862B48 = D_80862B48 || ((this->modelAnimType != PLAYER_ANIMTYPE_3) &&
(this->heldItemAction != PLAYER_IA_STICK) && (play->unk_1887C == 0))))) {
(this->heldItemAction != PLAYER_IA_DEKU_STICK) && (play->unk_1887C == 0))))) {
func_8082F43C(play, this, D_8085C9F0[this->heldItemAction]);
this->unk_ACC = 0;
this->unk_AA4 = 0;
@ -16590,7 +16590,7 @@ void func_80852B28(Player* this, PlayState* play) {
this->bodyPartsPos[PLAYER_BODYPART_RIGHT_HAND].y,
this->bodyPartsPos[PLAYER_BODYPART_RIGHT_HAND].z, 0xFA0, this->actor.shape.rot.y, 0,
ARROW_TYPE_DEKU_NUT) != NULL) {
Inventory_ChangeAmmo(ITEM_NUT, -1);
Inventory_ChangeAmmo(ITEM_DEKU_NUT, -1);
this->unk_D57 = 4;
}
@ -17273,7 +17273,7 @@ void func_80854430(Player* this, PlayState* play) {
} else {
this->stateFlags1 &= ~PLAYER_STATE1_100000;
if ((play->sceneId == SCENE_20SICHITAI) &&
(func_8012364C(play, this, func_8082FDC4()) == ITEM_PICTO_BOX)) {
(func_8012364C(play, this, func_8082FDC4()) == ITEM_PICTOGRAPH_BOX)) {
s32 requiredScopeTemp;
play->actorCtx.flags |= ACTORCTX_FLAG_PICTO_BOX_ON;
@ -18249,7 +18249,7 @@ void func_80856918(Player* this, PlayState* play) {
Audio_PlaySfx_AtPosWithTimer(&this->actor.projectedPos, 0x1851, 2.0f * (this->unk_B86[1] * (1.0f / 6000.0f)));
if ((this->boomerangActor == NULL) && CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B)) {
if (AMMO(ITEM_NUT) == 0) {
if (AMMO(ITEM_DEKU_NUT) == 0) {
Audio_PlaySfx(NA_SE_SY_ERROR);
} else {
this->boomerangActor =
@ -18259,7 +18259,7 @@ void func_80856918(Player* this, PlayState* play) {
if (this->boomerangActor != NULL) {
this->boomerangActor->velocity.x = this->actor.velocity.x * 1.5f;
this->boomerangActor->velocity.z = this->actor.velocity.z * 1.5f;
Inventory_ChangeAmmo(ITEM_NUT, -1);
Inventory_ChangeAmmo(ITEM_DEKU_NUT, -1);
Actor_PlaySfx(this->boomerangActor, NA_SE_PL_DEKUNUTS_DROP_BOMB);
}
}

16
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c
View File

@ -97,7 +97,7 @@ SectionPosition sSectionPositions[] = {
s16 sSlotItems[] = {
// Items Row 1
ITEM_OCARINA,
ITEM_OCARINA_OF_TIME,
ITEM_BOW,
ITEM_ARROW_FIRE,
ITEM_ARROW_ICE,
@ -106,14 +106,14 @@ s16 sSlotItems[] = {
// Items Row 2
ITEM_BOMB,
ITEM_BOMBCHU,
ITEM_STICK,
ITEM_NUT,
ITEM_DEKU_STICK,
ITEM_DEKU_NUT,
ITEM_MAGIC_BEANS,
ITEM_SLINGSHOT,
// Items Row 3
ITEM_POWDER_KEG,
ITEM_PICTO_BOX,
ITEM_LENS,
ITEM_PICTOGRAPH_BOX,
ITEM_LENS_OF_TRUTH,
ITEM_HOOKSHOT,
ITEM_SWORD_GREAT_FAIRY,
ITEM_LONGSHOT,
@ -427,7 +427,7 @@ void KaleidoScope_DrawInventoryEditor(PlayState* play) {
for (j = 0, rectLeft = 44; j < 6; j++, slot++, rectLeft += 23) {
counterDigits[3] = 0;
counterDigits[2] = 0;
if ((slot == SLOT_BOW) || ((slot >= SLOT_BOMB) && (slot <= SLOT_NUT)) || (slot == SLOT_POWDER_KEG) ||
if ((slot == SLOT_BOW) || ((slot >= SLOT_BOMB) && (slot <= SLOT_DEKU_NUT)) || (slot == SLOT_POWDER_KEG) ||
(slot == SLOT_MAGIC_BEANS)) {
counterDigits[3] = AMMO(gAmmoItems[slot]);
} else if ((slot == SLOT_TRADE_DEED) || (slot == SLOT_TRADE_KEY_MAMA) || (slot == SLOT_TRADE_COUPLE)) {
@ -778,8 +778,8 @@ void KaleidoScope_UpdateInventoryEditor(PlayState* play) {
if (sCurSection < INV_EDITOR_SECTION_BOSS) {
// Items
slot = sCurSection - INV_EDITOR_SECTION_ITEMS;
if ((slot == SLOT_BOW) || ((slot >= SLOT_BOMB) && (slot <= SLOT_NUT)) || (slot == SLOT_POWDER_KEG) ||
(slot == SLOT_MAGIC_BEANS)) {
if ((slot == SLOT_BOW) || ((slot >= SLOT_BOMB) && (slot <= SLOT_DEKU_NUT)) ||
(slot == SLOT_POWDER_KEG) || (slot == SLOT_MAGIC_BEANS)) {
if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
Inventory_DeleteItem(gAmmoItems[slot], SLOT(gAmmoItems[slot]));
AMMO(gAmmoItems[slot]) = 0;

140
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -26,13 +26,13 @@ u8 gPlayerFormSlotRestrictions[PLAYER_FORM_MAX][ITEM_NUM_SLOTS] = {
false, // SLOT_TRADE_DEED
false, // SLOT_BOMB
false, // SLOT_BOMBCHU
false, // SLOT_STICK
false, // SLOT_NUT
false, // SLOT_DEKU_STICK
false, // SLOT_DEKU_NUT
false, // SLOT_MAGIC_BEANS
false, // SLOT_TRADE_KEY_MAMA
false, // SLOT_POWDER_KEG
false, // SLOT_PICTO_BOX
false, // SLOT_LENS
false, // SLOT_PICTOGRAPH_BOX
false, // SLOT_LENS_OF_TRUTH
false, // SLOT_HOOKSHOT
false, // SLOT_SWORD_GREAT_FAIRY
false, // SLOT_TRADE_COUPLE
@ -53,13 +53,13 @@ u8 gPlayerFormSlotRestrictions[PLAYER_FORM_MAX][ITEM_NUM_SLOTS] = {
true, // SLOT_TRADE_DEED
false, // SLOT_BOMB
false, // SLOT_BOMBCHU
false, // SLOT_STICK
false, // SLOT_NUT
false, // SLOT_DEKU_STICK
false, // SLOT_DEKU_NUT
false, // SLOT_MAGIC_BEANS
true, // SLOT_TRADE_KEY_MAMA
true, // SLOT_POWDER_KEG
true, // SLOT_PICTO_BOX
true, // SLOT_LENS
true, // SLOT_PICTOGRAPH_BOX
true, // SLOT_LENS_OF_TRUTH
false, // SLOT_HOOKSHOT
false, // SLOT_SWORD_GREAT_FAIRY
true, // SLOT_TRADE_COUPLE
@ -80,13 +80,13 @@ u8 gPlayerFormSlotRestrictions[PLAYER_FORM_MAX][ITEM_NUM_SLOTS] = {
true, // SLOT_TRADE_DEED
false, // SLOT_BOMB
false, // SLOT_BOMBCHU
false, // SLOT_STICK
false, // SLOT_NUT
false, // SLOT_DEKU_STICK
false, // SLOT_DEKU_NUT
false, // SLOT_MAGIC_BEANS
true, // SLOT_TRADE_KEY_MAMA
false, // SLOT_POWDER_KEG
true, // SLOT_PICTO_BOX
true, // SLOT_LENS
true, // SLOT_PICTOGRAPH_BOX
true, // SLOT_LENS_OF_TRUTH
false, // SLOT_HOOKSHOT
false, // SLOT_SWORD_GREAT_FAIRY
true, // SLOT_TRADE_COUPLE
@ -107,13 +107,13 @@ u8 gPlayerFormSlotRestrictions[PLAYER_FORM_MAX][ITEM_NUM_SLOTS] = {
true, // SLOT_TRADE_DEED
false, // SLOT_BOMB
false, // SLOT_BOMBCHU
false, // SLOT_STICK
true, // SLOT_NUT
false, // SLOT_DEKU_STICK
true, // SLOT_DEKU_NUT
false, // SLOT_MAGIC_BEANS
true, // SLOT_TRADE_KEY_MAMA
false, // SLOT_POWDER_KEG
true, // SLOT_PICTO_BOX
true, // SLOT_LENS
true, // SLOT_PICTOGRAPH_BOX
true, // SLOT_LENS_OF_TRUTH
false, // SLOT_HOOKSHOT
false, // SLOT_SWORD_GREAT_FAIRY
true, // SLOT_TRADE_COUPLE
@ -134,13 +134,13 @@ u8 gPlayerFormSlotRestrictions[PLAYER_FORM_MAX][ITEM_NUM_SLOTS] = {
true, // SLOT_TRADE_DEED
true, // SLOT_BOMB
true, // SLOT_BOMBCHU
true, // SLOT_STICK
true, // SLOT_NUT
true, // SLOT_DEKU_STICK
true, // SLOT_DEKU_NUT
true, // SLOT_MAGIC_BEANS
true, // SLOT_TRADE_KEY_MAMA
false, // SLOT_POWDER_KEG
true, // SLOT_PICTO_BOX
true, // SLOT_LENS
true, // SLOT_PICTOGRAPH_BOX
true, // SLOT_LENS_OF_TRUTH
true, // SLOT_HOOKSHOT
true, // SLOT_SWORD_GREAT_FAIRY
true, // SLOT_TRADE_COUPLE
@ -157,22 +157,22 @@ s16 sAmmoRectLeft[] = {
95, // SLOT_BOW
62, // SLOT_BOMB
95, // SLOT_BOMBCHU
128, // SLOT_STICK
161, // SLOT_NUT
128, // SLOT_DEKU_STICK
161, // SLOT_DEKU_NUT
194, // SLOT_MAGIC_BEANS
62, // SLOT_POWDER_KEG
95, // SLOT_PICTO_BOX
95, // SLOT_PICTOGRAPH_BOX
};
s16 sAmmoRectHeight[] = {
85, // SLOT_BOW
117, // SLOT_BOMB
117, // SLOT_BOMBCHU
117, // SLOT_STICK
117, // SLOT_NUT
117, // SLOT_DEKU_STICK
117, // SLOT_DEKU_NUT
117, // SLOT_MAGIC_BEANS
150, // SLOT_POWDER_KEG
150, // SLOT_PICTO_BOX
150, // SLOT_PICTOGRAPH_BOX
};
void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, s16 item, u16 ammoIndex) {
@ -181,7 +181,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
OPEN_DISPS(gfxCtx);
if (item == ITEM_PICTO_BOX) {
if (item == ITEM_PICTOGRAPH_BOX) {
if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) {
ammo = 0;
} else {
@ -204,10 +204,10 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 130, 130, 130, pauseCtx->alpha);
} else if (((item == ITEM_BOMB) && (AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
((item == ITEM_BOW) && (AMMO(item) == CUR_CAPACITY(UPG_QUIVER))) ||
((item == ITEM_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_STICKS))) ||
((item == ITEM_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_NUTS))) ||
((item == ITEM_DEKU_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_DEKU_STICKS))) ||
((item == ITEM_DEKU_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_DEKU_NUTS))) ||
((item == ITEM_BOMBCHU) && (AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
((item == ITEM_POWDER_KEG) && (ammo == 1)) || ((item == ITEM_PICTO_BOX) && (ammo == 1)) ||
((item == ITEM_POWDER_KEG) && (ammo == 1)) || ((item == ITEM_PICTOGRAPH_BOX) && (ammo == 1)) ||
((item == ITEM_MAGIC_BEANS) && (ammo == 20))) {
// Ammo at capacity
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 120, 255, 0, pauseCtx->alpha);
@ -725,7 +725,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
sEquipMagicArrowBowSlotHoldTimer--;
if (sEquipMagicArrowBowSlotHoldTimer == 0) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
sEquipAnimTimer = 6;
pauseCtx->equipAnimScale = 320;
@ -802,9 +802,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT);
@ -819,9 +819,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT);
@ -837,19 +837,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
// Special case for magic arrows
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) == ITEM_BOW) ||
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_ARROW_LIGHT)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT);
C_SLOT_EQUIP(0, EQUIP_SLOT_C_DOWN) = C_SLOT_EQUIP(0, EQUIP_SLOT_C_LEFT);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_DOWN);
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT);
C_SLOT_EQUIP(0, EQUIP_SLOT_C_RIGHT) = C_SLOT_EQUIP(0, EQUIP_SLOT_C_LEFT);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_RIGHT);
@ -866,9 +866,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN);
@ -883,9 +883,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN);
@ -901,18 +901,18 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
// Special case for magic arrows
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) == ITEM_BOW) ||
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_ARROW_LIGHT)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_LEFT);
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_RIGHT);
}
@ -928,9 +928,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT);
@ -945,9 +945,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8) &&
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) == ITEM_BOW) ||
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) >= ITEM_BOW_ARROW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
(((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) >= ITEM_BOW_FIRE) &&
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) & 0xFF) <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT);
@ -963,18 +963,18 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
// Special case for magic arrows
if ((pauseCtx->equipTargetItem >= 0xB5) && (pauseCtx->equipTargetItem < 0xB8)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) == ITEM_BOW) ||
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_ARROW_LIGHT)) {
if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_LEFT);
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_ARROW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) >= ITEM_BOW_FIRE) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT);
Interface_LoadItemIcon(play, EQUIP_SLOT_C_DOWN);
}

2
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c
View File

@ -647,7 +647,7 @@ void KaleidoScope_UpdateMaskEquip(PlayState* play) {
sMaskEquipMagicArrowBowSlotHoldTimer--;
if (sMaskEquipMagicArrowBowSlotHoldTimer == 0) {
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_ARROW_FIRE;
pauseCtx->equipTargetItem -= 0xB5 - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
sMaskEquipAnimTimer = 6;
pauseCtx->equipAnimScale = 320;

2
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
View File

@ -2857,7 +2857,7 @@ void KaleidoScope_Update(PlayState* play) {
gSegments[0x08] = VIRTUAL_TO_PHYSICAL(pauseCtx->iconItemSegment);
for (itemId = 0; itemId <= ITEM_BOW_ARROW_FIRE; itemId++) {
for (itemId = 0; itemId <= ITEM_BOW_FIRE; itemId++) {
if (!gPlayerFormItemRestrictions[(void)0, gSaveContext.save.playerForm][(s32)itemId]) {
KaleidoScope_GrayOutTextureRGBA32(Lib_SegmentedToVirtual(gItemIcons[(s32)itemId]), 0x400);
}

64
tools/gitable.py
View File

@ -13,7 +13,7 @@ GETITEMENTRY_LENGTH = struct.calcsize(GETITEMENTRY_FORMAT)
# MM US: 0x2E964
itemId_names = {
0x00: "ITEM_OCARINA",
0x00: "ITEM_OCARINA_OF_TIME",
0x01: "ITEM_BOW",
0x02: "ITEM_ARROW_FIRE",
0x03: "ITEM_ARROW_ICE",
@ -21,13 +21,13 @@ itemId_names = {
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",
@ -87,9 +87,9 @@ itemId_names = {
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",
@ -132,8 +132,8 @@ itemId_names = {
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",
@ -150,10 +150,10 @@ itemId_names = {
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",
@ -166,10 +166,10 @@ itemId_names = {
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",
@ -198,15 +198,15 @@ getItemId_names = {
0x0A: "GI_RECOVERY_HEART",
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",
0x11: "GI_STRAY_FAIRY",
0x14: "GI_BOMBS_1",
0x15: "GI_BOMBS_5",
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",
@ -221,9 +221,9 @@ getItemId_names = {
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",
0x2E: "GI_BOMBCHUS_20",
0x32: "GI_SHIELD_HERO",
0x33: "GI_SHIELD_MIRROR",
@ -241,9 +241,9 @@ getItemId_names = {
0x3F: "GI_COMPASS",
0x40: "GI_40",
0x41: "GI_HOOKSHOT",
0x42: "GI_LENS",
0x43: "GI_PICTO_BOX",
0x4C: "GI_OCARINA",
0x42: "GI_LENS_OF_TRUTH",
0x43: "GI_PICTOGRAPH_BOX",
0x4C: "GI_OCARINA_OF_TIME",
0x50: "GI_BOMBERS_NOTEBOOK",
0x52: "GI_SKULL_TOKEN",
0x55: "GI_REMAINS_ODOLWA",
@ -354,7 +354,7 @@ getItemDrawId_names = {
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",
@ -363,10 +363,10 @@ getItemDrawId_names = {
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",
@ -453,7 +453,7 @@ getItemDrawId_names = {
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",
-1: "GID_NONE",

10
tools/namefixer.py
View File

@ -1147,7 +1147,7 @@ wordReplace = {
"EXCH_ITEM_MINUS1": "PLAYER_IA_MINUS1",
"EXCH_ITEM_NONE": "PLAYER_IA_NONE",
"EXCH_ITEM_PICTO_BOX": "PLAYER_IA_PICTO_BOX",
"EXCH_ITEM_PICTO_BOX": "PLAYER_IA_PICTOGRAPH_BOX",
"EXCH_ITEM_1E": "PLAYER_IA_BOTTLE_MUSHROOM",
"EXCH_ITEM_MOON_TEAR": "PLAYER_IA_MOONS_TEAR",
"EXCH_ITEM_DEED_LAND": "PLAYER_IA_DEED_LAND",
@ -1159,6 +1159,14 @@ wordReplace = {
"EXCH_ITEM_DEED_OCEAN": "PLAYER_IA_DEED_OCEAN",
"EXCH_ITEM_LETTER_MAMA": "PLAYER_IA_LETTER_MAMA",
"ITEM_FISHING_POLE": "ITEM_FISHING_ROD",
"ITEM_OCARINA": "ITEM_OCARINA_OF_TIME",
"ITEM_STICK": "ITEM_DEKU_STICK",
"ITEM_NUT": "ITEM_DEKU_NUT",
"ITEM_PICTO_BOX": "ITEM_PICTOGRAPH_BOX",
"ITEM_LENS": "ITEM_LENS_OF_TRUTH",
"ITEM_MAGIC_SMALL": "ITEM_MAGIC_JAR_SMALL",
"ITEM_MAGIC_LARGE": "ITEM_MAGIC_JAR_BIG",
"ITEM_MOON_TEAR": "ITEM_MOONS_TEAR",
"PLAYER_AP_FISHING_POLE": "PLAYER_IA_FISHING_ROD",
"PLAYER_IA_BOTTLE": "PLAYER_IA_BOTTLE_EMPTY",