Merge branch 'master' into legends-arceus-assets

2026-04-24 23:47:29 -05:00 · 2022-06-16 17:26:39 +02:00 · 2022-06-16 17:26:39 +02:00 · b29ae0b471
commit b29ae0b471
parent cacf13b477 be52e20533
32 changed files with 1827 additions and 1728 deletions
--- a/contributors.md
+++ b/contributors.md
@ -15,7 +15,7 @@ The [alternate sizes for Pumpkaboo and Gourgeist](https://github.com/msikma/poke

 The Pokémon Legends: Arceus sprite collection is taken from the [National Pokédex - Icon Dex](https://www.deviantart.com/pikafan2000/art/National-Pokedex-Version-Delta-Icon-Dex-824897934) project and its abundance of collaborators and contributors.

-Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update (original and DLC) and for tagging all the new inventory sprites.
+Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on various later additions, like the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update (original and DLC) and the <i title="Pokémon HOME">HOME 2.0.0</i> update inventory items. Thanks to [@mattyoukhana_](https://twitter.com/mattyoukhana_) for helping provide sprite rips for later games.

 Also, special thanks to anyone who reported issues, gave suggestions or sent in contributions.

--- a/data/item-map.json
+++ b/data/item-map.json
@ -891,5 +891,16 @@
  "item_1603": "key-item/shaderoot-carrot",
  "item_1604": "other-item/dynite-ore",
  "item_1605": "key-item/carrot-seeds",
-  "item_1606": "other-item/ability-patch"
+  "item_1606": "other-item/ability-patch",
+  "item_1710": "ball/hisuian-poke",
+  "item_1711": "ball/hisuian-great",
+  "item_1712": "ball/hisuian-ultra",
+  "item_1713": "ball/feather",
+  "item_1746": "ball/wing",
+  "item_1747": "ball/jet",
+  "item_1748": "ball/hisuian-heavy",
+  "item_1749": "ball/leaden",
+  "item_1750": "ball/gigaton",
+  "item_1771": "ball/origin",
+  "item_1785": "ball/strange"
 }
--- a/docs/index.html
+++ b/docs/index.html
@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>PokéSprite - Index</title>
@ -19,8 +19,8 @@
        <h1 class="title"><img class="p" src="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8/shiny/venusaur.png" alt="Shiny Venusaur" />PokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="curr">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li><li><a href="https://msikma.github.io/pokesprite/overview/misc.html" class="">Miscellaneous</a></li></ul>
-        <p><img class="banner" src="https://raw.githubusercontent.com/msikma/pokesprite/master/resources/images/banner_gen8_2x.png" width="726" /></p>
-        <p>See the <a href="https://github.com/msikma/pokesprite">project page on Github</a> for more information.</a></p>
+        <p><img class="banner" src="https://raw.githubusercontent.com/msikma/pokesprite/master/resources/images/banner_gen8_2x.png" width="726" alt="" /></p>
+        <p>See the <a href="https://github.com/msikma/pokesprite">project page on Github</a> for more information.</p>
        <h3>Legacy images</h3>
        <p>As of Mar 2022, this project is up-to-date with Gen 8 (Pokémon Sword/Shield and its DLC releases, and Pokémon Legends: Arceus). All old images from Gen 7 (Pokémon Ultra Sun/Ultra Moon) are still available for legacy support.</p>
        <p><strong>Archived versions of the legacy overview pages:</strong></p>
--- a/docs/overview/dex-gen7.html
+++ b/docs/overview/dex-gen7.html
--- a/docs/overview/dex-gen8-new.html
+++ b/docs/overview/dex-gen8-new.html
--- a/docs/overview/dex-gen8.html
+++ b/docs/overview/dex-gen8.html
--- a/docs/overview/inventory.html
+++ b/docs/overview/inventory.html
--- a/docs/overview/misc.html
+++ b/docs/overview/misc.html
--- a/docs/resources/pokesprite-docs.css
+++ b/docs/resources/pokesprite-docs.css
@ -79,7 +79,7 @@
 .markdown-body .pokesprite tbody tr.variable-height td {
  vertical-align: middle;
 }
-.markdown-body .pokesprite tbody attr span {
+.markdown-body .pokesprite tbody span[title] {
  border-bottom: 1px dotted var(--gh-black);
 }
 .markdown-body .pokesprite tbody th,
--- a/items-outline/ball/feather.png
+++ b/items-outline/ball/feather.png
--- a/items-outline/ball/gigaton.png
+++ b/items-outline/ball/gigaton.png
--- a/items-outline/ball/hisuian-great.png
+++ b/items-outline/ball/hisuian-great.png
--- a/items-outline/ball/hisuian-heavy.png
+++ b/items-outline/ball/hisuian-heavy.png
--- a/items-outline/ball/hisuian-poke.png
+++ b/items-outline/ball/hisuian-poke.png
--- a/items-outline/ball/hisuian-ultra.png
+++ b/items-outline/ball/hisuian-ultra.png
--- a/items-outline/ball/jet.png
+++ b/items-outline/ball/jet.png
--- a/items-outline/ball/leaden.png
+++ b/items-outline/ball/leaden.png
--- a/items-outline/ball/origin.png
+++ b/items-outline/ball/origin.png
--- a/items-outline/ball/strange.png
+++ b/items-outline/ball/strange.png
--- a/items-outline/ball/wing.png
+++ b/items-outline/ball/wing.png
--- a/items/ball/feather.png
+++ b/items/ball/feather.png
--- a/items/ball/gigaton.png
+++ b/items/ball/gigaton.png
--- a/items/ball/hisuian-great.png
+++ b/items/ball/hisuian-great.png
--- a/items/ball/hisuian-heavy.png
+++ b/items/ball/hisuian-heavy.png
--- a/items/ball/hisuian-poke.png
+++ b/items/ball/hisuian-poke.png
--- a/items/ball/hisuian-ultra.png
+++ b/items/ball/hisuian-ultra.png
--- a/items/ball/jet.png
+++ b/items/ball/jet.png
--- a/items/ball/leaden.png
+++ b/items/ball/leaden.png
--- a/items/ball/origin.png
+++ b/items/ball/origin.png
--- a/items/ball/strange.png
+++ b/items/ball/strange.png
--- a/items/ball/wing.png
+++ b/items/ball/wing.png
--- a/scripts/gen_docs.py
+++ b/scripts/gen_docs.py
@ -66,8 +66,8 @@ def generate_index_page(version, commit):
        <h1 class="title">%(title_sprite)sPokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
        <ul class="menu">%(menu_links)s</ul>
-        <p><img class="banner" src="%(example_image)s" width="%(example_image_width)s" /></p>
-        <p>See the <a href="%(project_url)s">project page on Github</a> for more information.</a></p>
+        <p><img class="banner" src="%(example_image)s" width="%(example_image_width)s" alt="" /></p>
+        <p>See the <a href="%(project_url)s">project page on Github</a> for more information.</p>
        <h3>Legacy images</h3>
        <p>As of Mar 2022, this project is up-to-date with Gen 8 (Pokémon Sword/Shield and its DLC releases, and Pokémon Legends: Arceus). All old images from Gen 7 (Pokémon Ultra Sun/Ultra Moon) are still available for legacy support.</p>
        <p><strong>Archived versions of the legacy overview pages:</strong></p>
@ -136,7 +136,7 @@ def wrap_docs_page(table_content, gen, gen_dir, curr_page, json_file, title, is_
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
        <ul class="menu">%(menu_links)s</ul>
        %(main_info)s
-        <p>See the <a href="%(project_url)s">project page on Github</a> for more information.</a></p>
+        <p>See the <a href="%(project_url)s">project page on Github</a> for more information.</p>
      </div>
      <table class="pokesprite">
        %(table_content)s
@ -177,7 +177,7 @@ def get_title_venusaur():
 def wrap_in_html(content, title, version, commit, res_dir = '.'):
  return '''
 <!doctype html>
-<html>
+<html lang="en">
  <head>
    <meta charset="utf-8" />
    <title>PokéSprite%(title)s</title>
@ -268,7 +268,7 @@ def get_pkm_form(form_name, form_alias, is_unofficial_icon, is_female, has_unoff
  if len(title):
    title = '; '.join(title)
    daggers = ''.join(daggers)
-    return f'<attr title="{title}"><span>{form_name}</span>{daggers}</attr>'
+    return f'<span title="{title}">{form_name}{daggers}</span>'

  return form_name

@ -441,7 +441,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
      desc_eng = desc.get('eng')
      desc_gen = desc.get('from_gen')
      desc_eng_esc = html.escape(desc_eng) if desc_eng else ''
-      name_eng_desc = f'<attr title="{desc_eng_esc}">{name_eng}</attr>' if desc_eng else name_eng
+      name_eng_desc = f'<span title="{desc_eng_esc}">{name_eng}</span>' if desc_eng else name_eng
      row_n = 0
      files = item['files'].items()
      buffer.append('<tbody class="alternating">')
@ -698,7 +698,7 @@ def generate_items_table(itm, itm_unl, inv, etc, dirs, curr_page, json_file, ver
      buffer.append(f'<td>{group}</td>')
      if expl:
        expl_esc = html.escape(expl)
-        buffer.append(f'<td class="item-id" colspan="2"><attr title="{expl_esc}"><span><code>{filename}</code></span>†</attr></td>')
+        buffer.append(f'<td class="item-id" colspan="2"><span title="{expl_esc}"><code>{filename}</code>†</span></td>')
      else:
        buffer.append(f'<td colspan="2" class="item-id"><code>{filename}</code></td>')
      buffer.append('</tr>')