Merge remote-tracking branch 'iimarckus/master' into crystal-makefile

Browse Source

Conflicts:
	Makefile
	main.asm

...

This commit is contained in:

yenatch 2013-12-07 23:20:43 -05:00

parent 766429f7d6 2ed422c696

commit 168d03b957

3 changed files with 4840 additions and 2265 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

gfx/ED_tile.1bpp Executable file

View File

Binary file not shown.

BIN

gfx/emotion_bubbles.2bpp

View File

Binary file not shown.

7105

main.asm

View File

File diff suppressed because it is too large Load Diff