From 7f54df58bfb00564874f8b6b3acef52a9aff7442 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Sun, 21 Jan 2018 18:00:23 -0500
Subject: [PATCH] Group engine/pokedex files

---
 docs/bugs_and_glitches.md                        |  2 +-
 docs/design_flaws.md                             |  4 ++--
 engine/{routines => pokedex}/newpokedexentry.asm |  0
 engine/{ => pokedex}/pokedex.asm                 |  0
 engine/{ => pokedex}/pokedex_2.asm               |  0
 engine/{ => pokedex}/pokedex_3.asm               |  0
 engine/{ => pokedex}/unown_dex.asm               |  0
 main.asm                                         | 10 +++++-----
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename engine/{routines => pokedex}/newpokedexentry.asm (100%)
 rename engine/{ => pokedex}/pokedex.asm (100%)
 rename engine/{ => pokedex}/pokedex_2.asm (100%)
 rename engine/{ => pokedex}/pokedex_3.asm (100%)
 rename engine/{ => pokedex}/unown_dex.asm (100%)

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 54f22c3df..5abf9d08a 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -993,7 +993,7 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 
 ([Video](https://www.youtube.com/watch?v=z305e4sIO24))
 
-The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActionJumptable.Cry` in [engine/pokedex.asm](/engine/pokedex.asm):
+The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActionJumptable.Cry` in [engine/pokedex/pokedex.asm](/engine/pokedex/pokedex.asm):
 
 ```asm
 .Cry: ; 40340
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index c856e8b38..7dc4d13db 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -228,7 +228,7 @@ INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
 ...
 ```
 
-`Pokedex_LoadAnyFootprint` in [engine/pokedex.asm](/engine/pokedex.asm):
+`Pokedex_LoadAnyFootprint` in [engine/pokedex/pokedex.asm](/engine/pokedex/pokedex.asm):
 
 ```asm
 	push hl
@@ -282,7 +282,7 @@ Modify `Pokedex_LoadAnyFootprint`:
 
 `PokedexDataPointerTable` in [data/pokemon/dex_entry_pointers.asm](/data/pokemon/dex_entry_pointers.asm) is a table of `dw`, not `dba`, yet there are four banks used for Pokédex entries. The correct bank is derived from the species ID at the beginning of each Pokémon's base stats. (This is the only use the base stat species ID has.)
 
-Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex_2.asm](/engine/pokedex_2.asm):
+Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex/pokedex_2.asm](/engine/pokedex/pokedex_2.asm):
 
 ```asm
 GetDexEntryPointer: ; 44333
diff --git a/engine/routines/newpokedexentry.asm b/engine/pokedex/newpokedexentry.asm
similarity index 100%
rename from engine/routines/newpokedexentry.asm
rename to engine/pokedex/newpokedexentry.asm
diff --git a/engine/pokedex.asm b/engine/pokedex/pokedex.asm
similarity index 100%
rename from engine/pokedex.asm
rename to engine/pokedex/pokedex.asm
diff --git a/engine/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
similarity index 100%
rename from engine/pokedex_2.asm
rename to engine/pokedex/pokedex_2.asm
diff --git a/engine/pokedex_3.asm b/engine/pokedex/pokedex_3.asm
similarity index 100%
rename from engine/pokedex_3.asm
rename to engine/pokedex/pokedex_3.asm
diff --git a/engine/unown_dex.asm b/engine/pokedex/unown_dex.asm
similarity index 100%
rename from engine/unown_dex.asm
rename to engine/pokedex/unown_dex.asm
diff --git a/main.asm b/main.asm
index 390e85cb9..11f4fd39e 100644
--- a/main.asm
+++ b/main.asm
@@ -175,7 +175,7 @@ INCLUDE "data/battle/effect_command_pointers.asm"
 
 SECTION "bank10", ROMX
 
-INCLUDE "engine/pokedex.asm"
+INCLUDE "engine/pokedex/pokedex.asm"
 INCLUDE "data/moves/moves.asm"
 INCLUDE "engine/evolve.asm"
 
@@ -184,7 +184,7 @@ SECTION "bank11", ROMX
 
 INCLUDE "engine/events/fruit_trees.asm"
 INCLUDE "engine/battle/ai/move.asm"
-INCLUDE "engine/pokedex_2.asm"
+INCLUDE "engine/pokedex/pokedex_2.asm"
 INCLUDE "data/pokemon/dex_entry_pointers.asm"
 INCLUDE "engine/mail.asm"
 
@@ -451,9 +451,9 @@ INCLUDE "engine/load_font.asm"
 INCLUDE "engine/time_capsule.asm"
 INCLUDE "engine/events/name_rater.asm"
 INCLUDE "engine/routines/playslowcry.asm"
-INCLUDE "engine/routines/newpokedexentry.asm"
+INCLUDE "engine/pokedex/newpokedexentry.asm"
 INCLUDE "engine/time_capsule_2.asm"
-INCLUDE "engine/unown_dex.asm"
+INCLUDE "engine/pokedex/unown_dex.asm"
 INCLUDE "engine/events/magikarp.asm"
 INCLUDE "engine/battle/hidden_power.asm"
 INCLUDE "engine/battle/misc.asm"
@@ -584,7 +584,7 @@ SECTION "bank77_2", ROMX
 
 INCLUDE "engine/routines/printhoursmins.asm"
 INCLUDE "engine/diploma.asm"
-INCLUDE "engine/pokedex_3.asm"
+INCLUDE "engine/pokedex/pokedex_3.asm"
 INCLUDE "engine/events/catch_tutorial_input.asm"
 INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm"