diff --git a/assets/tracker/Entrance.png b/assets/tracker/Entrance.png deleted file mode 100644 index a7dbd6fa..00000000 Binary files a/assets/tracker/Entrance.png and /dev/null differ diff --git a/assets/tracker/Inventory_Gear_Subscreen_Overlay.png b/assets/tracker/Inventory_Gear_Subscreen_Overlay.png deleted file mode 100644 index d3e55ea6..00000000 Binary files a/assets/tracker/Inventory_Gear_Subscreen_Overlay.png and /dev/null differ diff --git a/assets/tracker/No_Entrance.png b/assets/tracker/No_Entrance.png deleted file mode 100644 index e96d54c1..00000000 Binary files a/assets/tracker/No_Entrance.png and /dev/null differ diff --git a/assets/tracker/Song_Block.png b/assets/tracker/Song_Block.png deleted file mode 100644 index 1a6188cd..00000000 Binary files a/assets/tracker/Song_Block.png and /dev/null differ diff --git a/assets/tracker/Sword_Block.png b/assets/tracker/Sword_Block.png deleted file mode 100644 index 9d773c50..00000000 Binary files a/assets/tracker/Sword_Block.png and /dev/null differ diff --git a/assets/tracker/b wheel.png b/assets/tracker/b wheel.png deleted file mode 100644 index 025a46d0..00000000 Binary files a/assets/tracker/b wheel.png and /dev/null differ diff --git a/assets/tracker/bosses/dreadfuse.png b/assets/tracker/bosses/dreadfuse.png deleted file mode 100644 index ec10f46c..00000000 Binary files a/assets/tracker/bosses/dreadfuse.png and /dev/null differ diff --git a/assets/tracker/bosses/eldinTrialGate.png b/assets/tracker/bosses/eldinTrialGate.png deleted file mode 100644 index 24b4cc9e..00000000 Binary files a/assets/tracker/bosses/eldinTrialGate.png and /dev/null differ diff --git a/assets/tracker/bosses/faronTrialGate.png b/assets/tracker/bosses/faronTrialGate.png deleted file mode 100644 index 332051e5..00000000 Binary files a/assets/tracker/bosses/faronTrialGate.png and /dev/null differ diff --git a/assets/tracker/bosses/g1.png b/assets/tracker/bosses/g1.png deleted file mode 100644 index 644feaa7..00000000 Binary files a/assets/tracker/bosses/g1.png and /dev/null differ diff --git a/assets/tracker/bosses/g2.png b/assets/tracker/bosses/g2.png deleted file mode 100644 index d0fa5775..00000000 Binary files a/assets/tracker/bosses/g2.png and /dev/null differ diff --git a/assets/tracker/bosses/koloktos.png b/assets/tracker/bosses/koloktos.png deleted file mode 100644 index ee2c7ba1..00000000 Binary files a/assets/tracker/bosses/koloktos.png and /dev/null differ diff --git a/assets/tracker/bosses/lanayruTrialGate.png b/assets/tracker/bosses/lanayruTrialGate.png deleted file mode 100644 index b84be509..00000000 Binary files a/assets/tracker/bosses/lanayruTrialGate.png and /dev/null differ diff --git a/assets/tracker/bosses/moldarach.png b/assets/tracker/bosses/moldarach.png deleted file mode 100644 index e7d6fc13..00000000 Binary files a/assets/tracker/bosses/moldarach.png and /dev/null differ diff --git a/assets/tracker/bosses/scaldera.png b/assets/tracker/bosses/scaldera.png deleted file mode 100644 index 309f4080..00000000 Binary files a/assets/tracker/bosses/scaldera.png and /dev/null differ diff --git a/assets/tracker/bosses/tentalus.png b/assets/tracker/bosses/tentalus.png deleted file mode 100644 index bffa3b20..00000000 Binary files a/assets/tracker/bosses/tentalus.png and /dev/null differ diff --git a/assets/tracker/bosses/trialGate.png b/assets/tracker/bosses/trialGate.png deleted file mode 100644 index 5f338311..00000000 Binary files a/assets/tracker/bosses/trialGate.png and /dev/null differ diff --git a/assets/tracker/dungeonLayout.png b/assets/tracker/dungeonLayout.png deleted file mode 100644 index eb1da1d8..00000000 Binary files a/assets/tracker/dungeonLayout.png and /dev/null differ diff --git a/assets/tracker/dungeons/Stone_of_Trials.png b/assets/tracker/dungeons/stone_of_trials.png similarity index 100% rename from assets/tracker/dungeons/Stone_of_Trials.png rename to assets/tracker/dungeons/stone_of_trials.png diff --git a/assets/tracker/g1.jpg b/assets/tracker/g1.jpg deleted file mode 100644 index f9100ff3..00000000 Binary files a/assets/tracker/g1.jpg and /dev/null differ diff --git a/assets/tracker/hints/barren.png b/assets/tracker/hints/barren.png deleted file mode 100644 index 8a16bd3b..00000000 Binary files a/assets/tracker/hints/barren.png and /dev/null differ diff --git a/assets/tracker/hints/g1.png b/assets/tracker/hints/g1.png deleted file mode 100644 index e53af67d..00000000 Binary files a/assets/tracker/hints/g1.png and /dev/null differ diff --git a/assets/tracker/hints/g2.png b/assets/tracker/hints/g2.png deleted file mode 100644 index 936c653c..00000000 Binary files a/assets/tracker/hints/g2.png and /dev/null differ diff --git a/assets/tracker/hints/koloktos.png b/assets/tracker/hints/koloktos.png deleted file mode 100644 index 445d50c2..00000000 Binary files a/assets/tracker/hints/koloktos.png and /dev/null differ diff --git a/assets/tracker/hints/moldarach.png b/assets/tracker/hints/moldarach.png deleted file mode 100644 index 6e26b9b5..00000000 Binary files a/assets/tracker/hints/moldarach.png and /dev/null differ diff --git a/assets/tracker/hints/scaldera.png b/assets/tracker/hints/scaldera.png deleted file mode 100644 index bc8a4d0e..00000000 Binary files a/assets/tracker/hints/scaldera.png and /dev/null differ diff --git a/assets/tracker/hints/sots.png b/assets/tracker/hints/sots.png deleted file mode 100644 index fda54418..00000000 Binary files a/assets/tracker/hints/sots.png and /dev/null differ diff --git a/assets/tracker/hints/tentalus.png b/assets/tracker/hints/tentalus.png deleted file mode 100644 index 3ed6c59a..00000000 Binary files a/assets/tracker/hints/tentalus.png and /dev/null differ diff --git a/assets/tracker/hints/unknown.png b/assets/tracker/hints/unknown.png deleted file mode 100644 index b231e832..00000000 Binary files a/assets/tracker/hints/unknown.png and /dev/null differ diff --git a/assets/tracker/beetle.png b/assets/tracker/item_wheel/beetle.png similarity index 100% rename from assets/tracker/beetle.png rename to assets/tracker/item_wheel/beetle.png diff --git a/assets/tracker/beetle_gray.png b/assets/tracker/item_wheel/beetle_gray.png similarity index 100% rename from assets/tracker/beetle_gray.png rename to assets/tracker/item_wheel/beetle_gray.png diff --git a/assets/tracker/big_bug_net.png b/assets/tracker/item_wheel/big_bug_net.png similarity index 100% rename from assets/tracker/big_bug_net.png rename to assets/tracker/item_wheel/big_bug_net.png diff --git a/assets/tracker/bombs.png b/assets/tracker/item_wheel/bombs.png similarity index 100% rename from assets/tracker/bombs.png rename to assets/tracker/item_wheel/bombs.png diff --git a/assets/tracker/bombs_gray.png b/assets/tracker/item_wheel/bombs_gray.png similarity index 100% rename from assets/tracker/bombs_gray.png rename to assets/tracker/item_wheel/bombs_gray.png diff --git a/assets/tracker/bow.png b/assets/tracker/item_wheel/bow.png similarity index 100% rename from assets/tracker/bow.png rename to assets/tracker/item_wheel/bow.png diff --git a/assets/tracker/bow_gray.png b/assets/tracker/item_wheel/bow_gray.png similarity index 100% rename from assets/tracker/bow_gray.png rename to assets/tracker/item_wheel/bow_gray.png diff --git a/assets/tracker/bug_net.png b/assets/tracker/item_wheel/bug_net.png similarity index 100% rename from assets/tracker/bug_net.png rename to assets/tracker/item_wheel/bug_net.png diff --git a/assets/tracker/bug_net_gray.png b/assets/tracker/item_wheel/bug_net_gray.png similarity index 100% rename from assets/tracker/bug_net_gray.png rename to assets/tracker/item_wheel/bug_net_gray.png diff --git a/assets/tracker/clawshots.png b/assets/tracker/item_wheel/clawshots.png similarity index 100% rename from assets/tracker/clawshots.png rename to assets/tracker/item_wheel/clawshots.png diff --git a/assets/tracker/clawshots_gray.png b/assets/tracker/item_wheel/clawshots_gray.png similarity index 100% rename from assets/tracker/clawshots_gray.png rename to assets/tracker/item_wheel/clawshots_gray.png diff --git a/assets/tracker/gust_bellows.png b/assets/tracker/item_wheel/gust_bellows.png similarity index 100% rename from assets/tracker/gust_bellows.png rename to assets/tracker/item_wheel/gust_bellows.png diff --git a/assets/tracker/gust_bellows_gray.png b/assets/tracker/item_wheel/gust_bellows_gray.png similarity index 100% rename from assets/tracker/gust_bellows_gray.png rename to assets/tracker/item_wheel/gust_bellows_gray.png diff --git a/assets/tracker/hook_beetle.png b/assets/tracker/item_wheel/hook_beetle.png similarity index 100% rename from assets/tracker/hook_beetle.png rename to assets/tracker/item_wheel/hook_beetle.png diff --git a/assets/tracker/iron_bow.png b/assets/tracker/item_wheel/iron_bow.png similarity index 100% rename from assets/tracker/iron_bow.png rename to assets/tracker/item_wheel/iron_bow.png diff --git a/assets/tracker/quick_beetle.png b/assets/tracker/item_wheel/quick_beetle.png similarity index 100% rename from assets/tracker/quick_beetle.png rename to assets/tracker/item_wheel/quick_beetle.png diff --git a/assets/tracker/sacred_bow.png b/assets/tracker/item_wheel/sacred_bow.png similarity index 100% rename from assets/tracker/sacred_bow.png rename to assets/tracker/item_wheel/sacred_bow.png diff --git a/assets/tracker/scattershot.png b/assets/tracker/item_wheel/scattershot.png similarity index 100% rename from assets/tracker/scattershot.png rename to assets/tracker/item_wheel/scattershot.png diff --git a/assets/tracker/slingshot.png b/assets/tracker/item_wheel/slingshot.png similarity index 100% rename from assets/tracker/slingshot.png rename to assets/tracker/item_wheel/slingshot.png diff --git a/assets/tracker/slingshot_gray.png b/assets/tracker/item_wheel/slingshot_gray.png similarity index 100% rename from assets/tracker/slingshot_gray.png rename to assets/tracker/item_wheel/slingshot_gray.png diff --git a/assets/tracker/tough_beetle.png b/assets/tracker/item_wheel/tough_beetle.png similarity index 100% rename from assets/tracker/tough_beetle.png rename to assets/tracker/item_wheel/tough_beetle.png diff --git a/assets/tracker/whip.png b/assets/tracker/item_wheel/whip.png similarity index 100% rename from assets/tracker/whip.png rename to assets/tracker/item_wheel/whip.png diff --git a/assets/tracker/whip_gray.png b/assets/tracker/item_wheel/whip_gray.png similarity index 100% rename from assets/tracker/whip_gray.png rename to assets/tracker/item_wheel/whip_gray.png diff --git a/assets/tracker/junk/hylianShield.png b/assets/tracker/junk/hylianShield.png deleted file mode 100644 index 7d1d4b79..00000000 Binary files a/assets/tracker/junk/hylianShield.png and /dev/null differ diff --git a/assets/tracker/junk/rareTreasure.png b/assets/tracker/junk/rareTreasure.png deleted file mode 100644 index 86416cd7..00000000 Binary files a/assets/tracker/junk/rareTreasure.png and /dev/null differ diff --git a/assets/tracker/junk/rupees.png b/assets/tracker/junk/rupees.png deleted file mode 100644 index 1d4c5bcd..00000000 Binary files a/assets/tracker/junk/rupees.png and /dev/null differ diff --git a/assets/tracker/junk/semiRareTreasure.png b/assets/tracker/junk/semiRareTreasure.png deleted file mode 100644 index 6f483b5b..00000000 Binary files a/assets/tracker/junk/semiRareTreasure.png and /dev/null differ diff --git a/assets/tracker/junk/tumbleweed.png b/assets/tracker/junk/tumbleweed.png deleted file mode 100644 index e9d3b441..00000000 Binary files a/assets/tracker/junk/tumbleweed.png and /dev/null differ diff --git a/assets/tracker/junk/woodenShield.png b/assets/tracker/junk/woodenShield.png deleted file mode 100644 index b9b55773..00000000 Binary files a/assets/tracker/junk/woodenShield.png and /dev/null differ diff --git a/assets/tracker/main quest items.png b/assets/tracker/main quest items.png deleted file mode 100644 index 5ae269bd..00000000 Binary files a/assets/tracker/main quest items.png and /dev/null differ diff --git a/assets/tracker/main quest/1_Triforce.png b/assets/tracker/main quest/1_Triforce.png deleted file mode 100644 index 9a0d2bfe..00000000 Binary files a/assets/tracker/main quest/1_Triforce.png and /dev/null differ diff --git a/assets/tracker/main quest/2_Triforce.png b/assets/tracker/main quest/2_Triforce.png deleted file mode 100644 index 731da167..00000000 Binary files a/assets/tracker/main quest/2_Triforce.png and /dev/null differ diff --git a/assets/tracker/main quest/Full_Triforce.png b/assets/tracker/main quest/Full_Triforce.png deleted file mode 100644 index 0c142457..00000000 Binary files a/assets/tracker/main quest/Full_Triforce.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Earrings.png b/assets/tracker/main quest/No_Earrings.png deleted file mode 100644 index 1a00b06d..00000000 Binary files a/assets/tracker/main quest/No_Earrings.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Harp.png b/assets/tracker/main quest/No_Harp.png deleted file mode 100644 index a0ba9b00..00000000 Binary files a/assets/tracker/main quest/No_Harp.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Mitts.png b/assets/tracker/main quest/No_Mitts.png deleted file mode 100644 index c0c05760..00000000 Binary files a/assets/tracker/main quest/No_Mitts.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Sailcloth.png b/assets/tracker/main quest/No_Sailcloth.png deleted file mode 100644 index 2d812136..00000000 Binary files a/assets/tracker/main quest/No_Sailcloth.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Scale.png b/assets/tracker/main quest/No_Scale.png deleted file mode 100644 index ceaac058..00000000 Binary files a/assets/tracker/main quest/No_Scale.png and /dev/null differ diff --git a/assets/tracker/main quest/No_Triforce.png b/assets/tracker/main quest/No_Triforce.png deleted file mode 100644 index bd56930c..00000000 Binary files a/assets/tracker/main quest/No_Triforce.png and /dev/null differ diff --git a/assets/tracker/bird_statuette.png b/assets/tracker/main_quest/bird_statuette.png similarity index 100% rename from assets/tracker/bird_statuette.png rename to assets/tracker/main_quest/bird_statuette.png diff --git a/assets/tracker/bird_statuette_gray.png b/assets/tracker/main_quest/bird_statuette_gray.png similarity index 100% rename from assets/tracker/bird_statuette_gray.png rename to assets/tracker/main_quest/bird_statuette_gray.png diff --git a/assets/tracker/bottle.png b/assets/tracker/main_quest/bottle.png similarity index 100% rename from assets/tracker/bottle.png rename to assets/tracker/main_quest/bottle.png diff --git a/assets/tracker/bottle_gray.png b/assets/tracker/main_quest/bottle_gray.png similarity index 100% rename from assets/tracker/bottle_gray.png rename to assets/tracker/main_quest/bottle_gray.png diff --git a/assets/tracker/main quest/Digging_Mitts.png b/assets/tracker/main_quest/digging_mitts.png similarity index 100% rename from assets/tracker/main quest/Digging_Mitts.png rename to assets/tracker/main_quest/digging_mitts.png diff --git a/assets/tracker/main quest/digging_mitts_gray.png b/assets/tracker/main_quest/digging_mitts_gray.png similarity index 100% rename from assets/tracker/main quest/digging_mitts_gray.png rename to assets/tracker/main_quest/digging_mitts_gray.png diff --git a/assets/tracker/main quest/Fireshield_Earrings.png b/assets/tracker/main_quest/fireshield_earrings.png similarity index 100% rename from assets/tracker/main quest/Fireshield_Earrings.png rename to assets/tracker/main_quest/fireshield_earrings.png diff --git a/assets/tracker/main quest/fireshield_earrings_gray.png b/assets/tracker/main_quest/fireshield_earrings_gray.png similarity index 100% rename from assets/tracker/main quest/fireshield_earrings_gray.png rename to assets/tracker/main_quest/fireshield_earrings_gray.png diff --git a/assets/tracker/main quest/Goddess_Harp.png b/assets/tracker/main_quest/goddess_harp.png similarity index 100% rename from assets/tracker/main quest/Goddess_Harp.png rename to assets/tracker/main_quest/goddess_harp.png diff --git a/assets/tracker/main quest/goddess_harp_gray.png b/assets/tracker/main_quest/goddess_harp_gray.png similarity index 100% rename from assets/tracker/main quest/goddess_harp_gray.png rename to assets/tracker/main_quest/goddess_harp_gray.png diff --git a/assets/tracker/main quest/life_tree_fruit.png b/assets/tracker/main_quest/life_tree_fruit.png similarity index 100% rename from assets/tracker/main quest/life_tree_fruit.png rename to assets/tracker/main_quest/life_tree_fruit.png diff --git a/assets/tracker/main quest/life_tree_fruit_gray.png b/assets/tracker/main_quest/life_tree_fruit_gray.png similarity index 100% rename from assets/tracker/main quest/life_tree_fruit_gray.png rename to assets/tracker/main_quest/life_tree_fruit_gray.png diff --git a/assets/tracker/main quest/Mogma_Mitts.png b/assets/tracker/main_quest/mogma_mitts.png similarity index 100% rename from assets/tracker/main quest/Mogma_Mitts.png rename to assets/tracker/main_quest/mogma_mitts.png diff --git a/assets/tracker/pouch.png b/assets/tracker/main_quest/pouch.png similarity index 100% rename from assets/tracker/pouch.png rename to assets/tracker/main_quest/pouch.png diff --git a/assets/tracker/pouch_gray.png b/assets/tracker/main_quest/pouch_gray.png similarity index 100% rename from assets/tracker/pouch_gray.png rename to assets/tracker/main_quest/pouch_gray.png diff --git a/assets/tracker/main quest/Sailcloth.png b/assets/tracker/main_quest/sailcloth.png similarity index 100% rename from assets/tracker/main quest/Sailcloth.png rename to assets/tracker/main_quest/sailcloth.png diff --git a/assets/tracker/main quest/no_sailcloth_grid.png b/assets/tracker/main_quest/sailcloth_gray.png similarity index 100% rename from assets/tracker/main quest/no_sailcloth_grid.png rename to assets/tracker/main_quest/sailcloth_gray.png diff --git a/assets/tracker/main quest/Scrapper.png b/assets/tracker/main_quest/scrapper.png similarity index 100% rename from assets/tracker/main quest/Scrapper.png rename to assets/tracker/main_quest/scrapper.png diff --git a/assets/tracker/main quest/scrapper_gray.png b/assets/tracker/main_quest/scrapper_gray.png similarity index 100% rename from assets/tracker/main quest/scrapper_gray.png rename to assets/tracker/main_quest/scrapper_gray.png diff --git a/assets/tracker/sea_chart.png b/assets/tracker/main_quest/sea_chart.png similarity index 100% rename from assets/tracker/sea_chart.png rename to assets/tracker/main_quest/sea_chart.png diff --git a/assets/tracker/sea_chart_gray.png b/assets/tracker/main_quest/sea_chart_gray.png similarity index 100% rename from assets/tracker/sea_chart_gray.png rename to assets/tracker/main_quest/sea_chart_gray.png diff --git a/assets/tracker/main quest/tadtones.png b/assets/tracker/main_quest/tadtones.png similarity index 100% rename from assets/tracker/main quest/tadtones.png rename to assets/tracker/main_quest/tadtones.png diff --git a/assets/tracker/main quest/tadtones_gray.png b/assets/tracker/main_quest/tadtones_gray.png similarity index 100% rename from assets/tracker/main quest/tadtones_gray.png rename to assets/tracker/main_quest/tadtones_gray.png diff --git a/assets/tracker/main quest/triforce_0.png b/assets/tracker/main_quest/triforce_0.png similarity index 100% rename from assets/tracker/main quest/triforce_0.png rename to assets/tracker/main_quest/triforce_0.png diff --git a/assets/tracker/main quest/triforce_1.png b/assets/tracker/main_quest/triforce_1.png similarity index 100% rename from assets/tracker/main quest/triforce_1.png rename to assets/tracker/main_quest/triforce_1.png diff --git a/assets/tracker/main quest/triforce_2.png b/assets/tracker/main_quest/triforce_2.png similarity index 100% rename from assets/tracker/main quest/triforce_2.png rename to assets/tracker/main_quest/triforce_2.png diff --git a/assets/tracker/main quest/triforce_3.png b/assets/tracker/main_quest/triforce_3.png similarity index 100% rename from assets/tracker/main quest/triforce_3.png rename to assets/tracker/main_quest/triforce_3.png diff --git a/assets/tracker/main quest/Water_Dragon_Scale.png b/assets/tracker/main_quest/water_dragon_scale.png similarity index 100% rename from assets/tracker/main quest/Water_Dragon_Scale.png rename to assets/tracker/main_quest/water_dragon_scale.png diff --git a/assets/tracker/main quest/water_dragon_scale_gray.png b/assets/tracker/main_quest/water_dragon_scale_gray.png similarity index 100% rename from assets/tracker/main quest/water_dragon_scale_gray.png rename to assets/tracker/main_quest/water_dragon_scale_gray.png diff --git a/assets/tracker/maps/leaveEldin.png b/assets/tracker/maps/leaveEldin.png deleted file mode 100644 index c79854b6..00000000 Binary files a/assets/tracker/maps/leaveEldin.png and /dev/null differ diff --git a/assets/tracker/maps/leaveFaron.png b/assets/tracker/maps/leaveFaron.png deleted file mode 100644 index a67af667..00000000 Binary files a/assets/tracker/maps/leaveFaron.png and /dev/null differ diff --git a/assets/tracker/maps/leaveLanayru.png b/assets/tracker/maps/leaveLanayru.png deleted file mode 100644 index 5f7c8bf1..00000000 Binary files a/assets/tracker/maps/leaveLanayru.png and /dev/null differ diff --git a/assets/tracker/maps/leaveSkyloft.png b/assets/tracker/maps/leaveSkyloft.png deleted file mode 100644 index bcd790e2..00000000 Binary files a/assets/tracker/maps/leaveSkyloft.png and /dev/null differ diff --git a/assets/tracker/misc_items_block.png b/assets/tracker/misc_items_block.png deleted file mode 100644 index af5e688b..00000000 Binary files a/assets/tracker/misc_items_block.png and /dev/null differ diff --git a/assets/tracker/quest_items_block.png b/assets/tracker/quest_items_block.png deleted file mode 100644 index 4526dda5..00000000 Binary files a/assets/tracker/quest_items_block.png and /dev/null differ diff --git a/assets/tracker/sidequests/beedle_insect_cage.png b/assets/tracker/side_quests/beedle_insect_cage.png similarity index 100% rename from assets/tracker/sidequests/beedle_insect_cage.png rename to assets/tracker/side_quests/beedle_insect_cage.png diff --git a/assets/tracker/sidequests/beedle_insect_cage_gray.png b/assets/tracker/side_quests/beedle_insect_cage_gray.png similarity index 100% rename from assets/tracker/sidequests/beedle_insect_cage_gray.png rename to assets/tracker/side_quests/beedle_insect_cage_gray.png diff --git a/assets/tracker/sidequests/cawlin_letter.png b/assets/tracker/side_quests/cawlin_letter.png similarity index 100% rename from assets/tracker/sidequests/cawlin_letter.png rename to assets/tracker/side_quests/cawlin_letter.png diff --git a/assets/tracker/sidequests/cawlin_letter_gray.png b/assets/tracker/side_quests/cawlin_letter_gray.png similarity index 100% rename from assets/tracker/sidequests/cawlin_letter_gray.png rename to assets/tracker/side_quests/cawlin_letter_gray.png diff --git a/assets/tracker/sidequests/crystal.png b/assets/tracker/side_quests/crystal.png similarity index 100% rename from assets/tracker/sidequests/crystal.png rename to assets/tracker/side_quests/crystal.png diff --git a/assets/tracker/sidequests/crystal_gray.png b/assets/tracker/side_quests/crystal_gray.png similarity index 100% rename from assets/tracker/sidequests/crystal_gray.png rename to assets/tracker/side_quests/crystal_gray.png diff --git a/assets/tracker/sidequests/crystal_pack.png b/assets/tracker/side_quests/crystal_pack.png similarity index 100% rename from assets/tracker/sidequests/crystal_pack.png rename to assets/tracker/side_quests/crystal_pack.png diff --git a/assets/tracker/sidequests/goddess_cube.png b/assets/tracker/side_quests/goddess_cube.png similarity index 100% rename from assets/tracker/sidequests/goddess_cube.png rename to assets/tracker/side_quests/goddess_cube.png diff --git a/assets/tracker/sidequests/gossip_stone.png b/assets/tracker/side_quests/gossip_stone.png similarity index 100% rename from assets/tracker/sidequests/gossip_stone.png rename to assets/tracker/side_quests/gossip_stone.png diff --git a/assets/tracker/sidequests/rattle.png b/assets/tracker/side_quests/rattle.png similarity index 100% rename from assets/tracker/sidequests/rattle.png rename to assets/tracker/side_quests/rattle.png diff --git a/assets/tracker/sidequests/rattle_gray.png b/assets/tracker/side_quests/rattle_gray.png similarity index 100% rename from assets/tracker/sidequests/rattle_gray.png rename to assets/tracker/side_quests/rattle_gray.png diff --git a/assets/tracker/sidequests/no_cawlins_letter.png b/assets/tracker/sidequests/no_cawlins_letter.png deleted file mode 100644 index 53a6e5b8..00000000 Binary files a/assets/tracker/sidequests/no_cawlins_letter.png and /dev/null differ diff --git a/assets/tracker/sidequests/no_cbeetle.png b/assets/tracker/sidequests/no_cbeetle.png deleted file mode 100644 index 8f026e74..00000000 Binary files a/assets/tracker/sidequests/no_cbeetle.png and /dev/null differ diff --git a/assets/tracker/sidequests/no_crystal.png b/assets/tracker/sidequests/no_crystal.png deleted file mode 100644 index 081ce25a..00000000 Binary files a/assets/tracker/sidequests/no_crystal.png and /dev/null differ diff --git a/assets/tracker/sidequests/no_rattle.png b/assets/tracker/sidequests/no_rattle.png deleted file mode 100644 index f0676eaf..00000000 Binary files a/assets/tracker/sidequests/no_rattle.png and /dev/null differ diff --git a/assets/tracker/slot test.png b/assets/tracker/slot test.png deleted file mode 100644 index 5a82acf5..00000000 Binary files a/assets/tracker/slot test.png and /dev/null differ diff --git a/assets/tracker/songs/No_Song.png b/assets/tracker/songs/No_Song.png deleted file mode 100644 index 0a86140c..00000000 Binary files a/assets/tracker/songs/No_Song.png and /dev/null differ diff --git a/assets/tracker/songs/No_Soth.png b/assets/tracker/songs/No_Soth.png deleted file mode 100644 index 9fbf206e..00000000 Binary files a/assets/tracker/songs/No_Soth.png and /dev/null differ diff --git a/assets/tracker/songs/SOTH1.png b/assets/tracker/songs/SOTH1.png deleted file mode 100644 index 4212fa31..00000000 Binary files a/assets/tracker/songs/SOTH1.png and /dev/null differ diff --git a/assets/tracker/songs/SOTH2.png b/assets/tracker/songs/SOTH2.png deleted file mode 100644 index 02b1a482..00000000 Binary files a/assets/tracker/songs/SOTH2.png and /dev/null differ diff --git a/assets/tracker/songs/SOTH3.png b/assets/tracker/songs/SOTH3.png deleted file mode 100644 index b2ae05fd..00000000 Binary files a/assets/tracker/songs/SOTH3.png and /dev/null differ diff --git a/assets/tracker/songs/SOTH4.png b/assets/tracker/songs/SOTH4.png deleted file mode 100644 index 918d3b8f..00000000 Binary files a/assets/tracker/songs/SOTH4.png and /dev/null differ diff --git a/assets/tracker/swords/Dins_Flame.png b/assets/tracker/swords/Dins_Flame.png deleted file mode 100644 index 9ea0d159..00000000 Binary files a/assets/tracker/swords/Dins_Flame.png and /dev/null differ diff --git a/assets/tracker/swords/Farores_Flame.png b/assets/tracker/swords/Farores_Flame.png deleted file mode 100644 index 46e3c0de..00000000 Binary files a/assets/tracker/swords/Farores_Flame.png and /dev/null differ diff --git a/assets/tracker/swords/Nayrus_Flame.png b/assets/tracker/swords/Nayrus_Flame.png deleted file mode 100644 index 9ac76ece..00000000 Binary files a/assets/tracker/swords/Nayrus_Flame.png and /dev/null differ diff --git a/assets/tracker/swords/No_Dins_Flame.png b/assets/tracker/swords/No_Dins_Flame.png deleted file mode 100644 index 906f0d55..00000000 Binary files a/assets/tracker/swords/No_Dins_Flame.png and /dev/null differ diff --git a/assets/tracker/swords/No_Farores_Flame.png b/assets/tracker/swords/No_Farores_Flame.png deleted file mode 100644 index c240623e..00000000 Binary files a/assets/tracker/swords/No_Farores_Flame.png and /dev/null differ diff --git a/assets/tracker/swords/No_Nayrus_Flame.png b/assets/tracker/swords/No_Nayrus_Flame.png deleted file mode 100644 index 0e27a2b3..00000000 Binary files a/assets/tracker/swords/No_Nayrus_Flame.png and /dev/null differ diff --git a/assets/tracker/tablets_slot.png b/assets/tracker/tablets_slot.png deleted file mode 100644 index 284ae336..00000000 Binary files a/assets/tracker/tablets_slot.png and /dev/null differ diff --git a/data/tracker_areas.yaml b/data/tracker_areas.yaml index 578330b2..4df45d8a 100644 --- a/data/tracker_areas.yaml +++ b/data/tracker_areas.yaml @@ -1,5 +1,5 @@ - name: Root - image: Sky.png + image: sky.png children: - Skyloft - Faron @@ -23,7 +23,7 @@ y: 35 - name: Skyloft - image: Skyloft.png + image: skyloft.png x: 265 y: 145 children: @@ -67,7 +67,7 @@ - name: Faron - image: Faron.png + image: faron.png x: 365 y: 174 children: @@ -118,7 +118,7 @@ y: 120 - name: Eldin - image: Eldin.png + image: eldin.png x: 265 y: 66 children: @@ -163,7 +163,7 @@ y: 186 - name: Lanayru - image: Lanayru.png + image: lanayru.png x: 147 y: 145 children: diff --git a/gui/components/tracker_area.py b/gui/components/tracker_area.py index 3835cc18..f0db3911 100644 --- a/gui/components/tracker_area.py +++ b/gui/components/tracker_area.py @@ -164,13 +164,13 @@ def update(self, search: "Search | None" = None) -> None: ) if any([l for l in available_locations if l.has_vanilla_goddess_cube()]): self.setText( - f'' + f'' ) elif any( [l for l in available_locations if l.has_vanilla_gratitude_crystal()] ): self.setText( - f'' + f'' ) self.update_color("red") diff --git a/gui/components/tracker_inventory_button.py b/gui/components/tracker_inventory_button.py index 21b2eb73..9ef3e600 100644 --- a/gui/components/tracker_inventory_button.py +++ b/gui/components/tracker_inventory_button.py @@ -230,7 +230,7 @@ def mouseReleaseEvent(self, ev: QMouseEvent) -> None: else self.get_current_item() ), ( - "sidequests/crystal_pack.png" + "side_quests/crystal_pack.png" if must_be_five_pack else self.filenames[self.state] ), diff --git a/gui/components/tracker_location_label.py b/gui/components/tracker_location_label.py index 48dfa2f8..c6236126 100644 --- a/gui/components/tracker_location_label.py +++ b/gui/components/tracker_location_label.py @@ -94,15 +94,15 @@ def __init__( has_icon = True if self.location.has_vanilla_gratitude_crystal(): self.pixmap.load( - (TRACKER_ASSETS_PATH / "sidequests" / "crystal.png").as_posix() + (TRACKER_ASSETS_PATH / "side_quests" / "crystal.png").as_posix() ) elif self.location.has_vanilla_goddess_cube(): self.pixmap.load( - (TRACKER_ASSETS_PATH / "sidequests" / "goddess_cube.png").as_posix() + (TRACKER_ASSETS_PATH / "side_quests" / "goddess_cube.png").as_posix() ) elif self.location.is_gossip_stone(): self.pixmap.load( - (TRACKER_ASSETS_PATH / "sidequests" / "gossip_stone.png").as_posix() + (TRACKER_ASSETS_PATH / "side_quests" / "gossip_stone.png").as_posix() ) elif self.location.has_vanilla_dungeon_key(): self.pixmap.load( diff --git a/gui/tracker.py b/gui/tracker.py index 64d7d185..dacee797 100644 --- a/gui/tracker.py +++ b/gui/tracker.py @@ -96,7 +96,7 @@ def __init__(self, main: "Main", ui: "Ui_main_window") -> None: # Display the Sky if there's no active tracker self.ui.map_widget.setStyleSheet( - Tracker.map_widget_stylesheet.replace("IMAGE_FILENAME", "Sky.png") + Tracker.map_widget_stylesheet.replace("IMAGE_FILENAME", "sky.png") ) self.ui.map_widget.mouseReleaseEvent = self.handle_right_click @@ -274,52 +274,61 @@ def init_buttons(self): ) self.bombs_button = TrackerInventoryButton( - ["Nothing", BOMB_BAG], ["bombs_gray.png", "bombs.png"] + ["Nothing", BOMB_BAG], ["item_wheel/bombs_gray.png", "item_wheel/bombs.png"] ) self.slingshot_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_SLINGSHOT] * 2, - ["slingshot_gray.png", "slingshot.png", "scattershot.png"], + [ + "item_wheel/slingshot_gray.png", + "item_wheel/slingshot.png", + "item_wheel/scattershot.png", + ], None, ["No Slingshot", "Slingshot", "Scattershot"], ) self.beetle_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_BEETLE] * 4, [ - "beetle_gray.png", - "beetle.png", - "hook_beetle.png", - "quick_beetle.png", - "tough_beetle.png", + "item_wheel/beetle_gray.png", + "item_wheel/beetle.png", + "item_wheel/hook_beetle.png", + "item_wheel/quick_beetle.png", + "item_wheel/tough_beetle.png", ], None, ["No Beetle", "Beetle", "Hook Beetle", "Quick Beetle", "Tough Beetle"], ) self.bug_net_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_BUG_NET] * 2, - ["bug_net_gray.png", "bug_net.png", "big_bug_net.png"], + [ + "item_wheel/bug_net_gray.png", + "item_wheel/bug_net.png", + "item_wheel/big_bug_net.png", + ], None, ["No Bug Net", "Bug Net", "Big Bug Net"], ) self.bow_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_BOW] * 3, [ - "bow_gray.png", - "bow.png", - "iron_bow.png", - "sacred_bow.png", + "item_wheel/bow_gray.png", + "item_wheel/bow.png", + "item_wheel/iron_bow.png", + "item_wheel/sacred_bow.png", ], None, ["No Bow", "Bow", "Iron Bow", "Sacred Bow"], ) self.clawshots_button = TrackerInventoryButton( - ["Nothing", CLAWSHOTS], ["clawshots_gray.png", "clawshots.png"] + ["Nothing", CLAWSHOTS], + ["item_wheel/clawshots_gray.png", "item_wheel/clawshots.png"], ) self.whip_button = TrackerInventoryButton( - ["Nothing", WHIP], ["whip_gray.png", "whip.png"] + ["Nothing", WHIP], ["item_wheel/whip_gray.png", "item_wheel/whip.png"] ) self.gust_bellows_button = TrackerInventoryButton( ["Nothing", GUST_BELLOWS], - ["gust_bellows_gray.png", "gust_bellows.png"], + ["item_wheel/gust_bellows_gray.png", "item_wheel/gust_bellows.png"], ) self.sword_button = TrackerInventoryButton( @@ -360,15 +369,16 @@ def init_buttons(self): [f"Lanayru Caves Small Key ({i}/2)" for i in range(3)], ) self.sea_chart_button = TrackerInventoryButton( - ["Nothing", SEA_CHART], ["sea_chart_gray.png", "sea_chart.png"] + ["Nothing", SEA_CHART], + ["main_quest/sea_chart_gray.png", "main_quest/sea_chart.png"], ) self.spiral_charge_button = TrackerInventoryButton( ["Nothing", SPIRAL_CHARGE], - ["bird_statuette_gray.png", "bird_statuette.png"], + ["main_quest/bird_statuette_gray.png", "main_quest/bird_statuette.png"], ) self.adventure_pouch_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_POUCH] * 5, - ["pouch_gray.png"] + ["pouch.png"] * 5, + ["main_quest/pouch_gray.png"] + ["main_quest/pouch.png"] * 5, None, ["Adventure Pouch (0 Slots)"] + [f"Adventure Pouch ({i + 4} Slots)" for i in range(5)], @@ -378,7 +388,7 @@ def init_buttons(self): self.adventure_pouch_button.set_label_scale(1.25) self.bottle_button = TrackerInventoryButton( ["Nothing"] + [EMPTY_BOTTLE] * 5, - ["bottle_gray.png"] + ["bottle.png"] * 5, + ["main_quest/bottle_gray.png"] + ["main_quest/bottle.png"] * 5, None, [f"Empty Bottle ({i}/5)" for i in range(6)], ) @@ -413,9 +423,9 @@ def init_buttons(self): self.mitts_button = TrackerInventoryButton( ["Nothing"] + [PROGRESSIVE_MITTS] * 2, [ - "main quest/digging_mitts_gray.png", - "main quest/digging_mitts.png", - "main quest/mogma_mitts.png", + "main_quest/digging_mitts_gray.png", + "main_quest/digging_mitts.png", + "main_quest/mogma_mitts.png", ], None, ["No Mitts", "Digging Mitts", "Mogma Mitts"], @@ -423,7 +433,7 @@ def init_buttons(self): self.harp_button = TrackerInventoryButton( ["Nothing", GODDESS_HARP], - ["main quest/goddess_harp_gray.png", "main quest/goddess_harp.png"], + ["main_quest/goddess_harp_gray.png", "main_quest/goddess_harp.png"], ) self.ballad_of_the_goddess_button = TrackerInventoryButton( ["Nothing", BALLAD_OF_THE_GODDESS], @@ -451,7 +461,7 @@ def init_buttons(self): self.song_of_the_hero_button.set_label_scale(1.1) self.triforce_button = TrackerInventoryButton( ["Nothing", TRIFORCE_OF_COURAGE, TRIFORCE_OF_WISDOM, TRIFORCE_OF_POWER], - [f"main quest/triforce_{i}.png" for i in range(4)], + [f"main_quest/triforce_{i}.png" for i in range(4)], None, [f"Triforce ({i}/3)" for i in range(4)], ) @@ -459,51 +469,51 @@ def init_buttons(self): self.water_dragon_scale_button = TrackerInventoryButton( ["Nothing", WATER_DRAGON_SCALE], [ - "main quest/water_dragon_scale_gray.png", - "main quest/water_dragon_scale.png", + "main_quest/water_dragon_scale_gray.png", + "main_quest/water_dragon_scale.png", ], ) self.fireshield_earrings_button = TrackerInventoryButton( ["Nothing", FIRESHIELD_EARRINGS], [ - "main quest/fireshield_earrings_gray.png", - "main quest/fireshield_earrings.png", + "main_quest/fireshield_earrings_gray.png", + "main_quest/fireshield_earrings.png", ], ) self.cawlins_latter_button = TrackerInventoryButton( ["Nothing", CAWLINS_LETTER], - ["sidequests/cawlin_letter_gray.png", "sidequests/cawlin_letter.png"], + ["side_quests/cawlin_letter_gray.png", "side_quests/cawlin_letter.png"], ) self.insect_cage_button = TrackerInventoryButton( ["Nothing", BEEDLES_INSECT_CAGE], [ - "sidequests/beedle_insect_cage_gray.png", - "sidequests/beedle_insect_cage.png", + "side_quests/beedle_insect_cage_gray.png", + "side_quests/beedle_insect_cage.png", ], ) self.rattle_button = TrackerInventoryButton( ["Nothing", RATTLE], - ["sidequests/rattle_gray.png", "sidequests/rattle.png"], + ["side_quests/rattle_gray.png", "side_quests/rattle.png"], ) self.gratitude_crystals_button = TrackerInventoryButton( ["Nothing"] + [GRATITUDE_CRYSTAL] * 80, - ["sidequests/crystal_gray.png"] + ["sidequests/crystal.png"] * 80, + ["side_quests/crystal_gray.png"] + ["side_quests/crystal.png"] * 80, None, [f"Gratitude Crystals ({i}/80)" for i in range(81)], ) self.gratitude_crystals_button.create_number_label() self.life_tree_fruit_button = TrackerInventoryButton( ["Nothing", LIFE_TREE_FRUIT], - ["main quest/life_tree_fruit_gray.png", "main quest/life_tree_fruit.png"], + ["main_quest/life_tree_fruit_gray.png", "main_quest/life_tree_fruit.png"], ) # self.tadtones_button = TrackerInventoryButton( # ["Nothing", GROUP_OF_TADTONES], - # ["main quest/tadtones_gray.png", "main quest/tadtones.png"], + # ["main_quest/tadtones_gray.png", "main_quest/tadtones.png"], # ) self.scrapper_button = TrackerInventoryButton( ["Nothing", SCRAPPER], - ["main quest/scrapper_gray.png", "main quest/Scrapper.png"], + ["main_quest/scrapper_gray.png", "main_quest/scrapper.png"], ) # Load in tracker area buttons @@ -1802,7 +1812,7 @@ def on_click_inventory_button(self, item: Item, item_image: str): if single_crystal_question == QMessageBox.StandardButton.No: # Change sphere-tracked item to a pack item = self.world.get_item(GRATITUDE_CRYSTAL_PACK) - item_image = "sidequests/crystal_pack.png" + item_image = "side_quests/crystal_pack.png" for _ in range(4): crystals_button.increment_item_state()