luckytyphlosion 5ecda4d274 Merge git://github.com/dannye/pokeyellow into dannye-master ...

Conflicts:
	constants/connection_constants.asm
	constants/evolution_constants.asm
	constants/list_constants.asm
	constants/oam_constants.asm
	constants/sprite_constants.asm
	constants/type_constants.asm
	engine/bank3d/random.asm
	engine/bank3f/main.asm
	home.asm
	home/overworld.asm
	home/serial.asm
	macros.asm
	main.asm
	wram.asm

2015-06-05 20:15:21 -04:00

..

connection_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

credits_constants.asm

Credits order INCBIN and more labeling.

2013-12-27 11:41:54 -06:00

evolution_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

hardware_constants.asm

serial/trade/misc

2015-02-07 02:43:08 -08:00

hide_show_constants.asm

Enumerate hide/show constants

2014-09-26 07:37:21 -04:00

item_constants.asm

Add newlines to EOFs

2015-06-01 22:15:02 -05:00

list_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

map_constants.asm

Modularize the beach house.

2014-10-17 12:16:52 -06:00

map_dimensions.asm

Modularize the beach house.

2014-10-17 12:16:52 -06:00

misc_constants.asm

named misc functions

2015-02-08 01:44:41 -08:00

move_animation_constants.asm

Clean up white space

2014-06-09 16:58:02 -04:00

move_constants.asm

serial/trade/misc

2015-02-07 02:43:08 -08:00

move_effect_constants.asm

Finished documenting/labeling functions in the MoveEffectPointerTable.

2014-05-12 23:22:14 -05:00

music_constants.asm

Use labels instead of static addresses in sound pointers.

2014-03-30 16:56:42 -07:00

oam_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

palette_constants.asm

Add newlines to EOFs

2015-06-01 22:15:02 -05:00

pokedex_constants.asm

Hall of Fame sram labels and related constants.

2014-06-14 14:24:35 -07:00

pokemon_constants.asm

Space out monster constants to make gaps clearer.

2014-06-06 22:15:41 -07:00

sprite_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

starter_mons.asm

Use constants for the starter mons

2014-05-21 09:54:33 -04:00

status_constants.asm

Fix EOL to LF to make push requests more doable.

2015-06-05 17:23:06 -04:00

tilesets.asm

Modularize the beach house.

2014-10-17 12:16:52 -06:00

trainer_constants.asm

Add newlines to EOFs

2015-06-01 22:15:02 -05:00

type_constants.asm

Merge git://github.com/dannye/pokeyellow into dannye-master

2015-06-05 20:15:21 -04:00

wram_constants.asm

serial/trade/misc

2015-02-07 02:43:08 -08:00