diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-02-06 20:02:27 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-02-06 20:02:27 -0600 |
| commit | 709f495cdffbb7f70367d11804fc0053b79f74aa (patch) | |
| tree | 5e9407cc74146a31e5ce2200568333aa51b532c7 /stats | |
| parent | ff6306400b2272a863fb55edbc00c6a22f24230f (diff) | |
| parent | ddc665a31ac203315c0359b5ef161b731c5c5eda (diff) | |
Merge pull request #230 from yenatch/master
the calm before the storm
Diffstat (limited to 'stats')
| -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 |
6 files changed, 22 insertions, 14 deletions
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" |