Commit graph

458 commits

Author SHA1 Message Date
U-Fish-PC\Daniel 4ddba9774e Replace hardcoded song ids 2014-02-02 12:03:41 -05:00
U-Fish-PC\Daniel ed4ac6d551 Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
	main.asm
2014-02-01 08:46:53 -05:00
U-Fish-PC\Daniel 71d31fee0e Fix BookshelfTileIDs format 2014-01-28 09:06:26 -05:00
yenatch 1b9ee46af9 Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary

This speeds up build time by at least a third.
2014-01-27 16:24:13 -05:00
Adam AKA Coolboyman 6bde08504f added a couple of new moves constants 2014-01-26 23:59:48 -08:00
yenatch b4e8ec0901 Make text.asm an object 2014-01-23 15:55:33 -05:00
yenatch b84ee8468c Move text banks into text.asm 2014-01-23 15:44:40 -05:00
yenatch 0368685611 Split out move names 2014-01-23 15:38:10 -05:00
yenatch fbda25d3d8 Split out the rest of map text 2014-01-23 15:34:42 -05:00
U-Fish-PC\Daniel a60d16d89c Merge branch 'master' of https://github.com/iimarckus/pokered 2014-01-23 14:02:16 -05:00
yenatch 7762afaf99 Split out route text 2014-01-23 00:22:31 -05:00
yenatch 6e5476d420 Even more map text 2014-01-22 23:37:40 -05:00
yenatch bf743815fa Silph Co 1f text was actually somewhere else 2014-01-22 19:07:39 -05:00
yenatch 9da43a2311 Move city and town map text into text/maps 2014-01-22 18:58:57 -05:00
yenatch 31f074542b split out a bunch of map text 2014-01-22 17:47:55 -05:00
yenatch b52bcd6597 split viridian and oaks lab text into text/maps/ 2014-01-22 17:46:46 -05:00
yenatch cddc935127 stamp out even more text macros in main
Conflicts:
	main.asm
2014-01-22 17:46:00 -05:00
yenatch b452726f9a rename existing map text files and put them in text/maps/ 2014-01-22 17:38:14 -05:00
yenatch 32de715f5f Merge branch 'split-audio' into text
Conflicts:
	main.asm
2014-01-22 17:37:22 -05:00
yenatch 2c2111b7a5 Merge remote-tracking branch 'iimarckus/master' into resplit-audio
Conflicts:
	main.asm
2014-01-22 16:37:07 -05:00
yenatch 53a4432e68 use 'next' macro in strings 2014-01-22 01:21:41 -05:00
yenatch fea5be4699 rename and add some text macros
cont replaces next, and next becomes a generic newline.
para replaces page (now used for pokedex entries).
dex ends a pokedex entry.
2014-01-22 00:55:41 -05:00
yenatch 1295e2a605 clean up missed text macros in main.asm 2014-01-21 21:09:31 -05:00
yenatch 3964e6a137 use text macros in main.asm 2014-01-21 21:09:31 -05:00
yenatch ccd5d2387d condense MapSongBanks 2014-01-21 14:29:14 -05:00
yenatch 5914bb67ac use music constants everywhere
some sfx are treated as music, but don't have constants yet
2014-01-21 14:24:40 -05:00
U-Fish-PC\Daniel 966fa8a5cf Label Pewter Movement Scripts 2014-01-13 14:19:48 -05:00
U-Fish-PC\Daniel e39fe77f19 Replace false TX_RAM 2014-01-12 17:58:37 -05:00
yenatch 10bb09c4e2 split audio components into audio_red.o and audio_blue.o 2014-01-09 13:52:12 -05:00
U-Daniel-Laptop\Daniel a2084b200c Merge branch 'master' of https://github.com/dannye/pokered
Conflicts:
	main.asm
2014-01-08 13:05:02 -06:00
Marcus Huderle 47ec18ffa3 Labeled some more hardcoded banks and the OldManItemList. 2014-01-07 21:19:25 -06:00
Marcus Huderle fdb4498eb8 Labeled lots of hardcoded banks. 2014-01-07 12:12:05 -06:00
yenatch 94d755003e split out the audio engines 2014-01-06 22:34:14 -05:00
Marcus Huderle fb1ad40a10 Some more arbitrary labeling of unknown things. 2014-01-06 21:11:08 -06:00
Marcus Huderle 85f8430315 wram labels and text/function labels. 2014-01-06 12:10:06 -06:00
Marcus Huderle e54be71308 Some OT and name WRAM labels. 2014-01-05 18:24:01 -06:00
yenatch 5033ed32a3 untranslated good rod fisherman text
Only fishing
        It romance of a man!
        Heboi fishing rod
        Magikarp only I but such tangles
        If it is this good fishing rod
        It not you catch a better mon!
2014-01-04 18:10:34 -05:00
yenatch 30453b5c77 relabel good rod script in fuchsia house 3
how
2014-01-04 06:26:51 -05:00
yenatch 99555a209f more unknown data 2014-01-04 06:06:34 -05:00
yenatch a0b3d29a37 unused intro animation data
just a blank entry
2014-01-04 05:41:46 -05:00
yenatch 7cedb7ff08 unknown coordinate data
related to the cable club?
2014-01-04 05:36:28 -05:00
yenatch b926d25c39 TitleMon scrolling 2014-01-04 04:00:14 -05:00
yenatch 842bf15b5f some ATTR_BLK sgb packets 2014-01-04 02:37:47 -05:00
yenatch 7bd34b8f4e a dummy "TRAINER" string for trainer names 2014-01-03 22:19:12 -05:00
yenatch 093a5b9a4d vermilion gym trash can puzzle data 2014-01-03 22:06:51 -05:00
yenatch ffc0b8f9de repeated critical move table and recomment MoreCalculateDamage 2014-01-03 16:21:07 -05:00
yenatch d32e480f03 label remaining rom addresses
doesn't count incbins
2014-01-03 15:02:18 -05:00
Marcus Huderle 6ae2307ced Misc. labeling and unknown moves list incbin. 2013-12-28 12:55:29 -06:00
U-Daniel-Laptop\Daniel 38c99e4f53 Merge branch 'master' of https://github.com/huderlem/pokered 2013-12-28 12:36:06 -06:00
U-Daniel-Laptop\Daniel 4281bee9e8 remove redundant addressess 2013-12-28 12:35:17 -06:00