Commit graph

16 commits

Author SHA1 Message Date
dannye e25a7148d0 Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/town_map.asm
2015-07-14 00:58:09 -05:00
YamaArashi 5d3b958763 named town map stuff 2015-07-13 19:24:07 -07:00
YamaArashi 0066e09828 named party menu/naming screen wram variables 2015-07-13 15:40:33 -07:00
YamaArashi f66a74b9fc comment slot machine 2015-07-13 13:35:35 -07:00
YamaArashi bcfca2e267 movemon and removepokemon wram variables 2015-07-12 23:36:56 -07:00
YamaArashi 4a8c9993ad named wram variables 2015-07-12 23:00:48 -07:00
YamaArashi 3870f5e10a named misc functions 2015-02-08 01:44:41 -08:00
YamaArashi 83023cda19 commented menu stuff 2015-02-07 12:27:36 -08:00
YamaArashi 3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
yenatch dff0cdeb5a Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm
2014-09-20 00:57:27 -04:00
yenatch 3de9d14d3e Recomment misc functions in home.asm. 2014-09-17 21:14:32 -07:00
YamaArashi 91793015e5 Labelled and commented mostly sprite-related things 2014-09-09 20:55:19 -07:00
yenatch 81bbab85ac Hall of Fame sram labels and related constants. 2014-06-14 14:24:35 -07:00
yenatch 53ae0e93fa Use monster struct macros in wram. Rename related labels for consistency. 2014-06-14 04:12:40 -07:00
U-Fish-PC\Daniel 9eefed45f7 Use MAX_LEVEL instead of 100/$64 2014-06-10 17:06:30 -04:00
yenatch 955b53047c More complete hardware constants. Rename joypad constants. 2014-05-23 15:25:16 -07:00