Merge branch 'pokeclicker:develop' into develop

EatPant2nd · Sep 10, 2023 · 64e24b9 · 64e24b9
2 parents 720b665 + a94a626
commit 64e24b9
Show file tree

Hide file tree

Showing 102 changed files with 143,851 additions and 1,234 deletions.
diff --git a/other/Map tools/Galar_Crown_Tundra.tmx b/other/Map tools/Galar_Crown_Tundra.tmx
diff --git a/other/Map tools/Galar_Isle_of_Armor.tmx b/other/Map tools/Galar_Isle_of_Armor.tmx
diff --git a/other/Map tools/Galar_South.tmx b/other/Map tools/Galar_South.tmx
diff --git a/other/Map tools/Johto.tmx b/other/Map tools/Johto.tmx
diff --git a/other/Map tools/Kanto_kanto.tmx b/other/Map tools/Kanto_kanto.tmx
diff --git a/other/Map tools/tiles_custom.png b/other/Map tools/tiles_custom.png
diff --git a/src/assets/images/badges/Azure.svg b/src/assets/images/badges/Azure.svg
diff --git a/src/assets/images/badges/Bug_Gym.png b/src/assets/images/badges/Bug_Gym.png