Commit Graph

2246 Commits

Author SHA1 Message Date
IIMarckus
4aa3d3e31a Fix bad merge. 2014-10-24 00:43:50 -06:00
IIMarckus
b4df25a1e1 More comments and labels for ball catch rates. 2014-10-24 00:18:48 -06:00
yenatch
81e2a3f0cf Merge remote-tracking branch 'xcrystal/master' into master
Conflicts:
	battle/ai/scoring.asm
	main.asm
2014-10-23 02:41:52 -04:00
xCrystal
d430cccdfb Add commentary and labels to AI stuff
Name some labels and add lots of commentary to AI stuff, including most
AIScoring_Smart sublayers.
2014-10-22 23:19:30 +02:00
xCrystal
8641358590 Revert "nothing"
This reverts commit 201f56b3e9.
2014-10-22 23:17:49 +02:00
xCrystal
201f56b3e9 nothing 2014-10-22 23:17:19 +02:00
xCrystal
dd8653fe6f More AI commentary/labels 2014-10-22 23:08:51 +02:00
xCrystal
bb9818e3c3 More AI commentary/labels 2014-10-22 17:36:42 +02:00
xCrystal
bf60a6b690 evasionup, accdown, whirlwind, haze 2014-10-22 14:47:33 +02:00
xCrystal
7cbec0d52a More AI commentary/labels 2014-10-22 00:28:51 +02:00
xCrystal
96a89ffad7 More AI commentary 2014-10-21 20:44:42 +02:00
xCrystal
44377acb2a Rename labels and add more commentary to AI stuff 2014-10-21 19:21:13 +02:00
xCrystal
28097be25c Add commentary to some AI layers 2014-10-21 14:17:55 +02:00
xCrystal
df2d027501 Start commenting some AI layers 2014-10-21 13:54:04 +02:00
yenatch
78d16c1efa Better labels for item/switch AI. 2014-09-30 11:20:38 -07:00
yenatch
7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch
ca58bd215c Clean up wram sections so that all space is accounted for. 2014-09-30 11:17:52 -07:00
IIMarckus
c28be21260 Use a path argument for find as required by POSIX. 2014-09-23 22:20:27 -06:00
yenatch
d6ac5407e7 Add the initial mobile adapter save data.
The contents of the save and the rest of the bank are unknown.
2014-08-22 20:48:58 -07:00
yenatch
1d4158057e Close an open string in name selection.
The python preprocessor doesn't care if a string is left open.
It probably should, so this string is fixed preemptively.
2014-08-22 20:43:02 -07:00
yenatch
3be6ca012f Use AttrMap and TileMap labels for relative addressing. 2014-08-22 20:41:57 -07:00
yenatch
ed15916f05 Use landmark constants in displaylocation commands (phone scripts). 2014-08-22 20:36:10 -07:00
yenatch
a5862306b7 Split mobile/timer code out of home.asm. 2014-08-22 10:57:06 -07:00
yenatch
49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
Bryan Bishop
4f018846fb Merge pull request #260 from yenatch/master
Dump the phone scripts.
2014-08-16 19:43:42 -05:00
Bryan Bishop
85fe70ecba Merge pull request #261 from kanzure/use-vagrant
Downloadable virtual machine image (Vagrantfile and box)
2014-08-16 19:42:49 -05:00
yenatch
5337d0159e Recomment the text engine. 2014-08-14 23:50:53 -07:00
yenatch
ffdc3e4c12 Wrap macro arguments with parentheses.
Arguments are passed in as string literals.
2014-08-14 23:47:27 -07:00
yenatch
da799c80d4 Better trainer AI comments and finish off trainer attributes. 2014-08-13 19:44:56 -07:00
yenatch
88a15c5038 More constants and bug comments in item effects.
Apparently a bunch of constants from red were never removed for some reason.
2014-08-13 19:42:58 -07:00
yenatch
b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch
07693817ce Use phone script labels in the phone contact table. 2014-07-24 19:40:25 -07:00
yenatch
3fb29975ca Relabel GetItemDescription -> PrintItemDescription. 2014-07-24 19:27:21 -07:00
yenatch
ab0ca2b16a Pick off more incbins and static labels in pic animation code. 2014-07-24 12:05:39 -07:00
yenatch
dea79bb86e Add real-time-clock and Daylight Savings Time wram labels. 2014-07-24 10:45:54 -07:00
Bryan Bishop
6f786a2bca make a vagrant box to make things easier
Maybe a vagrant box will be less work for users. At the moment the
Vagrantfile is just pointing to a remote url, but in the future it
should contain the actual scripts to construct the box so that the box
can be updated as the dependencies in the repository change.
2014-07-23 22:42:04 -05:00
yenatch
f7e53b0f50 Dump the phone scripts.
This is one of the last major incbins. The rest is mostly mobile code.
2014-07-23 20:20:21 -07:00
yenatch
cda504fbce Fix "name" event command parameter comments. 2014-07-22 22:39:41 -07:00
yenatch
0671d46bb1 Bump pokemontools again for "name" event command fixes. 2014-07-22 22:38:57 -07:00
yenatch
b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -07:00
yenatch
29d92fe79c Fix some static addresses in std scripts. 2014-07-22 22:05:41 -07:00
yenatch
e75e735f7f Reflect the extra loadwilddata argument in its function comment. 2014-07-22 22:05:06 -07:00
yenatch
1f9ae9edb4 Bump pokemontools to fix loadwilddata. 2014-07-22 22:03:32 -07:00
yenatch
849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -07:00
yenatch
be08d93b61 Name the script special function and clean up a couple specials. 2014-07-19 14:02:58 -07:00
yenatch
52c5047a53 Remove the last incbin in map events.
Since it's unused there's no way of knowing for sure,
but movement data typically comes after scripts and
before text, and the commands make sense.
2014-07-19 13:12:43 -07:00
Bryan Bishop
bb5ae04ca5 Merge pull request #259 from yenatch/cries
Shorten cry defs now that cry parameters are all words.
2014-07-19 14:25:28 -05:00
yenatch
4757e299be Merge remote-tracking branch 'kanzure/master' into cries 2014-07-19 11:59:33 -07:00
Bryan Bishop
1ba907e353 Merge pull request #258 from yenatch/spawns
Use macros for spawns and flypoints.
2014-07-18 19:45:20 -05:00
yenatch
b9110b015d Condense cry headers to one line.
Keep the unused labels for readability (and maybe some symfile magic).
2014-07-18 17:03:52 -07:00