Merge branch 'master' into proceduralspinda

mikmera · Mar 6, 2020 · 179b04c · 179b04c
2 parents 9910e31 + 545f85f
commit 179b04c
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 21 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,12 +1,11 @@
-
 <!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>PokéSprite - Index</title>
     <!--
     PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-307 [60c9a96e]
+    pokesprite-images v2.0.0 master-314 [011c2224]
 
     (；ﾟ～ﾟ)ゝ”
     -->
@@ -38,4 +37,3 @@ <h2>License</h2>
 
   </body>
 </html>
-
diff --git a/docs/overview/dex-gen7.html b/docs/overview/dex-gen7.html
@@ -1,12 +1,11 @@
-
 <!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>PokéSprite - Gen 7</title>
     <!--
     PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-307 [60c9a96e]
+    pokesprite-images v2.0.0 master-314 [011c2224]
 
     (；ﾟ～ﾟ)ゝ”
     -->
@@ -31,7 +30,7 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
       </div>
       <table class="pokesprite gen7">
         <thead>
-<tr class="title"><th></th><th colspan="10">Gen 7 sprite overview table<br /><span>pokesprite-images v2.0.0 master-307 [60c9a96e]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 7 sprite overview table<br /><span>pokesprite-images v2.0.0 master-314 [011c2224]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
@@ -11570,4 +11569,3 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
 
   </body>
 </html>
-
diff --git a/docs/overview/dex-gen8-new.html b/docs/overview/dex-gen8-new.html
@@ -1,12 +1,11 @@
-
 <!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>PokéSprite - Gen 8 (new sprites only)</title>
     <!--
     PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-307 [60c9a96e]
+    pokesprite-images v2.0.0 master-314 [011c2224]
 
     (；ﾟ～ﾟ)ゝ”
     -->
@@ -31,7 +30,7 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
       </div>
       <table class="pokesprite gen8">
         <thead>
-<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table (new sprites only)<br /><span>pokesprite-images v2.0.0 master-307 [60c9a96e]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table (new sprites only)<br /><span>pokesprite-images v2.0.0 master-314 [011c2224]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
@@ -4658,4 +4657,3 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
 
   </body>
 </html>
-
diff --git a/docs/overview/dex-gen8.html b/docs/overview/dex-gen8.html
@@ -1,12 +1,11 @@
-
 <!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>PokéSprite - Gen 8</title>
     <!--
     PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-307 [60c9a96e]
+    pokesprite-images v2.0.0 master-314 [011c2224]
 
     (；ﾟ～ﾟ)ゝ”
     -->
@@ -31,7 +30,7 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
       </div>
       <table class="pokesprite gen8">
         <thead>
-<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table<br /><span>pokesprite-images v2.0.0 master-307 [60c9a96e]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table<br /><span>pokesprite-images v2.0.0 master-314 [011c2224]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
@@ -13343,4 +13342,3 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
 
   </body>
 </html>
-
diff --git a/docs/overview/inventory.html b/docs/overview/inventory.html
@@ -1,12 +1,11 @@
-
 <!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>PokéSprite - Gen None</title>
     <!--
     PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-307 [60c9a96e]
+    pokesprite-images v2.0.0 master-314 [011c2224]
 
     (；ﾟ～ﾟ)ゝ”
     -->
@@ -27,7 +26,7 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
       </div>
       <table class="pokesprite genNone">
         <thead>
-<tr class="title"><th></th><th colspan="11">Inventory sprite overview table<br /><span>pokesprite-images v2.0.0 master-307 [60c9a96e]</span></th></tr>
+<tr class="title"><th></th><th colspan="11">Inventory sprite overview table<br /><span>pokesprite-images v2.0.0 master-314 [011c2224]</span></th></tr>
 <tr class="header"><th>#</th><th>Item ID</th><th>Name</th><th colspan="2">Sprites</th><th>Group</th><th colspan="2">Filename/notes</th></tr>
 </thead>
 <tbody>
@@ -7671,4 +7670,3 @@ <h2 class="subtitle">Database project of box and inventory sprites from the Pok
 
   </body>
 </html>
-
diff --git a/icons/pokemon/shiny/koffing.png b/icons/pokemon/shiny/koffing.png
diff --git a/icons/pokemon/shiny/weezing.png b/icons/pokemon/shiny/weezing.png
diff --git a/pokemon-gen7x/shiny/koffing.png b/pokemon-gen7x/shiny/koffing.png
diff --git a/pokemon-gen7x/shiny/weezing.png b/pokemon-gen7x/shiny/weezing.png
diff --git a/pokemon-gen8/shiny/koffing.png b/pokemon-gen8/shiny/koffing.png
diff --git a/pokemon-gen8/shiny/weezing.png b/pokemon-gen8/shiny/weezing.png
diff --git a/readme.md b/readme.md
@@ -124,7 +124,7 @@ To somewhat mitigate this, the sprites can be made to overlap each other. In nea
 
 The recommended overlap is **-24px left** and **-16px top**, which is a compromise between bringing the smaller sprites closer together and not letting the larger sprites overlap. **Here's an example of what that looks like:**
 
-<p align="center"><img align="center" src="resources/images/offset_example_2x.png" width="512" alt="Sprite offset example"></p>
+<p align="center"><img align="center" src="resources/images/offset_example_2x.png" width="552" alt="Sprite offset example"></p>
 
 With this setup, the larger sprites are quite close together but not uncomfortably so, and the smaller sprites are not too far away from each other. There is some small overlap for the largest sprites (the special Gigantamax forms), but not excessively so, and in most cases it should be rare to see multiple Gigantamax forms next to one another since it's not a permanent form.
 
@@ -136,6 +136,7 @@ For a better example of what many adjacent sprites look like with this setup, se
 
 * **[PKHeX](https://github.com/kwsch/PKHeX)** – Pokémon save file editor
 * **[PikaSprite](https://github.com/arcanis/pikasprite)** – a different interface for PokéSprite sprites
+* **[DexTool](https://github.com/PoshoDev/DexTool)** – management tools for a Pokémon living Dex, shiny hunting and streaming
 * [Spinda Painter](https://msikma.github.io/spinda-spots/) – proof of concept for displaying accurate Spinda spots on its box sprite
 * Many Google Sheets used by Pokémon traders
 

diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py
@@ -169,7 +169,7 @@ def wrap_in_html(content, title, version, commit, res_dir = '.'):
     %(content)s
   </body>
 </html>
-  ''' % {
+  '''.strip() % {
     'res_dir': res_dir,
     'content': content,
     'title': title,