Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-09-11 18:15:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[in progress] Harmonize more constant and data files with pokecrystal

Browse Source
This commit is contained in:
Rangi
2020-06-16 14:11:36 -04:00
parent 011f795ea7
commit fda549a27a
21 changed files with 366 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -7,7 +7,6 @@ main.o \
wram.o \
data/text/common.o \
data/maps/map_data.o \
data/pokemon/dex_entries.o \
data/pokemon/egg_moves.o \
data/pokemon/evos_attacks.o \
engine/movie/credits.o \
@@ -16,10 +15,12 @@ gfx/sprites.o \
gfx/tilesets.o
# Distinguish asm files which are game-exclusive for building (*_[gold|silver].asm)
gs_excl_asm := gfx/pics
gs_excl_asm := \
data/pokemon/dex_entries \
gfx/pics
gold_excl_obj := $(addsuffix _gold.o,$(gs_excl_asm))
silver_excl_obj := $(addsuffix _silver.o,$(gs_excl_asm))
gold_obj := $(rom_obj:.o=_gold.o) $(gold_excl_obj)
silver_obj := $(rom_obj:.o=_silver.o) $(silver_excl_obj)

16
constants/collision_constants.asm
View File

@@ -20,8 +20,8 @@ COLL_TALL_GRASS EQU $18
COLL_CUT_TREE_1A EQU $1a ; unused
COLL_LONG_GRASS_1C EQU $1c ; unused
COLL_HEADBUTT_TREE_1D EQU $1d ; unused
COLL_1E EQU $1e ; ?
COLL_1F EQU $1f ; ?
COLL_1E EQU $1e ; garbage
COLL_1F EQU $1f ; garbage
COLL_WATER_21 EQU $21 ; unused
COLL_ICE EQU $23
COLL_WHIRLPOOL EQU $24
@@ -34,7 +34,7 @@ COLL_WATERFALL_RIGHT EQU $30 ; unused
COLL_WATERFALL_LEFT EQU $31 ; unused
COLL_WATERFALL_UP EQU $32 ; unused
COLL_WATERFALL EQU $33
COLL_36 EQU $36 ; ?
COLL_36 EQU $36 ; garbage
COLL_CURRENT_RIGHT EQU $38 ; unused
COLL_CURRENT_LEFT EQU $39 ; unused
COLL_CURRENT_UP EQU $3a ; unused
@@ -47,8 +47,8 @@ COLL_WALK_DOWN EQU $44 ; unused
COLL_BRAKE_45 EQU $45 ; garbage
COLL_BRAKE_46 EQU $46 ; unused
COLL_BRAKE_47 EQU $47 ; unused
COLL_GRASS_48 EQU $48
COLL_GRASS_49 EQU $49
COLL_GRASS_48 EQU $48 ; garbage
COLL_GRASS_49 EQU $49 ; garbage
COLL_GRASS_4A EQU $4a ; garbage
COLL_GRASS_4B EQU $4b ; garbage
COLL_GRASS_4C EQU $4c ; unused
@@ -63,7 +63,7 @@ COLL_BRAKE_57 EQU $57 ; unused
COLL_5B EQU $5b ; garbage
COLL_PIT EQU $60
COLL_VIRTUAL_BOY EQU $61 ; garbage
COLL_63 EQU $63 ; ?
COLL_63 EQU $63 ; garbage
COLL_64 EQU $64 ; garbage
COLL_65 EQU $65 ; garbage
COLL_PIT_68 EQU $68 ; unused
@@ -83,8 +83,8 @@ COLL_WARP_PANEL EQU $7c
COLL_DOOR_7D EQU $7d ; unused
COLL_WARP_CARPET_RIGHT EQU $7e
COLL_WARP_7F EQU $7f ; unused
COLL_88 EQU $88 ; ?
COLL_89 EQU $89 ; ?
COLL_88 EQU $88 ; garbage
COLL_89 EQU $89 ; garbage
COLL_COUNTER EQU $90
COLL_BOOKSHELF EQU $91
COLL_PC EQU $93

20
constants/event_flags.asm
View File

@@ -1836,16 +1836,16 @@
const EVENT_DAY_CARE_MAN_ON_ROUTE_34
const EVENT_DAY_CARE_MON_1
const EVENT_DAY_CARE_MON_2
const EVENT_ILEX_FOREST_FARFETCHD1
const EVENT_ILEX_FOREST_FARFETCHD2
const EVENT_ILEX_FOREST_FARFETCHD3
const EVENT_ILEX_FOREST_FARFETCHD4
const EVENT_ILEX_FOREST_FARFETCHD5
const EVENT_ILEX_FOREST_FARFETCHD6
const EVENT_ILEX_FOREST_FARFETCHD7
const EVENT_ILEX_FOREST_FARFETCHD8
const EVENT_ILEX_FOREST_FARFETCHD9
const EVENT_ILEX_FOREST_FARFETCHD10
const EVENT_ILEX_FOREST_FARFETCHD_1
const EVENT_ILEX_FOREST_FARFETCHD_2
const EVENT_ILEX_FOREST_FARFETCHD_3
const EVENT_ILEX_FOREST_FARFETCHD_4
const EVENT_ILEX_FOREST_FARFETCHD_5
const EVENT_ILEX_FOREST_FARFETCHD_6
const EVENT_ILEX_FOREST_FARFETCHD_7
const EVENT_ILEX_FOREST_FARFETCHD_8
const EVENT_ILEX_FOREST_FARFETCHD_9
const EVENT_ILEX_FOREST_FARFETCHD_10
const EVENT_ILEX_FOREST_APPRENTICE
const EVENT_ILEX_FOREST_CHARCOAL_MASTER
const EVENT_CHARCOAL_KILN_FARFETCH_D

2
constants/item_constants.asm
View File

@@ -278,6 +278,8 @@ ENDM
add_hm WATERFALL ; f9
NUM_HMS EQU const_value - HM01
NUM_TM_HM EQU __enum__ - 1
const ITEM_FA ; fa
USE_SCRIPT_VAR EQU $00

2
constants/pokemon_data_constants.asm
View File

@@ -63,7 +63,7 @@ GENDER_UNKNOWN EQU -1
const EGG_DRAGON ; e
const EGG_NONE ; f (Undiscovered)
; pokedex entries (see data/pokemon/dex_entries.asm)
; pokedex entries (see data/pokemon/dex_entries_*.asm)
NUM_DEX_ENTRY_BANKS EQU 4
; party_struct members (see macros/wram.asm)

2
constants/scgb_constants.asm
View File

@@ -31,7 +31,7 @@
const SCGB_TRAINER_OR_MON_FRONTPIC_PALS
const SCGB_MYSTERY_GIFT
const SCGB_1E
const SCGB_POKEDEX_5_5
const SCGB_POKEDEX_5X5
SCGB_PARTY_MENU_HP_PALS EQU -4
SCGB_RAM EQU -1

38
constants/sprite_anim_constants.asm
View File

@@ -1,21 +1,21 @@
; sprite_anim_struct members (see macros/wram.asm)
const_def
const SPRITEANIMSTRUCT_INDEX ; 00
const SPRITEANIMSTRUCT_FRAMESET_ID ; 01
const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 02
const SPRITEANIMSTRUCT_TILE_ID ; 03
const SPRITEANIMSTRUCT_XCOORD ; 04
const SPRITEANIMSTRUCT_YCOORD ; 05
const SPRITEANIMSTRUCT_XOFFSET ; 06
const SPRITEANIMSTRUCT_YOFFSET ; 07
const SPRITEANIMSTRUCT_DURATION ; 08
const SPRITEANIMSTRUCT_DURATIONOFFSET ; 09
const SPRITEANIMSTRUCT_FRAME ; 0a
const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; 0b
const SPRITEANIMSTRUCT_0C ; 0c
const SPRITEANIMSTRUCT_0D ; 0d
const SPRITEANIMSTRUCT_0E ; 0e
const SPRITEANIMSTRUCT_0F ; 0f
const SPRITEANIMSTRUCT_INDEX ; 0
const SPRITEANIMSTRUCT_FRAMESET_ID ; 1
const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2
const SPRITEANIMSTRUCT_TILE_ID ; 3
const SPRITEANIMSTRUCT_XCOORD ; 4
const SPRITEANIMSTRUCT_YCOORD ; 5
const SPRITEANIMSTRUCT_XOFFSET ; 6
const SPRITEANIMSTRUCT_YOFFSET ; 7
const SPRITEANIMSTRUCT_DURATION ; 8
const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9
const SPRITEANIMSTRUCT_FRAME ; a
const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
const SPRITEANIMSTRUCT_0C ; c
const SPRITEANIMSTRUCT_0D ; d
const SPRITEANIMSTRUCT_0E ; e
const SPRITEANIMSTRUCT_0F ; f
SPRITEANIMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
@@ -65,7 +65,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_INDEX_CUT_TREE ; 29
const SPRITE_ANIM_INDEX_FLY_LEAF ; 2a
const SPRITE_ANIM_INDEX_EGG_CRACK ; 2b
const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH ; 2c
const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA ; 2c
const SPRITE_ANIM_INDEX_HEADBUTT ; 2d
const SPRITE_ANIM_INDEX_EGG_HATCH ; 2e
@@ -162,7 +162,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 2b
const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 2c
const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 2d
const SPRITE_ANIM_FRAMESET_UNUSED_1C ; 2e
const SPRITE_ANIM_FRAMESET_UNUSED_2E ; 2e
const SPRITE_ANIM_FRAMESET_LEAF ; 2f
const SPRITE_ANIM_FRAMESET_CUT_TREE ; 30
const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 31
@@ -183,7 +183,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2 ; 05
const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1 ; 06
const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2 ; 07
const SPRITE_ANIM_OAMSET_UNUSED_LAPRAS ; 08
const SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS ; 08
const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 ; 09
const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 0a
const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0b

268
data/pokemon/dex_entries_gold.asm Normal file
View File

@@ -0,0 +1,268 @@
INCLUDE "constants.asm"
SECTION "Pokedex Entries 001-064", ROMX
BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm"
IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ivysaur.asm"
VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venusaur.asm"
CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmander.asm"
CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmeleon.asm"
CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charizard.asm"
SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/squirtle.asm"
WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wartortle.asm"
BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blastoise.asm"
CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/caterpie.asm"
MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/metapod.asm"
ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/butterfree.asm"
WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weedle.asm"
KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kakuna.asm"
BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/beedrill.asm"
PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgey.asm"
PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeotto.asm"
PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeot.asm"
RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rattata.asm"
RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raticate.asm"
SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spearow.asm"
FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/fearow.asm"
EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ekans.asm"
ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arbok.asm"
PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pikachu.asm"
RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raichu.asm"
SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandshrew.asm"
SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandslash.asm"
NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_f.asm"
NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorina.asm"
NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoqueen.asm"
NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_m.asm"
NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorino.asm"
NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoking.asm"
ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefairy.asm"
ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefable.asm"
VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vulpix.asm"
NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ninetales.asm"
JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jigglypuff.asm"
WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wigglytuff.asm"
ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zubat.asm"
GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golbat.asm"
OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/oddish.asm"
GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gloom.asm"
VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vileplume.asm"
ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/paras.asm"
ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/parasect.asm"
VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venonat.asm"
VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venomoth.asm"
DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/diglett.asm"
DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dugtrio.asm"
MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meowth.asm"
PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/persian.asm"
PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/psyduck.asm"
GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golduck.asm"
MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mankey.asm"
PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/primeape.asm"
GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/growlithe.asm"
ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arcanine.asm"
PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwag.asm"
PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwhirl.asm"
PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwrath.asm"
AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/abra.asm"
KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kadabra.asm"
SECTION "Pokedex Entries 065-128", ROMX
AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/alakazam.asm"
MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machop.asm"
MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machoke.asm"
MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machamp.asm"
BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellsprout.asm"
WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weepinbell.asm"
VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/victreebel.asm"
TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacool.asm"
TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacruel.asm"
GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/geodude.asm"
GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/graveler.asm"
GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golem.asm"
PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ponyta.asm"
RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rapidash.asm"
SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowpoke.asm"
SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowbro.asm"
MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magnemite.asm"
MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magneton.asm"
FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/farfetch_d.asm"
DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/doduo.asm"
DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dodrio.asm"
SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seel.asm"
DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dewgong.asm"
GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/grimer.asm"
MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/muk.asm"
ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shellder.asm"
CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cloyster.asm"
GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gastly.asm"
HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/haunter.asm"
GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gengar.asm"
OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/onix.asm"
DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/drowzee.asm"
HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hypno.asm"
KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/krabby.asm"
KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingler.asm"
VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/voltorb.asm"
ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electrode.asm"
ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggcute.asm"
ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggutor.asm"
CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cubone.asm"
MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marowak.asm"
HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonlee.asm"
HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonchan.asm"
LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lickitung.asm"
KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/koffing.asm"
WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weezing.asm"
RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhyhorn.asm"
RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhydon.asm"
ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chansey.asm"
TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tangela.asm"
KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kangaskhan.asm"
HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/horsea.asm"
SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seadra.asm"
GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/goldeen.asm"
SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seaking.asm"
StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/staryu.asm"
StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/starmie.asm"
MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mr__mime.asm"
ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scyther.asm"
JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jynx.asm"
ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electabuzz.asm"
MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magmar.asm"
PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pinsir.asm"
TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tauros.asm"
SECTION "Pokedex Entries 129-192", ROMX
MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magikarp.asm"
GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gyarados.asm"
LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lapras.asm"
DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ditto.asm"
EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/eevee.asm"
VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vaporeon.asm"
JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jolteon.asm"
FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flareon.asm"
PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon.asm"
OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omanyte.asm"
OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omastar.asm"
KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabuto.asm"
KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabutops.asm"
AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aerodactyl.asm"
SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snorlax.asm"
ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/articuno.asm"
ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zapdos.asm"
MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/moltres.asm"
DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dratini.asm"
DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonair.asm"
DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonite.asm"
MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mewtwo.asm"
MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mew.asm"
ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chikorita.asm"
BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bayleef.asm"
MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meganium.asm"
CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cyndaquil.asm"
QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quilava.asm"
TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/typhlosion.asm"
TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/totodile.asm"
CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/croconaw.asm"
FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/feraligatr.asm"
SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sentret.asm"
FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/furret.asm"
HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoothoot.asm"
NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/noctowl.asm"
LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledyba.asm"
LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledian.asm"
SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spinarak.asm"
AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ariados.asm"
CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/crobat.asm"
ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chinchou.asm"
LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lanturn.asm"
PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pichu.asm"
CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cleffa.asm"
IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/igglybuff.asm"
TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togepi.asm"
TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togetic.asm"
NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/natu.asm"
XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/xatu.asm"
MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mareep.asm"
FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flaaffy.asm"
AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ampharos.asm"
BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellossom.asm"
MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marill.asm"
AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/azumarill.asm"
SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sudowoodo.asm"
PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/politoed.asm"
HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoppip.asm"
SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skiploom.asm"
JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jumpluff.asm"
AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aipom.asm"
SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunkern.asm"
SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunflora.asm"
SECTION "Pokedex Entries 193-251", ROMX
YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/yanma.asm"
WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/espeon.asm"
UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/umbreon.asm"
MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/murkrow.asm"
SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowking.asm"
MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/misdreavus.asm"
UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/unown.asm"
WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wobbuffet.asm"
GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/girafarig.asm"
PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pineco.asm"
ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/forretress.asm"
DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dunsparce.asm"
GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gligar.asm"
SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/steelix.asm"
SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snubbull.asm"
GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/granbull.asm"
QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/qwilfish.asm"
ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scizor.asm"
ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shuckle.asm"
HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/heracross.asm"
SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sneasel.asm"
TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/teddiursa.asm"
UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ursaring.asm"
SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slugma.asm"
MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magcargo.asm"
SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/swinub.asm"
PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/piloswine.asm"
CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/corsola.asm"
RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/remoraid.asm"
OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/octillery.asm"
DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/delibird.asm"
MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mantine.asm"
SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skarmory.asm"
HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndour.asm"
HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndoom.asm"
KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingdra.asm"
PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/phanpy.asm"
DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/donphan.asm"
Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon2.asm"
StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/stantler.asm"
SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smeargle.asm"
TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyrogue.asm"
HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmontop.asm"
SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smoochum.asm"
ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/elekid.asm"
MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magby.asm"
MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/miltank.asm"
BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blissey.asm"
RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raikou.asm"
EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/entei.asm"
SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/suicune.asm"
LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/larvitar.asm"
PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pupitar.asm"
TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyranitar.asm"
LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lugia.asm"
HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ho_oh.asm"
CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/celebi.asm"

269
data/pokemon/dex_entries.asm → data/pokemon/dex_entries_silver.asm
View File

@@ -1,274 +1,6 @@
INCLUDE "constants.asm"
IF DEF(_GOLD)
SECTION "Pokedex Entries 001-064", ROMX
BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm"
IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ivysaur.asm"
VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venusaur.asm"
CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmander.asm"
CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmeleon.asm"
CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charizard.asm"
SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/squirtle.asm"
WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wartortle.asm"
BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blastoise.asm"
CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/caterpie.asm"
MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/metapod.asm"
ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/butterfree.asm"
WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weedle.asm"
KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kakuna.asm"
BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/beedrill.asm"
PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgey.asm"
PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeotto.asm"
PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeot.asm"
RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rattata.asm"
RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raticate.asm"
SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spearow.asm"
FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/fearow.asm"
EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ekans.asm"
ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arbok.asm"
PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pikachu.asm"
RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raichu.asm"
SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandshrew.asm"
SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandslash.asm"
NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_f.asm"
NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorina.asm"
NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoqueen.asm"
NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_m.asm"
NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorino.asm"
NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoking.asm"
ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefairy.asm"
ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefable.asm"
VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vulpix.asm"
NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ninetales.asm"
JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jigglypuff.asm"
WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wigglytuff.asm"
ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zubat.asm"
GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golbat.asm"
OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/oddish.asm"
GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gloom.asm"
VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vileplume.asm"
ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/paras.asm"
ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/parasect.asm"
VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venonat.asm"
VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venomoth.asm"
DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/diglett.asm"
DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dugtrio.asm"
MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meowth.asm"
PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/persian.asm"
PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/psyduck.asm"
GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golduck.asm"
MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mankey.asm"
PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/primeape.asm"
GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/growlithe.asm"
ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arcanine.asm"
PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwag.asm"
PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwhirl.asm"
PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwrath.asm"
AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/abra.asm"
KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kadabra.asm"
SECTION "Pokedex Entries 065-128", ROMX
AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/alakazam.asm"
MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machop.asm"
MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machoke.asm"
MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machamp.asm"
BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellsprout.asm"
WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weepinbell.asm"
VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/victreebel.asm"
TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacool.asm"
TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacruel.asm"
GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/geodude.asm"
GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/graveler.asm"
GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golem.asm"
PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ponyta.asm"
RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rapidash.asm"
SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowpoke.asm"
SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowbro.asm"
MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magnemite.asm"
MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magneton.asm"
FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/farfetch_d.asm"
DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/doduo.asm"
DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dodrio.asm"
SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seel.asm"
DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dewgong.asm"
GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/grimer.asm"
MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/muk.asm"
ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shellder.asm"
CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cloyster.asm"
GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gastly.asm"
HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/haunter.asm"
GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gengar.asm"
OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/onix.asm"
DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/drowzee.asm"
HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hypno.asm"
KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/krabby.asm"
KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingler.asm"
VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/voltorb.asm"
ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electrode.asm"
ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggcute.asm"
ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggutor.asm"
CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cubone.asm"
MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marowak.asm"
HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonlee.asm"
HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonchan.asm"
LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lickitung.asm"
KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/koffing.asm"
WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weezing.asm"
RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhyhorn.asm"
RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhydon.asm"
ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chansey.asm"
TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tangela.asm"
KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kangaskhan.asm"
HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/horsea.asm"
SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seadra.asm"
GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/goldeen.asm"
SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seaking.asm"
StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/staryu.asm"
StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/starmie.asm"
MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mr__mime.asm"
ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scyther.asm"
JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jynx.asm"
ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electabuzz.asm"
MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magmar.asm"
PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pinsir.asm"
TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tauros.asm"
SECTION "Pokedex Entries 129-192", ROMX
MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magikarp.asm"
GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gyarados.asm"
LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lapras.asm"
DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ditto.asm"
EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/eevee.asm"
VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vaporeon.asm"
JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jolteon.asm"
FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flareon.asm"
PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon.asm"
OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omanyte.asm"
OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omastar.asm"
KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabuto.asm"
KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabutops.asm"
AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aerodactyl.asm"
SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snorlax.asm"
ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/articuno.asm"
ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zapdos.asm"
MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/moltres.asm"
DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dratini.asm"
DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonair.asm"
DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonite.asm"
MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mewtwo.asm"
MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mew.asm"
ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chikorita.asm"
BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bayleef.asm"
MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meganium.asm"
CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cyndaquil.asm"
QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quilava.asm"
TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/typhlosion.asm"
TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/totodile.asm"
CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/croconaw.asm"
FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/feraligatr.asm"
SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sentret.asm"
FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/furret.asm"
HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoothoot.asm"
NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/noctowl.asm"
LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledyba.asm"
LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledian.asm"
SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spinarak.asm"
AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ariados.asm"
CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/crobat.asm"
ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chinchou.asm"
LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lanturn.asm"
PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pichu.asm"
CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cleffa.asm"
IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/igglybuff.asm"
TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togepi.asm"
TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togetic.asm"
NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/natu.asm"
XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/xatu.asm"
MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mareep.asm"
FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flaaffy.asm"
AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ampharos.asm"
BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellossom.asm"
MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marill.asm"
AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/azumarill.asm"
SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sudowoodo.asm"
PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/politoed.asm"
HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoppip.asm"
SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skiploom.asm"
JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jumpluff.asm"
AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aipom.asm"
SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunkern.asm"
SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunflora.asm"
SECTION "Pokedex Entries 193-251", ROMX
YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/yanma.asm"
WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/espeon.asm"
UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/umbreon.asm"
MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/murkrow.asm"
SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowking.asm"
MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/misdreavus.asm"
UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/unown.asm"
WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wobbuffet.asm"
GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/girafarig.asm"
PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pineco.asm"
ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/forretress.asm"
DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dunsparce.asm"
GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gligar.asm"
SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/steelix.asm"
SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snubbull.asm"
GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/granbull.asm"
QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/qwilfish.asm"
ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scizor.asm"
ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shuckle.asm"
HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/heracross.asm"
SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sneasel.asm"
TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/teddiursa.asm"
UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ursaring.asm"
SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slugma.asm"
MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magcargo.asm"
SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/swinub.asm"
PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/piloswine.asm"
CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/corsola.asm"
RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/remoraid.asm"
OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/octillery.asm"
DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/delibird.asm"
MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mantine.asm"
SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skarmory.asm"
HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndour.asm"
HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndoom.asm"
KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingdra.asm"
PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/phanpy.asm"
DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/donphan.asm"
Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon2.asm"
StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/stantler.asm"
SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smeargle.asm"
TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyrogue.asm"
HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmontop.asm"
SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smoochum.asm"
ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/elekid.asm"
MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magby.asm"
MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/miltank.asm"
BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blissey.asm"
RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raikou.asm"
EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/entei.asm"
SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/suicune.asm"
LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/larvitar.asm"
PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pupitar.asm"
TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyranitar.asm"
LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lugia.asm"
HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ho_oh.asm"
CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/celebi.asm"
ENDC
IF DEF(_SILVER)
SECTION "Pokedex Entries 001-064", ROMX
BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/bulbasaur.asm"
@@ -534,4 +266,3 @@ TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/tyranitar.asm"
LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/lugia.asm"
HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/ho_oh.asm"
CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/celebi.asm"
ENDC

38
data/sprite_anims/framesets.asm
View File

@@ -23,9 +23,9 @@ SpriteAnimFrameData:
dw .Frameset_GSIntroCyndaquil
dw .Frameset_GSIntroTotodile
dw .Frameset_GSTitleTrail
dw .Frameset_GSIntroPikachu ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU
dw .Frameset_GSIntroPikachu2 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2
dw .Frameset_GSIntroPikachu4 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3
dw .Frameset_GSIntroPikachu
dw .Frameset_GSIntroPikachu2
dw .Frameset_GSIntroPikachu4
dw .Frameset_TextEntryCursor
dw .Frameset_TextEntryCursorBig
dw .Frameset_GameFreakLogo
@@ -46,7 +46,7 @@ SpriteAnimFrameData:
dw .Frameset_EvolutionBallOfLight
dw .Frameset_RadioTuningKnob
dw .Frameset_MagnetTrainRed
dw .Frameset_Unused1C
dw .Frameset_Unused2E
dw .Frameset_Leaf
dw .Frameset_CutTree
dw .Frameset_EggCrack
@@ -94,12 +94,12 @@ SpriteAnimFrameData:
dorestart
.Frameset_GSIntroMagikarp:
frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, $41
frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, $41
frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, 1, OAM_X_FLIP
frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, 1, OAM_X_FLIP
dorestart
.Frameset_UnusedLapras:
frame SPRITE_ANIM_OAMSET_UNUSED_LAPRAS, $47
frame SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS, 7, OAM_X_FLIP
endanim
.Frameset_GSIntroLapras:
@@ -118,14 +118,14 @@ SpriteAnimFrameData:
endanim
.Frameset_GSIntroJigglypuff:
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $59
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25, OAM_X_FLIP
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $19
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9
dorestart
.Frameset_GSIntroJigglypuff2:
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32
frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32
endanim
.Frameset_GSIntroPikachu:
@@ -139,7 +139,7 @@ SpriteAnimFrameData:
endanim
.Frameset_GSIntroPikachu3:
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32
endanim
.Frameset_GSIntroPikachuTail:
@@ -150,7 +150,7 @@ SpriteAnimFrameData:
dorestart
.Frameset_GSIntroPikachuTail2:
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, $1f
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, 31
endanim
.Frameset_GSIntroFireball:
@@ -160,15 +160,15 @@ SpriteAnimFrameData:
delanim
.Frameset_GSIntroChikorita:
frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, $18
frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, 24
delanim
.Frameset_GSIntroCyndaquil:
frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, $58
frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, 24, OAM_X_FLIP
delanim
.Frameset_GSIntroTotodile:
frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, $18
frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, 24
delanim
.Frameset_GSTitleTrail:
@@ -177,14 +177,14 @@ IF DEF(_GOLD)
frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2, 1
dorestart
ELIF DEF(_SILVER)
frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32
frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32
endanim
ENDC
.Frameset_GSIntroPikachu4:
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2, 0
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15
frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15
endanim
.Frameset_TextEntryCursor:
@@ -334,7 +334,7 @@ ENDC
dowait 3
dorestart
.Frameset_Unused1C:
.Frameset_Unused2E:
dowait 32
endanim

2
data/sprite_anims/oam.asm
View File

@@ -9,7 +9,7 @@ SpriteAnimOAMData:
dbw $6e, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2
dbw $2d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1
dbw $4d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2
dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_UNUSED_LAPRAS
dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS
dbw $00, .OAMData_GSIntroLapras1 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
dbw $00, .OAMData_GSIntroLapras2 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2
dbw $06, .OAMData_GSIntroLapras3 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3

2
data/sprite_anims/sequences.asm
View File

@@ -45,6 +45,6 @@ SpriteAnimSeqData:
db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CUT_TREE
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT
db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH

2
data/text/battle.asm
View File

@@ -1071,6 +1071,8 @@ BeatUpAttackText:
line "attack!"
done
; BUG: Pokémon names 8-10 characters long can overflow the textbox,
; printing as "Enemy 1234567890 can't": up to 21 characters, over 18.
CantReceiveGiftText:
text "<TARGET> can't"
line "receive the gift!"

20
engine/events/std_scripts.asm
View File

@@ -441,16 +441,16 @@ InitializeEventsScript:
setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER
setevent EVENT_ILEX_FOREST_APPRENTICE
setevent EVENT_ILEX_FOREST_FARFETCHD1
setevent EVENT_ILEX_FOREST_FARFETCHD2
setevent EVENT_ILEX_FOREST_FARFETCHD3
setevent EVENT_ILEX_FOREST_FARFETCHD4
setevent EVENT_ILEX_FOREST_FARFETCHD5
setevent EVENT_ILEX_FOREST_FARFETCHD6
setevent EVENT_ILEX_FOREST_FARFETCHD7
setevent EVENT_ILEX_FOREST_FARFETCHD8
setevent EVENT_ILEX_FOREST_FARFETCHD9
setevent EVENT_ILEX_FOREST_FARFETCHD10
setevent EVENT_ILEX_FOREST_FARFETCHD_1
setevent EVENT_ILEX_FOREST_FARFETCHD_2
setevent EVENT_ILEX_FOREST_FARFETCHD_3
setevent EVENT_ILEX_FOREST_FARFETCHD_4
setevent EVENT_ILEX_FOREST_FARFETCHD_5
setevent EVENT_ILEX_FOREST_FARFETCHD_6
setevent EVENT_ILEX_FOREST_FARFETCHD_7
setevent EVENT_ILEX_FOREST_FARFETCHD_8
setevent EVENT_ILEX_FOREST_FARFETCHD_9
setevent EVENT_ILEX_FOREST_FARFETCHD_10
setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE

4
engine/gfx/cgb_layouts.asm
View File

@@ -61,7 +61,7 @@ LoadSGBLayoutCGB:
dw _CGB_TrainerOrMonFrontpicPals
dw _CGB_MysteryGift
dw _CGB1e
dw _CGB_Pokedex_5_5
dw _CGB_Pokedex_5x5
_CGB_BattleGrayscale:
ld hl, PalPacket_BattleGrayscale + 1
@@ -229,7 +229,7 @@ _CGB_Pokedex:
call FillBoxCGB
jp _CGB_Pokedex_Resume
_CGB_Pokedex_5_5:
_CGB_Pokedex_5x5:
call _CGB_Pokedex_Init
hlcoord 1, 1, wAttrmap
lb bc, 5, 5

6
engine/gfx/sgb_layouts.asm
View File

@@ -53,7 +53,7 @@ LoadSGBLayout:
dw .SGB_TrainerOrMonFrontpicPals
dw .SGB_MysteryGift
dw .SGB1e
dw .SGB_Pokedex_5_5
dw .SGB_Pokedex_5x5
.SGB_BattleGrayscale:
ld hl, PalPacket_BattleGrayscale
@@ -224,9 +224,9 @@ LoadSGBLayout:
ld de, BlkPacket_Pokedex_PC
ret
.SGB_Pokedex_5_5:
.SGB_Pokedex_5x5:
call .SGB_Pokedex
ld de, BlkPacket_9f65
ld de, BlkPacket_Pokedex_5x5
ret
.SGB_BillsPC:

2
engine/movie/title.asm
View File

@@ -69,7 +69,7 @@ TitleScreen:
ld [hl], a ; wTitleScreenTimer + 1
depixel 12, 11
ld a, SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
ld a, SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
call InitSpriteAnimStruct
ld hl, wSpriteAnim1
ld de, wSpriteAnim10

2
gfx/sgb/blk_packets.asm
View File

@@ -51,7 +51,7 @@ BlkPacket_9f55:
attr_blk_data %111, 1,1,0, 01,04, 07,10
ds 8
BlkPacket_9f65:
BlkPacket_Pokedex_5x5:
attr_blk 1
attr_blk_data %111, 1,1,0, 01,01, 05,05
ds 8

22
maps/IlexForest.asm
View File

@@ -254,7 +254,7 @@ IlexForestCharcoalMasterScript:
writetext Text_CharcoalMasterOutro
waitbutton
closetext
setevent EVENT_ILEX_FOREST_FARFETCHD10
setevent EVENT_ILEX_FOREST_FARFETCHD_10
setevent EVENT_ILEX_FOREST_APPRENTICE
setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
clearevent EVENT_CHARCOAL_KILN_FARFETCH_D
@@ -675,16 +675,16 @@ IlexForest_MapEvents:
bg_event 8, 22, BGEVENT_READ, IlexForestShrineScript
db 14 ; object events
object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition1, EVENT_ILEX_FOREST_FARFETCHD1
object_event 15, 25, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition2, EVENT_ILEX_FOREST_FARFETCHD2
object_event 20, 24, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition3, EVENT_ILEX_FOREST_FARFETCHD3
object_event 29, 22, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition4, EVENT_ILEX_FOREST_FARFETCHD4
object_event 28, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition5, EVENT_ILEX_FOREST_FARFETCHD5
object_event 24, 35, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition6, EVENT_ILEX_FOREST_FARFETCHD6
object_event 22, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition7, EVENT_ILEX_FOREST_FARFETCHD7
object_event 15, 29, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition8, EVENT_ILEX_FOREST_FARFETCHD8
object_event 10, 35, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition9, EVENT_ILEX_FOREST_FARFETCHD9
object_event 6, 28, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition10, EVENT_ILEX_FOREST_FARFETCHD10
object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition1, EVENT_ILEX_FOREST_FARFETCHD_1
object_event 15, 25, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition2, EVENT_ILEX_FOREST_FARFETCHD_2
object_event 20, 24, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition3, EVENT_ILEX_FOREST_FARFETCHD_3
object_event 29, 22, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition4, EVENT_ILEX_FOREST_FARFETCHD_4
object_event 28, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition5, EVENT_ILEX_FOREST_FARFETCHD_5
object_event 24, 35, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition6, EVENT_ILEX_FOREST_FARFETCHD_6
object_event 22, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition7, EVENT_ILEX_FOREST_FARFETCHD_7
object_event 15, 29, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition8, EVENT_ILEX_FOREST_FARFETCHD_8
object_event 10, 35, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition9, EVENT_ILEX_FOREST_FARFETCHD_9
object_event 6, 28, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FarfetchdPosition10, EVENT_ILEX_FOREST_FARFETCHD_10
object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1

2
maps/SlowpokeWellB1F.asm
View File

@@ -57,7 +57,7 @@ TrainerGruntM1:
variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_RIVAL_BATTLE
clearevent EVENT_ILEX_FOREST_APPRENTICE
clearevent EVENT_ILEX_FOREST_FARFETCHD1
clearevent EVENT_ILEX_FOREST_FARFETCHD_1
setevent EVENT_CHARCOAL_KILN_FARFETCH_D
setevent EVENT_CHARCOAL_KILN_APPRENTICE
setevent EVENT_SLOWPOKE_WELL_SLOWPOKES

2
wram.asm
View File

@@ -1948,7 +1948,7 @@ wBaseUnusedFrontpic:: dw ; d132
wBaseUnusedBackpic:: dw ; d134
wBaseGrowthRate:: db ; d136
wBaseEggGroups:: db ; d137
wBaseTMHM:: flag_array NUM_TMS + NUM_HMS ; d138
wBaseTMHM:: flag_array NUM_TM_HM ; d138
wCurBaseDataEnd::
ds 1