Commit graph

353 commits

Author SHA1 Message Date
yenatch dee4943043 finish off wram labels and fix up mistaken label overloads 2013-12-08 14:58:05 -05:00
yenatch f671ebc143 wram labels and clarify safari zone step counter 2013-12-08 14:48:17 -05:00
yenatch 4f527b7eef more wram labels 2013-12-08 04:58:44 -05:00
yenatch 168d03b957 Merge remote-tracking branch 'iimarckus/master' into crystal-makefile
Conflicts:
	Makefile
	main.asm
2013-12-07 23:31:49 -05:00
yenatch f8258985aa INCLUDE .asm instead of .tx
.tx is a build abstraction. if the process changes down the line, .tx includes will break
2013-12-07 20:02:50 -05:00
yenatch a548c1d097 split wram/hram out of constants.asm and start using wram sections
also inadvertently labeling some hard addresses
2013-12-05 01:18:14 -05:00
U-Fish-PC\Daniel 2ed422c696 IshiharaTeam 2013-11-26 13:32:08 -05:00
U-Fish-PC\Daniel 6b37623b1d FlyWarp data 2013-11-26 12:11:44 -05:00
U-Fish-PC\Daniel 6d6ce4c35b Evem more map scripts 2013-11-26 10:15:36 -05:00
U-Fish-PC\Daniel fa3d148935 Complete Map Scripts 2013-11-24 15:25:41 -05:00
U-Fish-PC\Daniel 33a233c6a1 Unincbin more map scripts 2013-11-17 02:05:33 -05:00
U-Fish-PC\Daniel e30f1be2b1 Add OAM data 2013-11-16 23:13:32 -05:00
U-Fish-PC\Daniel ffc4c03e19 Dissasemble and clean up 2013-11-15 01:56:54 -05:00
U-Fish-PC\Daniel 80f3c18776 Disassemble incbinned predef routines 2013-11-15 00:38:45 -05:00
U-Fish-PC\Daniel 42489ab02f Add labels to PredefPointers: 2013-11-12 14:58:41 -05:00
U-Fish-PC\Daniel b474bbdde7 remove more redundant addresses 2013-11-09 14:21:51 -05:00
IIMarckus c60da440b6 Merge branch 'master' of https://github.com/Sanky/pokered
Conflicts:
	main.asm
2013-11-01 20:15:09 -06:00
U-Fish-PC\Daniel 0bdfbd8762 All INCBIN baserom.gbcs begin with \n and all INCBINs of gfx etc begin with \t 2013-11-01 10:08:41 -04:00
U-Fish-PC\Daniel 1a34c1a43f Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
	main.asm
2013-10-31 14:35:51 -04:00
IIMarckus 7ecf8b1714 Merge branch 'music' of https://github.com/dannye/pokered 2013-10-30 22:27:36 -06:00
U-Fish-PC\Daniel e73d3d24aa Remove redundant addresses and 'known jump sources' 2013-10-25 14:15:25 -04:00
U-Fish-PC\Daniel 367c7eed64 Add MapSongBanks: 2013-10-24 04:14:23 -04:00
U-Fish-PC\Daniel 086e76a010 Music Engine Bank 8 2013-10-24 03:04:50 -04:00
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 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 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
U-Fish-PC\Daniel 4000d7a23a Merge branch 'master' into comments 2013-09-16 13:12:42 -04:00
U-Fish-PC\Daniel 5537897109 give consistency to map names 2013-09-16 12:10:26 -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