From ef5cda0bc35f2797f8a2bd798ee488845affb187 Mon Sep 17 00:00:00 2001
From: "Brandon M. M. Green" <bmmgreen@gmail.com>
Date: Thu, 9 Jul 2026 16:15:28 +0000
Subject: [PATCH] reconciling pokemon folder

---
 .../{dex_order.asm => dex_order_reconcile.asm}    |  5 ++++-
 .../{menu_icons.asm => menu_icons_reconcile.asm}  |  0
 wla/data/pokemon/mew.asm                          |  5 -----
 wla/data/pokemon/mew_reconcile.asm                | 15 +++++++++++++++
 .../pokemon/{names.asm => names_reconcile.asm}    |  0
 .../{palettes.asm => palettes_reconcile.asm}      |  0
 .../{title_mons.asm => title_mons_reconcile.asm}  |  1 +
 7 files changed, 20 insertions(+), 6 deletions(-)
 rename wla/data/pokemon/{dex_order.asm => dex_order_reconcile.asm} (98%)
 rename wla/data/pokemon/{menu_icons.asm => menu_icons_reconcile.asm} (100%)
 delete mode 100644 wla/data/pokemon/mew.asm
 create mode 100644 wla/data/pokemon/mew_reconcile.asm
 rename wla/data/pokemon/{names.asm => names_reconcile.asm} (100%)
 rename wla/data/pokemon/{palettes.asm => palettes_reconcile.asm} (100%)
 rename wla/data/pokemon/{title_mons.asm => title_mons_reconcile.asm} (77%)

diff --git a/wla/data/pokemon/dex_order.asm b/wla/data/pokemon/dex_order_reconcile.asm
similarity index 98%
rename from wla/data/pokemon/dex_order.asm
rename to wla/data/pokemon/dex_order_reconcile.asm
index c2665a944..5fdfc973e 100644
--- a/wla/data/pokemon/dex_order.asm
+++ b/wla/data/pokemon/dex_order_reconcile.asm
@@ -1,4 +1,5 @@
-PokedexOrder::
+PokedexOrder:
+
 .DB DEX_RHYDON
 .DB DEX_KANGASKHAN
 .DB DEX_NIDORAN_M
@@ -189,3 +190,5 @@ PokedexOrder::
 .DB DEX_BELLSPROUT
 .DB DEX_WEEPINBELL
 .DB DEX_VICTREEBEL
+assert_table_length NUM_POKEMON_INDEXES
+
diff --git a/wla/data/pokemon/menu_icons.asm b/wla/data/pokemon/menu_icons_reconcile.asm
similarity index 100%
rename from wla/data/pokemon/menu_icons.asm
rename to wla/data/pokemon/menu_icons_reconcile.asm
diff --git a/wla/data/pokemon/mew.asm b/wla/data/pokemon/mew.asm
deleted file mode 100644
index 2be316f93..000000000
--- a/wla/data/pokemon/mew.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
-MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
-
-MewBaseStats::
-.INCBIN "data/pokemon/base_stats/mew.asm"
diff --git a/wla/data/pokemon/mew_reconcile.asm b/wla/data/pokemon/mew_reconcile.asm
new file mode 100644
index 000000000..a0a173b19
--- /dev/null
+++ b/wla/data/pokemon/mew_reconcile.asm
@@ -0,0 +1,15 @@
+; Mew's pics and base data are not grouped with the other Pokémon
+; because it was a last-minute addition "as a kind of prank".
+; Shigeki Morimoto explained in an Iwata Asks interview:
+; "We put Mew in right at the very end. The cartridge was really full and
+; there wasn't room for much more on there. Then the debug features which
+; weren't going to be included in the final version of the game were removed,
+; creating a miniscule 300 bytes of free space. So we thought that we could
+; slot Mew in there. What we did would be unthinkable nowadays!"
+; https://iwataasks.nintendo.com/interviews/ds/pokemon/0/0/
+
+
+MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
+MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
+
+MewBaseStats:: INCLUDE "data/pokemon/base_stats/mew.asm"
diff --git a/wla/data/pokemon/names.asm b/wla/data/pokemon/names_reconcile.asm
similarity index 100%
rename from wla/data/pokemon/names.asm
rename to wla/data/pokemon/names_reconcile.asm
diff --git a/wla/data/pokemon/palettes.asm b/wla/data/pokemon/palettes_reconcile.asm
similarity index 100%
rename from wla/data/pokemon/palettes.asm
rename to wla/data/pokemon/palettes_reconcile.asm
diff --git a/wla/data/pokemon/title_mons.asm b/wla/data/pokemon/title_mons_reconcile.asm
similarity index 77%
rename from wla/data/pokemon/title_mons.asm
rename to wla/data/pokemon/title_mons_reconcile.asm
index f130721d3..9aabe49a9 100644
--- a/wla/data/pokemon/title_mons.asm
+++ b/wla/data/pokemon/title_mons_reconcile.asm
@@ -1,4 +1,5 @@
 TitleMons::
+; mons on the title screen are randomly chosen from here
 .DB STARTER1
 .DB STARTER2
 .DB STARTER3