mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00

Go to file

Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm

2018-02-25 20:39:54 -05:00

audio

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-03 19:42:56 -05:00

constants

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

data

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

docs

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

engine

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

extras @ 2ae1ae2f19

Bump extras again to fix last bump.

2016-04-10 19:24:35 -04:00

gfx

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

home

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-15 21:21:58 -05:00

lib/mobile

Sync code with wiki

2018-02-04 13:16:40 -05:00

macros

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

maps

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

mobile

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

tools

Shebang

2018-01-14 23:51:24 -05:00

.gitattributes

Fix marts using hard-coded bank number

2016-01-27 12:25:12 -05:00

.gitignore

Rename: gfx/pics → gfx/pokemon

2017-12-26 12:55:02 -05:00

.gitmodules

Restructured functions in main.asm to resemble the home functions they clone

2015-10-17 13:00:34 -04:00

.travis.yml

travis: turn check-status back on

2017-12-28 22:23:13 -05:00

audio.asm

includes.asm → constants.asm

2018-01-09 00:36:15 -05:00

charmap.asm

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-03 19:42:56 -05:00

constants.asm

Add scene ID constants (TODO: meaningful names)

2018-01-31 23:16:51 -05:00

FAQ.md

Don't repeat a subheading

2018-01-30 22:44:44 -05:00

gfx.py

fix animated pic dumps

2017-10-22 02:04:06 -04:00

home.asm

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-03 19:42:56 -05:00

hram.asm

Fix wVirtualOAM labels, part 1.

2018-01-30 14:47:14 -05:00

INSTALL.md

Add an FAQ, and ive a bit more detail in Windows install instructions

2017-12-12 18:50:39 -05:00

macros.asm

Legacy support macros

2018-02-02 22:24:50 -05:00

main.asm

Make tileset palette maps easier to edit

2018-02-09 13:50:20 -05:00

Makefile

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

pokecrystal.link

data/text/X_text.asm is redundant

2018-01-24 21:27:23 -05:00

README.md

Fix link targets

2018-01-28 00:56:57 -05:00

roms.sha1

Use SHA1 to compare roms

2017-06-24 18:32:54 -04:00

sram.asm

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

STYLE.md

Heading

2018-01-09 22:47:17 -05:00

vram.asm

Lowercase v for VRAM addresses

2017-12-28 13:32:33 +01:00

wram.asm

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

README.md

Pokémon Crystal

This is a disassembly of Pokémon Crystal.

It builds the following ROMs:

Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133
Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc sha1: f2f52230b536214ef7c9924f483392993e226cfb

To set up the repository, see INSTALL.md.

README.md

Pokémon Crystal

See also