falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`icon_item_static` and `icon_item_24_static` documented (#1297) 

* extract_archives.py

* autogenerated xmls

* build OK

* cleanup

* Use symbols in gItemIcons

* change how archives are generated

* makeyar in C

* Rename segments

* rename .archive.o to .yar.o

* Explanation at the top of programs

* fix progress calculation

* Ignore archives in progress script

* merge

* document icon items

* cleanup

* remove duplicate headers

* jap -> jpn

* PR review

* link human

* PR Review

* missed some

---------

Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
engineer124 2023-06-24 00:57:01 +10:00 committed by GitHub
parent 11dac8d020
commit aa9e368561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 499 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
assets/xml/archives/icon_item_24_static.xml
View File

@ -1,18 +1,21 @@
<Root> <Root>
<File Name="icon_item_24_static_yar.unarchive" Segment="9"> <File Name="icon_item_24_static_yar.unarchive" Segment="9">
<Blob Name="icon_item_24_static_yar_Blob_000000" Size="0x0900" Offset="0x0" /> <Texture Name="gQuestIconGoldSkulltulaTex" OutName="gold_skulltula_icon" Format="rgba32" Width="24" Height="24" Offset="0x0" />
<Blob Name="icon_item_24_static_yar_Blob_000900" Size="0x0900" Offset="0x900" /> <Texture Name="gQuestIconHeartContainerTex" OutName="heart_container_icon" Format="rgba32" Width="24" Height="24" Offset="0x900" />
<Blob Name="icon_item_24_static_yar_Blob_001200" Size="0x0900" Offset="0x1200" /> <Texture Name="gQuestIconPieceOfHeartTex" OutName="piece_of_heart_icon" Format="rgba32" Width="24" Height="24" Offset="0x1200" />
<Blob Name="icon_item_24_static_yar_Blob_001B00" Size="0x0900" Offset="0x1B00" /> <!-- Identical to gQuestIconPieceOfHeartTex -->
<Blob Name="icon_item_24_static_yar_Blob_002400" Size="0x0900" Offset="0x2400" /> <Texture Name="gQuestIconPieceOfHeart2Tex" OutName="piece_of_heart_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x1B00" />
<Blob Name="icon_item_24_static_yar_Blob_002D00" Size="0x0900" Offset="0x2D00" /> <!-- Both identical to gQuestIconHeartContainerTex -->
<Blob Name="icon_item_24_static_yar_Blob_003600" Size="0x0900" Offset="0x3600" /> <Texture Name="gQuestIconHeartContainer2Tex" OutName="heart_container_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x2400" />
<Blob Name="icon_item_24_static_yar_Blob_003F00" Size="0x0900" Offset="0x3F00" /> <Texture Name="gQuestIconHeartContainer3Tex" OutName="heart_container_3_icon" Format="rgba32" Width="24" Height="24" Offset="0x2D00" />
<Blob Name="icon_item_24_static_yar_Blob_004800" Size="0x0900" Offset="0x4800" /> <Texture Name="gQuestIconBossKeyTex" OutName="boss_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x3600" />
<Blob Name="icon_item_24_static_yar_Blob_005100" Size="0x0900" Offset="0x5100" /> <Texture Name="gQuestIconCompassTex" OutName="compass_icon" Format="rgba32" Width="24" Height="24" Offset="0x3F00" />
<Blob Name="icon_item_24_static_yar_Blob_005A00" Size="0x0900" Offset="0x5A00" /> <Texture Name="gQuestIconDungeonMapTex" OutName="dungeon_map_icon" Format="rgba32" Width="24" Height="24" Offset="0x4800" />
<Blob Name="icon_item_24_static_yar_Blob_006300" Size="0x0900" Offset="0x6300" /> <!-- Identical to gQuestIconGoldSkulltulaTex -->
<Blob Name="icon_item_24_static_yar_Blob_006C00" Size="0x0900" Offset="0x6C00" /> <Texture Name="gQuestIconGoldSkulltula2Tex" OutName="gold_skulltula_2_icon" Format="rgba32" Width="24" Height="24" Offset="0x5100" />
<Blob Name="icon_item_24_static_yar_Blob_007500" Size="0x0200" Offset="0x7500" /> <Texture Name="gQuestIconSmallMagicJarTex" OutName="small_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6300" />
<Texture Name="gQuestIconSmallKeyTex" OutName="small_key_icon" Format="rgba32" Width="24" Height="24" Offset="0x5A00" />
<Texture Name="gQuestIconBigMagicJarTex" OutName="big_magic_jar_icon" Format="rgba32" Width="24" Height="24" Offset="0x6C00" />
<Texture Name="gQuestIconLinkHumanFaceTex" OutName="link_human_face_icon" Format="rgba16" Width="16" Height="16" Offset="0x7500"/>
</File> </File>
</Root> </Root>

409
assets/xml/archives/icon_item_static.xml
View File

@ -1,194 +1,223 @@
<Root> <Root>
<File Name="icon_item_static_yar.unarchive" Segment="8"> <File Name="icon_item_static_yar.unarchive" Segment="8">
<Blob Name="icon_item_static_yar_Blob_000000" Size="0x1000" Offset="0x0" /> <!-- Item icons -->
<Blob Name="icon_item_static_yar_Blob_001000" Size="0x1000" Offset="0x1000" /> <Texture Name="gItemIconOcarinaOfTimeTex" OutName="ocarina_of_time_icon" Format="rgba32" Width="32" Height="32" Offset="0x0000"/>
<Blob Name="icon_item_static_yar_Blob_002000" Size="0x1000" Offset="0x2000" /> <Texture Name="gItemIconBowTex" OutName="bow_icon" Format="rgba32" Width="32" Height="32" Offset="0x1000"/>
<Blob Name="icon_item_static_yar_Blob_003000" Size="0x1000" Offset="0x3000" /> <Texture Name="gItemIconFireArrowTex" OutName="fire_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x2000" />
<Blob Name="icon_item_static_yar_Blob_004000" Size="0x1000" Offset="0x4000" /> <Texture Name="gItemIconIceArrowTex" OutName="ice_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x3000" />
<Blob Name="icon_item_static_yar_Blob_005000" Size="0x1000" Offset="0x5000" /> <Texture Name="gItemIconLightArrowTex" OutName="light_arrow_icon" Format="rgba32" Width="32" Height="32" Offset="0x4000" />
<Blob Name="icon_item_static_yar_Blob_006000" Size="0x1000" Offset="0x6000" /> <Texture Name="gItemIconFairyOcarinaTex" OutName="fairy_ocarina_icon" Format="rgba32" Width="32" Height="32" Offset="0x5000" />
<Blob Name="icon_item_static_yar_Blob_007000" Size="0x1000" Offset="0x7000" /> <Texture Name="gItemIconBombTex" OutName="bomb_icon" Format="rgba32" Width="32" Height="32" Offset="0x6000" />
<Blob Name="icon_item_static_yar_Blob_008000" Size="0x1000" Offset="0x8000" /> <Texture Name="gItemIconBombchuTex" OutName="bombchu_icon" Format="rgba32" Width="32" Height="32" Offset="0x7000" />
<Blob Name="icon_item_static_yar_Blob_009000" Size="0x1000" Offset="0x9000" /> <Texture Name="gItemIconDekuStickTex" OutName="deku_stick_icon" Format="rgba32" Width="32" Height="32" Offset="0x8000" />
<Blob Name="icon_item_static_yar_Blob_00A000" Size="0x1000" Offset="0xA000" /> <Texture Name="gItemIconDekuNutTex" OutName="deku_nut_icon" Format="rgba32" Width="32" Height="32" Offset="0x9000" />
<Blob Name="icon_item_static_yar_Blob_00B000" Size="0x1000" Offset="0xB000" /> <Texture Name="gItemIconMagicBeansTex" OutName="magic_beans_icon" Format="rgba32" Width="32" Height="32" Offset="0xA000" />
<Blob Name="icon_item_static_yar_Blob_00C000" Size="0x1000" Offset="0xC000" /> <Texture Name="gItemIconSlingshotTex" OutName="slingshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xB000" />
<Blob Name="icon_item_static_yar_Blob_00D000" Size="0x1000" Offset="0xD000" /> <Texture Name="gItemIconPowderKegTex" OutName="powder_keg_icon" Format="rgba32" Width="32" Height="32" Offset="0xC000" />
<Blob Name="icon_item_static_yar_Blob_00E000" Size="0x1000" Offset="0xE000" /> <Texture Name="gItemIconPictoBoxTex" OutName="picto_box_icon" Format="rgba32" Width="32" Height="32" Offset="0xD000" />
<Blob Name="icon_item_static_yar_Blob_00F000" Size="0x1000" Offset="0xF000" /> <Texture Name="gItemIconLensofTruthTex" OutName="lens_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0xE000" />
<Blob Name="icon_item_static_yar_Blob_010000" Size="0x1000" Offset="0x10000" /> <Texture Name="gItemIconHookshotTex" OutName="hookshot_icon" Format="rgba32" Width="32" Height="32" Offset="0xF000" />
<Blob Name="icon_item_static_yar_Blob_011000" Size="0x1000" Offset="0x11000" /> <Texture Name="gItemIconGreatFairysSwordTex" OutName="great_fairys_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x10000" />
<Blob Name="icon_item_static_yar_Blob_012000" Size="0x1000" Offset="0x12000" /> <!-- Visually looks like OoT's Hookshot Icon -->
<Blob Name="icon_item_static_yar_Blob_013000" Size="0x1000" Offset="0x13000" /> <Texture Name="gItemIconLongshotTex" OutName="longshot_icon" Format="rgba32" Width="32" Height="32" Offset="0x11000" />
<Blob Name="icon_item_static_yar_Blob_014000" Size="0x1000" Offset="0x14000" />
<Blob Name="icon_item_static_yar_Blob_015000" Size="0x1000" Offset="0x15000" /> <!-- Bottled item icons -->
<Blob Name="icon_item_static_yar_Blob_016000" Size="0x1000" Offset="0x16000" /> <Texture Name="gItemIconEmptyBottleTex" OutName="empty_bottle_icon" Format="rgba32" Width="32" Height="32" Offset="0x12000" />
<Blob Name="icon_item_static_yar_Blob_017000" Size="0x1000" Offset="0x17000" /> <Texture Name="gItemIconRedPotionTex" OutName="red_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x13000" />
<Blob Name="icon_item_static_yar_Blob_018000" Size="0x1000" Offset="0x18000" /> <Texture Name="gItemIconGreenPotionTex" OutName="green_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x14000" />
<Blob Name="icon_item_static_yar_Blob_019000" Size="0x1000" Offset="0x19000" /> <Texture Name="gItemIconBluePotionTex" OutName="blue_potion_icon" Format="rgba32" Width="32" Height="32" Offset="0x15000" />
<Blob Name="icon_item_static_yar_Blob_01A000" Size="0x1000" Offset="0x1A000" /> <Texture Name="gItemIconBottledFairyTex" OutName="bottled_fairy_icon" Format="rgba32" Width="32" Height="32" Offset="0x16000" />
<Blob Name="icon_item_static_yar_Blob_01B000" Size="0x1000" Offset="0x1B000" /> <Texture Name="gItemIconBottledDekuPrincessTex" OutName="bottled_deku_princess_icon" Format="rgba32" Width="32" Height="32" Offset="0x17000" />
<Blob Name="icon_item_static_yar_Blob_01C000" Size="0x1000" Offset="0x1C000" /> <Texture Name="gItemIconBottledFullMilkTex" OutName="bottled_full_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x18000" />
<Blob Name="icon_item_static_yar_Blob_01D000" Size="0x1000" Offset="0x1D000" /> <Texture Name="gItemIconBottledHalfMilkTex" OutName="bottled_half_milk_icon" Format="rgba32" Width="32" Height="32" Offset="0x19000" />
<Blob Name="icon_item_static_yar_Blob_01E000" Size="0x1000" Offset="0x1E000" /> <Texture Name="gItemIconBottledFishTex" OutName="bottled_fish_icon" Format="rgba32" Width="32" Height="32" Offset="0x1A000" />
<Blob Name="icon_item_static_yar_Blob_01F000" Size="0x1000" Offset="0x1F000" /> <Texture Name="gItemIconBottledBugTex" OutName="bottled_bug_icon" Format="rgba32" Width="32" Height="32" Offset="0x1B000" />
<Blob Name="icon_item_static_yar_Blob_020000" Size="0x1000" Offset="0x20000" /> <Texture Name="gItemIconBottledBlueFireTex" OutName="bottled_blue_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x1C000" />
<Blob Name="icon_item_static_yar_Blob_021000" Size="0x1000" Offset="0x21000" /> <Texture Name="gItemIconBottledPoeTex" OutName="bottled_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1D000" />
<Blob Name="icon_item_static_yar_Blob_022000" Size="0x1000" Offset="0x22000" /> <Texture Name="gItemIconBottledBigPoeTex" OutName="bottled_big_poe_icon" Format="rgba32" Width="32" Height="32" Offset="0x1E000" />
<Blob Name="icon_item_static_yar_Blob_023000" Size="0x1000" Offset="0x23000" /> <Texture Name="gItemIconSpringWaterTex" OutName="spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x1F000" />
<Blob Name="icon_item_static_yar_Blob_024000" Size="0x1000" Offset="0x24000" /> <Texture Name="gItemIconHotSpringWaterTex" OutName="hot_spring_water_icon" Format="rgba32" Width="32" Height="32" Offset="0x20000" />
<Blob Name="icon_item_static_yar_Blob_025000" Size="0x1000" Offset="0x25000" /> <Texture Name="gItemIconBottledZoraEggTex" OutName="bottled_zora_egg_icon" Format="rgba32" Width="32" Height="32" Offset="0x21000" />
<Blob Name="icon_item_static_yar_Blob_026000" Size="0x1000" Offset="0x26000" /> <Texture Name="gItemIconBottledGoldDustTex" OutName="bottled_gold_dust_icon" Format="rgba32" Width="32" Height="32" Offset="0x22000" />
<Blob Name="icon_item_static_yar_Blob_027000" Size="0x1000" Offset="0x27000" /> <Texture Name="gItemIconBottledMushroomTex" OutName="bottled_mushroom_icon" Format="rgba32" Width="32" Height="32" Offset="0x23000" />
<Blob Name="icon_item_static_yar_Blob_028000" Size="0x1000" Offset="0x28000" /> <Texture Name="gItemIconBottledSeahorseTex" OutName="bottled_seahorse_icon" Format="rgba32" Width="32" Height="32" Offset="0x24000" />
<Blob Name="icon_item_static_yar_Blob_029000" Size="0x1000" Offset="0x29000" /> <Texture Name="gItemIconChateauRomaniTex" OutName="chateau_romani_icon" Format="rgba32" Width="32" Height="32" Offset="0x25000" />
<Blob Name="icon_item_static_yar_Blob_02A000" Size="0x1000" Offset="0x2A000" /> <Texture Name="gItemIconBottledHylianLoachTex" OutName="bottled_hylian_loach_icon" Format="rgba32" Width="32" Height="32" Offset="0x26000" />
<Blob Name="icon_item_static_yar_Blob_02B000" Size="0x1000" Offset="0x2B000" /> <!-- Identical to gItemIconEmptyBottleTex -->
<Blob Name="icon_item_static_yar_Blob_02C000" Size="0x1000" Offset="0x2C000" /> <Texture Name="gItemIconEmptyBottle2Tex" OutName="empty_bottle_2_icon" Format="rgba32" Width="32" Height="32" Offset="0x27000" />
<Blob Name="icon_item_static_yar_Blob_02D000" Size="0x1000" Offset="0x2D000" />
<Blob Name="icon_item_static_yar_Blob_02E000" Size="0x1000" Offset="0x2E000" /> <!-- Trade Quest icons -->
<Blob Name="icon_item_static_yar_Blob_02F000" Size="0x1000" Offset="0x2F000" /> <Texture Name="gItemIconLandDeedTex" OutName="land_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x29000" />
<Blob Name="icon_item_static_yar_Blob_030000" Size="0x1000" Offset="0x30000" /> <Texture Name="gItemIconMoonsTearTex" OutName="moons_tear_icon" Format="rgba32" Width="32" Height="32" Offset="0x28000" />
<Blob Name="icon_item_static_yar_Blob_031000" Size="0x1000" Offset="0x31000" /> <Texture Name="gItemIconSwampDeedTex" OutName="swamp_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2A000" />
<Blob Name="icon_item_static_yar_Blob_032000" Size="0x1000" Offset="0x32000" /> <Texture Name="gItemIconMountainDeedTex" OutName="mountain_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2B000" />
<Blob Name="icon_item_static_yar_Blob_033000" Size="0x1000" Offset="0x33000" /> <Texture Name="gItemIconOceanDeedTex" OutName="ocean_deed_icon" Format="rgba32" Width="32" Height="32" Offset="0x2C000" />
<Blob Name="icon_item_static_yar_Blob_034000" Size="0x1000" Offset="0x34000" /> <Texture Name="gItemIconRoomKeyTex" OutName="room_key_icon" Format="rgba32" Width="32" Height="32" Offset="0x2D000" />
<Blob Name="icon_item_static_yar_Blob_035000" Size="0x1000" Offset="0x35000" /> <Texture Name="gItemIconLetterToMamaTex" OutName="letter_to_mama_icon" Format="rgba32" Width="32" Height="32" Offset="0x2E000" />
<Blob Name="icon_item_static_yar_Blob_036000" Size="0x1000" Offset="0x36000" /> <Texture Name="gItemIconLetterToKafeiTex" OutName="letter_to_kafei_icon" Format="rgba32" Width="32" Height="32" Offset="0x2F000" />
<Blob Name="icon_item_static_yar_Blob_037000" Size="0x1000" Offset="0x37000" /> <Texture Name="gItemIconPendantOfMemoriesTex" OutName="pendant_of_memories_icon" Format="rgba32" Width="32" Height="32" Offset="0x30000" />
<Blob Name="icon_item_static_yar_Blob_038000" Size="0x1000" Offset="0x38000" />
<Blob Name="icon_item_static_yar_Blob_039000" Size="0x1000" Offset="0x39000" /> <Texture Name="gItemIconTingleMapTex" OutName="tingle_map_icon" Format="rgba32" Width="32" Height="32" Offset="0x31000" />
<Blob Name="icon_item_static_yar_Blob_03A000" Size="0x1000" Offset="0x3A000" />
<Blob Name="icon_item_static_yar_Blob_03B000" Size="0x1000" Offset="0x3B000" /> <!-- Mask icons -->
<Blob Name="icon_item_static_yar_Blob_03C000" Size="0x1000" Offset="0x3C000" /> <Texture Name="gItemIconDekuMaskTex" OutName="deku_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x32000" />
<Blob Name="icon_item_static_yar_Blob_03D000" Size="0x1000" Offset="0x3D000" /> <Texture Name="gItemIconGoronMaskTex" OutName="goron_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x33000" />
<Blob Name="icon_item_static_yar_Blob_03E000" Size="0x1000" Offset="0x3E000" /> <Texture Name="gItemIconZoraMaskTex" OutName="zora_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x34000" />
<Blob Name="icon_item_static_yar_Blob_03F000" Size="0x1000" Offset="0x3F000" /> <Texture Name="gItemIconFierceDeityMaskTex" OutName="fierce_deity_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x35000" />
<Blob Name="icon_item_static_yar_Blob_040000" Size="0x1000" Offset="0x40000" /> <Texture Name="gItemIconMaskOfTruthTex" OutName="mask_of_truth_icon" Format="rgba32" Width="32" Height="32" Offset="0x36000" />
<Blob Name="icon_item_static_yar_Blob_041000" Size="0x1000" Offset="0x41000" /> <Texture Name="gItemIconKafeisMaskTex" OutName="kafeis_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x37000" />
<Blob Name="icon_item_static_yar_Blob_042000" Size="0x1000" Offset="0x42000" /> <Texture Name="gItemIconAllNightMaskTex" OutName="all_night_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x38000" />
<Blob Name="icon_item_static_yar_Blob_043000" Size="0x1000" Offset="0x43000" /> <Texture Name="gItemIconBunnyHoodTex" OutName="bunny_hood_icon" Format="rgba32" Width="32" Height="32" Offset="0x39000" />
<Blob Name="icon_item_static_yar_Blob_044000" Size="0x1000" Offset="0x44000" /> <Texture Name="gItemIconKeatonMaskTex" OutName="keaton_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3A000" />
<Blob Name="icon_item_static_yar_Blob_045000" Size="0x1000" Offset="0x45000" /> <Texture Name="gItemIconGaroMaskTex" OutName="garo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3B000" />
<Blob Name="icon_item_static_yar_Blob_046000" Size="0x1000" Offset="0x46000" /> <Texture Name="gItemIconRomaniMaskTex" OutName="romani_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3C000" />
<Blob Name="icon_item_static_yar_Blob_047000" Size="0x1000" Offset="0x47000" /> <Texture Name="gItemIconCircusLeaderMaskTex" OutName="circus_leader_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3D000" />
<Blob Name="icon_item_static_yar_Blob_048000" Size="0x1000" Offset="0x48000" /> <Texture Name="gItemIconPostmansHatTex" OutName="postmans_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x3E000" />
<Blob Name="icon_item_static_yar_Blob_049000" Size="0x1000" Offset="0x49000" /> <Texture Name="gItemIconCouplesMaskTex" OutName="couples_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x3F000" />
<Blob Name="icon_item_static_yar_Blob_04A000" Size="0x1000" Offset="0x4A000" /> <Texture Name="gItemIconGreatFairyMaskTex" OutName="great_fairy_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x40000" />
<Blob Name="icon_item_static_yar_Blob_04B000" Size="0x1000" Offset="0x4B000" /> <Texture Name="gItemIconGibdoMaskTex" OutName="gibdo_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x41000" />
<Blob Name="icon_item_static_yar_Blob_04C000" Size="0x1000" Offset="0x4C000" /> <Texture Name="gItemIconDonGeroMaskTex" OutName="don_gero_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x42000" />
<Blob Name="icon_item_static_yar_Blob_04D000" Size="0x1000" Offset="0x4D000" /> <Texture Name="gItemIconKamaroMaskTex" OutName="kamaro_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x43000" />
<Blob Name="icon_item_static_yar_Blob_04E000" Size="0x1000" Offset="0x4E000" /> <Texture Name="gItemIconCaptainsHatTex" OutName="captains_hat_icon" Format="rgba32" Width="32" Height="32" Offset="0x44000" />
<Blob Name="icon_item_static_yar_Blob_04F000" Size="0x1000" Offset="0x4F000" /> <Texture Name="gItemIconStoneMaskTex" OutName="stone_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x45000" />
<Blob Name="icon_item_static_yar_Blob_050000" Size="0x1000" Offset="0x50000" /> <Texture Name="gItemIconBremenMaskTex" OutName="bremen_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x46000" />
<Blob Name="icon_item_static_yar_Blob_051000" Size="0x1000" Offset="0x51000" /> <Texture Name="gItemIconBlastMaskTex" OutName="blast_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x47000" />
<Blob Name="icon_item_static_yar_Blob_052000" Size="0x1000" Offset="0x52000" /> <Texture Name="gItemIconMaskOfScentsTex" OutName="mask_of_scents_icon" Format="rgba32" Width="32" Height="32" Offset="0x48000" />
<Blob Name="icon_item_static_yar_Blob_053000" Size="0x1000" Offset="0x53000" /> <Texture Name="gItemIconGiantsMaskTex" OutName="giants_mask_icon" Format="rgba32" Width="32" Height="32" Offset="0x49000" />
<Blob Name="icon_item_static_yar_Blob_054000" Size="0x1000" Offset="0x54000" />
<Blob Name="icon_item_static_yar_Blob_055000" Size="0x1000" Offset="0x55000" /> <!-- Upgrads/Misc icons -->
<Blob Name="icon_item_static_yar_Blob_056000" Size="0x1000" Offset="0x56000" /> <Texture Name="gItemIconBowFireTex" OutName="bow_fire_icon" Format="rgba32" Width="32" Height="32" Offset="0x4A000" />
<Blob Name="icon_item_static_yar_Blob_057000" Size="0x1000" Offset="0x57000" /> <Texture Name="gItemIconBowIceTex" OutName="bow_ice_icon" Format="rgba32" Width="32" Height="32" Offset="0x4B000" />
<Blob Name="icon_item_static_yar_Blob_058000" Size="0x1000" Offset="0x58000" /> <Texture Name="gItemIconBowLightTex" OutName="bow_light_icon" Format="rgba32" Width="32" Height="32" Offset="0x4C000" />
<Blob Name="icon_item_static_yar_Blob_059000" Size="0x1000" Offset="0x59000" /> <Texture Name="gItemIconKokiriSwordTex" OutName="kokiri_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4D000" />
<Blob Name="icon_item_static_yar_Blob_05A000" Size="0x1000" Offset="0x5A000" /> <Texture Name="gItemIconRazorSwordTex" OutName="razor_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4E000" />
<Blob Name="icon_item_static_yar_Blob_05B000" Size="0x1000" Offset="0x5B000" /> <Texture Name="gItemIconGildedSwordTex" OutName="gilded_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x4F000" />
<Blob Name="icon_item_static_yar_Blob_05C000" Size="0x1000" Offset="0x5C000" /> <Texture Name="gItemIconFierceDeitySwordTex" OutName="fierce_deity_sword_icon" Format="rgba32" Width="32" Height="32" Offset="0x50000" />
<Blob Name="icon_item_static_yar_Blob_05D000" Size="0x1000" Offset="0x5D000" /> <Texture Name="gItemIconHerosShieldTex" OutName="heros_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x51000" />
<Blob Name="icon_item_static_yar_Blob_05E000" Size="0x1000" Offset="0x5E000" /> <Texture Name="gItemIconMirrorShieldTex" OutName="mirror_shield_icon" Format="rgba32" Width="32" Height="32" Offset="0x52000" />
<Blob Name="icon_item_static_yar_Blob_05F000" Size="0x1000" Offset="0x5F000" /> <Texture Name="gItemIconQuiver30Tex" OutName="quiver_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x53000" />
<Blob Name="icon_item_static_yar_Blob_060000" Size="0x1000" Offset="0x60000" /> <Texture Name="gItemIconQuiver40Tex" OutName="quiver_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x54000" />
<Blob Name="icon_item_static_yar_Blob_061000" Size="0x1000" Offset="0x61000" /> <Texture Name="gItemIconQuiver50Tex" OutName="quiver_50_icon" Format="rgba32" Width="32" Height="32" Offset="0x55000" />
<Blob Name="icon_item_static_yar_Blob_062000" Size="0x0180" Offset="0x62000" /> <Texture Name="gItemIconBombBag20Tex" OutName="bomb_bag_20_icon" Format="rgba32" Width="32" Height="32" Offset="0x56000" />
<Blob Name="icon_item_static_yar_Blob_062180" Size="0x0900" Offset="0x62180" /> <Texture Name="gItemIconBombBag30Tex" OutName="bomb_bag_30_icon" Format="rgba32" Width="32" Height="32" Offset="0x57000" />
<Blob Name="icon_item_static_yar_Blob_062A80" Size="0x0900" Offset="0x62A80" /> <Texture Name="gItemIconBombBag40Tex" OutName="bomb_bag_40_icon" Format="rgba32" Width="32" Height="32" Offset="0x58000" />
<Blob Name="icon_item_static_yar_Blob_063380" Size="0x0900" Offset="0x63380" /> <Texture Name="gItemIconDefaultWalletTex" OutName="default_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x59000" />
<Blob Name="icon_item_static_yar_Blob_063C80" Size="0x0480" Offset="0x63C80" /> <Texture Name="gItemIconAdultsWalletTex" OutName="adults_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5A000" />
<Blob Name="icon_item_static_yar_Blob_064100" Size="0x0240" Offset="0x64100" /> <Texture Name="gItemIconGiantsWalletTex" OutName="giants_wallet_icon" Format="rgba32" Width="32" Height="32" Offset="0x5B000" />
<Blob Name="icon_item_static_yar_Blob_064340" Size="0x0100" Offset="0x64340" /> <Texture Name="gItemIconFishingRodTex" OutName="fishing_rod_icon" Format="rgba32" Width="32" Height="32" Offset="0x5C000" />
<Blob Name="icon_item_static_yar_Blob_064440" Size="0x0A00" Offset="0x64440" /> <Texture Name="gItemIconOdolwasRemainsTex" OutName="odolwas_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5D000" />
<Blob Name="icon_item_static_yar_Blob_064E40" Size="0x0A00" Offset="0x64E40" /> <Texture Name="gItemIconGohtsRemainsTex" OutName="gohts_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5E000" />
<Blob Name="icon_item_static_yar_Blob_065840" Size="0x0A00" Offset="0x65840" /> <Texture Name="gItemIconGyorgsRemainsTex" OutName="gyorgs_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x5F000" />
<Blob Name="icon_item_static_yar_Blob_066240" Size="0x0A00" Offset="0x66240" /> <Texture Name="gItemIconTwinmoldsRemainsTex" OutName="twinmolds_remains_icon" Format="rgba32" Width="32" Height="32" Offset="0x60000" />
<Blob Name="icon_item_static_yar_Blob_066C40" Size="0x0A00" Offset="0x66C40" /> <Texture Name="gItemIconBombersNotebookTex" OutName="bombers_notebook_icon" Format="rgba32" Width="32" Height="32" Offset="0x61000" />
<Blob Name="icon_item_static_yar_Blob_067640" Size="0x0A00" Offset="0x67640" />
<Blob Name="icon_item_static_yar_Blob_068040" Size="0x0A00" Offset="0x68040" /> <!-- ia8 icons -->
<Blob Name="icon_item_static_yar_Blob_068A40" Size="0x0A00" Offset="0x68A40" /> <Texture Name="gItemIconSongNoteTex" OutName="song_note_icon" Format="ia8" Width="16" Height="24" Offset="0x62000" />
<Blob Name="icon_item_static_yar_Blob_069440" Size="0x0A00" Offset="0x69440" /> <Texture Name="gItemIconHeartPiece1Tex" OutName="heart_piece_icon_1" Format="ia8" Width="48" Height="48" Offset="0x62180" />
<Blob Name="icon_item_static_yar_Blob_069E40" Size="0x0A00" Offset="0x69E40" /> <Texture Name="gItemIconHeartPiece2Tex" OutName="heart_piece_icon_2" Format="ia8" Width="48" Height="48" Offset="0x62A80" />
<Blob Name="icon_item_static_yar_Blob_06A840" Size="0x0A00" Offset="0x6A840" /> <Texture Name="gItemIconHeartPiece3Tex" OutName="heart_piece_icon_3" Format="ia8" Width="48" Height="48" Offset="0x63380" />
<Blob Name="icon_item_static_yar_Blob_06B240" Size="0x0A00" Offset="0x6B240" />
<Blob Name="icon_item_static_yar_Blob_06BC40" Size="0x0A00" Offset="0x6BC40" /> <!-- Cursors -->
<Blob Name="icon_item_static_yar_Blob_06C640" Size="0x0A00" Offset="0x6C640" /> <Texture Name="gPausePromptCursorTex" OutName="pause_prompt_cursor" Format="i4" Width="48" Height="48" Offset="0x63C80"/>
<Blob Name="icon_item_static_yar_Blob_06D040" Size="0x0A00" Offset="0x6D040" /> <Texture Name="gPauseUnusedCursorTex" OutName="pause_unused_cursor" Format="i8" Width="24" Height="24" Offset="0x64100"/>
<Blob Name="icon_item_static_yar_Blob_06DA40" Size="0x0A00" Offset="0x6DA40" /> <Texture Name="gPauseMenuCursorTex" OutName="pause_menu_cursor" Format="ia8" Width="16" Height="16" Offset="0x64340" />
<Blob Name="icon_item_static_yar_Blob_06E440" Size="0x0A00" Offset="0x6E440" />
<Blob Name="icon_item_static_yar_Blob_06EE40" Size="0x0A00" Offset="0x6EE40" /> <!-- Divided Background Menu: First Row -->
<Blob Name="icon_item_static_yar_Blob_06F840" Size="0x0A00" Offset="0x6F840" /> <Texture Name="gPauseMasks00Tex" OutName="pause_masks_0_0" Format="ia8" Width="80" Height="32" Offset="0x64440" />
<Blob Name="icon_item_static_yar_Blob_070240" Size="0x0A00" Offset="0x70240" /> <Texture Name="gPauseMasks10JPNTex" OutName="pause_masks_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x64E40" />
<Blob Name="icon_item_static_yar_Blob_070C40" Size="0x0A00" Offset="0x70C40" /> <Texture Name="gPauseMasks20Tex" OutName="pause_masks_2_0" Format="ia8" Width="80" Height="32" Offset="0x65840" />
<Blob Name="icon_item_static_yar_Blob_071640" Size="0x0A00" Offset="0x71640" /> <Texture Name="gPauseSelectItem00JPNTex" OutName="pause_select_item_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66240" />
<Blob Name="icon_item_static_yar_Blob_072040" Size="0x0A00" Offset="0x72040" /> <Texture Name="gPauseSelectItem10JPNTex" OutName="pause_select_item_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x66C40" />
<Blob Name="icon_item_static_yar_Blob_072A40" Size="0x0A00" Offset="0x72A40" /> <Texture Name="gPauseSelectItem20JPNTex" OutName="pause_select_item_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x67640" />
<Blob Name="icon_item_static_yar_Blob_073440" Size="0x0A00" Offset="0x73440" /> <Texture Name="gPauseMap00Tex" OutName="pause_map_0_0" Format="ia8" Width="80" Height="32" Offset="0x68040" />
<Blob Name="icon_item_static_yar_Blob_073E40" Size="0x0A00" Offset="0x73E40" /> <Texture Name="gPauseMap10JPNTex" OutName="pause_map_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x68A40" />
<Blob Name="icon_item_static_yar_Blob_074840" Size="0x0A00" Offset="0x74840" /> <Texture Name="gPauseMap20Tex" OutName="pause_map_2_0" Format="ia8" Width="80" Height="32" Offset="0x69440" />
<Blob Name="icon_item_static_yar_Blob_075240" Size="0x0A00" Offset="0x75240" /> <Texture Name="gPauseQuestStatus00JPNTex" OutName="pause_quest_status_0_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x69E40" />
<Blob Name="icon_item_static_yar_Blob_075C40" Size="0x0A00" Offset="0x75C40" /> <Texture Name="gPauseQuestStatus10JPNTex" OutName="pause_quest_status_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6A840" />
<Blob Name="icon_item_static_yar_Blob_076640" Size="0x0A00" Offset="0x76640" /> <Texture Name="gPauseQuestStatus20JPNTex" OutName="pause_quest_status_2_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6B240" />
<Blob Name="icon_item_static_yar_Blob_077040" Size="0x0A00" Offset="0x77040" /> <Texture Name="gPauseSave00Tex" OutName="pause_save_0_0" Format="ia8" Width="80" Height="32" Offset="0x6BC40" />
<Blob Name="icon_item_static_yar_Blob_077A40" Size="0x0A00" Offset="0x77A40" /> <Texture Name="gPauseSave10JPNTex" OutName="pause_save_1_0_jpn" Format="ia8" Width="80" Height="32" Offset="0x6C640" />
<Blob Name="icon_item_static_yar_Blob_078440" Size="0x0A00" Offset="0x78440" /> <Texture Name="gPauseSave20Tex" OutName="pause_save_2_0" Format="ia8" Width="80" Height="32" Offset="0x6D040" />
<Blob Name="icon_item_static_yar_Blob_078E40" Size="0x0A00" Offset="0x78E40" /> <Texture Name="gPauseGameOver10Tex" OutName="pause_game_over_1_0" Format="ia8" Width="80" Height="32" Offset="0x6DA40" />
<Blob Name="icon_item_static_yar_Blob_079840" Size="0x0A00" Offset="0x79840" />
<Blob Name="icon_item_static_yar_Blob_07A240" Size="0x0A00" Offset="0x7A240" /> <!-- Divided Background Menu: Second Row -->
<Blob Name="icon_item_static_yar_Blob_07AC40" Size="0x0A00" Offset="0x7AC40" /> <Texture Name="gPauseMasks01Tex" OutName="pause_masks_0_1" Format="ia8" Width="80" Height="32" Offset="0x6E440" />
<Blob Name="icon_item_static_yar_Blob_07B640" Size="0x0A00" Offset="0x7B640" /> <Texture Name="gPauseMasks11Tex" OutName="pause_masks_1_1" Format="ia8" Width="80" Height="32" Offset="0x6EE40" />
<Blob Name="icon_item_static_yar_Blob_07C040" Size="0x0A00" Offset="0x7C040" /> <Texture Name="gPauseMasks21Tex" OutName="pause_masks_2_1" Format="ia8" Width="80" Height="32" Offset="0x6F840" />
<Blob Name="icon_item_static_yar_Blob_07CA40" Size="0x0A00" Offset="0x7CA40" /> <Texture Name="gPauseSelectItem01Tex" OutName="pause_select_item_0_1" Format="ia8" Width="80" Height="32" Offset="0x70240" />
<Blob Name="icon_item_static_yar_Blob_07D440" Size="0x0A00" Offset="0x7D440" /> <Texture Name="gPauseSelectItem11Tex" OutName="pause_select_item_1_1" Format="ia8" Width="80" Height="32" Offset="0x70C40" />
<Blob Name="icon_item_static_yar_Blob_07DE40" Size="0x0A00" Offset="0x7DE40" /> <Texture Name="gPauseSelectItem21Tex" OutName="pause_select_item_2_1" Format="ia8" Width="80" Height="32" Offset="0x71640" />
<Blob Name="icon_item_static_yar_Blob_07E840" Size="0x0A00" Offset="0x7E840" /> <Texture Name="gPauseMap01Tex" OutName="pause_map_0_1" Format="ia8" Width="80" Height="32" Offset="0x72040" />
<Blob Name="icon_item_static_yar_Blob_07F240" Size="0x0A00" Offset="0x7F240" /> <Texture Name="gPauseMap11Tex" OutName="pause_map_1_1" Format="ia8" Width="80" Height="32" Offset="0x72A40" />
<Blob Name="icon_item_static_yar_Blob_07FC40" Size="0x0A00" Offset="0x7FC40" /> <Texture Name="gPauseMap21Tex" OutName="pause_map_2_1" Format="ia8" Width="80" Height="32" Offset="0x73440" />
<Blob Name="icon_item_static_yar_Blob_080640" Size="0x0A00" Offset="0x80640" /> <Texture Name="gPauseQuestStatus01Tex" OutName="pause_quest_status_0_1" Format="ia8" Width="80" Height="32" Offset="0x73E40" />
<Blob Name="icon_item_static_yar_Blob_081040" Size="0x0A00" Offset="0x81040" /> <Texture Name="gPauseQuestStatus11Tex" OutName="pause_quest_status_1_1" Format="ia8" Width="80" Height="32" Offset="0x74840" />
<Blob Name="icon_item_static_yar_Blob_081A40" Size="0x0A00" Offset="0x81A40" /> <Texture Name="gPauseQuestStatus21Tex" OutName="pause_quest_status_2_1" Format="ia8" Width="80" Height="32" Offset="0x75240" />
<Blob Name="icon_item_static_yar_Blob_082440" Size="0x0A00" Offset="0x82440" /> <Texture Name="gPauseSave01Tex" OutName="pause_save_0_1" Format="ia8" Width="80" Height="32" Offset="0x75C40" />
<Blob Name="icon_item_static_yar_Blob_082E40" Size="0x0A00" Offset="0x82E40" /> <Texture Name="gPauseSave11Tex" OutName="pause_save_1_1" Format="ia8" Width="80" Height="32" Offset="0x76640" />
<Blob Name="icon_item_static_yar_Blob_083840" Size="0x0A00" Offset="0x83840" /> <Texture Name="gPauseSave21Tex" OutName="pause_save_2_1" Format="ia8" Width="80" Height="32" Offset="0x77040" />
<Blob Name="icon_item_static_yar_Blob_084240" Size="0x0A00" Offset="0x84240" />
<Blob Name="icon_item_static_yar_Blob_084C40" Size="0x0A00" Offset="0x84C40" /> <!-- Divided Background Menu: Third Row -->
<Blob Name="icon_item_static_yar_Blob_085640" Size="0x0A00" Offset="0x85640" /> <Texture Name="gPauseMasks02Tex" OutName="pause_masks_0_2" Format="ia8" Width="80" Height="32" Offset="0x77A40" />
<Blob Name="icon_item_static_yar_Blob_086040" Size="0x0A00" Offset="0x86040" /> <Texture Name="gPauseMasks12Tex" OutName="pause_masks_1_2" Format="ia8" Width="80" Height="32" Offset="0x78440" />
<Blob Name="icon_item_static_yar_Blob_086A40" Size="0x0A00" Offset="0x86A40" /> <Texture Name="gPauseMasks22Tex" OutName="pause_masks_2_2" Format="ia8" Width="80" Height="32" Offset="0x78E40" />
<Blob Name="icon_item_static_yar_Blob_087440" Size="0x0A00" Offset="0x87440" /> <Texture Name="gPauseSelectItem02Tex" OutName="pause_select_item_0_2" Format="ia8" Width="80" Height="32" Offset="0x79840" />
<Blob Name="icon_item_static_yar_Blob_087E40" Size="0x0A00" Offset="0x87E40" /> <Texture Name="gPauseSelectItem12Tex" OutName="pause_select_item_1_2" Format="ia8" Width="80" Height="32" Offset="0x7A240" />
<Blob Name="icon_item_static_yar_Blob_088840" Size="0x0A00" Offset="0x88840" /> <Texture Name="gPauseSelectItem22Tex" OutName="pause_select_item_2_2" Format="ia8" Width="80" Height="32" Offset="0x7AC40" />
<Blob Name="icon_item_static_yar_Blob_089240" Size="0x0A00" Offset="0x89240" /> <Texture Name="gPauseMap02Tex" OutName="pause_map_0_2" Format="ia8" Width="80" Height="32" Offset="0x7B640" />
<Blob Name="icon_item_static_yar_Blob_089C40" Size="0x0A00" Offset="0x89C40" /> <Texture Name="gPauseMap12Tex" OutName="pause_map_1_2" Format="ia8" Width="80" Height="32" Offset="0x7C040" />
<Blob Name="icon_item_static_yar_Blob_08A640" Size="0x0A00" Offset="0x8A640" /> <Texture Name="gPauseMap22Tex" OutName="pause_map_2_2" Format="ia8" Width="80" Height="32" Offset="0x7CA40" />
<Blob Name="icon_item_static_yar_Blob_08B040" Size="0x0A00" Offset="0x8B040" /> <Texture Name="gPauseQuestStatus02Tex" OutName="pause_quest_status_0_2" Format="ia8" Width="80" Height="32" Offset="0x7D440" />
<Blob Name="icon_item_static_yar_Blob_08BA40" Size="0x0A00" Offset="0x8BA40" /> <Texture Name="gPauseQuestStatus12Tex" OutName="pause_quest_status_1_2" Format="ia8" Width="80" Height="32" Offset="0x7DE40" />
<Blob Name="icon_item_static_yar_Blob_08C440" Size="0x0A00" Offset="0x8C440" /> <Texture Name="gPauseQuestStatus22Tex" OutName="pause_quest_status_2_2" Format="ia8" Width="80" Height="32" Offset="0x7E840" />
<Blob Name="icon_item_static_yar_Blob_08CE40" Size="0x0A00" Offset="0x8CE40" /> <Texture Name="gPauseSave02Tex" OutName="pause_save_0_2" Format="ia8" Width="80" Height="32" Offset="0x7F240" />
<Blob Name="icon_item_static_yar_Blob_08D840" Size="0x0A00" Offset="0x8D840" /> <Texture Name="gPauseSave12Tex" OutName="pause_save_1_2" Format="ia8" Width="80" Height="32" Offset="0x7FC40" />
<Blob Name="icon_item_static_yar_Blob_08E240" Size="0x0A00" Offset="0x8E240" /> <Texture Name="gPauseSave22Tex" OutName="pause_save_2_2" Format="ia8" Width="80" Height="32" Offset="0x80640" />
<Blob Name="icon_item_static_yar_Blob_08EC40" Size="0x0A00" Offset="0x8EC40" />
<Blob Name="icon_item_static_yar_Blob_08F640" Size="0x0A00" Offset="0x8F640" /> <!-- Divided Background Menu: Fourth Row -->
<Blob Name="icon_item_static_yar_Blob_090040" Size="0x0A00" Offset="0x90040" /> <Texture Name="gPauseMasks03Tex" OutName="pause_masks_0_3" Format="ia8" Width="80" Height="32" Offset="0x81040" />
<Blob Name="icon_item_static_yar_Blob_090A40" Size="0x0A00" Offset="0x90A40" /> <Texture Name="gPauseMasks13Tex" OutName="pause_masks_1_3" Format="ia8" Width="80" Height="32" Offset="0x81A40" />
<Blob Name="icon_item_static_yar_Blob_091440" Size="0x0A00" Offset="0x91440" /> <Texture Name="gPauseMasks23Tex" OutName="pause_masks_2_3" Format="ia8" Width="80" Height="32" Offset="0x82440" />
<Blob Name="icon_item_static_yar_Blob_091E40" Size="0x0A00" Offset="0x91E40" /> <Texture Name="gPauseSelectItem03Tex" OutName="pause_select_item_0_3" Format="ia8" Width="80" Height="32" Offset="0x82E40" />
<Blob Name="icon_item_static_yar_Blob_092840" Size="0x0A00" Offset="0x92840" /> <Texture Name="gPauseSelectItem13Tex" OutName="pause_select_item_1_3" Format="ia8" Width="80" Height="32" Offset="0x83840" />
<Blob Name="icon_item_static_yar_Blob_093240" Size="0x0A00" Offset="0x93240" /> <Texture Name="gPauseSelectItem23Tex" OutName="pause_select_item_2_3" Format="ia8" Width="80" Height="32" Offset="0x84240" />
<Blob Name="icon_item_static_yar_Blob_093C40" Size="0x0180" Offset="0x93C40" /> <Texture Name="gPauseMap03Tex" OutName="pause_map_0_3" Format="ia8" Width="80" Height="32" Offset="0x84C40" />
<Blob Name="icon_item_static_yar_Blob_093DC0" Size="0x0180" Offset="0x93DC0" /> <Texture Name="gPauseMap13Tex" OutName="pause_map_1_3" Format="ia8" Width="80" Height="32" Offset="0x85640" />
<Blob Name="icon_item_static_yar_Blob_093F40" Size="0x0300" Offset="0x93F40" /> <Texture Name="gPauseMap23Tex" OutName="pause_map_2_3" Format="ia8" Width="80" Height="32" Offset="0x86040" />
<Blob Name="icon_item_static_yar_Blob_094240" Size="0x06C0" Offset="0x94240" /> <Texture Name="gPauseQuestStatus03Tex" OutName="pause_quest_status_0_3" Format="ia8" Width="80" Height="32" Offset="0x86A40" />
<Blob Name="icon_item_static_yar_Blob_094900" Size="0x06C0" Offset="0x94900" /> <Texture Name="gPauseQuestStatus13Tex" OutName="pause_quest_status_1_3" Format="ia8" Width="80" Height="32" Offset="0x87440" />
<Blob Name="icon_item_static_yar_Blob_094FC0" Size="0x0300" Offset="0x94FC0" /> <Texture Name="gPauseQuestStatus23Tex" OutName="pause_quest_status_2_3" Format="ia8" Width="80" Height="32" Offset="0x87E40" />
<Blob Name="icon_item_static_yar_Blob_0952C0" Size="0x0300" Offset="0x952C0" /> <Texture Name="gPauseSave03Tex" OutName="pause_save_0_3" Format="ia8" Width="80" Height="32" Offset="0x88840" />
<Blob Name="icon_item_static_yar_Blob_0955C0" Size="0x0500" Offset="0x955C0" /> <Texture Name="gPauseSave13Tex" OutName="pause_save_1_3" Format="ia8" Width="80" Height="32" Offset="0x89240" />
<Blob Name="icon_item_static_yar_Blob_095AC0" Size="0x0400" Offset="0x95AC0" /> <Texture Name="gPauseSave23Tex" OutName="pause_save_2_3" Format="ia8" Width="80" Height="32" Offset="0x89C40" />
<!-- Divided Background Menu: Fifth Row -->
<Texture Name="gPauseMasks04Tex" OutName="pause_masks_0_4" Format="ia8" Width="80" Height="32" Offset="0x8A640" />
<Texture Name="gPauseMasks14Tex" OutName="pause_masks_1_4" Format="ia8" Width="80" Height="32" Offset="0x8B040" />
<Texture Name="gPauseMasks24Tex" OutName="pause_masks_2_4" Format="ia8" Width="80" Height="32" Offset="0x8BA40" />
<Texture Name="gPauseSelectItem04Tex" OutName="pause_select_item_0_4" Format="ia8" Width="80" Height="32" Offset="0x8C440" />
<Texture Name="gPauseSelectItem14Tex" OutName="pause_select_item_1_4" Format="ia8" Width="80" Height="32" Offset="0x8CE40" />
<Texture Name="gPauseSelectItem24Tex" OutName="pause_select_item_2_4" Format="ia8" Width="80" Height="32" Offset="0x8D840" />
<Texture Name="gPauseMap04Tex" OutName="pause_map_0_4" Format="ia8" Width="80" Height="32" Offset="0x8E240" />
<Texture Name="gPauseMap14Tex" OutName="pause_map_1_4" Format="ia8" Width="80" Height="32" Offset="0x8EC40" />
<Texture Name="gPauseMap24Tex" OutName="pause_map_2_4" Format="ia8" Width="80" Height="32" Offset="0x8F640" />
<Texture Name="gPauseQuestStatus04Tex" OutName="pause_quest_status_0_4" Format="ia8" Width="80" Height="32" Offset="0x90040" />
<Texture Name="gPauseQuestStatus14Tex" OutName="pause_quest_status_1_4" Format="ia8" Width="80" Height="32" Offset="0x90A40" />
<Texture Name="gPauseQuestStatus24Tex" OutName="pause_quest_status_2_4" Format="ia8" Width="80" Height="32" Offset="0x91440" />
<Texture Name="gPauseSave04Tex" OutName="pause_save_0_4" Format="ia8" Width="80" Height="32" Offset="0x91E40" />
<Texture Name="gPauseSave14Tex" OutName="pause_save_1_4" Format="ia8" Width="80" Height="32" Offset="0x92840" />
<Texture Name="gPauseSave24Tex" OutName="pause_save_2_4" Format="ia8" Width="80" Height="32" Offset="0x93240" />
<!-- Textures used by display lists extracted from icon_item_vtx_static -->
<Texture Name="gABtnSymbolTex" OutName="a_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93C40"/>
<Texture Name="gBBtnSymbolTex" OutName="b_button_symbol" Format="ia8" Width="24" Height="16" Offset="0x93DC0"/>
<Texture Name="gCBtnSymbolsTex" OutName="c_button_symbols" Format="ia8" Width="48" Height="16" Offset="0x93F40"/>
<Texture Name="gNamePanelLeftTex" OutName="name_panel_left" Format="ia8" Width="72" Height="24" Offset="0x94240"/>
<Texture Name="gNamePanelRightTex" OutName="name_panel_right" Format="ia8" Width="72" Height="24" Offset="0x94900"/>
<Texture Name="gZButtonTex" OutName="z_button" Format="ia8" Width="24" Height="32" Offset="0x94FC0"/>
<Texture Name="gRButtonTex" OutName="r_button" Format="ia8" Width="24" Height="32" Offset="0x952C0"/>
<!-- unused -->
<Texture Name="gShowAMusicalNoteTex" OutName="show_a_musical_note" Format="ia8" Width="80" Height="16" Offset="0x955C0"/>
<Texture Name="gMagicArrowEquipEffectTex" OutName="magic_arrow_equip_effect" Format="ia8" Width="32" Height="32" Offset="0x95AC0"/>
</File> </File>
</Root> </Root>

16
assets/xml/objects/object_gi_sword_4.xml
View File

@ -1,14 +1,14 @@
<Root> <Root>
<!-- Get Item Draw: Great Fairy Sword --> <!-- Get Item Draw: Great Fairys Sword -->
<File Name="object_gi_sword_4" Segment="6"> <File Name="object_gi_sword_4" Segment="6">
<!-- Great Fairy Sword Display Lists --> <!-- Great Fairys Sword Display Lists -->
<DList Name="gGiGreatFairySwordHiltEmblemDL" Offset="0x940" /> <!-- The leafy hilt and the green emblem on the blade --> <DList Name="gGiGreatFairysSwordHiltEmblemDL" Offset="0x940" /> <!-- The leafy hilt and the green emblem on the blade -->
<DList Name="gGiGreatFairySwordBladeDL" Offset="0xAD8" /> <DList Name="gGiGreatFairysSwordBladeDL" Offset="0xAD8" />
<!-- Great Fairy Sword Textures --> <!-- Great Fairys Sword Textures -->
<Texture Name="gGiGreatFairySwordLeafPatternTex" OutName="gi_great_fairy_sword_leaf_pattern" Format="ia8" Width="32" Height="32" Offset="0xE58" /> <Texture Name="gGiGreatFairysSwordLeafPatternTex" OutName="gi_great_fairys_sword_leaf_pattern" Format="ia8" Width="32" Height="32" Offset="0xE58" />
<Texture Name="gGiGreatFairySwordBladeTex" OutName="gi_great_fairy_sword_blade" Format="i8" Width="16" Height="16" Offset="0x1258" /> <Texture Name="gGiGreatFairysSwordBladeTex" OutName="gi_great_fairys_sword_blade" Format="i8" Width="16" Height="16" Offset="0x1258" />
<Texture Name="gGiGreatFairySwordEmblemBackgroundTex" OutName="gi_great_fairy_sword_emblem_background" Format="i8" Width="16" Height="16" Offset="0x1358" /> <Texture Name="gGiGreatFairysSwordEmblemBackgroundTex" OutName="gi_great_fairys_sword_emblem_background" Format="i8" Width="16" Height="16" Offset="0x1358" />
</File> </File>
</Root> </Root>

6
assets/xml/objects/object_thiefbird.xml
View File

@ -40,13 +40,13 @@
<!-- DisplayLists for stolen items --> <!-- DisplayLists for stolen items -->
<DList Name="gTakkuriStolenBottleDL" Offset="0x33B0" /> <DList Name="gTakkuriStolenBottleDL" Offset="0x33B0" />
<DList Name="gTakkuriStolenGreatFairySwordDL" Offset="0x3D58" /> <DList Name="gTakkuriStolenGreatFairysSwordDL" Offset="0x3D58" />
<DList Name="gTakkuriStolenKokiriSwordDL" Offset="0x4348" /> <DList Name="gTakkuriStolenKokiriSwordDL" Offset="0x4348" />
<DList Name="gTakkuriStolenRazorSwordDL" Offset="0x4B88" /> <DList Name="gTakkuriStolenRazorSwordDL" Offset="0x4B88" />
<DList Name="gTakkuriStolenGildedSwordDL" Offset="0x55E0" /> <DList Name="gTakkuriStolenGildedSwordDL" Offset="0x55E0" />
<!-- Textures for stolen items --> <!-- Textures for stolen items -->
<Texture Name="gTakkuriStolenGreatFairySwordCenterAndHiltTex" OutName="takkuri_stolen_great_fairy_sword_center_and_hilt" Format="rgba16" Width="32" Height="8" Offset="0x59A0" /> <Texture Name="gTakkuriStolenGreatFairysSwordCenterAndHiltTex" OutName="takkuri_stolen_great_fairys_sword_center_and_hilt" Format="rgba16" Width="32" Height="8" Offset="0x59A0" />
<Texture Name="gTakkuriStolenKokiriSwordPommelTex" OutName="takkuri_stolen_kokiri_sword_pommel" Format="rgba16" Width="8" Height="8" Offset="0x5BA0" /> <Texture Name="gTakkuriStolenKokiriSwordPommelTex" OutName="takkuri_stolen_kokiri_sword_pommel" Format="rgba16" Width="8" Height="8" Offset="0x5BA0" />
<Texture Name="gTakkuriStolenKokiriAndRazorSwordScabbardTex" OutName="takkuri_stolen_kokiri_and_razor_sword_scabbard" Format="rgba16" Width="8" Height="8" Offset="0x5C20" /> <Texture Name="gTakkuriStolenKokiriAndRazorSwordScabbardTex" OutName="takkuri_stolen_kokiri_and_razor_sword_scabbard" Format="rgba16" Width="8" Height="8" Offset="0x5C20" />
<Texture Name="gTakkuriStolenKokiriSwordGuardTex" OutName="takkuri_stolen_kokiri_sword_guard" Format="rgba16" Width="8" Height="8" Offset="0x5CA0" /> <Texture Name="gTakkuriStolenKokiriSwordGuardTex" OutName="takkuri_stolen_kokiri_sword_guard" Format="rgba16" Width="8" Height="8" Offset="0x5CA0" />
@ -55,7 +55,7 @@
<Texture Name="gTakkuriStolenGildedSwordScabbardTex" OutName="takkuri_stolen_gilded_sword_scabbard" Format="rgba16" Width="8" Height="16" Offset="0x5E60" /> <Texture Name="gTakkuriStolenGildedSwordScabbardTex" OutName="takkuri_stolen_gilded_sword_scabbard" Format="rgba16" Width="8" Height="16" Offset="0x5E60" />
<Texture Name="gTakkuriStolenGildedSwordGripAndScabbardTopTex" OutName="takkuri_stolen_gilded_sword_grip_and_scabbard_top" Format="rgba16" Width="8" Height="8" Offset="0x5F60" /> <Texture Name="gTakkuriStolenGildedSwordGripAndScabbardTopTex" OutName="takkuri_stolen_gilded_sword_grip_and_scabbard_top" Format="rgba16" Width="8" Height="8" Offset="0x5F60" />
<Texture Name="gTakkuriStolenBottleAndGildedSwordGemTex" OutName="takkuri_stolen_bottle_and_gilded_sword_gem" Format="i8" Width="8" Height="8" Offset="0x5FE0" /> <Texture Name="gTakkuriStolenBottleAndGildedSwordGemTex" OutName="takkuri_stolen_bottle_and_gilded_sword_gem" Format="i8" Width="8" Height="8" Offset="0x5FE0" />
<Texture Name="gTakkuriStolenGreatFairySwordBladeGildedSwordPommelAndGuardTex" OutName="takkuri_stolen_great_fairy_sword_blade_gilded_sword_pommel_and_guard" Format="i4" Width="16" Height="16" Offset="0x6020" /> <Texture Name="gTakkuriStolenGreatFairysSwordBladeGildedSwordPommelGuardTex" OutName="takkuri_stolen_great_fairys_sword_blade_gilded_sword_pommel_guard" Format="i4" Width="16" Height="16" Offset="0x6020" />
<!-- Takkuri Limbs --> <!-- Takkuri Limbs -->
<Limb Name="gTakkuriBodyLimb" Type="Standard" EnumName="TAKKURI_LIMB_BODY" Offset="0x60A0" /> <Limb Name="gTakkuriBodyLimb" Type="Standard" EnumName="TAKKURI_LIMB_BODY" Offset="0x60A0" />

6
include/z64item.h
View File

@ -184,7 +184,7 @@ typedef enum ItemId {
/* 0x25 */ ITEM_CHATEAU, /* 0x25 */ ITEM_CHATEAU,
/* 0x26 */ ITEM_HYLIAN_LOACH, /* 0x26 */ ITEM_HYLIAN_LOACH,
/* 0x27 */ ITEM_OBABA_DRINK, /* 0x27 */ ITEM_OBABA_DRINK,
/* 0x28 */ ITEM_MOON_TEAR, /* 0x28 */ ITEM_MOONS_TEAR,
/* 0x29 */ ITEM_DEED_LAND, /* 0x29 */ ITEM_DEED_LAND,
/* 0x2A */ ITEM_DEED_SWAMP, /* 0x2A */ ITEM_DEED_SWAMP,
/* 0x2B */ ITEM_DEED_MOUNTAIN, /* 0x2B */ ITEM_DEED_MOUNTAIN,
@ -471,7 +471,7 @@ typedef enum GetItemId {
/* 0x93 */ GI_GOLD_DUST_2, /* 0x93 */ GI_GOLD_DUST_2,
/* 0x94 */ GI_HYLIAN_LOACH_2, // Unused bottled eel /* 0x94 */ GI_HYLIAN_LOACH_2, // Unused bottled eel
/* 0x95 */ GI_SEAHORSE_CAUGHT, /* 0x95 */ GI_SEAHORSE_CAUGHT,
/* 0x96 */ GI_MOON_TEAR, /* 0x96 */ GI_MOONS_TEAR,
/* 0x97 */ GI_DEED_LAND, /* 0x97 */ GI_DEED_LAND,
/* 0x98 */ GI_DEED_SWAMP, /* 0x98 */ GI_DEED_SWAMP,
/* 0x99 */ GI_DEED_MOUNTAIN, /* 0x99 */ GI_DEED_MOUNTAIN,
@ -601,7 +601,7 @@ typedef enum GetItemDrawId {
/* 0x56 */ GID_SKULL_TOKEN_2, /* 0x56 */ GID_SKULL_TOKEN_2,
/* 0x57 */ GID_57, /* 0x57 */ GID_57,
/* 0x58 */ GID_ZORA_EGG, /* 0x58 */ GID_ZORA_EGG,
/* 0x59 */ GID_MOON_TEAR, /* 0x59 */ GID_MOONS_TEAR,
/* 0x5A */ GID_DEED_LAND, /* 0x5A */ GID_DEED_LAND,
/* 0x5B */ GID_MASK_DEKU, /* 0x5B */ GID_MASK_DEKU,
/* 0x5C */ GID_REMAINS_ODOLWA, /* 0x5C */ GID_REMAINS_ODOLWA,

2
include/z64player.h
View File

@ -98,7 +98,7 @@ typedef enum PlayerItemAction {
/* 0x27 */ PLAYER_IA_BOTTLE_MILK_HALF, /* 0x27 */ PLAYER_IA_BOTTLE_MILK_HALF,
/* 0x28 */ PLAYER_IA_BOTTLE_CHATEAU, /* 0x28 */ PLAYER_IA_BOTTLE_CHATEAU,
/* 0x29 */ PLAYER_IA_BOTTLE_FAIRY, /* 0x29 */ PLAYER_IA_BOTTLE_FAIRY,
/* 0x2A */ PLAYER_IA_MOON_TEAR, /* 0x2A */ PLAYER_IA_MOONS_TEAR,
/* 0x2B */ PLAYER_IA_DEED_LAND, /* 0x2B */ PLAYER_IA_DEED_LAND,
/* 0x2C */ PLAYER_IA_ROOM_KEY, /* 0x2C */ PLAYER_IA_ROOM_KEY,
/* 0x2D */ PLAYER_IA_LETTER_TO_KAFEI, /* 0x2D */ PLAYER_IA_LETTER_TO_KAFEI,

256
src/code/code_8012EC80.c
View File

@ -98,132 +98,132 @@ u32 gGsFlagsShift[] = {
}; };
TexturePtr gItemIcons[] = { TexturePtr gItemIcons[] = {
icon_item_static_yar_Blob_000000, // ITEM_OCARINA gItemIconOcarinaOfTimeTex, // ITEM_OCARINA
icon_item_static_yar_Blob_001000, // ITEM_BOW gItemIconBowTex, // ITEM_BOW
icon_item_static_yar_Blob_002000, // ITEM_ARROW_FIRE gItemIconFireArrowTex, // ITEM_ARROW_FIRE
icon_item_static_yar_Blob_003000, // ITEM_ARROW_ICE gItemIconIceArrowTex, // ITEM_ARROW_ICE
icon_item_static_yar_Blob_004000, // ITEM_ARROW_LIGHT gItemIconLightArrowTex, // ITEM_ARROW_LIGHT
icon_item_static_yar_Blob_005000, // ITEM_OCARINA_FAIRY gItemIconFairyOcarinaTex, // ITEM_OCARINA_FAIRY
icon_item_static_yar_Blob_006000, // ITEM_BOMB gItemIconBombTex, // ITEM_BOMB
icon_item_static_yar_Blob_007000, // ITEM_BOMBCHU gItemIconBombchuTex, // ITEM_BOMBCHU
icon_item_static_yar_Blob_008000, // ITEM_STICK gItemIconDekuStickTex, // ITEM_STICK
icon_item_static_yar_Blob_009000, // ITEM_NUT gItemIconDekuNutTex, // ITEM_NUT
icon_item_static_yar_Blob_00A000, // ITEM_MAGIC_BEANS gItemIconMagicBeansTex, // ITEM_MAGIC_BEANS
icon_item_static_yar_Blob_00B000, // ITEM_SLINGSHOT gItemIconSlingshotTex, // ITEM_SLINGSHOT
icon_item_static_yar_Blob_00C000, // ITEM_POWDER_KEG gItemIconPowderKegTex, // ITEM_POWDER_KEG
icon_item_static_yar_Blob_00D000, // ITEM_PICTO_BOX gItemIconPictoBoxTex, // ITEM_PICTO_BOX
icon_item_static_yar_Blob_00E000, // ITEM_LENS gItemIconLensofTruthTex, // ITEM_LENS
icon_item_static_yar_Blob_00F000, // ITEM_HOOKSHOT gItemIconHookshotTex, // ITEM_HOOKSHOT
icon_item_static_yar_Blob_010000, // ITEM_SWORD_GREAT_FAIRY gItemIconGreatFairysSwordTex, // ITEM_SWORD_GREAT_FAIRY
icon_item_static_yar_Blob_011000, // ITEM_LONGSHOT gItemIconLongshotTex, // ITEM_LONGSHOT
icon_item_static_yar_Blob_012000, // ITEM_BOTTLE gItemIconEmptyBottleTex, // ITEM_BOTTLE
icon_item_static_yar_Blob_013000, // ITEM_POTION_RED gItemIconRedPotionTex, // ITEM_POTION_RED
icon_item_static_yar_Blob_014000, // ITEM_POTION_GREEN gItemIconGreenPotionTex, // ITEM_POTION_GREEN
icon_item_static_yar_Blob_015000, // ITEM_POTION_BLUE gItemIconBluePotionTex, // ITEM_POTION_BLUE
icon_item_static_yar_Blob_016000, // ITEM_FAIRY gItemIconBottledFairyTex, // ITEM_FAIRY
icon_item_static_yar_Blob_017000, // ITEM_DEKU_PRINCESS gItemIconBottledDekuPrincessTex, // ITEM_DEKU_PRINCESS
icon_item_static_yar_Blob_018000, // ITEM_MILK_BOTTLE gItemIconBottledFullMilkTex, // ITEM_MILK_BOTTLE
icon_item_static_yar_Blob_019000, // ITEM_MILK_HALF gItemIconBottledHalfMilkTex, // ITEM_MILK_HALF
icon_item_static_yar_Blob_01A000, // ITEM_FISH gItemIconBottledFishTex, // ITEM_FISH
icon_item_static_yar_Blob_01B000, // ITEM_BUG gItemIconBottledBugTex, // ITEM_BUG
icon_item_static_yar_Blob_01C000, // ITEM_BLUE_FIRE gItemIconBottledBlueFireTex, // ITEM_BLUE_FIRE
icon_item_static_yar_Blob_01D000, // ITEM_POE gItemIconBottledPoeTex, // ITEM_POE
icon_item_static_yar_Blob_01E000, // ITEM_BIG_POE gItemIconBottledBigPoeTex, // ITEM_BIG_POE
icon_item_static_yar_Blob_01F000, // ITEM_SPRING_WATER gItemIconSpringWaterTex, // ITEM_SPRING_WATER
icon_item_static_yar_Blob_020000, // ITEM_HOT_SPRING_WATER gItemIconHotSpringWaterTex, // ITEM_HOT_SPRING_WATER
icon_item_static_yar_Blob_021000, // ITEM_ZORA_EGG gItemIconBottledZoraEggTex, // ITEM_ZORA_EGG
icon_item_static_yar_Blob_022000, // ITEM_GOLD_DUST gItemIconBottledGoldDustTex, // ITEM_GOLD_DUST
icon_item_static_yar_Blob_023000, // ITEM_MUSHROOM gItemIconBottledMushroomTex, // ITEM_MUSHROOM
icon_item_static_yar_Blob_024000, // ITEM_SEAHORSE gItemIconBottledSeahorseTex, // ITEM_SEAHORSE
icon_item_static_yar_Blob_025000, // ITEM_CHATEAU gItemIconChateauRomaniTex, // ITEM_CHATEAU
icon_item_static_yar_Blob_026000, // ITEM_HYLIAN_LOACH gItemIconBottledHylianLoachTex, // ITEM_HYLIAN_LOACH
icon_item_static_yar_Blob_027000, // ITEM_OBABA_DRINK gItemIconEmptyBottle2Tex, // ITEM_OBABA_DRINK
icon_item_static_yar_Blob_028000, // ITEM_MOON_TEAR gItemIconMoonsTearTex, // ITEM_MOONS_TEAR
icon_item_static_yar_Blob_029000, // ITEM_DEED_LAND gItemIconLandDeedTex, // ITEM_DEED_LAND
icon_item_static_yar_Blob_02A000, // ITEM_DEED_SWAMP gItemIconSwampDeedTex, // ITEM_DEED_SWAMP
icon_item_static_yar_Blob_02B000, // ITEM_DEED_MOUNTAIN gItemIconMountainDeedTex, // ITEM_DEED_MOUNTAIN
icon_item_static_yar_Blob_02C000, // ITEM_DEED_OCEAN gItemIconOceanDeedTex, // ITEM_DEED_OCEAN
icon_item_static_yar_Blob_02D000, // ITEM_ROOM_KEY gItemIconRoomKeyTex, // ITEM_ROOM_KEY
icon_item_static_yar_Blob_02E000, // ITEM_LETTER_MAMA gItemIconLetterToMamaTex, // ITEM_LETTER_MAMA
icon_item_static_yar_Blob_02F000, // ITEM_LETTER_TO_KAFEI gItemIconLetterToKafeiTex, // ITEM_LETTER_TO_KAFEI
icon_item_static_yar_Blob_030000, // ITEM_PENDANT_OF_MEMORIES gItemIconPendantOfMemoriesTex, // ITEM_PENDANT_OF_MEMORIES
icon_item_static_yar_Blob_031000, // ITEM_TINGLE_MAP gItemIconTingleMapTex, // ITEM_TINGLE_MAP
icon_item_static_yar_Blob_032000, // ITEM_MASK_DEKU gItemIconDekuMaskTex, // ITEM_MASK_DEKU
icon_item_static_yar_Blob_033000, // ITEM_MASK_GORON gItemIconGoronMaskTex, // ITEM_MASK_GORON
icon_item_static_yar_Blob_034000, // ITEM_MASK_ZORA gItemIconZoraMaskTex, // ITEM_MASK_ZORA
icon_item_static_yar_Blob_035000, // ITEM_MASK_FIERCE_DEITY gItemIconFierceDeityMaskTex, // ITEM_MASK_FIERCE_DEITY
icon_item_static_yar_Blob_036000, // ITEM_MASK_TRUTH gItemIconMaskOfTruthTex, // ITEM_MASK_TRUTH
icon_item_static_yar_Blob_037000, // ITEM_MASK_KAFEIS_MASK gItemIconKafeisMaskTex, // ITEM_MASK_KAFEIS_MASK
icon_item_static_yar_Blob_038000, // ITEM_MASK_ALL_NIGHT gItemIconAllNightMaskTex, // ITEM_MASK_ALL_NIGHT
icon_item_static_yar_Blob_039000, // ITEM_MASK_BUNNY gItemIconBunnyHoodTex, // ITEM_MASK_BUNNY
icon_item_static_yar_Blob_03A000, // ITEM_MASK_KEATON gItemIconKeatonMaskTex, // ITEM_MASK_KEATON
icon_item_static_yar_Blob_03B000, // ITEM_MASK_GARO gItemIconGaroMaskTex, // ITEM_MASK_GARO
icon_item_static_yar_Blob_03C000, // ITEM_MASK_ROMANI gItemIconRomaniMaskTex, // ITEM_MASK_ROMANI
icon_item_static_yar_Blob_03D000, // ITEM_MASK_CIRCUS_LEADER gItemIconCircusLeaderMaskTex, // ITEM_MASK_CIRCUS_LEADER
icon_item_static_yar_Blob_03E000, // ITEM_MASK_POSTMAN gItemIconPostmansHatTex, // ITEM_MASK_POSTMAN
icon_item_static_yar_Blob_03F000, // ITEM_MASK_COUPLE gItemIconCouplesMaskTex, // ITEM_MASK_COUPLE
icon_item_static_yar_Blob_040000, // ITEM_MASK_GREAT_FAIRY gItemIconGreatFairyMaskTex, // ITEM_MASK_GREAT_FAIRY
icon_item_static_yar_Blob_041000, // ITEM_MASK_GIBDO gItemIconGibdoMaskTex, // ITEM_MASK_GIBDO
icon_item_static_yar_Blob_042000, // ITEM_MASK_DON_GERO gItemIconDonGeroMaskTex, // ITEM_MASK_DON_GERO
icon_item_static_yar_Blob_043000, // ITEM_MASK_KAMARO gItemIconKamaroMaskTex, // ITEM_MASK_KAMARO
icon_item_static_yar_Blob_044000, // ITEM_MASK_CAPTAIN gItemIconCaptainsHatTex, // ITEM_MASK_CAPTAIN
icon_item_static_yar_Blob_045000, // ITEM_MASK_STONE gItemIconStoneMaskTex, // ITEM_MASK_STONE
icon_item_static_yar_Blob_046000, // ITEM_MASK_BREMEN gItemIconBremenMaskTex, // ITEM_MASK_BREMEN
icon_item_static_yar_Blob_047000, // ITEM_MASK_BLAST gItemIconBlastMaskTex, // ITEM_MASK_BLAST
icon_item_static_yar_Blob_048000, // ITEM_MASK_SCENTS gItemIconMaskOfScentsTex, // ITEM_MASK_SCENTS
icon_item_static_yar_Blob_049000, // ITEM_MASK_GIANT gItemIconGiantsMaskTex, // ITEM_MASK_GIANT
icon_item_static_yar_Blob_04A000, // ITEM_BOW_ARROW_FIRE gItemIconBowFireTex, // ITEM_BOW_ARROW_FIRE
icon_item_static_yar_Blob_04B000, // ITEM_BOW_ARROW_ICE gItemIconBowIceTex, // ITEM_BOW_ARROW_ICE
icon_item_static_yar_Blob_04C000, // ITEM_BOW_ARROW_LIGHT gItemIconBowLightTex, // ITEM_BOW_ARROW_LIGHT
icon_item_static_yar_Blob_04D000, // ITEM_SWORD_KOKIRI gItemIconKokiriSwordTex, // ITEM_SWORD_KOKIRI
icon_item_static_yar_Blob_04E000, // ITEM_SWORD_RAZOR gItemIconRazorSwordTex, // ITEM_SWORD_RAZOR
icon_item_static_yar_Blob_04F000, // ITEM_SWORD_GILDED gItemIconGildedSwordTex, // ITEM_SWORD_GILDED
icon_item_static_yar_Blob_050000, // ITEM_SWORD_DEITY gItemIconFierceDeitySwordTex, // ITEM_SWORD_DEITY
icon_item_static_yar_Blob_051000, // ITEM_SHIELD_HERO gItemIconHerosShieldTex, // ITEM_SHIELD_HERO
icon_item_static_yar_Blob_052000, // ITEM_SHIELD_MIRROR gItemIconMirrorShieldTex, // ITEM_SHIELD_MIRROR
icon_item_static_yar_Blob_053000, // ITEM_QUIVER_30 gItemIconQuiver30Tex, // ITEM_QUIVER_30
icon_item_static_yar_Blob_054000, // ITEM_QUIVER_40 gItemIconQuiver40Tex, // ITEM_QUIVER_40
icon_item_static_yar_Blob_055000, // ITEM_QUIVER_50 gItemIconQuiver50Tex, // ITEM_QUIVER_50
icon_item_static_yar_Blob_056000, // ITEM_BOMB_BAG_20 gItemIconBombBag20Tex, // ITEM_BOMB_BAG_20
icon_item_static_yar_Blob_057000, // ITEM_BOMB_BAG_30 gItemIconBombBag30Tex, // ITEM_BOMB_BAG_30
icon_item_static_yar_Blob_058000, // ITEM_BOMB_BAG_40 gItemIconBombBag40Tex, // ITEM_BOMB_BAG_40
icon_item_static_yar_Blob_059000, // ITEM_WALLET_DEFAULT gItemIconDefaultWalletTex, // ITEM_WALLET_DEFAULT
icon_item_static_yar_Blob_05A000, // ITEM_WALLET_ADULT gItemIconAdultsWalletTex, // ITEM_WALLET_ADULT
icon_item_static_yar_Blob_05B000, // ITEM_WALLET_GIANT gItemIconGiantsWalletTex, // ITEM_WALLET_GIANT
icon_item_static_yar_Blob_05C000, // ITEM_FISHING_ROD gItemIconFishingRodTex, // ITEM_FISHING_ROD
icon_item_static_yar_Blob_05D000, // ITEM_REMAINS_ODOLWA gItemIconOdolwasRemainsTex, // ITEM_REMAINS_ODOLWA
icon_item_static_yar_Blob_05E000, // ITEM_REMAINS_GOHT gItemIconGohtsRemainsTex, // ITEM_REMAINS_GOHT
icon_item_static_yar_Blob_05F000, // ITEM_REMAINS_GYORG gItemIconGyorgsRemainsTex, // ITEM_REMAINS_GYORG
icon_item_static_yar_Blob_060000, // ITEM_REMAINS_TWINMOLD gItemIconTwinmoldsRemainsTex, // ITEM_REMAINS_TWINMOLD
icon_item_static_yar_Blob_062000, // ITEM_SONG_SONATA gItemIconSongNoteTex, // ITEM_SONG_SONATA
icon_item_static_yar_Blob_062000, // ITEM_SONG_LULLABY gItemIconSongNoteTex, // ITEM_SONG_LULLABY
icon_item_static_yar_Blob_062000, // ITEM_SONG_NOVA gItemIconSongNoteTex, // ITEM_SONG_NOVA
icon_item_static_yar_Blob_062000, // ITEM_SONG_ELEGY gItemIconSongNoteTex, // ITEM_SONG_ELEGY
icon_item_static_yar_Blob_062000, // ITEM_SONG_OATH gItemIconSongNoteTex, // ITEM_SONG_OATH
icon_item_static_yar_Blob_062000, // ITEM_SONG_SARIA gItemIconSongNoteTex, // ITEM_SONG_SARIA
icon_item_static_yar_Blob_062000, // ITEM_SONG_TIME gItemIconSongNoteTex, // ITEM_SONG_TIME
icon_item_static_yar_Blob_062000, // ITEM_SONG_HEALING gItemIconSongNoteTex, // ITEM_SONG_HEALING
icon_item_static_yar_Blob_062000, // ITEM_SONG_EPONA gItemIconSongNoteTex, // ITEM_SONG_EPONA
icon_item_static_yar_Blob_062000, // ITEM_SONG_SOARING gItemIconSongNoteTex, // ITEM_SONG_SOARING
icon_item_static_yar_Blob_062000, // ITEM_SONG_STORMS gItemIconSongNoteTex, // ITEM_SONG_STORMS
icon_item_static_yar_Blob_062000, // ITEM_SONG_SUN gItemIconSongNoteTex, // ITEM_SONG_SUN
icon_item_static_yar_Blob_061000, // ITEM_BOMBERS_NOTEBOOK gItemIconBombersNotebookTex, // ITEM_BOMBERS_NOTEBOOK
icon_item_24_static_yar_Blob_000000, // ITEM_SKULL_TOKEN gQuestIconGoldSkulltulaTex, // ITEM_SKULL_TOKEN
icon_item_24_static_yar_Blob_000900, // ITEM_HEART_CONTAINER gQuestIconHeartContainerTex, // ITEM_HEART_CONTAINER
icon_item_24_static_yar_Blob_001200, // ITEM_HEART_PIECE gQuestIconPieceOfHeartTex, // ITEM_HEART_PIECE
icon_item_static_yar_Blob_062000, // gItemIconSongNoteTex, //
icon_item_static_yar_Blob_062000, // gItemIconSongNoteTex, //
icon_item_static_yar_Blob_062000, // ITEM_SONG_LULLABY_INTRO gItemIconSongNoteTex, // ITEM_SONG_LULLABY_INTRO
icon_item_24_static_yar_Blob_003600, // ITEM_KEY_BOSS gQuestIconBossKeyTex, // ITEM_KEY_BOSS
icon_item_24_static_yar_Blob_004800, // ITEM_COMPASS gQuestIconDungeonMapTex, // ITEM_COMPASS
icon_item_24_static_yar_Blob_003F00, // ITEM_DUNGEON_MAP gQuestIconCompassTex, // ITEM_DUNGEON_MAP
icon_item_24_static_yar_Blob_005100, // ITEM_STRAY_FAIRIES gQuestIconGoldSkulltula2Tex, // ITEM_STRAY_FAIRIES
icon_item_24_static_yar_Blob_005A00, // ITEM_KEY_SMALL gQuestIconSmallKeyTex, // ITEM_KEY_SMALL
icon_item_24_static_yar_Blob_006300, // ITEM_MAGIC_SMALL gQuestIconSmallMagicJarTex, // ITEM_MAGIC_SMALL
icon_item_24_static_yar_Blob_006C00, // ITEM_MAGIC_LARGE gQuestIconBigMagicJarTex, // ITEM_MAGIC_LARGE
icon_item_static_yar_Blob_062180, // ITEM_HEART_PIECE_2 gItemIconHeartPiece1Tex, // ITEM_HEART_PIECE_2
icon_item_static_yar_Blob_062A80, // ITEM_INVALID_1 gItemIconHeartPiece2Tex, // ITEM_INVALID_1
icon_item_static_yar_Blob_063380, // ITEM_INVALID_2 gItemIconHeartPiece3Tex, // ITEM_INVALID_2
gOcarinaCUpTex, // ITEM_INVALID_3 gOcarinaCUpTex, // ITEM_INVALID_3
gOcarinaCDownTex, // ITEM_INVALID_4 gOcarinaCDownTex, // ITEM_INVALID_4
gOcarinaCLeftTex, // ITEM_INVALID_5 gOcarinaCLeftTex, // ITEM_INVALID_5
@ -273,7 +273,7 @@ u8 gItemSlots[] = {
SLOT_BOTTLE_1, // ITEM_CHATEAU SLOT_BOTTLE_1, // ITEM_CHATEAU
SLOT_BOTTLE_1, // ITEM_HYLIAN_LOACH SLOT_BOTTLE_1, // ITEM_HYLIAN_LOACH
SLOT_BOTTLE_1, // ITEM_OBABA_DRINK SLOT_BOTTLE_1, // ITEM_OBABA_DRINK
SLOT_TRADE_DEED, // ITEM_MOON_TEAR SLOT_TRADE_DEED, // ITEM_MOONS_TEAR
SLOT_TRADE_DEED, // ITEM_DEED_LAND SLOT_TRADE_DEED, // ITEM_DEED_LAND
SLOT_TRADE_DEED, // ITEM_DEED_SWAMP SLOT_TRADE_DEED, // ITEM_DEED_SWAMP
SLOT_TRADE_DEED, // ITEM_DEED_MOUNTAIN SLOT_TRADE_DEED, // ITEM_DEED_MOUNTAIN
@ -353,7 +353,7 @@ s16 gItemPrices[] = {
200, // ITEM_CHATEAU 200, // ITEM_CHATEAU
20, // ITEM_HYLIAN_LOACH 20, // ITEM_HYLIAN_LOACH
0, // ITEM_OBABA_DRINK 0, // ITEM_OBABA_DRINK
0, // ITEM_MOON_TEAR 0, // ITEM_MOONS_TEAR
0, // ITEM_DEED_LAND 0, // ITEM_DEED_LAND
0, // ITEM_DEED_SWAMP 0, // ITEM_DEED_SWAMP
0, // ITEM_DEED_MOUNTAIN 0, // ITEM_DEED_MOUNTAIN

4
src/code/z_draw.c
View File

@ -313,7 +313,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawOpa0Xlu1, { gGiRedPotionBottleEmptyDL, gGiRedPotionBottleDL } }, { GetItem_DrawOpa0Xlu1, { gGiRedPotionBottleEmptyDL, gGiRedPotionBottleDL } },
// GID_ZORA_EGG, OBJECT_GI_BOTTLE_15 // GID_ZORA_EGG, OBJECT_GI_BOTTLE_15
{ GetItem_DrawOpa0Xlu1, { gGiZoraEggBottleContentsDL, gGiZoraEggBottleGlassAndCorkDL } }, { GetItem_DrawOpa0Xlu1, { gGiZoraEggBottleContentsDL, gGiZoraEggBottleGlassAndCorkDL } },
// GID_MOON_TEAR, OBJECT_GI_RESERVE00 // GID_MOONS_TEAR, OBJECT_GI_RESERVE00
{ GetItem_DrawMoonsTear, { gGiMoonsTearItemDL, gGiMoonsTearGlowDL } }, { GetItem_DrawMoonsTear, { gGiMoonsTearItemDL, gGiMoonsTearGlowDL } },
// GID_DEED_LAND, OBJECT_GI_RESERVE01 // GID_DEED_LAND, OBJECT_GI_RESERVE01
{ GetItem_DrawOpa01, { gGiTitleDeedEmptyDL, gGiTitleDeedLandColorDL } }, { GetItem_DrawOpa01, { gGiTitleDeedEmptyDL, gGiTitleDeedLandColorDL } },
@ -344,7 +344,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
// GID_SWORD_GILDED, OBJECT_GI_SWORD_3 // GID_SWORD_GILDED, OBJECT_GI_SWORD_3
{ GetItem_DrawOpa01, { gGiGildedSwordDL, gGiGildedSwordEmptyDL } }, { GetItem_DrawOpa01, { gGiGildedSwordDL, gGiGildedSwordEmptyDL } },
// GID_SWORD_GREAT_FAIRY, OBJECT_GI_SWORD_4 // GID_SWORD_GREAT_FAIRY, OBJECT_GI_SWORD_4
{ GetItem_DrawOpa0Xlu1, { gGiGreatFairySwordBladeDL, gGiGreatFairySwordHiltEmblemDL } }, { GetItem_DrawOpa0Xlu1, { gGiGreatFairysSwordBladeDL, gGiGreatFairysSwordHiltEmblemDL } },
// GID_MASK_GARO, OBJECT_GI_MASK09 // GID_MASK_GARO, OBJECT_GI_MASK09
{ GetItem_DrawOpa0Xlu1, { gGiGarosMaskCloakDL, gGiGarosMaskFaceDL } }, { GetItem_DrawOpa0Xlu1, { gGiGarosMaskCloakDL, gGiGarosMaskFaceDL } },
// GID_MASK_GREAT_FAIRY, OBJECT_GI_MASK14 // GID_MASK_GREAT_FAIRY, OBJECT_GI_MASK14

2
src/code/z_elf_message.c
View File

@ -57,7 +57,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
return 0; return 0;
} }
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_MOON_TEAR) { if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_MOONS_TEAR) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_04)) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_04)) {
return 0x242; return 0x242;
} }

19
src/code/z_parameter.c
View File

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "z64snap.h" #include "z64snap.h"
#include "z64view.h" #include "z64view.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "interface/parameter_static/parameter_static.h" #include "interface/parameter_static/parameter_static.h"
#include "interface/do_action_static/do_action_static.h" #include "interface/do_action_static/do_action_static.h"
#include "misc/story_static/story_static.h" #include "misc/story_static/story_static.h"
@ -8,8 +9,6 @@
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
#include "overlays/actors/ovl_En_Mm3/z_en_mm3.h" #include "overlays/actors/ovl_En_Mm3/z_en_mm3.h"
extern TexturePtr D_08095AC0; // gMagicArrowEquipEffectTex
typedef enum { typedef enum {
/* 0 */ PICTO_BOX_STATE_OFF, // Not using the pictograph /* 0 */ PICTO_BOX_STATE_OFF, // Not using the pictograph
/* 1 */ PICTO_BOX_STATE_LENS, // Looking through the lens of the pictograph /* 1 */ PICTO_BOX_STATE_LENS, // Looking through the lens of the pictograph
@ -2057,7 +2056,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} else { } else {
// End of special item cases. Apply restrictions to buttons // End of special item cases. Apply restrictions to buttons
if (interfaceCtx->restrictions.tradeItems != 0) { if (interfaceCtx->restrictions.tradeItems != 0) {
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || (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_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@ -2068,7 +2067,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
gSaveContext.buttonStatus[i] = BTN_DISABLED; gSaveContext.buttonStatus[i] = BTN_DISABLED;
} }
} else if (interfaceCtx->restrictions.tradeItems == 0) { } else if (interfaceCtx->restrictions.tradeItems == 0) {
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || (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_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@ -2115,7 +2114,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} }
if (interfaceCtx->restrictions.all != 0) { if (interfaceCtx->restrictions.all != 0) {
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && (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_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@ -2130,7 +2129,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} }
} }
} else if (interfaceCtx->restrictions.all == 0) { } else if (interfaceCtx->restrictions.all == 0) {
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && (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_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@ -2899,10 +2898,10 @@ u8 Item_Give(PlayState* play, u8 item) {
} }
} }
} else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) { } else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
temp = INV_CONTENT(item); temp = INV_CONTENT(item);
INV_CONTENT(item) = item; INV_CONTENT(item) = item;
if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) { if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) {
for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
if (temp == GET_CUR_FORM_BTN_ITEM(i)) { if (temp == GET_CUR_FORM_BTN_ITEM(i)) {
SET_CUR_FORM_BTN_ITEM(i, item); SET_CUR_FORM_BTN_ITEM(i, item);
@ -3066,7 +3065,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
} }
} }
} }
} else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) { } else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
return ITEM_NONE; return ITEM_NONE;
} }
@ -4295,7 +4294,7 @@ void Interface_DrawPauseMenuEquippingIcons(PlayState* play) {
} }
gSPVertex(OVERLAY_DISP++, &pauseCtx->cursorVtx[16], 4, 0); gSPVertex(OVERLAY_DISP++, &pauseCtx->cursorVtx[16], 4, 0);
gDPLoadTextureBlock(OVERLAY_DISP++, &D_08095AC0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, gDPLoadTextureBlock(OVERLAY_DISP++, gMagicArrowEquipEffectTex, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD); G_TX_NOLOD, G_TX_NOLOD);
} }

2
src/code/z_player_lib.c
View File

@ -695,7 +695,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_HALF PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_HALF
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_CHATEAU PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_CHATEAU
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FAIRY PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FAIRY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MOON_TEAR PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MOONS_TEAR
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEED_LAND PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEED_LAND
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ROOM_KEY PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ROOM_KEY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LETTER_TO_KAFEI PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LETTER_TO_KAFEI

4
src/code/z_sram_NES.c
View File

@ -608,7 +608,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE); Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) { for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOON_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); SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
Interface_LoadItemIconImpl(play, j); Interface_LoadItemIconImpl(play, j);
} }
@ -907,7 +907,7 @@ Inventory sSaveDebugInventory = {
ITEM_ARROW_FIRE, ITEM_ARROW_FIRE,
ITEM_ARROW_ICE, ITEM_ARROW_ICE,
ITEM_ARROW_LIGHT, ITEM_ARROW_LIGHT,
ITEM_MOON_TEAR, ITEM_MOONS_TEAR,
ITEM_BOMB, ITEM_BOMB,
ITEM_BOMBCHU, ITEM_BOMBCHU,
ITEM_STICK, ITEM_STICK,

2
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
View File

@ -959,7 +959,7 @@ void EnFsn_DeterminePrice(EnFsn* this, PlayState* play) {
if (itemAction > PLAYER_IA_NONE) { if (itemAction > PLAYER_IA_NONE) {
buttonItem = GET_CUR_FORM_BTN_ITEM(player->heldItemButton); buttonItem = GET_CUR_FORM_BTN_ITEM(player->heldItemButton);
this->price = (buttonItem < ITEM_MOON_TEAR) ? gItemPrices[buttonItem] : 0; this->price = (buttonItem < ITEM_MOONS_TEAR) ? gItemPrices[buttonItem] : 0;
if (this->price > 0) { if (this->price > 0) {
player->actor.textId = 0x29EF; player->actor.textId = 0x29EF;
player->exchangeItemId = buttonItem; player->exchangeItemId = buttonItem;

8
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
View File

@ -147,7 +147,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) {
player->unk_B08 = 1.0f; player->unk_B08 = 1.0f;
this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) { if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 6; this->scaleTarget = 6;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) { } else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 4; this->scaleTarget = 4;
@ -158,7 +158,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) {
player->unk_B08 = 0.5f; player->unk_B08 = 0.5f;
this->collider.info.toucher.damage = sDamages[this->type]; this->collider.info.toucher.damage = sDamages[this->type];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) { if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 4; this->scaleTarget = 4;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) { } else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 3; this->scaleTarget = 3;
@ -276,7 +276,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) {
if (player->unk_B08 < 0.85f) { if (player->unk_B08 < 0.85f) {
this->collider.info.toucher.damage = sDamages[this->type]; this->collider.info.toucher.damage = sDamages[this->type];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) { if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 4; this->scaleTarget = 4;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) { } else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 3; this->scaleTarget = 3;
@ -286,7 +286,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) {
} else { } else {
this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) { if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 6; this->scaleTarget = 6;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) { } else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 4; this->scaleTarget = 4;

2
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
View File

@ -12,7 +12,7 @@ typedef enum {
/* 0x00 */ ENMTHUNDER_TYPE_KOKIRI_SWORD, /* 0x00 */ ENMTHUNDER_TYPE_KOKIRI_SWORD,
/* 0x01 */ ENMTHUNDER_TYPE_RAZOR_SWORD, /* 0x01 */ ENMTHUNDER_TYPE_RAZOR_SWORD,
/* 0x02 */ ENMTHUNDER_TYPE_GILDED_SWORD, /* 0x02 */ ENMTHUNDER_TYPE_GILDED_SWORD,
/* 0x03 */ ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD, /* 0x03 */ ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD,
/* 0x80 */ ENMTHUNDER_TYPE_UNK = 0x80 /* 0x80 */ ENMTHUNDER_TYPE_UNK = 0x80
} EnMThunderType; } EnMThunderType;

6
src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
View File

@ -341,7 +341,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0, 0); Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0, 0);
this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.world.rot.y = this->actor.shape.rot.y;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Player_GetExchangeItemId(play) == PLAYER_IA_MOON_TEAR) { if (Player_GetExchangeItemId(play) == PLAYER_IA_MOONS_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A]; player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId; this->unk_340 = player->actor.textId;
this->actionFunc = func_80ADBAB8; this->actionFunc = func_80ADBAB8;
@ -382,7 +382,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
} else if (((this->actor.xzDistToPlayer < 80.0f) && } else if (((this->actor.xzDistToPlayer < 80.0f) &&
(((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f)) ? true : false)) || (((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f)) ? true : false)) ||
this->actor.isTargeted) { this->actor.isTargeted) {
func_800B85E0(&this->actor, play, 80.0f, PLAYER_IA_MOON_TEAR); func_800B85E0(&this->actor, play, 80.0f, PLAYER_IA_MOONS_TEAR);
if (player->transformation == PLAYER_FORM_DEKU) { if (player->transformation == PLAYER_FORM_DEKU) {
if (gSaveContext.save.day == 3) { if (gSaveContext.save.day == 3) {
this->unk_33A = 2; this->unk_33A = 2;
@ -423,7 +423,7 @@ void func_80ADB924(EnSellnuts* this, PlayState* play) {
itemAction = func_80123810(play); itemAction = func_80123810(play);
if (itemAction > PLAYER_IA_NONE) { if (itemAction > PLAYER_IA_NONE) {
if (itemAction == PLAYER_IA_MOON_TEAR) { if (itemAction == PLAYER_IA_MOONS_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A]; player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId; this->unk_340 = player->actor.textId;
player->exchangeItemId = itemAction; player->exchangeItemId = itemAction;

2
src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
View File

@ -265,7 +265,7 @@ s32 func_80C10B0C(EnThiefbird* this, PlayState* play) {
itemId1 = phi_a3 + (ITEM_SWORD_KOKIRI - 1); itemId1 = phi_a3 + (ITEM_SWORD_KOKIRI - 1);
if (phi_a3 == 4) { if (phi_a3 == 4) {
Inventory_DeleteItem(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY); Inventory_DeleteItem(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY);
this->unk_3E8 = gTakkuriStolenGreatFairySwordDL; this->unk_3E8 = gTakkuriStolenGreatFairysSwordDL;
itemId1 = ITEM_SWORD_GREAT_FAIRY; itemId1 = ITEM_SWORD_GREAT_FAIRY;
} else { } else {
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE; CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;

2
src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c
View File

@ -117,7 +117,7 @@ void func_80C06768(ObjMoonStone* this, PlayState* play) {
this->actor.draw = NULL; this->actor.draw = NULL;
func_80C0685C(this); func_80C0685C(this);
} else if (this->actor.xzDistToPlayer < 25.0f) { } else if (this->actor.xzDistToPlayer < 25.0f) {
Actor_OfferGetItem(&this->actor, play, GI_MOON_TEAR, 100.0f, 30.0f); Actor_OfferGetItem(&this->actor, play, GI_MOONS_TEAR, 100.0f, 30.0f);
} }
} }
} }

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

@ -2449,8 +2449,8 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
// GI_SEAHORSE_CAUGHT // GI_SEAHORSE_CAUGHT
GET_ITEM(ITEM_SEAHORSE_CAUGHT, OBJECT_GI_SEAHORSE, GID_SEAHORSE_CAUGHT, 0x95, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0), GET_ITEM(ITEM_SEAHORSE_CAUGHT, OBJECT_GI_SEAHORSE, GID_SEAHORSE_CAUGHT, 0x95, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG), CHEST_ANIM_LONG),
// GI_MOON_TEAR // GI_MOONS_TEAR
GET_ITEM(ITEM_MOON_TEAR, OBJECT_GI_RESERVE00, GID_MOON_TEAR, 0x96, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0), GET_ITEM(ITEM_MOONS_TEAR, OBJECT_GI_RESERVE00, GID_MOONS_TEAR, 0x96, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG), CHEST_ANIM_LONG),
// GI_DEED_LAND // GI_DEED_LAND
GET_ITEM(ITEM_DEED_LAND, OBJECT_GI_RESERVE01, GID_DEED_LAND, 0x97, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0), GET_ITEM(ITEM_DEED_LAND, OBJECT_GI_RESERVE01, GID_DEED_LAND, 0x97, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
@ -2912,7 +2912,7 @@ s8 sItemItemActions[] = {
PLAYER_IA_BOTTLE_CHATEAU, // ITEM_CHATEAU, PLAYER_IA_BOTTLE_CHATEAU, // ITEM_CHATEAU,
PLAYER_IA_BOTTLE_HYLIAN_LOACH, // ITEM_HYLIAN_LOACH, PLAYER_IA_BOTTLE_HYLIAN_LOACH, // ITEM_HYLIAN_LOACH,
PLAYER_IA_BOTTLE_POE, // ITEM_OBABA_DRINK, // ! PLAYER_IA_BOTTLE_POE, // ITEM_OBABA_DRINK, // !
PLAYER_IA_MOON_TEAR, // ITEM_MOON_TEAR, PLAYER_IA_MOONS_TEAR, // ITEM_MOONS_TEAR,
PLAYER_IA_DEED_LAND, // ITEM_DEED_LAND, PLAYER_IA_DEED_LAND, // ITEM_DEED_LAND,
PLAYER_IA_DEED_SWAMP, // ITEM_DEED_SWAMP, PLAYER_IA_DEED_SWAMP, // ITEM_DEED_SWAMP,
PLAYER_IA_DEED_MOUNTAIN, // ITEM_DEED_MOUNTAIN, PLAYER_IA_DEED_MOUNTAIN, // ITEM_DEED_MOUNTAIN,
@ -3031,7 +3031,7 @@ PlayerFuncAC4 D_8085C9F0[PLAYER_IA_MAX] = {
func_80848780, // PLAYER_IA_BOTTLE_MILK_HALF func_80848780, // PLAYER_IA_BOTTLE_MILK_HALF
func_80848780, // PLAYER_IA_BOTTLE_CHATEAU func_80848780, // PLAYER_IA_BOTTLE_CHATEAU
func_80848780, // PLAYER_IA_BOTTLE_FAIRY func_80848780, // PLAYER_IA_BOTTLE_FAIRY
func_80848780, // PLAYER_IA_MOON_TEAR func_80848780, // PLAYER_IA_MOONS_TEAR
func_80848780, // PLAYER_IA_DEED_LAND func_80848780, // PLAYER_IA_DEED_LAND
func_80848780, // PLAYER_IA_ROOM_KEY func_80848780, // PLAYER_IA_ROOM_KEY
func_80848780, // PLAYER_IA_LETTER_TO_KAFEI func_80848780, // PLAYER_IA_LETTER_TO_KAFEI
@ -3118,7 +3118,7 @@ void (*D_8085CB3C[PLAYER_IA_MAX])(PlayState*, Player*) = {
func_8082F594, // PLAYER_IA_BOTTLE_MILK_HALF func_8082F594, // PLAYER_IA_BOTTLE_MILK_HALF
func_8082F594, // PLAYER_IA_BOTTLE_CHATEAU func_8082F594, // PLAYER_IA_BOTTLE_CHATEAU
func_8082F594, // PLAYER_IA_BOTTLE_FAIRY func_8082F594, // PLAYER_IA_BOTTLE_FAIRY
func_8082F594, // PLAYER_IA_MOON_TEAR func_8082F594, // PLAYER_IA_MOONS_TEAR
func_8082F594, // PLAYER_IA_DEED_LAND func_8082F594, // PLAYER_IA_DEED_LAND
func_8082F594, // PLAYER_IA_ROOM_KEY func_8082F594, // PLAYER_IA_ROOM_KEY
func_8082F594, // PLAYER_IA_LETTER_TO_KAFEI func_8082F594, // PLAYER_IA_LETTER_TO_KAFEI
@ -7054,7 +7054,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_MILK_HALF, // PLAYER_IA_BOTTLE_MILK_HALF GI_MILK_HALF, // PLAYER_IA_BOTTLE_MILK_HALF
GI_CHATEAU, // PLAYER_IA_BOTTLE_CHATEAU GI_CHATEAU, // PLAYER_IA_BOTTLE_CHATEAU
GI_FAIRY, // PLAYER_IA_BOTTLE_FAIRY GI_FAIRY, // PLAYER_IA_BOTTLE_FAIRY
GI_MOON_TEAR, // PLAYER_IA_MOON_TEAR GI_MOONS_TEAR, // PLAYER_IA_MOONS_TEAR
GI_DEED_LAND, // PLAYER_IA_DEED_LAND GI_DEED_LAND, // PLAYER_IA_DEED_LAND
GI_ROOM_KEY, // PLAYER_IA_ROOM_KEY GI_ROOM_KEY, // PLAYER_IA_ROOM_KEY
GI_LETTER_TO_KAFEI, // PLAYER_IA_LETTER_TO_KAFEI GI_LETTER_TO_KAFEI, // PLAYER_IA_LETTER_TO_KAFEI
@ -7062,7 +7062,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_DEED_SWAMP, // PLAYER_IA_DEED_SWAMP GI_DEED_SWAMP, // PLAYER_IA_DEED_SWAMP
GI_DEED_MOUNTAIN, // PLAYER_IA_DEED_MOUNTAIN GI_DEED_MOUNTAIN, // PLAYER_IA_DEED_MOUNTAIN
GI_DEED_OCEAN, // PLAYER_IA_DEED_OCEAN GI_DEED_OCEAN, // PLAYER_IA_DEED_OCEAN
GI_MOON_TEAR, // PLAYER_IA_32 GI_MOONS_TEAR, // PLAYER_IA_32
GI_LETTER_TO_MAMA, // PLAYER_IA_LETTER_MAMA GI_LETTER_TO_MAMA, // PLAYER_IA_LETTER_MAMA
GI_A7, // PLAYER_IA_34 GI_A7, // PLAYER_IA_34
GI_A8, // PLAYER_IA_35 GI_A8, // PLAYER_IA_35

15
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c
View File

@ -6,12 +6,10 @@
#include "z_kaleido_scope.h" #include "z_kaleido_scope.h"
#include "interface/parameter_static/parameter_static.h" #include "interface/parameter_static/parameter_static.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s16 point); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s16 point);
extern TexturePtr D_08061000; // gBombersNotebookIconTex
extern TexturePtr D_08062000; // gSongNoteIconTex
s16 sQuestRemainsColorTimerInit[] = { 120, 60, 2, 80 }; s16 sQuestRemainsColorTimerInit[] = { 120, 60, 2, 80 };
s16 sQuestHpColorTimerInits[] = { 20, 4, 20, 10 }; s16 sQuestHpColorTimerInits[] = { 20, 4, 20, 10 };
s16 sQuestSongPlayedOcarinaButtonsNum = 0; s16 sQuestSongPlayedOcarinaButtonsNum = 0;
@ -117,8 +115,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
255, // QUEST_SONG_SUN 255, // QUEST_SONG_SUN
}; };
static TexturePtr sQuestUpgradeTextures[][3] = { static TexturePtr sQuestUpgradeTextures[][3] = {
{ 0x08053000, 0x08054000, 0x08055000 }, // UPG_QUIVER { gItemIconQuiver30Tex, gItemIconQuiver40Tex, gItemIconQuiver50Tex }, // UPG_QUIVER
{ 0x08056000, 0x08057000, 0x08058000 }, // UPG_BOMB_BAG { gItemIconBombBag20Tex, gItemIconBombBag30Tex, gItemIconBombBag40Tex }, // UPG_BOMB_BAG
}; };
static u8 sQuestUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG }; static u8 sQuestUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG };
PauseContext* pauseCtx = &play->pauseCtx; PauseContext* pauseCtx = &play->pauseCtx;
@ -221,8 +219,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gDPLoadTextureBlock(POLY_OPA_DISP++, &D_08062000, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, gDPLoadTextureBlock(POLY_OPA_DISP++, gItemIconSongNoteTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
for (i = 0; i < 12; i++, j += 4) { for (i = 0; i < 12; i++, j += 4) {
if (CHECK_QUEST_ITEM(i + QUEST_SONG_SONATA) || if (CHECK_QUEST_ITEM(i + QUEST_SONG_SONATA) ||
@ -256,7 +255,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
if (CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) { if (CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[j], 4, 0); gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[j], 4, 0);
KaleidoScope_DrawTexQuadRGBA32(play->state.gfxCtx, &D_08061000, 32, 32, 0); KaleidoScope_DrawTexQuadRGBA32(play->state.gfxCtx, gItemIconBombersNotebookTex, 32, 32, 0);
} }
j += 4; j += 4;

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

@ -805,18 +805,18 @@ void KaleidoScope_UpdateInventoryEditor(PlayState* play) {
Inventory_DeleteItem(value, slot); Inventory_DeleteItem(value, slot);
} else if (slot == SLOT_TRADE_DEED) { } else if (slot == SLOT_TRADE_DEED) {
if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_NONE) { if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_NONE) {
gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_MOON_TEAR; gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_MOONS_TEAR;
} else if ((INV_CONTENT(ITEM_MOON_TEAR) >= ITEM_MOON_TEAR) && } else if ((INV_CONTENT(ITEM_MOONS_TEAR) >= ITEM_MOONS_TEAR) &&
(INV_CONTENT(ITEM_MOON_TEAR) <= ITEM_DEED_MOUNTAIN)) { (INV_CONTENT(ITEM_MOONS_TEAR) <= ITEM_DEED_MOUNTAIN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOON_TEAR) + 1; gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOONS_TEAR) + 1;
} }
} else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { } else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_NONE) { if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_NONE) {
gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_DEED_OCEAN; gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_DEED_OCEAN;
} else if ((INV_CONTENT(ITEM_MOON_TEAR) >= ITEM_DEED_LAND) && } else if ((INV_CONTENT(ITEM_MOONS_TEAR) >= ITEM_DEED_LAND) &&
(INV_CONTENT(ITEM_MOON_TEAR) <= ITEM_DEED_OCEAN)) { (INV_CONTENT(ITEM_MOONS_TEAR) <= ITEM_DEED_OCEAN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOON_TEAR) - 1; gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOONS_TEAR) - 1;
} }
} }
} else if (slot == SLOT_TRADE_KEY_MAMA) { } else if (slot == SLOT_TRADE_KEY_MAMA) {

14
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c
View File

@ -9,8 +9,7 @@
#include "interface/icon_item_field_static/icon_item_field_static.h" #include "interface/icon_item_field_static/icon_item_field_static.h"
#include "interface/icon_item_dungeon_static/icon_item_dungeon_static.h" #include "interface/icon_item_dungeon_static/icon_item_dungeon_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h" #include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
#include "archives/icon_item_24_static/icon_item_24_static_yar.h"
extern TexturePtr D_09007500; // gPlayerFaceIcon
void KaleidoScope_DrawDungeonStrayFairyCount(PlayState* play) { void KaleidoScope_DrawDungeonStrayFairyCount(PlayState* play) {
s16 counterDigits[2]; s16 counterDigits[2];
@ -76,9 +75,9 @@ void KaleidoScope_DrawDungeonStrayFairyCount(PlayState* play) {
} }
TexturePtr sDungeonItemTextures[] = { TexturePtr sDungeonItemTextures[] = {
0x09003600, // `gBossKeyIconTex`: DUNGEON_BOSS_KEY gQuestIconBossKeyTex, // DUNGEON_BOSS_KEY
0x09003F00, // `gCompassIconTex`: DUNGEON_COMPASS gQuestIconCompassTex, // DUNGEON_COMPASS
0x09004800, // `gDungeonMapIconTex`: DUNGEON_MAP gQuestIconDungeonMapTex, // DUNGEON_MAP
}; };
TexturePtr sDungeonTitleTextures[] = { TexturePtr sDungeonTitleTextures[] = {
@ -283,7 +282,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play) {
// Draw Player's face next to the dungeon floor icon currently in. // Draw Player's face next to the dungeon floor icon currently in.
POLY_OPA_DISP = POLY_OPA_DISP =
Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, &D_09007500, 16, 16, 62, Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, gQuestIconLinkHumanFaceTex, 16, 16, 62,
sDungeonMapFloorIconPosY[R_REVERSE_FLOOR_INDEX], 16, 16, 1 << 10, 1 << 10); sDungeonMapFloorIconPosY[R_REVERSE_FLOOR_INDEX], 16, 16, 1 << 10, 1 << 10);
if (CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, gSaveContext.dungeonIndex)) { if (CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, gSaveContext.dungeonIndex)) {
@ -813,7 +812,8 @@ void KaleidoScope_DrawWorldMap(PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
POLY_OPA_DISP = Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, &D_09007500, 16, 16, sWorldMapCursorsRectLeft[n], POLY_OPA_DISP =
Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, gQuestIconLinkHumanFaceTex, 16, 16, sWorldMapCursorsRectLeft[n],
sWorldMapCursorsRectTop[n], 16, 16, 1 << 10, 1 << 10); sWorldMapCursorsRectTop[n], 16, 16, 1 << 10, 1 << 10);
} }
} }

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

@ -3,102 +3,96 @@
* Overlay: ovl_kaleido_scope * Overlay: ovl_kaleido_scope
* Description: Pause Menu * Description: Pause Menu
*/ */
#include "prevent_bss_reordering.h"
#include "z_kaleido_scope.h" #include "z_kaleido_scope.h"
#include "overlays/gamestates/ovl_opening/z_opening.h"
#include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
#include "z64view.h" #include "z64view.h"
#include "overlays/gamestates/ovl_opening/z_opening.h" #include "overlays/gamestates/ovl_opening/z_opening.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "interface/icon_item_gameover_static/icon_item_gameover_static.h" #include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h" #include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
#include "interface/icon_item_vtx_static/icon_item_vtx_static.h" #include "interface/icon_item_vtx_static/icon_item_vtx_static.h"
// iconItemSegment
extern TexturePtr D_08064340; // gPauseMenuCursorTex
// Page Textures (Background of Page): // Page Textures (Background of Page):
// Broken up into multiple textures. // Broken up into multiple textures.
// Numbered by column/row. // Numbered by column/row.
TexturePtr sMaskPageBgTextures[] = { TexturePtr sMaskPageBgTextures[] = {
// Column 0 // Column 0
0x08064440, // gPauseMasks00Tex gPauseMasks00Tex,
0x0806E440, // gPauseMasks01Tex gPauseMasks01Tex,
0x08077A40, // gPauseMasks02Tex gPauseMasks02Tex,
0x08081040, // gPauseMasks03Tex gPauseMasks03Tex,
0x0808A640, // gPauseMasks04Tex gPauseMasks04Tex,
// Column 1 // Column 1
gPauseMasks10ENGTex, gPauseMasks10ENGTex,
0x0806EE40, // gPauseMasks11Tex gPauseMasks11Tex,
0x08078440, // gPauseMasks12Tex gPauseMasks12Tex,
0x08081A40, // gPauseMasks13Tex gPauseMasks13Tex,
0x0808B040, // gPauseMasks14Tex gPauseMasks14Tex,
// Column 2 // Column 2
0x08065840, // gPauseMasks20Tex gPauseMasks20Tex,
0x0806F840, // gPauseMasks21Tex gPauseMasks21Tex,
0x08078E40, // gPauseMasks22Tex gPauseMasks22Tex,
0x08082440, // gPauseMasks23Tex gPauseMasks23Tex,
0x0808BA40, // gPauseMasks24Tex gPauseMasks24Tex,
}; };
TexturePtr sItemPageBgTextures[] = { TexturePtr sItemPageBgTextures[] = {
// Column 0 // Column 0
gPauseSelectItem00ENGTex, gPauseSelectItem00ENGTex,
0x08070240, // gPauseSelectItem01Tex gPauseSelectItem01Tex,
0x08079840, // gPauseSelectItem02Tex gPauseSelectItem02Tex,
0x08082E40, // gPauseSelectItem03Tex gPauseSelectItem03Tex,
0x0808C440, // gPauseSelectItem04Tex gPauseSelectItem04Tex,
// Column 1 // Column 1
gPauseSelectItem10ENGTex, gPauseSelectItem10ENGTex,
0x08070C40, // gPauseSelectItem11Tex gPauseSelectItem11Tex,
0x0807A240, // gPauseSelectItem12Tex gPauseSelectItem12Tex,
0x08083840, // gPauseSelectItem13Tex gPauseSelectItem13Tex,
0x0808CE40, // gPauseSelectItem14Tex gPauseSelectItem14Tex,
// Column 2 // Column 2
gPauseSelectItem20ENGTex, gPauseSelectItem20ENGTex,
0x08071640, // gPauseSelectItem21Tex gPauseSelectItem21Tex,
0x0807AC40, // gPauseSelectItem22Tex gPauseSelectItem22Tex,
0x08084240, // gPauseSelectItem23Tex gPauseSelectItem23Tex,
0x0808D840, // gPauseSelectItem24Tex gPauseSelectItem24Tex,
}; };
TexturePtr sMapPageBgTextures[] = { TexturePtr sMapPageBgTextures[] = {
// Column 0 // Column 0
0x08068040, // gPauseMap00Tex gPauseMap00Tex,
0x08072040, // gPauseMap01Tex gPauseMap01Tex,
0x0807B640, // gPauseMap02Tex gPauseMap02Tex,
0x08084C40, // gPauseMap03Tex gPauseMap03Tex,
0x0808E240, // gPauseMap04Tex gPauseMap04Tex,
// Column 1 // Column 1
gPauseMap10ENGTex, gPauseMap10ENGTex,
0x08072A40, // gPauseMap11Tex gPauseMap11Tex,
0x0807C040, // gPauseMap12Tex gPauseMap12Tex,
0x08085640, // gPauseMap13Tex gPauseMap13Tex,
0x0808EC40, // gPauseMap14Tex gPauseMap14Tex,
// Column 2 // Column 2
0x08069440, // gPauseMap20Tex gPauseMap20Tex,
0x08073440, // gPauseMap21Tex gPauseMap21Tex,
0x0807CA40, // gPauseMap22Tex gPauseMap22Tex,
0x08086040, // gPauseMap23Tex gPauseMap23Tex,
0x0808F640, // gPauseMap24Tex gPauseMap24Tex,
}; };
TexturePtr sQuestPageBgTextures[] = { TexturePtr sQuestPageBgTextures[] = {
// Column 0 // Column 0
gPauseQuestStatus00ENGTex, gPauseQuestStatus00ENGTex,
0x08073E40, // gPauseQuestStatus01Tex gPauseQuestStatus01Tex,
0x0807D440, // gPauseQuestStatus02Tex gPauseQuestStatus02Tex,
0x08086A40, // gPauseQuestStatus03Tex gPauseQuestStatus03Tex,
0x08090040, // gPauseQuestStatus04Tex gPauseQuestStatus04Tex,
// Column 1 // Column 1
gPauseQuestStatus10ENGTex, gPauseQuestStatus10ENGTex,
0x08074840, // gPauseQuestStatus11Tex gPauseQuestStatus11Tex,
0x0807DE40, // gPauseQuestStatus12Tex gPauseQuestStatus12Tex,
0x08087440, // gPauseQuestStatus13Tex gPauseQuestStatus13Tex,
0x08090A40, // gPauseQuestStatus14Tex gPauseQuestStatus14Tex,
// Column 2 // Column 2
gPauseQuestStatus20ENGTex, gPauseQuestStatus20ENGTex,
0x08075240, // gPauseQuestStatus21Tex gPauseQuestStatus21Tex,
0x0807E840, // gPauseQuestStatus22Tex gPauseQuestStatus22Tex,
0x08087E40, // gPauseQuestStatus23Tex gPauseQuestStatus23Tex,
0x08091440, // gPauseQuestStatus24Tex gPauseQuestStatus24Tex,
}; };
s16 gVtxPageMapWorldQuadsWidth[VTX_PAGE_MAP_WORLD_QUADS] = { s16 gVtxPageMapWorldQuadsWidth[VTX_PAGE_MAP_WORLD_QUADS] = {
@ -2607,7 +2601,7 @@ void KaleidoScope_DrawCursor(PlayState* play) {
Matrix_Translate(sCursorCirclesX[i], sCursorCirclesY[i], -50.0f, MTXMODE_APPLY); Matrix_Translate(sCursorCirclesX[i], sCursorCirclesY[i], -50.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPLoadTextureBlock(POLY_OPA_DISP++, &D_08064340, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, gDPLoadTextureBlock(POLY_OPA_DISP++, gPauseMenuCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD); G_TX_NOLOD, G_TX_NOLOD);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->cursorVtx[0], 4, 0); gSPVertex(POLY_OPA_DISP++, &pauseCtx->cursorVtx[0], 4, 0);

6
tools/gitable.py
View File

@ -53,7 +53,7 @@ itemId_names = {
0x25: "ITEM_CHATEAU", 0x25: "ITEM_CHATEAU",
0x26: "ITEM_HYLIAN_LOACH", 0x26: "ITEM_HYLIAN_LOACH",
0x27: "ITEM_OBABA_DRINK", 0x27: "ITEM_OBABA_DRINK",
0x28: "ITEM_MOON_TEAR", 0x28: "ITEM_MOONS_TEAR",
0x29: "ITEM_DEED_LAND", 0x29: "ITEM_DEED_LAND",
0x2A: "ITEM_DEED_SWAMP", 0x2A: "ITEM_DEED_SWAMP",
0x2B: "ITEM_DEED_MOUNTAIN", 0x2B: "ITEM_DEED_MOUNTAIN",
@ -305,7 +305,7 @@ getItemId_names = {
0x93: "GI_GOLD_DUST_2", 0x93: "GI_GOLD_DUST_2",
0x94: "GI_HYLIAN_LOACH", 0x94: "GI_HYLIAN_LOACH",
0x95: "GI_SEAHORSE_CAUGHT", 0x95: "GI_SEAHORSE_CAUGHT",
0x96: "GI_MOON_TEAR", 0x96: "GI_MOONS_TEAR",
0x97: "GI_DEED_LAND", 0x97: "GI_DEED_LAND",
0x98: "GI_DEED_SWAMP", 0x98: "GI_DEED_SWAMP",
0x99: "GI_DEED_MOUNTAIN", 0x99: "GI_DEED_MOUNTAIN",
@ -426,7 +426,7 @@ getItemDrawId_names = {
0x56: "GID_SKULL_TOKEN_2", 0x56: "GID_SKULL_TOKEN_2",
0x57: "GID_57", 0x57: "GID_57",
0x58: "GID_ZORA_EGG", 0x58: "GID_ZORA_EGG",
0x59: "GID_MOON_TEAR", 0x59: "GID_MOONS_TEAR",
0x5A: "GID_DEED_LAND", 0x5A: "GID_DEED_LAND",
0x5B: "GID_MASK_DEKU", 0x5B: "GID_MASK_DEKU",
0x5C: "GID_REMAINS_ODOLWA", 0x5C: "GID_REMAINS_ODOLWA",

2
tools/namefixer.py
View File

@ -1149,7 +1149,7 @@ wordReplace = {
"EXCH_ITEM_NONE": "PLAYER_IA_NONE", "EXCH_ITEM_NONE": "PLAYER_IA_NONE",
"EXCH_ITEM_PICTO_BOX": "PLAYER_IA_PICTO_BOX", "EXCH_ITEM_PICTO_BOX": "PLAYER_IA_PICTO_BOX",
"EXCH_ITEM_1E": "PLAYER_IA_BOTTLE_MUSHROOM", "EXCH_ITEM_1E": "PLAYER_IA_BOTTLE_MUSHROOM",
"EXCH_ITEM_MOON_TEAR": "PLAYER_IA_MOON_TEAR", "EXCH_ITEM_MOON_TEAR": "PLAYER_IA_MOONS_TEAR",
"EXCH_ITEM_DEED_LAND": "PLAYER_IA_DEED_LAND", "EXCH_ITEM_DEED_LAND": "PLAYER_IA_DEED_LAND",
"EXCH_ITEM_ROOM_KEY": "PLAYER_IA_ROOM_KEY", "EXCH_ITEM_ROOM_KEY": "PLAYER_IA_ROOM_KEY",
"EXCH_ITEM_LETTER_TO_KAFEI": "PLAYER_IA_LETTER_TO_KAFEI", "EXCH_ITEM_LETTER_TO_KAFEI": "PLAYER_IA_LETTER_TO_KAFEI",

28
undefined_syms.txt
View File

@ -1101,34 +1101,6 @@ D_06000D60 = 0x06000D60;
// segment 0x08 // segment 0x08
D_08000000 = 0x08000000; D_08000000 = 0x08000000;
D_08000100 = 0x08000100;
D_08000700 = 0x08000700;
D_08000880 = 0x08000880;
D_08000A40 = 0x08000A40;
D_08001240 = 0x08001240;
D_080012C0 = 0x080012C0;
D_08001340 = 0x08001340;
D_08001358 = 0x08001358;
D_080013D8 = 0x080013D8;
D_080017D8 = 0x080017D8;
D_08001898 = 0x08001898;
D_080018B0 = 0x080018B0;
D_080018D0 = 0x080018D0;
D_08001950 = 0x08001950;
D_08001CD0 = 0x08001CD0;
D_08001DB0 = 0x08001DB0;
D_08001E90 = 0x08001E90;
D_08001F70 = 0x08001F70;
D_080025C8 = 0x080025C8;
D_080032B0 = 0x080032B0;
D_08061000 = 0x08061000;
D_08062000 = 0x08062000;
D_08064340 = 0x08064340;
D_08095AC0 = 0x08095AC0;
// segment 0x09
D_09007500 = 0x09007500;
// segment 0x0A // segment 0x0A