diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/descriptions.asm | 1 | ||||
| -rw-r--r-- | data/moves/effects.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/dex_entries.asm | 4 | ||||
| -rw-r--r-- | data/pokemon/egg_moves.asm | 4 | ||||
| -rw-r--r-- | data/pokemon/evos_attacks.asm | 6 | ||||
| -rw-r--r-- | data/text/battle.asm | 2 |
6 files changed, 4 insertions, 15 deletions
diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index d86ceea37..7f35132cf 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -836,6 +836,7 @@ LovelyKissDescription: SkyAttackDescription: db "1st turn: Prepare" next "2nd turn: Attack@" + TransformDescription: db "The user assumes" next "the foe's guise.@" diff --git a/data/moves/effects.asm b/data/moves/effects.asm index eeb02b3a1..df597f8bc 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -1,4 +1,4 @@ -MoveEffects: ; 2732e +MoveEffects: ; used only for BANK(MoveEffects) NormalHit: checkobedience diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 7381a4262..a66f16737 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -3,7 +3,6 @@ INCLUDE "constants.asm" SECTION "Pokedex Entries 001-064", ROMX -PokedexEntries1:: BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" @@ -72,7 +71,6 @@ KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" SECTION "Pokedex Entries 065-128", ROMX -PokedexEntries2:: AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/machoke.asm" @@ -141,7 +139,6 @@ TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" SECTION "Pokedex Entries 129-192", ROMX -PokedexEntries3:: MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lapras.asm" @@ -210,7 +207,6 @@ SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" SECTION "Pokedex Entries 193-251", ROMX -PokedexEntries4:: YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm index 886c47349..1ababff89 100644 --- a/data/pokemon/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -11,12 +11,8 @@ SECTION "Egg Moves", ROMX ; Staryu's egg moves were removed in Crystal, because Staryu is genderless ; and can only breed with Ditto. - INCLUDE "data/pokemon/egg_move_pointers.asm" - -EggMoves:: - BulbasaurEggMoves: db LIGHT_SCREEN db SKULL_BASH diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index b57f88408..1ec2f2886 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -3,11 +3,6 @@ INCLUDE "constants.asm" SECTION "Evolutions and Attacks", ROMX - -INCLUDE "data/pokemon/evos_attacks_pointers.asm" - - -EvosAttacks:: ; Evos+attacks data structure: ; - Evolution methods: ; * db EVOLVE_LEVEL, level, species @@ -20,6 +15,7 @@ EvosAttacks:: ; * db level, move ; - db 0 ; no more level-up moves +INCLUDE "data/pokemon/evos_attacks_pointers.asm" BulbasaurEvosAttacks: db EVOLVE_LEVEL, 16, IVYSAUR diff --git a/data/text/battle.asm b/data/text/battle.asm index 9508c8c80..2e7645015 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1,4 +1,4 @@ -BattleText:: +BattleText:: ; used only for BANK(BattleText) BattleText_PlayerPickedUpPayDayMoney: ; 0x80730 text "<PLAYER> picked up" |