Merge pull request #397 from CovenEsme/clean-up-tracker-assets

Standardize tracker asset names and remove unused assets
mint-choc-chip-skyblade · Jul 19, 2024 · 95ebe8e · 95ebe8e
2 parents 06f3154 + c84d89a
commit 95ebe8e
Show file tree

Hide file tree

Showing 137 changed files with 59 additions and 49 deletions.
diff --git a/assets/tracker/Entrance.png b/assets/tracker/Entrance.png
diff --git a/assets/tracker/Inventory_Gear_Subscreen_Overlay.png b/assets/tracker/Inventory_Gear_Subscreen_Overlay.png
diff --git a/assets/tracker/No_Entrance.png b/assets/tracker/No_Entrance.png
diff --git a/assets/tracker/Song_Block.png b/assets/tracker/Song_Block.png
diff --git a/assets/tracker/Sword_Block.png b/assets/tracker/Sword_Block.png
diff --git a/assets/tracker/b wheel.png b/assets/tracker/b wheel.png
diff --git a/assets/tracker/bosses/dreadfuse.png b/assets/tracker/bosses/dreadfuse.png
diff --git a/assets/tracker/bosses/eldinTrialGate.png b/assets/tracker/bosses/eldinTrialGate.png
diff --git a/assets/tracker/bosses/faronTrialGate.png b/assets/tracker/bosses/faronTrialGate.png
diff --git a/assets/tracker/bosses/g1.png b/assets/tracker/bosses/g1.png
diff --git a/assets/tracker/bosses/g2.png b/assets/tracker/bosses/g2.png
diff --git a/assets/tracker/bosses/koloktos.png b/assets/tracker/bosses/koloktos.png
diff --git a/assets/tracker/bosses/lanayruTrialGate.png b/assets/tracker/bosses/lanayruTrialGate.png
diff --git a/assets/tracker/bosses/moldarach.png b/assets/tracker/bosses/moldarach.png
diff --git a/assets/tracker/bosses/scaldera.png b/assets/tracker/bosses/scaldera.png
diff --git a/assets/tracker/bosses/tentalus.png b/assets/tracker/bosses/tentalus.png
diff --git a/assets/tracker/bosses/trialGate.png b/assets/tracker/bosses/trialGate.png
diff --git a/assets/tracker/dungeonLayout.png b/assets/tracker/dungeonLayout.png
diff --git a/assets/tracker/dungeons/Stone_of_Trials.png → assets/tracker/dungeons/stone_of_trials.png b/assets/tracker/dungeons/Stone_of_Trials.png → assets/tracker/dungeons/stone_of_trials.png
diff --git a/assets/tracker/g1.jpg b/assets/tracker/g1.jpg
diff --git a/assets/tracker/hints/barren.png b/assets/tracker/hints/barren.png
diff --git a/assets/tracker/hints/g1.png b/assets/tracker/hints/g1.png
diff --git a/assets/tracker/hints/g2.png b/assets/tracker/hints/g2.png
diff --git a/assets/tracker/hints/koloktos.png b/assets/tracker/hints/koloktos.png
diff --git a/assets/tracker/hints/moldarach.png b/assets/tracker/hints/moldarach.png
diff --git a/assets/tracker/hints/scaldera.png b/assets/tracker/hints/scaldera.png
diff --git a/assets/tracker/hints/sots.png b/assets/tracker/hints/sots.png
diff --git a/assets/tracker/hints/tentalus.png b/assets/tracker/hints/tentalus.png
diff --git a/assets/tracker/hints/unknown.png b/assets/tracker/hints/unknown.png
diff --git a/assets/tracker/beetle.png → assets/tracker/item_wheel/beetle.png b/assets/tracker/beetle.png → assets/tracker/item_wheel/beetle.png
diff --git a/assets/tracker/beetle_gray.png → assets/tracker/item_wheel/beetle_gray.png b/assets/tracker/beetle_gray.png → assets/tracker/item_wheel/beetle_gray.png
diff --git a/assets/tracker/big_bug_net.png → assets/tracker/item_wheel/big_bug_net.png b/assets/tracker/big_bug_net.png → assets/tracker/item_wheel/big_bug_net.png
diff --git a/assets/tracker/bombs.png → assets/tracker/item_wheel/bombs.png b/assets/tracker/bombs.png → assets/tracker/item_wheel/bombs.png
diff --git a/assets/tracker/bombs_gray.png → assets/tracker/item_wheel/bombs_gray.png b/assets/tracker/bombs_gray.png → assets/tracker/item_wheel/bombs_gray.png
diff --git a/assets/tracker/bow.png → assets/tracker/item_wheel/bow.png b/assets/tracker/bow.png → assets/tracker/item_wheel/bow.png
diff --git a/assets/tracker/bow_gray.png → assets/tracker/item_wheel/bow_gray.png b/assets/tracker/bow_gray.png → assets/tracker/item_wheel/bow_gray.png
diff --git a/assets/tracker/bug_net.png → assets/tracker/item_wheel/bug_net.png b/assets/tracker/bug_net.png → assets/tracker/item_wheel/bug_net.png
diff --git a/assets/tracker/bug_net_gray.png → assets/tracker/item_wheel/bug_net_gray.png b/assets/tracker/bug_net_gray.png → assets/tracker/item_wheel/bug_net_gray.png
diff --git a/assets/tracker/clawshots.png → assets/tracker/item_wheel/clawshots.png b/assets/tracker/clawshots.png → assets/tracker/item_wheel/clawshots.png
diff --git a/assets/tracker/clawshots_gray.png → assets/tracker/item_wheel/clawshots_gray.png b/assets/tracker/clawshots_gray.png → assets/tracker/item_wheel/clawshots_gray.png
diff --git a/assets/tracker/gust_bellows.png → assets/tracker/item_wheel/gust_bellows.png b/assets/tracker/gust_bellows.png → assets/tracker/item_wheel/gust_bellows.png
diff --git a/assets/tracker/gust_bellows_gray.png → .../tracker/item_wheel/gust_bellows_gray.png b/assets/tracker/gust_bellows_gray.png → .../tracker/item_wheel/gust_bellows_gray.png
diff --git a/assets/tracker/hook_beetle.png → assets/tracker/item_wheel/hook_beetle.png b/assets/tracker/hook_beetle.png → assets/tracker/item_wheel/hook_beetle.png
diff --git a/assets/tracker/iron_bow.png → assets/tracker/item_wheel/iron_bow.png b/assets/tracker/iron_bow.png → assets/tracker/item_wheel/iron_bow.png
diff --git a/assets/tracker/quick_beetle.png → assets/tracker/item_wheel/quick_beetle.png b/assets/tracker/quick_beetle.png → assets/tracker/item_wheel/quick_beetle.png
diff --git a/assets/tracker/sacred_bow.png → assets/tracker/item_wheel/sacred_bow.png b/assets/tracker/sacred_bow.png → assets/tracker/item_wheel/sacred_bow.png
diff --git a/assets/tracker/scattershot.png → assets/tracker/item_wheel/scattershot.png b/assets/tracker/scattershot.png → assets/tracker/item_wheel/scattershot.png
diff --git a/assets/tracker/slingshot.png → assets/tracker/item_wheel/slingshot.png b/assets/tracker/slingshot.png → assets/tracker/item_wheel/slingshot.png
diff --git a/assets/tracker/slingshot_gray.png → assets/tracker/item_wheel/slingshot_gray.png b/assets/tracker/slingshot_gray.png → assets/tracker/item_wheel/slingshot_gray.png
diff --git a/assets/tracker/tough_beetle.png → assets/tracker/item_wheel/tough_beetle.png b/assets/tracker/tough_beetle.png → assets/tracker/item_wheel/tough_beetle.png
diff --git a/assets/tracker/whip.png → assets/tracker/item_wheel/whip.png b/assets/tracker/whip.png → assets/tracker/item_wheel/whip.png
diff --git a/assets/tracker/whip_gray.png → assets/tracker/item_wheel/whip_gray.png b/assets/tracker/whip_gray.png → assets/tracker/item_wheel/whip_gray.png
diff --git a/assets/tracker/junk/hylianShield.png b/assets/tracker/junk/hylianShield.png
diff --git a/assets/tracker/junk/rareTreasure.png b/assets/tracker/junk/rareTreasure.png
diff --git a/assets/tracker/junk/rupees.png b/assets/tracker/junk/rupees.png
diff --git a/assets/tracker/junk/semiRareTreasure.png b/assets/tracker/junk/semiRareTreasure.png
diff --git a/assets/tracker/junk/tumbleweed.png b/assets/tracker/junk/tumbleweed.png
diff --git a/assets/tracker/junk/woodenShield.png b/assets/tracker/junk/woodenShield.png
diff --git a/assets/tracker/main quest items.png b/assets/tracker/main quest items.png
diff --git a/assets/tracker/main quest/1_Triforce.png b/assets/tracker/main quest/1_Triforce.png
diff --git a/assets/tracker/main quest/2_Triforce.png b/assets/tracker/main quest/2_Triforce.png
diff --git a/assets/tracker/main quest/Full_Triforce.png b/assets/tracker/main quest/Full_Triforce.png
diff --git a/assets/tracker/main quest/No_Earrings.png b/assets/tracker/main quest/No_Earrings.png
diff --git a/assets/tracker/main quest/No_Harp.png b/assets/tracker/main quest/No_Harp.png
diff --git a/assets/tracker/main quest/No_Mitts.png b/assets/tracker/main quest/No_Mitts.png
diff --git a/assets/tracker/main quest/No_Sailcloth.png b/assets/tracker/main quest/No_Sailcloth.png
diff --git a/assets/tracker/main quest/No_Scale.png b/assets/tracker/main quest/No_Scale.png
diff --git a/assets/tracker/main quest/No_Triforce.png b/assets/tracker/main quest/No_Triforce.png
diff --git a/assets/tracker/bird_statuette.png → assets/tracker/main_quest/bird_statuette.png b/assets/tracker/bird_statuette.png → assets/tracker/main_quest/bird_statuette.png
diff --git a/assets/tracker/bird_statuette_gray.png → ...racker/main_quest/bird_statuette_gray.png b/assets/tracker/bird_statuette_gray.png → ...racker/main_quest/bird_statuette_gray.png
diff --git a/assets/tracker/bottle.png → assets/tracker/main_quest/bottle.png b/assets/tracker/bottle.png → assets/tracker/main_quest/bottle.png
diff --git a/assets/tracker/bottle_gray.png → assets/tracker/main_quest/bottle_gray.png b/assets/tracker/bottle_gray.png → assets/tracker/main_quest/bottle_gray.png
diff --git a/assets/tracker/main quest/Digging_Mitts.png → assets/tracker/main_quest/digging_mitts.png b/assets/tracker/main quest/Digging_Mitts.png → assets/tracker/main_quest/digging_mitts.png
diff --git a/...tracker/main quest/digging_mitts_gray.png → ...tracker/main_quest/digging_mitts_gray.png b/...tracker/main quest/digging_mitts_gray.png → ...tracker/main_quest/digging_mitts_gray.png
diff --git a/...racker/main quest/Fireshield_Earrings.png → ...racker/main_quest/fireshield_earrings.png b/...racker/main quest/Fireshield_Earrings.png → ...racker/main_quest/fireshield_earrings.png
diff --git a/...r/main quest/fireshield_earrings_gray.png → ...r/main_quest/fireshield_earrings_gray.png b/...r/main quest/fireshield_earrings_gray.png → ...r/main_quest/fireshield_earrings_gray.png
diff --git a/assets/tracker/main quest/Goddess_Harp.png → assets/tracker/main_quest/goddess_harp.png b/assets/tracker/main quest/Goddess_Harp.png → assets/tracker/main_quest/goddess_harp.png
diff --git a/.../tracker/main quest/goddess_harp_gray.png → .../tracker/main_quest/goddess_harp_gray.png b/.../tracker/main quest/goddess_harp_gray.png → .../tracker/main_quest/goddess_harp_gray.png
diff --git a/...ts/tracker/main quest/life_tree_fruit.png → ...ts/tracker/main_quest/life_tree_fruit.png b/...ts/tracker/main quest/life_tree_fruit.png → ...ts/tracker/main_quest/life_tree_fruit.png
diff --git a/...acker/main quest/life_tree_fruit_gray.png → ...acker/main_quest/life_tree_fruit_gray.png b/...acker/main quest/life_tree_fruit_gray.png → ...acker/main_quest/life_tree_fruit_gray.png
diff --git a/assets/tracker/main quest/Mogma_Mitts.png → assets/tracker/main_quest/mogma_mitts.png b/assets/tracker/main quest/Mogma_Mitts.png → assets/tracker/main_quest/mogma_mitts.png
diff --git a/assets/tracker/pouch.png → assets/tracker/main_quest/pouch.png b/assets/tracker/pouch.png → assets/tracker/main_quest/pouch.png
diff --git a/assets/tracker/pouch_gray.png → assets/tracker/main_quest/pouch_gray.png b/assets/tracker/pouch_gray.png → assets/tracker/main_quest/pouch_gray.png
diff --git a/assets/tracker/main quest/Sailcloth.png → assets/tracker/main_quest/sailcloth.png b/assets/tracker/main quest/Sailcloth.png → assets/tracker/main_quest/sailcloth.png
diff --git a/.../tracker/main quest/no_sailcloth_grid.png → assets/tracker/main_quest/sailcloth_gray.png b/.../tracker/main quest/no_sailcloth_grid.png → assets/tracker/main_quest/sailcloth_gray.png
diff --git a/assets/tracker/main quest/Scrapper.png → assets/tracker/main_quest/scrapper.png b/assets/tracker/main quest/Scrapper.png → assets/tracker/main_quest/scrapper.png
diff --git a/assets/tracker/main quest/scrapper_gray.png → assets/tracker/main_quest/scrapper_gray.png b/assets/tracker/main quest/scrapper_gray.png → assets/tracker/main_quest/scrapper_gray.png
diff --git a/assets/tracker/sea_chart.png → assets/tracker/main_quest/sea_chart.png b/assets/tracker/sea_chart.png → assets/tracker/main_quest/sea_chart.png
diff --git a/assets/tracker/sea_chart_gray.png → assets/tracker/main_quest/sea_chart_gray.png b/assets/tracker/sea_chart_gray.png → assets/tracker/main_quest/sea_chart_gray.png
diff --git a/assets/tracker/main quest/tadtones.png → assets/tracker/main_quest/tadtones.png b/assets/tracker/main quest/tadtones.png → assets/tracker/main_quest/tadtones.png
diff --git a/assets/tracker/main quest/tadtones_gray.png → assets/tracker/main_quest/tadtones_gray.png b/assets/tracker/main quest/tadtones_gray.png → assets/tracker/main_quest/tadtones_gray.png
diff --git a/assets/tracker/main quest/triforce_0.png → assets/tracker/main_quest/triforce_0.png b/assets/tracker/main quest/triforce_0.png → assets/tracker/main_quest/triforce_0.png
diff --git a/assets/tracker/main quest/triforce_1.png → assets/tracker/main_quest/triforce_1.png b/assets/tracker/main quest/triforce_1.png → assets/tracker/main_quest/triforce_1.png
diff --git a/assets/tracker/main quest/triforce_2.png → assets/tracker/main_quest/triforce_2.png b/assets/tracker/main quest/triforce_2.png → assets/tracker/main_quest/triforce_2.png
diff --git a/assets/tracker/main quest/triforce_3.png → assets/tracker/main_quest/triforce_3.png b/assets/tracker/main quest/triforce_3.png → assets/tracker/main_quest/triforce_3.png
diff --git a/...tracker/main quest/Water_Dragon_Scale.png → ...tracker/main_quest/water_dragon_scale.png b/...tracker/main quest/Water_Dragon_Scale.png → ...tracker/main_quest/water_dragon_scale.png
diff --git a/...er/main quest/water_dragon_scale_gray.png → ...er/main_quest/water_dragon_scale_gray.png b/...er/main quest/water_dragon_scale_gray.png → ...er/main_quest/water_dragon_scale_gray.png
diff --git a/assets/tracker/maps/leaveEldin.png b/assets/tracker/maps/leaveEldin.png
diff --git a/assets/tracker/maps/leaveFaron.png b/assets/tracker/maps/leaveFaron.png
diff --git a/assets/tracker/maps/leaveLanayru.png b/assets/tracker/maps/leaveLanayru.png
diff --git a/assets/tracker/maps/leaveSkyloft.png b/assets/tracker/maps/leaveSkyloft.png
diff --git a/assets/tracker/misc_items_block.png b/assets/tracker/misc_items_block.png
diff --git a/assets/tracker/quest_items_block.png b/assets/tracker/quest_items_block.png
diff --git a/...tracker/sidequests/beedle_insect_cage.png → ...racker/side_quests/beedle_insect_cage.png b/...tracker/sidequests/beedle_insect_cage.png → ...racker/side_quests/beedle_insect_cage.png
diff --git a/...er/sidequests/beedle_insect_cage_gray.png → ...r/side_quests/beedle_insect_cage_gray.png b/...er/sidequests/beedle_insect_cage_gray.png → ...r/side_quests/beedle_insect_cage_gray.png
diff --git a/assets/tracker/sidequests/cawlin_letter.png → assets/tracker/side_quests/cawlin_letter.png b/assets/tracker/sidequests/cawlin_letter.png → assets/tracker/side_quests/cawlin_letter.png
diff --git a/...tracker/sidequests/cawlin_letter_gray.png → ...racker/side_quests/cawlin_letter_gray.png b/...tracker/sidequests/cawlin_letter_gray.png → ...racker/side_quests/cawlin_letter_gray.png
diff --git a/assets/tracker/sidequests/crystal.png → assets/tracker/side_quests/crystal.png b/assets/tracker/sidequests/crystal.png → assets/tracker/side_quests/crystal.png
diff --git a/assets/tracker/sidequests/crystal_gray.png → assets/tracker/side_quests/crystal_gray.png b/assets/tracker/sidequests/crystal_gray.png → assets/tracker/side_quests/crystal_gray.png
diff --git a/assets/tracker/sidequests/crystal_pack.png → assets/tracker/side_quests/crystal_pack.png b/assets/tracker/sidequests/crystal_pack.png → assets/tracker/side_quests/crystal_pack.png
diff --git a/assets/tracker/sidequests/goddess_cube.png → assets/tracker/side_quests/goddess_cube.png b/assets/tracker/sidequests/goddess_cube.png → assets/tracker/side_quests/goddess_cube.png
diff --git a/assets/tracker/sidequests/gossip_stone.png → assets/tracker/side_quests/gossip_stone.png b/assets/tracker/sidequests/gossip_stone.png → assets/tracker/side_quests/gossip_stone.png
diff --git a/assets/tracker/sidequests/rattle.png → assets/tracker/side_quests/rattle.png b/assets/tracker/sidequests/rattle.png → assets/tracker/side_quests/rattle.png
diff --git a/assets/tracker/sidequests/rattle_gray.png → assets/tracker/side_quests/rattle_gray.png b/assets/tracker/sidequests/rattle_gray.png → 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
diff --git a/assets/tracker/sidequests/no_cbeetle.png b/assets/tracker/sidequests/no_cbeetle.png
diff --git a/assets/tracker/sidequests/no_crystal.png b/assets/tracker/sidequests/no_crystal.png
diff --git a/assets/tracker/sidequests/no_rattle.png b/assets/tracker/sidequests/no_rattle.png
diff --git a/assets/tracker/slot test.png b/assets/tracker/slot test.png
diff --git a/assets/tracker/songs/No_Song.png b/assets/tracker/songs/No_Song.png
diff --git a/assets/tracker/songs/No_Soth.png b/assets/tracker/songs/No_Soth.png
diff --git a/assets/tracker/songs/SOTH1.png b/assets/tracker/songs/SOTH1.png
diff --git a/assets/tracker/songs/SOTH2.png b/assets/tracker/songs/SOTH2.png
diff --git a/assets/tracker/songs/SOTH3.png b/assets/tracker/songs/SOTH3.png
diff --git a/assets/tracker/songs/SOTH4.png b/assets/tracker/songs/SOTH4.png
diff --git a/assets/tracker/swords/Dins_Flame.png b/assets/tracker/swords/Dins_Flame.png
diff --git a/assets/tracker/swords/Farores_Flame.png b/assets/tracker/swords/Farores_Flame.png
diff --git a/assets/tracker/swords/Nayrus_Flame.png b/assets/tracker/swords/Nayrus_Flame.png
diff --git a/assets/tracker/swords/No_Dins_Flame.png b/assets/tracker/swords/No_Dins_Flame.png
diff --git a/assets/tracker/swords/No_Farores_Flame.png b/assets/tracker/swords/No_Farores_Flame.png
diff --git a/assets/tracker/swords/No_Nayrus_Flame.png b/assets/tracker/swords/No_Nayrus_Flame.png
diff --git a/assets/tracker/tablets_slot.png b/assets/tracker/tablets_slot.png
diff --git 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
@@ -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'<img src="{(TRACKER_ASSETS_PATH / "sidequests" / "goddess_cube.png").as_posix()}" width="23" height="25">'
+                    f'<img src="{(TRACKER_ASSETS_PATH / "side_quests" / "goddess_cube.png").as_posix()}" width="23" height="25">'
                 )
             elif any(
                 [l for l in available_locations if l.has_vanilla_gratitude_crystal()]
             ):
                 self.setText(
-                    f'<img src="{(TRACKER_ASSETS_PATH / "sidequests" / "crystal.png").as_posix()}" width="25" height="25">'
+                    f'<img src="{(TRACKER_ASSETS_PATH / "side_quests" / "crystal.png").as_posix()}" width="25" height="25">'
                 )
 
             self.update_color("red")

diff --git 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
@@ -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
@@ -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,17 +423,17 @@ 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"],
         )
 
         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,59 +461,59 @@ 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)],
         )
 
         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()