Commit graph

1568 commits

Author SHA1 Message Date
U-Fish-PC\Daniel
f199c146d7 Music Engine Bank 1f 2013-10-23 20:33:21 -04:00
U-Fish-PC\Daniel
e411ca2419 Noise_endchannel: 2013-10-22 12:21:28 -04:00
U-Fish-PC\Daniel
a6a363e83a Add unused sfx 2013-10-22 09:17:11 -04:00
U-Fish-PC\Daniel
fef4ab1fdc Fix sfx_02_5e 2013-10-22 08:46:05 -04:00
U-Fish-PC\Daniel
7059bb15f3 Fix blue and yellow music 2013-10-22 02:13:16 -04:00
U-Fish-PC\Daniel
d47cdd6e15 More bank 2 music engine and music/sfx format update 2013-10-21 19:30:07 -04:00
Sanky
b5268ab920 Merge remote-tracking branch 'kanzure/master' into mergetastic
Conflicts:
	main.asm
2013-10-21 20:24:46 +02:00
U-Fish-PC\Daniel
74948728aa More music engine labels and comments 2013-10-19 13:24:34 -04:00
U-Fish-PC\Daniel
a336ddf0e5 More music engine labels 2013-10-18 16:28:58 -04:00
U-Fish-PC\Daniel
4037c6a959 Some music engine labels 2013-10-18 15:29:31 -04:00
IIMarckus
5c6bcde09f Improve comments. 2013-10-17 21:48:35 -06:00
U-Fish-PC\Daniel
c62aed4fa5 Replace terminator character in TX_FAR's 2013-10-16 21:24:54 -04:00
U-Fish-PC\Daniel
ae9b13f5ec Misc text characters 2013-10-16 11:08:06 -04:00
U-Fish-PC\Daniel
7feec67578 Add PrintStatusAilment 2013-10-15 21:08:04 -04:00
U-Fish-PC\Daniel
51701f534b Add Mon nest icon 2013-10-15 20:38:49 -04:00
iimarckus
ad402f1243 Merge pull request #11 from dannye/music
Music
2013-10-13 23:35:43 -07:00
U-Fish-PC\Daniel
7df715d0c4 Add song alternate start labels 2013-10-14 00:41:56 -04:00
U-Fish-PC\Daniel
5e7ecff26c Update submodule 2013-10-13 12:27:02 -04:00
U-Fish-PC\Daniel
8edfcc4b1e All music and sfx 2013-10-12 14:40:37 -04:00
IIMarckus
3016f72851 Fix CheckIfInOutsideMap comments.
Pointed out by 80C.
2013-09-25 23:28:16 -06:00
IIMarckus
3c14752719 Merge branch 'comments' of https://github.com/dannye/pokered 2013-09-17 22:50:33 -06:00
U-Fish-PC\Daniel
d7aa1d61cd Merge remote-tracking branch 'kanzure/use-new-preprocessor' 2013-09-16 15:50:02 -04:00
Bryan Bishop
fecbe4a60c bump and support latest pokemontools 2013-09-16 12:42:46 -05:00
U-Fish-PC\Daniel
cd433d32ee Merge branch 'comments' 2013-09-16 13:18:37 -04:00
U-Fish-PC\Daniel
4000d7a23a Merge branch 'master' into comments 2013-09-16 13:12:42 -04:00
U-Fish-PC\Daniel
11aa33e49c revert pokemontools to 7aa016fb 2013-09-16 12:57:41 -04:00
U-Fish-PC\Daniel
5537897109 give consistency to map names 2013-09-16 12:10:26 -04:00
U-Fish-PC\Daniel
3b62d2a6f6 gbz80disasm for pokered fix 2013-09-11 12:22:11 -04:00
dannye
d256be1b09 Merge pull request #1 from kanzure/dannye-incbins
Merge so that iimarckus does less work
2013-09-10 20:04:54 -07:00
Bryan Bishop
e47308a1f8 Merge branch kanzure/master into dannye-incbins
Conflicts:
	extras
2013-09-10 20:08:49 -05:00
U-Fish-PC\Daniel
a684941cfc Add labels to recently added asm 2013-09-10 20:57:44 -04:00
U-Fish-PC\Daniel
351c48959a Add misc asm 2013-09-10 20:51:45 -04:00
U-Fish-PC\Daniel
929dce66e4 add misc asm 2013-09-10 20:46:10 -04:00
U-Fish-PC\Daniel
21ffdf684a Include text command $0a in UnnamedText_27fb3 2013-09-10 20:42:09 -04:00
U-Fish-PC\Daniel
89eba26278 misc asm 2013-09-10 20:38:18 -04:00
U-Fish-PC\Daniel
6a589c3278 Add HMMoveArray 2013-09-10 18:33:53 -04:00
U-Fish-PC\Daniel
7380b242b0 Add misc asm 2013-09-10 18:24:04 -04:00
U-Fish-PC\Daniel
54a0478d9c Add UnnamedText_1ebe2 2013-09-10 18:09:01 -04:00
U-Fish-PC\Daniel
e93809a84b Add CinnabarGymGateCoords 2013-09-10 18:03:38 -04:00
U-Fish-PC\Daniel
778dbb83ba Add UnnamedText_1eae3 2013-09-10 13:20:10 -04:00
U-Fish-PC\Daniel
3b3051ea09 Add PointerTable_1ea60 and organize PointerTable labels 2013-09-10 13:13:45 -04:00
U-Fish-PC\Daniel
a1a3393317 un-incbin misc asm 2013-09-10 13:00:53 -04:00
U-Fish-PC\Daniel
6637f8a69a Add UnnamedText_1e940 2013-09-10 12:53:06 -04:00
U-Fish-PC\Daniel
3bdb704dc4 Add UnnamedText_1cae8 2013-09-10 12:46:57 -04:00
U-Fish-PC\Daniel
7ef33f15f3 Add TownMapOrder 2013-09-10 11:56:29 -04:00
U-Fish-PC\Daniel
5fd2c9b7d4 Merge branch 'comments' of https://github.com/dannye/pokered 2013-09-08 10:19:47 -04:00
U-Fish-PC\Daniel
c29ed3b405 Split blank_leader_names and circle_tile 2013-09-08 10:18:05 -04:00
U-Fish-PC\Daniel
55d5a879dd Merge branch 'incbin' of https://github.com/dannye/pokered 2013-09-06 20:05:23 -04:00
U-Fish-PC\Daniel
1b19d68671 Add bank 1C palette packets 2013-09-06 18:26:20 -04:00
U-Fish-PC\Daniel
52e7b42e89 Add UnknownText_74229 2013-09-06 17:08:11 -04:00