diff --git a/src/components/Sidebar/Sidebar.svelte b/src/components/Sidebar/Sidebar.svelte
index 74e39872..b6923900 100644
--- a/src/components/Sidebar/Sidebar.svelte
+++ b/src/components/Sidebar/Sidebar.svelte
@@ -106,6 +106,7 @@
         { label: $t('sidebar.furnishing'), href: '/furnishing' },
         { label: $t('sidebar.weapons'), href: '/weapons' },
         { label: $t('sidebar.artifacts'), href: '/artifacts' },
+        { label: $t('sidebar.fishing'), href: '/fishing' },
       ]}
     />
     <SidebarItem
diff --git a/src/data/fishing/de.json b/src/data/fishing/de.json
new file mode 100644
index 00000000..6ffc1eb2
--- /dev/null
+++ b/src/data/fishing/de.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Aizen-Medaka","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Giftstichling","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai Maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Teefarbiger Schmetterlingsfisch","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Kugelfisch","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Bitterer Kugelfisch","bait":"fake_fly_bait"},"crystalfish":{"name":"Kristallfisch","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Rost-Koi","bait":"fake_fly_bait"},"dawncatcher":{"name":"Dämmerfänger","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Goldener Koi","bait":"fake_fly_bait"},"snowstrider":{"name":"Schneekönig","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Zuckerblumen-Medaka","bait":"fruit_paste_bait"},"betta":{"name":"Kampfstichling","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Brauner Schmetterlingsfisch","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Langlebiger Kaiserfisch","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Glasmedaka","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Lungenstichling","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Lila Schmetterlingsfisch","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Raimei-Kaiserfisch","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/en.json b/src/data/fishing/en.json
new file mode 100644
index 00000000..98e84226
--- /dev/null
+++ b/src/data/fishing/en.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Aizen Medaka","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Venomspine Fish","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai Maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Tea-Colored Shirakodai","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Pufferfish","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Bitter Pufferfish","bait":"fake_fly_bait"},"crystalfish":{"name":"Crystalfish","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Rusty Koi","bait":"fake_fly_bait"},"dawncatcher":{"name":"Dawncatcher","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Golden Koi","bait":"fake_fly_bait"},"snowstrider":{"name":"Snowstrider","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Sweet-Flower Medaka","bait":"fruit_paste_bait"},"betta":{"name":"Betta","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Brown Shirakodai","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Abiding Angelfish","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Glaze Medaka","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Lunged Stickleback","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Purple Shirakodai","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Raimei Angelfish","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/es.json b/src/data/fishing/es.json
new file mode 100644
index 00000000..dece5e9b
--- /dev/null
+++ b/src/data/fishing/es.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Medaka azul","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Espinoso venenoso","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Pez mariposa verdoso","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Pez globo","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Pez globo amargo","bait":"fake_fly_bait"},"crystalfish":{"name":"Pez de cristal","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Koi plateado","bait":"fake_fly_bait"},"dawncatcher":{"name":"Atrapaauroras","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Koi dorado","bait":"fake_fly_bait"},"snowstrider":{"name":"Pisanieves","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Medaka flor dulce","bait":"fruit_paste_bait"},"betta":{"name":"Espinoso luchador","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Pez mariposa marrón","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Pez ángel","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Medaka brillante","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Espinoso anfibio","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Pez mariposa violeta","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Pez ángel raimei","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/fr.json b/src/data/fishing/fr.json
new file mode 100644
index 00000000..0aa77808
--- /dev/null
+++ b/src/data/fishing/fr.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Médaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Médaka bleuté","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Épinoche dovenin","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Poisson-papillon vert","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Poisson-globe","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Poisson-globe amer","bait":"fake_fly_bait"},"crystalfish":{"name":"Poisson cristal","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Koï rouillé","bait":"fake_fly_bait"},"dawncatcher":{"name":"Attrape-aube","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Koï doré","bait":"fake_fly_bait"},"snowstrider":{"name":"Arpente-neige","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Médaka sucrant","bait":"fruit_paste_bait"},"betta":{"name":"Épinoche combattante","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Poisson-papillon marron","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Scalaire chousei","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Médaka verni","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Épinoche pulmonée","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Poisson-papillon violet","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Scalaire raimei","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/id.json b/src/data/fishing/id.json
new file mode 100644
index 00000000..98e84226
--- /dev/null
+++ b/src/data/fishing/id.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Aizen Medaka","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Venomspine Fish","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai Maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Tea-Colored Shirakodai","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Pufferfish","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Bitter Pufferfish","bait":"fake_fly_bait"},"crystalfish":{"name":"Crystalfish","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Rusty Koi","bait":"fake_fly_bait"},"dawncatcher":{"name":"Dawncatcher","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Golden Koi","bait":"fake_fly_bait"},"snowstrider":{"name":"Snowstrider","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Sweet-Flower Medaka","bait":"fruit_paste_bait"},"betta":{"name":"Betta","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Brown Shirakodai","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Abiding Angelfish","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Glaze Medaka","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Lunged Stickleback","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Purple Shirakodai","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Raimei Angelfish","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/ko.json b/src/data/fishing/ko.json
new file mode 100644
index 00000000..e14a8cba
--- /dev/null
+++ b/src/data/fishing/ko.json
@@ -0,0 +1 @@
+{"medaka":{"name":"구피","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"파란 구피","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"맹독 가시고기","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"붉은 마왕 가시고기","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"녹색 나비고기","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"대포 복어","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"쓴맛 대포 복어","bait":"fake_fly_bait"},"crystalfish":{"name":"수정빛 구피","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"녹빛 용 물고기","bait":"fake_fly_bait"},"dawncatcher":{"name":"노을빛 구피","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"금적빛 용 물고기","bait":"fake_fly_bait"},"snowstrider":{"name":"흰눈 가시고기","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"달콤달콤 구피","bait":"fruit_paste_bait"},"betta":{"name":"전투 가시고기","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"갈색 나비고기","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"장수 나비 고기","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"유리 구피","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"부레 가시고기","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"자색 나비고기","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"전류 나비고기","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/location.json b/src/data/fishing/location.json
new file mode 100644
index 00000000..b1ddf475
--- /dev/null
+++ b/src/data/fishing/location.json
@@ -0,0 +1,264 @@
+{
+  "cider_lake": {
+    "name": "Cider Lake",
+    "fish": [
+      "aizen_medaka",
+      "crystalfish",
+      "venomspine_fish",
+      "rusty_koi",
+      "tea-colored_shirakodai"
+    ],
+    "location": "mondstadt"
+  },
+  "stormbearer_mountains": {
+    "name": "Stormbearer Mountains",
+    "fish": [
+      "medaka",
+      "aizen_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "venomspine_fish",
+      "golden_koi",
+      "tea-colored_shirakodai"
+    ],
+    "location": "mondstadt"
+  },
+  "stormterrors_lair": {
+    "name": "Stormterror's Lair",
+    "fish": [
+      "medaka",
+      "aizen_medaka",
+      "dawncatcher",
+      "crystalfish"
+    ],
+    "location": "mondstadt"
+  },
+  "windrise": {
+    "name": "Windrise",
+    "fish": [
+      "medaka",
+      "aizen_medaka",
+      "venomspine_fish",
+      "tea-colored_shirakodai"
+    ],
+    "location": "mondstadt"
+  },
+  "near_dawn_winery": {
+    "name": "Near Dawn Winery",
+    "fish": [
+      "aizen_medaka",
+      "dawncatcher",
+      "venomspine_fish",
+      "akai_maou",
+      "tea-colored_shirakodai",
+      "pufferfish",
+      "bitter_pufferfish"
+    ],
+    "location": "mondstadt"
+  },
+  "dragonspine": {
+    "name": "Dragonspine",
+    "fish": [
+      "medaka",
+      "venomspine_fish",
+      "snowstrider",
+      "tea-colored_shirakodai"
+    ],
+    "location": "mondstadt"
+  },
+  "qingce_village": {
+    "name": "Qingce Village",
+    "fish": [
+      "sweet-flower_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "betta",
+      "brown_shirakodai",
+      "bitter_pufferfish"
+    ],
+    "location": "liyue"
+  },
+  "dihua_marsh": {
+    "name": "Dihua Marsh",
+    "fish": [
+      "medaka",
+      "sweet-flower_medaka",
+      "dawncatcher",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "beside_wangshu_inn": {
+    "name": "Beside Wangshu Inn",
+    "fish": [
+      "sweet-flower_medaka",
+      "betta",
+      "akai_maou",
+      "golden_koi",
+      "rusty_koi",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "beside_guili_plains": {
+    "name": "Beside Guili Plains",
+    "fish": [
+      "sweet-flower_medaka",
+      "betta",
+      "akai_maou",
+      "golden_koi",
+      "rusty_koi",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "bishui_plain": {
+    "name": "Bishui Plain",
+    "fish": [
+      "medaka",
+      "dawncatcher",
+      "crystalfish",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "mt._hulao": {
+    "name": "Mt. Hulao",
+    "fish": [
+      "medaka",
+      "sweet-flower_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "betta",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "luhua_pool": {
+    "name": "Luhua Pool",
+    "fish": [
+      "sweet-flower_medaka",
+      "betta",
+      "akai_maou",
+      "golden_koi",
+      "rusty_koi",
+      "brown_shirakodai"
+    ],
+    "location": "liyue"
+  },
+  "tianqiu_valley": {
+    "name": "Tianqiu Valley",
+    "fish": [
+      "medaka",
+      "crystalfish",
+      "betta"
+    ],
+    "location": "liyue"
+  },
+  "liyue_harbor": {
+    "name": "Liyue Harbor",
+    "fish": [
+      "sweet-flower_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "betta",
+      "pufferfish"
+    ],
+    "location": "liyue"
+  },
+  "mt._aocang": {
+    "name": "Mt. Aocang",
+    "fish": [
+      "medaka",
+      "sweet-flower_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "abiding_angelfish"
+    ],
+    "location": "liyue"
+  },
+  "ritou": {
+    "name": "Ritou",
+    "fish": [
+      "glaze_medaka",
+      "lunged_stickleback",
+      "akai_maou",
+      "pufferfish",
+      "bitter_pufferfish"
+    ],
+    "location": "inazuma"
+  },
+  "near_amakane_island": {
+    "name": "Near Amakane Island",
+    "fish": [
+      "glaze_medaka",
+      "lunged_stickleback",
+      "purple_shirakodai"
+    ],
+    "location": "inazuma"
+  },
+  "nazuchi_beach": {
+    "name": "Nazuchi Beach",
+    "fish": [
+      "medaka",
+      "lunged_stickleback",
+      "purple_shirakodai",
+      "bitter_pufferfish"
+    ],
+    "location": "inazuma"
+  },
+  "sangonomiya_shrine": {
+    "name": "Sangonomiya Shrine",
+    "fish": [
+      "medaka",
+      "glaze_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "lunged_stickleback",
+      "purple_shirakodai"
+    ],
+    "location": "inazuma"
+  },
+  "suigetsu_pool": {
+    "name": "Suigetsu Pool",
+    "fish": [
+      "medaka",
+      "glaze_medaka",
+      "dawncatcher",
+      "crystalfish",
+      "lunged_stickleback",
+      "purple_shirakodai"
+    ],
+    "location": "inazuma"
+  },
+  "koseki_village": {
+    "name": "Koseki Village",
+    "fish": [
+      "glaze_medaka",
+      "lunged_stickleback",
+      "akai_maou",
+      "golden_koi",
+      "rusty_koi",
+      "purple_shirakodai"
+    ],
+    "location": "inazuma"
+  },
+  "near_koseki_village": {
+    "name": "Near Koseki Village",
+    "fish": [
+      "medaka",
+      "dawncatcher",
+      "crystalfish",
+      "purple_shirakodai",
+      "pufferfish"
+    ],
+    "location": "inazuma"
+  },
+  "tatarasuna": {
+    "name": "Tatarasuna",
+    "fish": [
+      "raimei_angelfish"
+    ],
+    "location": "inazuma"
+  }
+}
\ No newline at end of file
diff --git a/src/data/fishing/pt.json b/src/data/fishing/pt.json
new file mode 100644
index 00000000..9add9c5c
--- /dev/null
+++ b/src/data/fishing/pt.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Medaka Azulado","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Peixe-leão Esgana-Gato","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai Maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Shirakodai Cor de Chá","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Fugu","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Fugu Amargo","bait":"fake_fly_bait"},"crystalfish":{"name":"Peixe Cristal","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Koi Enferrujado","bait":"fake_fly_bait"},"dawncatcher":{"name":"Apanhador da Aurora","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Koi Dourado","bait":"fake_fly_bait"},"snowstrider":{"name":"Rei da Neve","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Flor Doce Medaka","bait":"fruit_paste_bait"},"betta":{"name":"Betta Esgana-Gato","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Shirakodai Marrom","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Acará Devoto","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Medaka Envernizado","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Piramboia Esgana-Gato","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Shirakodai Roxo","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Acará Raimei","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/ru.json b/src/data/fishing/ru.json
new file mode 100644
index 00000000..5798455f
--- /dev/null
+++ b/src/data/fishing/ru.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Оризия","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Голубая оризия","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Ядовитая колюшка","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Алый дьявол","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Чайная рыба-бабочка","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Иглобрюх","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Горький иглобрюх","bait":"fake_fly_bait"},"crystalfish":{"name":"Кристальная рыба","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Стальной лжедракон","bait":"fake_fly_bait"},"dawncatcher":{"name":"Ловец зари","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Золотой лжедракон","bait":"fake_fly_bait"},"snowstrider":{"name":"Снежный странник","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Сахарная оризия","bait":"fruit_paste_bait"},"betta":{"name":"Боевая колюшка","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Бурая рыба-бабочка","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Вечная рыба-ангел","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Глазурная оризия","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Двоякодышащая колюшка","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Пурпурная рыба-бабочка","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Рыба-ангел раймэй","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/th.json b/src/data/fishing/th.json
new file mode 100644
index 00000000..98e84226
--- /dev/null
+++ b/src/data/fishing/th.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Medaka","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Aizen Medaka","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Venomspine Fish","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Akai Maou","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Tea-Colored Shirakodai","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Pufferfish","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Bitter Pufferfish","bait":"fake_fly_bait"},"crystalfish":{"name":"Crystalfish","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Rusty Koi","bait":"fake_fly_bait"},"dawncatcher":{"name":"Dawncatcher","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Golden Koi","bait":"fake_fly_bait"},"snowstrider":{"name":"Snowstrider","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Sweet-Flower Medaka","bait":"fruit_paste_bait"},"betta":{"name":"Betta","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Brown Shirakodai","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Abiding Angelfish","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Glaze Medaka","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Lunged Stickleback","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Purple Shirakodai","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Raimei Angelfish","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/tw.json b/src/data/fishing/tw.json
new file mode 100644
index 00000000..a35ac942
--- /dev/null
+++ b/src/data/fishing/tw.json
@@ -0,0 +1 @@
+{"medaka":{"name":"花鱂","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"藍染花鱂","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"鴆棘魚","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"赤魔王","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"流紋茶蝶魚","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"炮魨","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"苦炮魨","bait":"fake_fly_bait"},"crystalfish":{"name":"水晶宴","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"錆假龍","bait":"fake_fly_bait"},"dawncatcher":{"name":"擒霞客","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"金赤假龍","bait":"fake_fly_bait"},"snowstrider":{"name":"雪中君","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"甜甜花鱂","bait":"fruit_paste_bait"},"betta":{"name":"鬥棘魚","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"流紋褐蝶魚","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"長生仙","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"琉璃花鱂","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"肺棘魚","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"流紋京紫蝶魚","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"雷鳴仙","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/vi.json b/src/data/fishing/vi.json
new file mode 100644
index 00000000..232e91b6
--- /dev/null
+++ b/src/data/fishing/vi.json
@@ -0,0 +1 @@
+{"medaka":{"name":"Cá Khổng Tước","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"Cá Khổng Tước Lam","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"Cá Gai Độc","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"Xích Ma Vương","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"Cá Bướm Vân Trà","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"Cá Pháo","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"Cá Pháo Cay Đắng","bait":"fake_fly_bait"},"crystalfish":{"name":"Cá Pha Lê","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"Cá Rồng Thép","bait":"fake_fly_bait"},"dawncatcher":{"name":"Cá Bình Minh","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"Cá Rồng Xích Kim","bait":"fake_fly_bait"},"snowstrider":{"name":"Tuyết Quân Tử","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"Cá Khổng Tước Ngọt","bait":"fruit_paste_bait"},"betta":{"name":"Cá Gai Đấu Sĩ","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"Cá Bướm Vân Đất","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"Trường Sinh Tiên","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"Cá Khổng Tước Lưu Ly","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"Cá Thân Gai","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"Cá Bướm Vân Tím","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"Lôi Minh Tiên","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/data/fishing/zh.json b/src/data/fishing/zh.json
new file mode 100644
index 00000000..47ad0bac
--- /dev/null
+++ b/src/data/fishing/zh.json
@@ -0,0 +1 @@
+{"medaka":{"name":"花鳉","bait":"fruit_paste_bait"},"aizen_medaka":{"name":"蓝染花鳉","bait":"fruit_paste_bait"},"venomspine_fish":{"name":"鸩棘鱼","bait":"redrot_bait","time":"night"},"akai_maou":{"name":"赤魔王","bait":"redrot_bait","time":"day"},"tea-colored_shirakodai":{"name":"流纹茶蝶鱼","bait":"false_worm_bait","time":"day"},"pufferfish":{"name":"炮鲀","bait":"fake_fly_bait"},"bitter_pufferfish":{"name":"苦炮鲀","bait":"fake_fly_bait"},"crystalfish":{"name":"水晶宴","bait":"fruit_paste_bait","time":"day"},"rusty_koi":{"name":"锖假龙","bait":"fake_fly_bait"},"dawncatcher":{"name":"擒霞客","bait":"fruit_paste_bait","time":"night"},"golden_koi":{"name":"金赤假龙","bait":"fake_fly_bait"},"snowstrider":{"name":"雪中君","bait":"redrot_bait","time":"night"},"sweet-flower_medaka":{"name":"甜甜花鳉","bait":"fruit_paste_bait"},"betta":{"name":"斗棘鱼","bait":"redrot_bait","time":"night"},"brown_shirakodai":{"name":"流纹褐蝶鱼","bait":"false_worm_bait","time":"day"},"abiding_angelfish":{"name":"长生仙","bait":"false_worm_bait","time":"day"},"glaze_medaka":{"name":"琉璃花鳉","bait":"fruit_paste_bait"},"lunged_stickleback":{"name":"肺棘鱼","bait":"redrot_bait","time":"night"},"purple_shirakodai":{"name":"流纹京紫蝶鱼","bait":"false_worm_bait","time":"day"},"raimei_angelfish":{"name":"雷鸣仙","bait":"false_worm_bait","time":"night"}}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 494a83f3..b1255233 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -13,6 +13,7 @@
     "furnishing": "Furnishing",
     "weapons": "Weapons",
     "artifacts": "Artifacts",
+    "fishing": "Fishing",
     "settings": "Settings",
     "donate": "Donate"
   },
@@ -744,5 +745,11 @@
     "artifact": "Artifact",
     "setPiece": "{piece} Set Bonus",
     "recommendedCharacter": "Recommended Characters {piece} Set"
+  },
+  "fishing": {
+    "title": "Fishing Book",
+    "mondstadt": "Mondstadt",
+    "liyue": "Liyue",
+    "inazuma": "Inazuma"
   }
 }
\ No newline at end of file
diff --git a/src/routes/fishing/index.svelte b/src/routes/fishing/index.svelte
new file mode 100644
index 00000000..723a4e4d
--- /dev/null
+++ b/src/routes/fishing/index.svelte
@@ -0,0 +1,97 @@
+<script context="module">
+  import data from '../../data/fishing/en.json';
+  import locations from '../../data/fishing/location.json';
+
+  let spots = {
+    mondstadt: [],
+    liyue: [],
+    inazuma: [],
+  };
+  for (const [id, location] of Object.entries(locations)) {
+    spots[location.location].push({ ...location, id });
+  }
+
+  export async function preload() {
+    return { data, spots };
+  }
+</script>
+
+<script>
+  import { locale, t } from 'svelte-i18n';
+  import { onMount } from 'svelte';
+
+  export let data;
+  export let spots;
+
+  let fishList = data;
+
+  async function changeLocale(locale) {
+    const _data = await import(`../../data/fishing/${locale}.json`);
+    fishList = _data.default;
+  }
+
+  onMount(async () => {
+    locale.subscribe((val) => {
+      changeLocale(val);
+    });
+  });
+</script>
+
+<svelte:head>
+  <title>Fishing - Paimon.moe</title>
+  <meta name="description" content="Genshin Impact fish list and fishing spot location with time marker" />
+  <meta property="og:description" content="Genshin Impact fish list and fishing spot location with time marker" />
+</svelte:head>
+<div class="lg:ml-64 pt-20 lg:pt-8 max-w-screen-xl">
+  <h1 class="font-display px-4 md:px-8 font-black text-5xl text-white">{$t('fishing.title')}</h1>
+  {#each Object.entries(spots) as [id, location]}
+    <h3 class="font-display px-4 md:px-8 font-black text-2xl text-white mt-4 mb-2">{$t(`fishing.${id}`)}</h3>
+    <div class="px-8 w-full">
+      {#each location as spot}
+        <div class="flex w-full bg-item rounded-xl p-4 mb-2">
+          <div class="mr-4">
+            <img
+              class="w-48 h-48 rounded-md"
+              style="min-width: 192px;"
+              src="/images/fishing/locations/{spot.id}.png"
+              alt={spot.name}
+              title={spot.name}
+            />
+          </div>
+          <div class="flex flex-wrap" style="margin: -4px; height: fit-content;">
+            {#each spot.fish as fish}
+              <div
+                class="w-24 flex flex-col justify-between rounded-md bg-background-secondary relative"
+                style="margin: 4px 12px 4px 4px;"
+              >
+                <div class="w-24 h-24 flex items-center justify-center">
+                  <img
+                    class="w-24 h-auto"
+                    style="min-width: 96px;"
+                    src="/images/fishing/fish/{fish}.png"
+                    alt={fishList[fish].name}
+                    title={fishList[fish].name}
+                  />
+                </div>
+                <span class="text-sm text-white leading-none mt-1 text-center">{fishList[fish].name}</span>
+                <div
+                  class="absolute rounded-full flex bg-background-secondary"
+                  style="top: -8px; left: -8px; background: rgba(0, 0, 0, 0.50);"
+                >
+                  <div class="w-6 h-6 flex justify-center items-center rounded-full">
+                    <img class="w-5" src="/images/fishing/bait/{fishList[fish].bait}.png" alt={fishList[fish].bait} />
+                  </div>
+                  {#if fishList[fish].time}
+                    <div class="w-6 h-6 flex justify-center items-center rounded-full ml-1">
+                      <img class="w-5" src="/images/{fishList[fish].time}.png" alt={fishList[fish].time} />
+                    </div>
+                  {/if}
+                </div>
+              </div>
+            {/each}
+          </div>
+        </div>
+      {/each}
+    </div>
+  {/each}
+</div>
diff --git a/static/images/day.png b/static/images/day.png
new file mode 100644
index 00000000..dd833208
Binary files /dev/null and b/static/images/day.png differ
diff --git a/static/images/fishing/bait/fake_fly_bait.png b/static/images/fishing/bait/fake_fly_bait.png
new file mode 100644
index 00000000..9574748b
Binary files /dev/null and b/static/images/fishing/bait/fake_fly_bait.png differ
diff --git a/static/images/fishing/bait/false_worm_bait.png b/static/images/fishing/bait/false_worm_bait.png
new file mode 100644
index 00000000..e0e44158
Binary files /dev/null and b/static/images/fishing/bait/false_worm_bait.png differ
diff --git a/static/images/fishing/bait/fruit_paste_bait.png b/static/images/fishing/bait/fruit_paste_bait.png
new file mode 100644
index 00000000..994f5b28
Binary files /dev/null and b/static/images/fishing/bait/fruit_paste_bait.png differ
diff --git a/static/images/fishing/bait/redrot_bait.png b/static/images/fishing/bait/redrot_bait.png
new file mode 100644
index 00000000..92112f70
Binary files /dev/null and b/static/images/fishing/bait/redrot_bait.png differ
diff --git a/static/images/fishing/fish/abiding_angelfish.png b/static/images/fishing/fish/abiding_angelfish.png
new file mode 100644
index 00000000..f4748e92
Binary files /dev/null and b/static/images/fishing/fish/abiding_angelfish.png differ
diff --git a/static/images/fishing/fish/aizen_medaka.png b/static/images/fishing/fish/aizen_medaka.png
new file mode 100644
index 00000000..9e0788aa
Binary files /dev/null and b/static/images/fishing/fish/aizen_medaka.png differ
diff --git a/static/images/fishing/fish/akai_maou.png b/static/images/fishing/fish/akai_maou.png
new file mode 100644
index 00000000..c05051c9
Binary files /dev/null and b/static/images/fishing/fish/akai_maou.png differ
diff --git a/static/images/fishing/fish/betta.png b/static/images/fishing/fish/betta.png
new file mode 100644
index 00000000..8796a5f6
Binary files /dev/null and b/static/images/fishing/fish/betta.png differ
diff --git a/static/images/fishing/fish/bitter_pufferfish.png b/static/images/fishing/fish/bitter_pufferfish.png
new file mode 100644
index 00000000..ed748499
Binary files /dev/null and b/static/images/fishing/fish/bitter_pufferfish.png differ
diff --git a/static/images/fishing/fish/brown_shirakodai.png b/static/images/fishing/fish/brown_shirakodai.png
new file mode 100644
index 00000000..452f2482
Binary files /dev/null and b/static/images/fishing/fish/brown_shirakodai.png differ
diff --git a/static/images/fishing/fish/crystalfish.png b/static/images/fishing/fish/crystalfish.png
new file mode 100644
index 00000000..56080371
Binary files /dev/null and b/static/images/fishing/fish/crystalfish.png differ
diff --git a/static/images/fishing/fish/dawncatcher.png b/static/images/fishing/fish/dawncatcher.png
new file mode 100644
index 00000000..040811f1
Binary files /dev/null and b/static/images/fishing/fish/dawncatcher.png differ
diff --git a/static/images/fishing/fish/glaze_medaka.png b/static/images/fishing/fish/glaze_medaka.png
new file mode 100644
index 00000000..eb06c612
Binary files /dev/null and b/static/images/fishing/fish/glaze_medaka.png differ
diff --git a/static/images/fishing/fish/golden_koi.png b/static/images/fishing/fish/golden_koi.png
new file mode 100644
index 00000000..52c2c620
Binary files /dev/null and b/static/images/fishing/fish/golden_koi.png differ
diff --git a/static/images/fishing/fish/lunged_stickleback.png b/static/images/fishing/fish/lunged_stickleback.png
new file mode 100644
index 00000000..534e0927
Binary files /dev/null and b/static/images/fishing/fish/lunged_stickleback.png differ
diff --git a/static/images/fishing/fish/medaka.png b/static/images/fishing/fish/medaka.png
new file mode 100644
index 00000000..c4543970
Binary files /dev/null and b/static/images/fishing/fish/medaka.png differ
diff --git a/static/images/fishing/fish/pufferfish.png b/static/images/fishing/fish/pufferfish.png
new file mode 100644
index 00000000..5c621153
Binary files /dev/null and b/static/images/fishing/fish/pufferfish.png differ
diff --git a/static/images/fishing/fish/purple_shirakodai.png b/static/images/fishing/fish/purple_shirakodai.png
new file mode 100644
index 00000000..31933725
Binary files /dev/null and b/static/images/fishing/fish/purple_shirakodai.png differ
diff --git a/static/images/fishing/fish/raimei_angelfish.png b/static/images/fishing/fish/raimei_angelfish.png
new file mode 100644
index 00000000..efd208b8
Binary files /dev/null and b/static/images/fishing/fish/raimei_angelfish.png differ
diff --git a/static/images/fishing/fish/rusty_koi.png b/static/images/fishing/fish/rusty_koi.png
new file mode 100644
index 00000000..1ee859ed
Binary files /dev/null and b/static/images/fishing/fish/rusty_koi.png differ
diff --git a/static/images/fishing/fish/snowstrider.png b/static/images/fishing/fish/snowstrider.png
new file mode 100644
index 00000000..d8a7fec1
Binary files /dev/null and b/static/images/fishing/fish/snowstrider.png differ
diff --git a/static/images/fishing/fish/sweet-flower_medaka.png b/static/images/fishing/fish/sweet-flower_medaka.png
new file mode 100644
index 00000000..ad2a63fc
Binary files /dev/null and b/static/images/fishing/fish/sweet-flower_medaka.png differ
diff --git a/static/images/fishing/fish/tea-colored_shirakodai.png b/static/images/fishing/fish/tea-colored_shirakodai.png
new file mode 100644
index 00000000..45b00eb1
Binary files /dev/null and b/static/images/fishing/fish/tea-colored_shirakodai.png differ
diff --git a/static/images/fishing/fish/venomspine_fish.png b/static/images/fishing/fish/venomspine_fish.png
new file mode 100644
index 00000000..50f74c3a
Binary files /dev/null and b/static/images/fishing/fish/venomspine_fish.png differ
diff --git a/static/images/fishing/locations/beside_guili_plains.png b/static/images/fishing/locations/beside_guili_plains.png
new file mode 100644
index 00000000..b00d0c61
Binary files /dev/null and b/static/images/fishing/locations/beside_guili_plains.png differ
diff --git a/static/images/fishing/locations/beside_wangshu_inn.png b/static/images/fishing/locations/beside_wangshu_inn.png
new file mode 100644
index 00000000..14fd5301
Binary files /dev/null and b/static/images/fishing/locations/beside_wangshu_inn.png differ
diff --git a/static/images/fishing/locations/bishui_plain.png b/static/images/fishing/locations/bishui_plain.png
new file mode 100644
index 00000000..22244cea
Binary files /dev/null and b/static/images/fishing/locations/bishui_plain.png differ
diff --git a/static/images/fishing/locations/cider_lake.png b/static/images/fishing/locations/cider_lake.png
new file mode 100644
index 00000000..b0d41611
Binary files /dev/null and b/static/images/fishing/locations/cider_lake.png differ
diff --git a/static/images/fishing/locations/dihua_marsh.png b/static/images/fishing/locations/dihua_marsh.png
new file mode 100644
index 00000000..cc11bcf5
Binary files /dev/null and b/static/images/fishing/locations/dihua_marsh.png differ
diff --git a/static/images/fishing/locations/dragonspine.png b/static/images/fishing/locations/dragonspine.png
new file mode 100644
index 00000000..bd84e9d2
Binary files /dev/null and b/static/images/fishing/locations/dragonspine.png differ
diff --git a/static/images/fishing/locations/koseki_village.png b/static/images/fishing/locations/koseki_village.png
new file mode 100644
index 00000000..328c2234
Binary files /dev/null and b/static/images/fishing/locations/koseki_village.png differ
diff --git a/static/images/fishing/locations/liyue_harbor.png b/static/images/fishing/locations/liyue_harbor.png
new file mode 100644
index 00000000..dad6362a
Binary files /dev/null and b/static/images/fishing/locations/liyue_harbor.png differ
diff --git a/static/images/fishing/locations/luhua_pool.png b/static/images/fishing/locations/luhua_pool.png
new file mode 100644
index 00000000..2cad4c41
Binary files /dev/null and b/static/images/fishing/locations/luhua_pool.png differ
diff --git a/static/images/fishing/locations/mt._aocang.png b/static/images/fishing/locations/mt._aocang.png
new file mode 100644
index 00000000..755f9866
Binary files /dev/null and b/static/images/fishing/locations/mt._aocang.png differ
diff --git a/static/images/fishing/locations/mt._hulao.png b/static/images/fishing/locations/mt._hulao.png
new file mode 100644
index 00000000..9e3a5a3e
Binary files /dev/null and b/static/images/fishing/locations/mt._hulao.png differ
diff --git a/static/images/fishing/locations/nazuchi_beach.png b/static/images/fishing/locations/nazuchi_beach.png
new file mode 100644
index 00000000..a870ec2c
Binary files /dev/null and b/static/images/fishing/locations/nazuchi_beach.png differ
diff --git a/static/images/fishing/locations/near_amakane_island.png b/static/images/fishing/locations/near_amakane_island.png
new file mode 100644
index 00000000..35143fc8
Binary files /dev/null and b/static/images/fishing/locations/near_amakane_island.png differ
diff --git a/static/images/fishing/locations/near_dawn_winery.png b/static/images/fishing/locations/near_dawn_winery.png
new file mode 100644
index 00000000..ec1c31ef
Binary files /dev/null and b/static/images/fishing/locations/near_dawn_winery.png differ
diff --git a/static/images/fishing/locations/near_koseki_village.png b/static/images/fishing/locations/near_koseki_village.png
new file mode 100644
index 00000000..328c2234
Binary files /dev/null and b/static/images/fishing/locations/near_koseki_village.png differ
diff --git a/static/images/fishing/locations/qingce_village.png b/static/images/fishing/locations/qingce_village.png
new file mode 100644
index 00000000..82cd33d0
Binary files /dev/null and b/static/images/fishing/locations/qingce_village.png differ
diff --git a/static/images/fishing/locations/ritou.png b/static/images/fishing/locations/ritou.png
new file mode 100644
index 00000000..6de580e8
Binary files /dev/null and b/static/images/fishing/locations/ritou.png differ
diff --git a/static/images/fishing/locations/sangonomiya_shrine.png b/static/images/fishing/locations/sangonomiya_shrine.png
new file mode 100644
index 00000000..1d8e2327
Binary files /dev/null and b/static/images/fishing/locations/sangonomiya_shrine.png differ
diff --git a/static/images/fishing/locations/stormbearer_mountains.png b/static/images/fishing/locations/stormbearer_mountains.png
new file mode 100644
index 00000000..7c8d2388
Binary files /dev/null and b/static/images/fishing/locations/stormbearer_mountains.png differ
diff --git a/static/images/fishing/locations/stormterrors_lair.png b/static/images/fishing/locations/stormterrors_lair.png
new file mode 100644
index 00000000..b1dd1099
Binary files /dev/null and b/static/images/fishing/locations/stormterrors_lair.png differ
diff --git a/static/images/fishing/locations/suigetsu_pool.png b/static/images/fishing/locations/suigetsu_pool.png
new file mode 100644
index 00000000..ef3b6752
Binary files /dev/null and b/static/images/fishing/locations/suigetsu_pool.png differ
diff --git a/static/images/fishing/locations/tatarasuna.png b/static/images/fishing/locations/tatarasuna.png
new file mode 100644
index 00000000..26da752f
Binary files /dev/null and b/static/images/fishing/locations/tatarasuna.png differ
diff --git a/static/images/fishing/locations/tianqiu_valley.png b/static/images/fishing/locations/tianqiu_valley.png
new file mode 100644
index 00000000..67ecfe19
Binary files /dev/null and b/static/images/fishing/locations/tianqiu_valley.png differ
diff --git a/static/images/fishing/locations/windrise.png b/static/images/fishing/locations/windrise.png
new file mode 100644
index 00000000..0830e308
Binary files /dev/null and b/static/images/fishing/locations/windrise.png differ
diff --git a/static/images/night.png b/static/images/night.png
new file mode 100644
index 00000000..37fbeafe
Binary files /dev/null and b/static/images/night.png differ