🔀 merge main

src/app/use-badges.ts

@@ -6,7 +6,9 @@ const useBadges = () => {
   const inventory = useSelector(selectInventory);
   const itemData = useItemData();
 
-  return inventory.filter((item) => itemData[item.item].badge);
+  return inventory.filter(
+    (item) => itemData[item.item].badge && item.amount > 0
+  );
 };
 
 export default useBadges;

src/app/use-quests.ts

@@ -8,6 +8,7 @@ import {
   consumeItem,
   gainMoney,
   healPokemon,
+  moveLeft,
   selectCompletedQuests,
   selectInventory,
   selectPokemon,
@@ -71,6 +72,7 @@ const useQuests = () => {
         "Follow me!",
       ],
       action: () => {
+        dispatch(moveLeft());
         dispatch(setBlackScreen(true));
         setTimeout(() => {
           dispatch(setPos({ x: 14, y: 19 }));