Split items/ and trainers/ into their data/ and engine/ components

Move some data into a pokemon/ subdirectory
This commit is contained in:
Remy Oukaour
2017-12-14 23:00:54 -05:00
parent 9ba224e2e6
commit 6ab1d028bb
555 changed files with 605 additions and 588 deletions

16
FAQ.md
View File

@@ -1,27 +1,43 @@
# FAQ
## Questions
- [What is pokecrystal11.gbc?](#what-is-pokecrystal11gbc)
- [Can't build ROM; "ERROR: `UNION` already defined"](#cant-build-rom-error-union-already-defined)
- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx)
- [Can't build ROM; "Section is too big" or "Unable to place section in bank"](#cant-build-rom-section-is-too-big-or-unable-to-place-section-in-bank)
- [How do I edit maps?](#how-do-i-edit-maps)
- [I need more help!](#i-need-more-help)
## What is pokecrystal11.gbc?
Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `CRYSTAL11` so the assembly builds the changed version.
## Can't build ROM; "ERROR: `UNION` already defined"
Download [**rgbds 0.3.3**](rgbds). Earlier versions will not work.
## Can't build ROM; "Segmentation fault" from `rgbgfx`
If you are using 64-bit Windows, download [**64-bit Cygwin**](cygwin) and [**64-bit rgbds**](rgbds).
## Can't build ROM; "Section is too big" or "Unable to place section in bank"
If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)).
If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which **`SECTION`**s go in which banks. Try moving some code into a new section.
## How do I edit maps?
For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` layouts, try [crowdmap](crowdmap) or [Polished Map](polished-map).
## I need more help!
Try asking on IRC or Discord (see [README.md](README.md)).

View File

@@ -25,9 +25,9 @@ audio.o \
maps.o \
engine/events.o \
engine/credits.o \
data/egg_moves.o \
data/evos_attacks.o \
data/pokedex/entries.o \
data/pokemon/egg_moves.o \
data/pokemon/evos_attacks.o \
data/pokemon/dex_entries.o \
misc/crystal_misc.o \
text/common_text.o \
gfx/pics.o

View File

@@ -4,7 +4,7 @@ INCLUDE "includes.asm"
SECTION "Audio", ROMX
INCLUDE "audio/engine.asm"
INCLUDE "trainers/encounter_music.asm"
INCLUDE "data/trainers/encounter_music.asm"
INCLUDE "audio/music_pointers.asm"
INCLUDE "audio/music/nothing.asm"
INCLUDE "audio/cry_pointers.asm"
@@ -157,6 +157,6 @@ INCLUDE "audio/sfx_crystal.asm"
SECTION "Cries", ROMX
CryHeaders:: INCLUDE "audio/cry_headers.asm"
INCLUDE "data/pokemon/cry_headers.asm"
INCLUDE "audio/cries.asm"

View File

@@ -1,9 +1,9 @@
; item ids
; indexes for:
; - ItemAttributes (see items/item_attributes.asm)
; - ItemDescriptions (see items/item_descriptions.asm)
; - ItemEffects (see items/item_effects.asm)
; - ItemNames (see items/item_names.asm)
; - ItemAttributes (see data/items/item_attributes.asm)
; - ItemDescriptions (see data/items/item_descriptions.asm)
; - ItemEffects (see engine/item_effects.asm)
; - ItemNames (see data/items/item_names.asm)
const_def
const NO_ITEM ; $00
const MASTER_BALL ; $01
@@ -372,7 +372,7 @@ const_value SET 70
const HELD_78
const HELD_FOCUS_BAND
; item_attribute struct members (see items/item_attributes.asm)
; item_attribute struct members (see data/items/item_attributes.asm)
const_def
const ITEMATTR_PRICE
const ITEMATTR_PRICE_HI
@@ -397,7 +397,7 @@ ITEMMENU_CLOSE EQU 6
const MARTTYPE_PHARMACY
const MARTTYPE_ROOFTOP
; Marts indexes (see items/marts.asm)
; Marts indexes (see data/items/marts.asm)
const_def
const MART_CHERRYGROVE
const MART_CHERRYGROVE_DEX

View File

@@ -1,4 +1,4 @@
; Landmarks indexes (see data/landmarks.asm)
; Landmarks indexes (see data/maps/landmarks.asm)
const_def
; Johto landmarks

View File

@@ -127,7 +127,7 @@ SLIDING EQU 3
EMOTE_OBJECT EQU 7
; SpawnPoints indexes (see data/spawn_points.asm)
; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_value = -1
const SPAWN_N_A
const SPAWN_HOME

View File

@@ -16,8 +16,8 @@ endm
; map group ids
; `newgroup` indexes are for:
; - MapGroupPointers (see maps/map_headers.asm)
; - OutdoorSprites (see data/outdoor_sprites.asm)
; - MapGroupRoofs (see data/mapgroup_roofs.asm)
; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm)
; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
const_def

View File

@@ -1,21 +1,21 @@
; pokemon ids
; indexes for:
; - CryHeaders (see audio/cry_headers.asm)
; - BaseData (see data/base_stats.asm)
; - EggMovePointers (see data/egg_move_pointers.asm)
; - EvosAttacksPointers (see data/evos_attacks_pointers.asm)
; - PokemonNames (see data/pokemon_names.asm)
; - PokedexDataPointerTable (see data/pokedex/entry_pointers.asm)
; - CryHeaders (see data/pokemon/cry_headers.asm)
; - BaseData (see data/pokemon/base_stats.asm)
; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm)
; - PokemonNames (see data/pokemon/pokemon_names.asm)
; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm)
; - AnimationPointers (see gfx/pics/anim_pointers.asm)
; - BitmasksPointers (see gfx/pics/bitmask_pointers.asm)
; - AnimationExtraPointers (see gfx/pics/extra_pointers.asm)
; - FramesPointers (see gfx/pics/frame_pointers.asm)
; - PokemonPalettes (see gfx/pics/palette_pointers.asm)
; - PicPointers (see gfx/pics/pic_pointers.asm)
; - AlphabeticalPokedexOrder (see data/pokedex/order_alpha.asm)
; - NewPokedexOrder (see data/pokedex/order_new.asm)
; - MonMenuIcons (see data/mon_menu_icons.asm)
; - Pokered_MonIndices (see engine/time_capsule/conversion.asm)
; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
; - MonMenuIcons (see data/pokemon/menu_icons.asm)
; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
; - SortedPokemon (see misc/fixed_words.asm)
const_value set 1
const BULBASAUR ; 01

View File

@@ -1,4 +1,4 @@
; base data struct members (see data/base_stats/*.asm)
; base data struct members (see data/pokemon/base_stats/*.asm)
BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)"
BASE_STATS EQUS "(BaseStats - CurBaseData)"
BASE_HP EQUS "(BaseHP - CurBaseData)"
@@ -145,7 +145,7 @@ PARTY_LENGTH EQU 6
const ICON_BIGMON
; evolution types (used in data/evos_attacks.asm)
; evolution types (used in data/pokemon/evos_attacks.asm)
const_value SET 1
const EVOLVE_LEVEL
const EVOLVE_ITEM

View File

@@ -5,12 +5,12 @@ ENDM
; trainer class ids
; `trainerclass` indexes are for:
; - TrainerClassAttributes (see trainers/attributes.asm)
; - TrainerClassDVs (see trainers/dvs.asm)
; - TrainerEncounterMusic (see trainers/encounter_music.asm)
; - TrainerGroups (see trainers/trainer_pointers.asm)
; - BTTrainerClassGenders (see misc/battle_tower_47.asm)
; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see trainers/trainers.asm)
; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm)
; - TrainerClassDVs (see data/trainers/trainer_dvs.asm)
; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
; - TrainerGroups (see data/trainers/party_pointers.asm)
; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm)
; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
enum_start
CHRIS EQU __enum__
trainerclass TRAINER_NONE ; 0
@@ -677,7 +677,7 @@ KRIS EQU __enum__
NUM_TRAINER_CLASSES EQU __enum__
; TrainerClassAttributes fields (see trainers/attributes.asm)
; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm)
const_def
const TRNATTR_ITEM1
const TRNATTR_ITEM2

View File

@@ -1,252 +0,0 @@
BaseData::
INCLUDE "data/base_stats/bulbasaur.asm"
INCLUDE "data/base_stats/ivysaur.asm"
INCLUDE "data/base_stats/venusaur.asm"
INCLUDE "data/base_stats/charmander.asm"
INCLUDE "data/base_stats/charmeleon.asm"
INCLUDE "data/base_stats/charizard.asm"
INCLUDE "data/base_stats/squirtle.asm"
INCLUDE "data/base_stats/wartortle.asm"
INCLUDE "data/base_stats/blastoise.asm"
INCLUDE "data/base_stats/caterpie.asm"
INCLUDE "data/base_stats/metapod.asm"
INCLUDE "data/base_stats/butterfree.asm"
INCLUDE "data/base_stats/weedle.asm"
INCLUDE "data/base_stats/kakuna.asm"
INCLUDE "data/base_stats/beedrill.asm"
INCLUDE "data/base_stats/pidgey.asm"
INCLUDE "data/base_stats/pidgeotto.asm"
INCLUDE "data/base_stats/pidgeot.asm"
INCLUDE "data/base_stats/rattata.asm"
INCLUDE "data/base_stats/raticate.asm"
INCLUDE "data/base_stats/spearow.asm"
INCLUDE "data/base_stats/fearow.asm"
INCLUDE "data/base_stats/ekans.asm"
INCLUDE "data/base_stats/arbok.asm"
INCLUDE "data/base_stats/pikachu.asm"
INCLUDE "data/base_stats/raichu.asm"
INCLUDE "data/base_stats/sandshrew.asm"
INCLUDE "data/base_stats/sandslash.asm"
INCLUDE "data/base_stats/nidoran_f.asm"
INCLUDE "data/base_stats/nidorina.asm"
INCLUDE "data/base_stats/nidoqueen.asm"
INCLUDE "data/base_stats/nidoran_m.asm"
INCLUDE "data/base_stats/nidorino.asm"
INCLUDE "data/base_stats/nidoking.asm"
INCLUDE "data/base_stats/clefairy.asm"
INCLUDE "data/base_stats/clefable.asm"
INCLUDE "data/base_stats/vulpix.asm"
INCLUDE "data/base_stats/ninetales.asm"
INCLUDE "data/base_stats/jigglypuff.asm"
INCLUDE "data/base_stats/wigglytuff.asm"
INCLUDE "data/base_stats/zubat.asm"
INCLUDE "data/base_stats/golbat.asm"
INCLUDE "data/base_stats/oddish.asm"
INCLUDE "data/base_stats/gloom.asm"
INCLUDE "data/base_stats/vileplume.asm"
INCLUDE "data/base_stats/paras.asm"
INCLUDE "data/base_stats/parasect.asm"
INCLUDE "data/base_stats/venonat.asm"
INCLUDE "data/base_stats/venomoth.asm"
INCLUDE "data/base_stats/diglett.asm"
INCLUDE "data/base_stats/dugtrio.asm"
INCLUDE "data/base_stats/meowth.asm"
INCLUDE "data/base_stats/persian.asm"
INCLUDE "data/base_stats/psyduck.asm"
INCLUDE "data/base_stats/golduck.asm"
INCLUDE "data/base_stats/mankey.asm"
INCLUDE "data/base_stats/primeape.asm"
INCLUDE "data/base_stats/growlithe.asm"
INCLUDE "data/base_stats/arcanine.asm"
INCLUDE "data/base_stats/poliwag.asm"
INCLUDE "data/base_stats/poliwhirl.asm"
INCLUDE "data/base_stats/poliwrath.asm"
INCLUDE "data/base_stats/abra.asm"
INCLUDE "data/base_stats/kadabra.asm"
INCLUDE "data/base_stats/alakazam.asm"
INCLUDE "data/base_stats/machop.asm"
INCLUDE "data/base_stats/machoke.asm"
INCLUDE "data/base_stats/machamp.asm"
INCLUDE "data/base_stats/bellsprout.asm"
INCLUDE "data/base_stats/weepinbell.asm"
INCLUDE "data/base_stats/victreebel.asm"
INCLUDE "data/base_stats/tentacool.asm"
INCLUDE "data/base_stats/tentacruel.asm"
INCLUDE "data/base_stats/geodude.asm"
INCLUDE "data/base_stats/graveler.asm"
INCLUDE "data/base_stats/golem.asm"
INCLUDE "data/base_stats/ponyta.asm"
INCLUDE "data/base_stats/rapidash.asm"
INCLUDE "data/base_stats/slowpoke.asm"
INCLUDE "data/base_stats/slowbro.asm"
INCLUDE "data/base_stats/magnemite.asm"
INCLUDE "data/base_stats/magneton.asm"
INCLUDE "data/base_stats/farfetch_d.asm"
INCLUDE "data/base_stats/doduo.asm"
INCLUDE "data/base_stats/dodrio.asm"
INCLUDE "data/base_stats/seel.asm"
INCLUDE "data/base_stats/dewgong.asm"
INCLUDE "data/base_stats/grimer.asm"
INCLUDE "data/base_stats/muk.asm"
INCLUDE "data/base_stats/shellder.asm"
INCLUDE "data/base_stats/cloyster.asm"
INCLUDE "data/base_stats/gastly.asm"
INCLUDE "data/base_stats/haunter.asm"
INCLUDE "data/base_stats/gengar.asm"
INCLUDE "data/base_stats/onix.asm"
INCLUDE "data/base_stats/drowzee.asm"
INCLUDE "data/base_stats/hypno.asm"
INCLUDE "data/base_stats/krabby.asm"
INCLUDE "data/base_stats/kingler.asm"
INCLUDE "data/base_stats/voltorb.asm"
INCLUDE "data/base_stats/electrode.asm"
INCLUDE "data/base_stats/exeggcute.asm"
INCLUDE "data/base_stats/exeggutor.asm"
INCLUDE "data/base_stats/cubone.asm"
INCLUDE "data/base_stats/marowak.asm"
INCLUDE "data/base_stats/hitmonlee.asm"
INCLUDE "data/base_stats/hitmonchan.asm"
INCLUDE "data/base_stats/lickitung.asm"
INCLUDE "data/base_stats/koffing.asm"
INCLUDE "data/base_stats/weezing.asm"
INCLUDE "data/base_stats/rhyhorn.asm"
INCLUDE "data/base_stats/rhydon.asm"
INCLUDE "data/base_stats/chansey.asm"
INCLUDE "data/base_stats/tangela.asm"
INCLUDE "data/base_stats/kangaskhan.asm"
INCLUDE "data/base_stats/horsea.asm"
INCLUDE "data/base_stats/seadra.asm"
INCLUDE "data/base_stats/goldeen.asm"
INCLUDE "data/base_stats/seaking.asm"
INCLUDE "data/base_stats/staryu.asm"
INCLUDE "data/base_stats/starmie.asm"
INCLUDE "data/base_stats/mr__mime.asm"
INCLUDE "data/base_stats/scyther.asm"
INCLUDE "data/base_stats/jynx.asm"
INCLUDE "data/base_stats/electabuzz.asm"
INCLUDE "data/base_stats/magmar.asm"
INCLUDE "data/base_stats/pinsir.asm"
INCLUDE "data/base_stats/tauros.asm"
INCLUDE "data/base_stats/magikarp.asm"
INCLUDE "data/base_stats/gyarados.asm"
INCLUDE "data/base_stats/lapras.asm"
INCLUDE "data/base_stats/ditto.asm"
INCLUDE "data/base_stats/eevee.asm"
INCLUDE "data/base_stats/vaporeon.asm"
INCLUDE "data/base_stats/jolteon.asm"
INCLUDE "data/base_stats/flareon.asm"
INCLUDE "data/base_stats/porygon.asm"
INCLUDE "data/base_stats/omanyte.asm"
INCLUDE "data/base_stats/omastar.asm"
INCLUDE "data/base_stats/kabuto.asm"
INCLUDE "data/base_stats/kabutops.asm"
INCLUDE "data/base_stats/aerodactyl.asm"
INCLUDE "data/base_stats/snorlax.asm"
INCLUDE "data/base_stats/articuno.asm"
INCLUDE "data/base_stats/zapdos.asm"
INCLUDE "data/base_stats/moltres.asm"
INCLUDE "data/base_stats/dratini.asm"
INCLUDE "data/base_stats/dragonair.asm"
INCLUDE "data/base_stats/dragonite.asm"
INCLUDE "data/base_stats/mewtwo.asm"
INCLUDE "data/base_stats/mew.asm"
INCLUDE "data/base_stats/chikorita.asm"
INCLUDE "data/base_stats/bayleef.asm"
INCLUDE "data/base_stats/meganium.asm"
INCLUDE "data/base_stats/cyndaquil.asm"
INCLUDE "data/base_stats/quilava.asm"
INCLUDE "data/base_stats/typhlosion.asm"
INCLUDE "data/base_stats/totodile.asm"
INCLUDE "data/base_stats/croconaw.asm"
INCLUDE "data/base_stats/feraligatr.asm"
INCLUDE "data/base_stats/sentret.asm"
INCLUDE "data/base_stats/furret.asm"
INCLUDE "data/base_stats/hoothoot.asm"
INCLUDE "data/base_stats/noctowl.asm"
INCLUDE "data/base_stats/ledyba.asm"
INCLUDE "data/base_stats/ledian.asm"
INCLUDE "data/base_stats/spinarak.asm"
INCLUDE "data/base_stats/ariados.asm"
INCLUDE "data/base_stats/crobat.asm"
INCLUDE "data/base_stats/chinchou.asm"
INCLUDE "data/base_stats/lanturn.asm"
INCLUDE "data/base_stats/pichu.asm"
INCLUDE "data/base_stats/cleffa.asm"
INCLUDE "data/base_stats/igglybuff.asm"
INCLUDE "data/base_stats/togepi.asm"
INCLUDE "data/base_stats/togetic.asm"
INCLUDE "data/base_stats/natu.asm"
INCLUDE "data/base_stats/xatu.asm"
INCLUDE "data/base_stats/mareep.asm"
INCLUDE "data/base_stats/flaaffy.asm"
INCLUDE "data/base_stats/ampharos.asm"
INCLUDE "data/base_stats/bellossom.asm"
INCLUDE "data/base_stats/marill.asm"
INCLUDE "data/base_stats/azumarill.asm"
INCLUDE "data/base_stats/sudowoodo.asm"
INCLUDE "data/base_stats/politoed.asm"
INCLUDE "data/base_stats/hoppip.asm"
INCLUDE "data/base_stats/skiploom.asm"
INCLUDE "data/base_stats/jumpluff.asm"
INCLUDE "data/base_stats/aipom.asm"
INCLUDE "data/base_stats/sunkern.asm"
INCLUDE "data/base_stats/sunflora.asm"
INCLUDE "data/base_stats/yanma.asm"
INCLUDE "data/base_stats/wooper.asm"
INCLUDE "data/base_stats/quagsire.asm"
INCLUDE "data/base_stats/espeon.asm"
INCLUDE "data/base_stats/umbreon.asm"
INCLUDE "data/base_stats/murkrow.asm"
INCLUDE "data/base_stats/slowking.asm"
INCLUDE "data/base_stats/misdreavus.asm"
INCLUDE "data/base_stats/unown.asm"
INCLUDE "data/base_stats/wobbuffet.asm"
INCLUDE "data/base_stats/girafarig.asm"
INCLUDE "data/base_stats/pineco.asm"
INCLUDE "data/base_stats/forretress.asm"
INCLUDE "data/base_stats/dunsparce.asm"
INCLUDE "data/base_stats/gligar.asm"
INCLUDE "data/base_stats/steelix.asm"
INCLUDE "data/base_stats/snubbull.asm"
INCLUDE "data/base_stats/granbull.asm"
INCLUDE "data/base_stats/qwilfish.asm"
INCLUDE "data/base_stats/scizor.asm"
INCLUDE "data/base_stats/shuckle.asm"
INCLUDE "data/base_stats/heracross.asm"
INCLUDE "data/base_stats/sneasel.asm"
INCLUDE "data/base_stats/teddiursa.asm"
INCLUDE "data/base_stats/ursaring.asm"
INCLUDE "data/base_stats/slugma.asm"
INCLUDE "data/base_stats/magcargo.asm"
INCLUDE "data/base_stats/swinub.asm"
INCLUDE "data/base_stats/piloswine.asm"
INCLUDE "data/base_stats/corsola.asm"
INCLUDE "data/base_stats/remoraid.asm"
INCLUDE "data/base_stats/octillery.asm"
INCLUDE "data/base_stats/delibird.asm"
INCLUDE "data/base_stats/mantine.asm"
INCLUDE "data/base_stats/skarmory.asm"
INCLUDE "data/base_stats/houndour.asm"
INCLUDE "data/base_stats/houndoom.asm"
INCLUDE "data/base_stats/kingdra.asm"
INCLUDE "data/base_stats/phanpy.asm"
INCLUDE "data/base_stats/donphan.asm"
INCLUDE "data/base_stats/porygon2.asm"
INCLUDE "data/base_stats/stantler.asm"
INCLUDE "data/base_stats/smeargle.asm"
INCLUDE "data/base_stats/tyrogue.asm"
INCLUDE "data/base_stats/hitmontop.asm"
INCLUDE "data/base_stats/smoochum.asm"
INCLUDE "data/base_stats/elekid.asm"
INCLUDE "data/base_stats/magby.asm"
INCLUDE "data/base_stats/miltank.asm"
INCLUDE "data/base_stats/blissey.asm"
INCLUDE "data/base_stats/raikou.asm"
INCLUDE "data/base_stats/entei.asm"
INCLUDE "data/base_stats/suicune.asm"
INCLUDE "data/base_stats/larvitar.asm"
INCLUDE "data/base_stats/pupitar.asm"
INCLUDE "data/base_stats/tyranitar.asm"
INCLUDE "data/base_stats/lugia.asm"
INCLUDE "data/base_stats/ho_oh.asm"
INCLUDE "data/base_stats/celebi.asm"

Some files were not shown because too many files have changed in this diff Show More