Commit graph

1756 commits

Author SHA1 Message Date
yenatch
205c475191 Consolidate rgbfix options between Red and Blue.
Yellow and JP roms will take different options, but this is good for now.
2014-02-14 00:05:01 -05:00
yenatch
89b7957556 No more init.sh 2014-02-13 22:35:30 -05:00
yenatch
43342f1376 Rewrite the install instructions without init.sh.
Cygwin instructions return.
2014-02-13 22:34:52 -05:00
yenatch
8f1b7acd3c Readme: Builds both Red and Blue. 2014-02-13 03:04:35 -05:00
yenatch
0192edb8ad Install: Refer to pokeblue.gbc by its filename. 2014-02-13 03:02:19 -05:00
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
Marcus Huderle
38435ee672 Labeled Battle Center and Trade Center constants. 2014-01-29 14:39:44 -06:00
U-Fish-PC\Daniel
71d31fee0e Fix BookshelfTileIDs format 2014-01-28 09:06:26 -05:00
yenatch
b48435bb26 Makefile: condense dependency scanning into one loop 2014-01-27 17:27:37 -05:00
yenatch
c49dd99a98 Split wram.asm from poke{red,blue}.o into wram.o
wram.asm still defines some constants. They're moved into constants/wram_constants.asm.
2014-01-27 17:09:09 -05:00
yenatch
2b961ceaf4 Clean up makefile messages and prerequisite handling 2014-01-27 16:37:16 -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
IIMarckus
6bfe2f4238 Merge branch 'text' of https://github.com/yenatch/pokered 2014-01-26 23:09:34 -07:00
IIMarckus
27c5fe339f Merge branch 'fix-init-sudo' of https://github.com/yenatch/pokered 2014-01-26 22:29:43 -07:00
yenatch
7e4febba58 Get rid of more unnecessary labels in text.asm 2014-01-24 12:42:31 -05:00
yenatch
896cc790d1 Makefile: remove duplicates when consolidating objects 2014-01-23 22:33:16 -05:00
yenatch
fbe9cdde27 Give a : to label def _UnnamedText_ef7d 2014-01-23 15:56:49 -05:00
yenatch
b4e8ec0901 Make text.asm an object 2014-01-23 15:55:33 -05:00
yenatch
cf90d30e9e Bank constants for text.asm 2014-01-23 15:48:11 -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
c832fd85c5 bump pokemontools for merging the previous bump
this brings pokemontools up to date, including some map editor fixes
2014-01-22 16:38:16 -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
283e4c1cee Don't use sudo in init.sh
Besides being bad practice, permissions are handled differently cross-platform (cygwin).
2014-01-22 11:36:07 -05:00
yenatch
53a4432e68 use 'next' macro in strings 2014-01-22 01:21:41 -05:00
yenatch
7a69bfaa92 text macros in pokedex entries 2014-01-22 00:56:48 -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
2ac15d2475 text macros in text/ 2014-01-21 21:09:32 -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
795decd080 Add text macros
Before text looked like:

_CeladonCityText2: ; a5a4b (29:5a4b)
	db $0, "Heheh! This GYM", $4f
	db "is great! It's", $55
	db "full of women!", $57

Now it looks like:

_CeladonCityText2: ; a5a4b (29:5a4b)
	text "Heheh! This GYM"
	line "is great! It's"
	next "full of women!"
	done
2014-01-21 21:09:22 -05:00
yenatch
93e1316e3d bump pokemontools to play nice with EQUS 2014-01-21 17:49:30 -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
yenatch
001270908a define music constants instead of running around with ((label-$4000)/3) 2014-01-21 14:08:06 -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