mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00

Go to file

Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm

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

audio

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )

2018-01-14 23:00:22 -05:00

constants

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

data

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

docs

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

engine

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

extras @ 2ae1ae2f19

Bump extras again to fix last bump.

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

gfx

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )

2018-01-14 23:00:22 -05:00

home

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

lib/mobile

More unreferenced labels cleanup

2018-01-02 16:04:21 +01:00

macros

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )

2018-01-14 22:56:36 -05:00

maps

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

mobile

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

tools

Revert "python3 sort_map.py pokecrystal.map sorted.sym"

2018-01-09 00:30:36 -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

Don't split stats gfx in three

2018-01-13 15:22:16 -05:00

constants.asm

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )

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

FAQ.md

CRYSTAL11 → _CRYSTAL11

2018-01-09 17:26:40 -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/xCrystal/pokecrystal (resolve PR #459 )

2018-01-14 22:56:36 -05:00

hram.asm

Explain HRAM

2018-01-03 13:01:23 -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

Specialized macros go with their data/code

2018-01-10 00:08:05 -05:00

main.asm

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )

2018-01-14 22:56:36 -05:00

Makefile

Mystery Gift graphics match

2018-01-12 15:30:46 -05:00

maps.asm

SaffronMagnetTrainStation

2018-01-12 02:33:06 -05:00

pokecrystal.link

Rename some sections

2017-12-26 22:57:19 -05:00

README.md

Add pokegold and pokefirered.

2017-12-31 13:25:53 -05:00

roms.sha1

Use SHA1 to compare roms

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

sram.asm

Correct spacing

2018-01-10 22:34:22 -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/mid-kid/pokecrystal (resolve PR #452 )

2018-01-14 23:43:51 -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