Commit Graph

52 Commits

Author SHA1 Message Date
luckytyphlosion
cb414f1480 overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
2015-10-29 14:23:30 -04:00
luckytyphlosion
2ea331ebb3 Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related functions, other misc functions""
This reverts commit c8ddbe7566.
2015-10-26 20:00:48 -04:00
luckytyphlosion
c8ddbe7566 Revert "data/facing.asm, titlescreen functions, oam/sprite related functions, other misc functions"
This reverts commit 3a5d7ec05d.
2015-10-25 12:56:05 -04:00
luckytyphlosion
3a5d7ec05d data/facing.asm, titlescreen functions, oam/sprite related functions, other misc functions
Also rename pcm-related functions.
2015-10-24 17:35:57 -04:00
luckytyphlosion
b7ed43bd56 Make pokeyellow build correctly. 2015-09-03 14:42:46 -04:00
luckytyphlosion
d2ed7674f4 Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
2015-08-30 17:55:02 -04:00
dannye
fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05:00
YamaArashi
525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
U-Daniel-PC\Daniel
1d63499fa7 Remove (incorrect) address comments
Conflicts:
	text.asm
2015-08-01 17:34:51 -04:00
U-Daniel-PC\Daniel
8f2edd9c41 Build only Yellow
Conflicts:
	gfx/intro_nido_1.6x6.png
	gfx/intro_nido_2.6x6.png
	gfx/intro_nido_3.6x6.png
	gfx/redgreenversion.png
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	yellow/main.asm
2015-08-01 17:32:39 -04:00
U-Daniel-PC\Daniel
10af88ddd7 text.o
Conflicts:
	main.asm
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	wram.asm
	yellow/text.asm
2015-08-01 17:16:11 -04:00
YamaArashi
7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi
04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -07:00
YamaArashi
c169073eed misc 2015-07-18 21:58:55 -07:00
U-Daniel-PC\Daniel
3cd3efd060 Name the last of unnamed text 2015-06-12 11:00:25 -05:00
yenatch
26227cc45f Clean up type names. 2014-12-10 20:07:01 -08:00
stag019
b08a0b860a Fix unclosed quotes. 2014-11-04 20:22:18 -05:00
IIMarckus
5ea1d8a61f Labels for Fuji in Pokémon Tower. 2014-10-26 21:00:29 -06:00
IIMarckus
b17d958e60 Add more text changes from Yellow. 2014-10-24 01:50:40 -06:00
IIMarckus
a36e090d43 Add parts of the Safari Zone entrance script from Yellow. 2014-10-17 22:47:31 -06:00
IIMarckus
7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
IIMarckus
a3d3f8324a Kill version.asm. 2014-10-17 02:42:32 -06:00
IIMarckus
00049b6f39 Fix typo in previous. 2014-10-10 02:01:47 -06:00
IIMarckus
6e14461fa6 Add a lot of Yellow text changes. 2014-10-10 01:46:06 -06:00
yenatch
ea05c44163 Add macro TX_BCD for printing BCD numbers.
This fixes some more static wram addresses.
2014-05-27 11:16:05 -07:00
yenatch
40c17c906b Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".

Label overleads are still an issue.
2014-05-26 22:04:39 -07:00
U-Fish-PC\Daniel
f29c4e473e Misc relabelling 2014-05-21 11:58:18 -04:00
U-Fish-PC\Daniel
1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
2014-05-19 16:05:19 -04:00
U-Fish-PC\Daniel
82ffb336a9 Pull more data out of main.asm 2014-05-19 08:05:48 -04:00
U-Fish-PC\Daniel
24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00
U-Fish-PC\Daniel
1e86625c87 Pull most data out of main.asm 2014-05-16 19:50:38 -04:00
Marcus Huderle
d218d1972a Documented/Labeled Route 22 scripts. 2014-05-13 10:43:09 -05:00
IIMarckus
65e7657318 Add labels and comments to the Fan Club. 2014-04-21 02:12:25 -06:00
IIMarckus
d036e24ae1 Improve comments/labels for Silph Co 7F. 2014-04-19 23:31:59 -06:00
IIMarckus
199ec815c6 Label a Route 11 gatehouse script better. 2014-04-19 21:44:51 -06:00
U-Fish-PC\Daniel
f8452ebeb8 Use dimension constants in warp data and add map name consisntency 2014-04-05 10:47:23 -04: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
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
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
b452726f9a rename existing map text files and put them in text/maps/ 2014-01-22 17:38:14 -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
IIMarckus
18bf34ec0b Split large chunks of text into separate files, and improve Makefile.
hg-commit-id: 59e6e303019d
2011-12-26 18:40:25 -07:00