diff options
-rw-r--r-- | docs/bugs_and_glitches.md | 2 | ||||
-rw-r--r-- | docs/design_flaws.md | 4 | ||||
-rw-r--r-- | engine/pokedex/newpokedexentry.asm (renamed from engine/routines/newpokedexentry.asm) | 0 | ||||
-rw-r--r-- | engine/pokedex/pokedex.asm (renamed from engine/pokedex.asm) | 0 | ||||
-rw-r--r-- | engine/pokedex/pokedex_2.asm (renamed from engine/pokedex_2.asm) | 0 | ||||
-rw-r--r-- | engine/pokedex/pokedex_3.asm (renamed from engine/pokedex_3.asm) | 0 | ||||
-rwxr-xr-x | engine/pokedex/unown_dex.asm (renamed from engine/unown_dex.asm) | 0 | ||||
-rw-r--r-- | main.asm | 10 |
8 files changed, 8 insertions, 8 deletions
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 index d6b755200..d6b755200 100644 --- a/engine/routines/newpokedexentry.asm +++ b/engine/pokedex/newpokedexentry.asm diff --git a/engine/pokedex.asm b/engine/pokedex/pokedex.asm index e96d0a7d7..e96d0a7d7 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex/pokedex.asm diff --git a/engine/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 4dd608ac0..4dd608ac0 100644 --- a/engine/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm diff --git a/engine/pokedex_3.asm b/engine/pokedex/pokedex_3.asm index dc52f83d3..dc52f83d3 100644 --- a/engine/pokedex_3.asm +++ b/engine/pokedex/pokedex_3.asm diff --git a/engine/unown_dex.asm b/engine/pokedex/unown_dex.asm index dc6db9dc6..dc6db9dc6 100755 --- a/engine/unown_dex.asm +++ b/engine/pokedex/unown_dex.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" |