Commit Graph

2369 Commits

Author SHA1 Message Date
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
Bryan Bishop
a207770470 Merge pull request #257 from yenatch/map-headers
Map header macros and misc comments
2014-07-18 15:25:26 -05:00
yenatch
3110fd28e2 Badge and move constants in Strength and Surf field effects. 2014-07-18 10:31:53 -07:00
yenatch
2b1cc7f270 Use WOOPER in Oak speech. 2014-07-18 10:31:52 -07:00
yenatch
68ee99818a Move cry functions out of home.asm. 2014-07-18 10:31:52 -07:00
yenatch
928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch
251517812f Rename the internal PlayCry function to _PlayCryHeader. 2014-07-18 10:31:52 -07:00
yenatch
2f99608526 Use macros for spawns and flypoints.
This firmly ties spawn constant definition to data allocation,
preventing usage earlier in main.asm or in other objects.

A potential solution is to abuse ifdefs and include it in
both main.asm and constants.asm.
2014-07-18 10:31:51 -07:00
yenatch
0c7ef5e2d8 Use macros for both types of map headers.
This should make map headers much easier to edit than before.

Rather than occasionally being able to reuse blockdata semantically,
create a label for each map and attach it to some blockdata include.
This improves readability and reduces overhead when adding new maps.

The macro argument length bug doesn't seem to crop up here...
It looks like it only happens when an argument is over 16 characters
long and references a symbol that exists before the macro is invoked.
2014-07-18 10:31:51 -07:00
yenatch
ab018a5094 Cry "echo" is actually the upper byte of pitch (now a word). 2014-07-18 10:31:51 -07:00
yenatch
091e55bfa6 Add labels for maps that reuse blockdata. 2014-07-18 10:31:50 -07:00
yenatch
2955e28a42 Add address labels used by Decompress. 2014-07-18 10:31:50 -07:00
yenatch
b6793b65df Use a macro for Odd Egg probabilities. 2014-07-18 10:31:39 -07:00
yenatch
e2ec8a1d13 Recomment type names.
This is mostly just whitespace reduction.
2014-07-09 12:50:33 -07:00
Bryan Bishop
1ecfe6bd23 Merge pull request #256 from yenatch/master
Fix predefs and battle code.
2014-06-27 21:33:08 -05:00
yenatch
43fb5732a2 Don't use Olivine maps to define the length of a map header.
The first and second map header labels have no semantic meaning with regard to length.
In fact, none of the labels are used at all.
2014-06-24 10:19:27 -07:00
yenatch
49ef0121dc Remove excessive whitespace in map headers.
Use the "map" macro instead of using GROUP_* and MAP_* constants.
Also remove redundant "(bank then label)" comments.
2014-06-24 09:01:29 -07:00
yenatch
d6fbdfb8de More comments and constants in move effect command code.
Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:52 -07:00
yenatch
32a5f21cc7 More PartyMon labels for relative addressing. 2014-06-23 12:45:30 -07:00
yenatch
6fee80528a More object struct labels and constants. 2014-06-19 17:23:53 -07:00
yenatch
044d0f7f04 Merge remote-tracking branch 'kanzure/master' 2014-06-18 01:05:52 -07:00
yenatch
bc3a21193d Residual damage, battle text labels, pic predefs. 2014-06-18 00:55:44 -07:00
yenatch
dbe4c7ab67 Fix some misnamed substatus constants.
SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE.
SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT.
Substatus 5 bit 4 was actually SUBSTATUS_ENCORED.

Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
IIMarckus
1fbe471b74 Use better constants/comments in DST near-midnight checks. 2014-06-17 04:53:58 -06:00
yenatch
541a9c7347 Name the UpdateEnemyHUD predef.
Also start using hp palette constants.
2014-06-16 22:53:56 -07:00
yenatch
8639fcd29b Use a predef macro that takes labels instead of juggling constants.
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
yenatch
0b7dfeb9b2 Name and comment some move learning functions. 2014-06-16 10:32:39 -07:00