Note which labels are only needed for locating banks (relevant to issue #485)

This commit is contained in:
Rangi
2018-06-12 23:29:15 -04:00
parent 6130fc5cd6
commit fbe82a7fe0
27 changed files with 62 additions and 67 deletions

View File

@@ -836,6 +836,7 @@ LovelyKissDescription:
SkyAttackDescription:
db "1st turn: Prepare"
next "2nd turn: Attack@"
TransformDescription:
db "The user assumes"
next "the foe's guise.@"

View File

@@ -1,4 +1,4 @@
MoveEffects: ; 2732e
MoveEffects: ; used only for BANK(MoveEffects)
NormalHit:
checkobedience

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -1,4 +1,4 @@
BattleText::
BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
text "<PLAYER> picked up"