diff options
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/credits_crystal.asm | 3 | ||||
| -rw-r--r-- | engine/scripting.asm | 5 | ||||
| -rw-r--r-- | engine/scripting_crystal.asm | 6 | ||||
| -rw-r--r-- | maps.asm | 2 | ||||
| -rw-r--r-- | maps_crystal.asm | 2 | ||||
| -rw-r--r-- | stats/egg_moves.asm | 9 | ||||
| -rw-r--r-- | stats/egg_moves_crystal.asm | 7 | ||||
| -rw-r--r-- | stats/evos_attacks.asm | 9 | ||||
| -rw-r--r-- | stats/evos_attacks_crystal.asm | 7 | ||||
| -rw-r--r-- | stats/pokedex/entries.asm | 2 | ||||
| -rw-r--r-- | stats/pokedex/entries_crystal.asm | 2 |
12 files changed, 34 insertions, 24 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index fabd409da..42144c5d2 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -1,3 +1,7 @@ +INCLUDE "includes.asm" + + +SECTION "Credits", ROMX, BANK[CREDITS] const_def const SATOSHI_TAJIRI diff --git a/engine/credits_crystal.asm b/engine/credits_crystal.asm index 76dc86319..f417985e9 100644 --- a/engine/credits_crystal.asm +++ b/engine/credits_crystal.asm @@ -1,6 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - -SECTION "Credits", ROMX, BANK[CREDITS] INCLUDE "engine/credits.asm" diff --git a/engine/scripting.asm b/engine/scripting.asm index 5f1612677..06ca48d66 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1,6 +1,11 @@ +INCLUDE "includes.asm" + ; Event scripting commands. +SECTION "Event Scripting", ROMX, BANK[EVENTS] + + Function96c56:: ; 96c56 push af ld a, 1 diff --git a/engine/scripting_crystal.asm b/engine/scripting_crystal.asm index 6d80455a0..8df277248 100644 --- a/engine/scripting_crystal.asm +++ b/engine/scripting_crystal.asm @@ -1,7 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - - -SECTION "Event Scripting", ROMX, BANK[EVENTS] - INCLUDE "engine/scripting.asm" + @@ -1,3 +1,5 @@ +INCLUDE "includes.asm" + SECTION "Map Headers", ROMX, BANK[MAP_HEADERS] diff --git a/maps_crystal.asm b/maps_crystal.asm index 0379ca4b8..5ef83dc4a 100644 --- a/maps_crystal.asm +++ b/maps_crystal.asm @@ -1,5 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - INCLUDE "maps.asm" diff --git a/stats/egg_moves.asm b/stats/egg_moves.asm index 1d4daaa66..185be1cb3 100644 --- a/stats/egg_moves.asm +++ b/stats/egg_moves.asm @@ -1,9 +1,18 @@ +INCLUDE "includes.asm" + + +SECTION "Egg Moves", ROMX, BANK[EGG_MOVES] + ; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were ; removed from egg move lists in Crystal, because they are also TMs. ; Staryu's egg moves were removed in Crystal, because Staryu is genderless ; and can only breed with Ditto. + +INCLUDE "stats/egg_move_pointers.asm" + + BulbasaurEggMoves: db LIGHT_SCREEN db SKULL_BASH diff --git a/stats/egg_moves_crystal.asm b/stats/egg_moves_crystal.asm index c4e626e3b..c0713e5a5 100644 --- a/stats/egg_moves_crystal.asm +++ b/stats/egg_moves_crystal.asm @@ -1,8 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - - -SECTION "Egg Moves", ROMX, BANK[EGG_MOVES] - -INCLUDE "stats/egg_move_pointers.asm" INCLUDE "stats/egg_moves.asm" + diff --git a/stats/evos_attacks.asm b/stats/evos_attacks.asm index eaebcc84a..02f4e561b 100644 --- a/stats/evos_attacks.asm +++ b/stats/evos_attacks.asm @@ -1,3 +1,12 @@ +INCLUDE "includes.asm" + + +SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS] + + +INCLUDE "stats/evos_attacks_pointers.asm" + + EvosAttacks:: BulbasaurEvosAttacks: diff --git a/stats/evos_attacks_crystal.asm b/stats/evos_attacks_crystal.asm index 093baadc5..2dbfe0d19 100644 --- a/stats/evos_attacks_crystal.asm +++ b/stats/evos_attacks_crystal.asm @@ -1,8 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - - -SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS] - -INCLUDE "stats/evos_attacks_pointers.asm" INCLUDE "stats/evos_attacks.asm" + diff --git a/stats/pokedex/entries.asm b/stats/pokedex/entries.asm index 3d063b93f..b9dfe7559 100644 --- a/stats/pokedex/entries.asm +++ b/stats/pokedex/entries.asm @@ -1,3 +1,5 @@ +INCLUDE "includes.asm" + SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] diff --git a/stats/pokedex/entries_crystal.asm b/stats/pokedex/entries_crystal.asm index f66d52350..d33c9d7bc 100644 --- a/stats/pokedex/entries_crystal.asm +++ b/stats/pokedex/entries_crystal.asm @@ -1,5 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - INCLUDE "stats/pokedex/entries.asm" |