1998 Commits

Author SHA1 Message Date
Bryan Bishop
a99a205b28 labels for some battle menus 2013-11-12 00:29:26 -06:00
yenatch
42a0396b6a get rid of external song labels 2013-11-07 01:18:58 -05:00
yenatch
8627d1760e dump the music again 2013-11-07 01:18:50 -05:00
yenatch
2143b5479e import some new sound classes from pokemontools 2013-11-07 01:15:20 -05:00
yenatch
6271b61982 bump pokemontools feat sound dumps 2013-11-07 01:13:51 -05:00
yenatch
fa3145dd44 rework note macro 2013-11-07 01:11:42 -05:00
yenatch
76d8ed2264 split sfx constants out of music constants 2013-11-07 01:10:43 -05:00
yenatch
6a641b438a get rid of unused sound constants 2013-11-07 01:06:37 -05:00
yenatch
6f1928eaea stack music command labels 2013-11-05 15:19:12 -05:00
yenatch
12f0be8ccc recomment ReadNoiseSample 2013-11-05 15:04:26 -05:00
yenatch
b2dd26c8a0 rename ParseCommand to ParseMusicCommand 2013-11-05 14:40:55 -05:00
Bryan Bishop
07612257cc Merge pull request #213 from yenatch/merge-mrwint
Merge mrwint/master into kanzure/master
2013-10-25 16:01:12 -07:00
yenatch
046192575e Merge branch 'master' into merge-mrwint 2013-10-25 18:10:42 -04:00
yenatch
86cdb9e013 Merge commit 'cf966bb8' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 18:02:17 -04:00
yenatch
193dbd53a6 Merge commit '0ead58cd' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:57:27 -04:00
yenatch
52a6b7da8e Merge commit '946a213f' into merge-mrwint 2013-10-25 17:54:04 -04:00
yenatch
9e81c46cbf Merge commit '66ef1838' into merge-mrwint
Conflicts:
	home/map.asm
2013-10-25 17:53:16 -04:00
yenatch
933634d913 Merge commit 'da689fa7' into merge-mrwint 2013-10-25 17:45:25 -04:00
yenatch
9d02e1063f Merge commit '8b8de40' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:44:50 -04:00
yenatch
6ea15c444e Merge commit '650dc98b' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:34:45 -04:00
yenatch
a41b870dfa Merge commit '754325b2' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:21:20 -04:00
yenatch
15a6bd55f4 Merge commit 'e1cce1c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:06:19 -04:00
yenatch
32ede188d7 Merge commit 'a0ba53e' into merge-mrwint 2013-10-25 16:55:58 -04:00
yenatch
2ca81c9d73 Merge commit 'aae33da9' into merge-mrwint 2013-10-25 16:55:41 -04:00
yenatch
4fcabdc07b Merge commit '91b822c' into merge-mrwint 2013-10-25 16:51:24 -04:00