Commit Graph

29 Commits

Author SHA1 Message Date
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
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
db27602679 Name and comment the trainer party reader.
Reads the contents of trainers/trainers.asm.
2014-06-14 22:35:00 -07:00
yenatch
b83f237254 Rename _GetBattleVar -> GetBattleVarAddr.
Functions prefixed with _ imply they're private.
The real purpose of this function is to use an address,
rather than saving a few cycles on push/pop.
2014-06-14 00:41:34 -07:00
yenatch
e23f341258 Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
yenatch
eb9fc6676c More battle code cleanup.
- Use more substatus constants.
- Reformat some code to be more atomic.
- Add constants for unused status prevention held item effects.
- Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
yenatch
023cfdbb05 Consolidate monster structs in wram and sram.
The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
yenatch
23f9b5d21e Use constants for move struct positioning.
This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:24:25 -07:00
yenatch
86c1e0feea Consolidate NUM_MOVES usage and monster struct labels.
There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
yenatch
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
20444d2f63 More MAX_LEVEL use. 2014-06-03 14:07:10 -07:00
yenatch
1fe2560a36 Growth rate data. 2014-03-05 06:11:52 -05:00
yenatch
d952b5c3eb Label more graphics in bank 3e. 2014-03-05 02:43:08 -05:00
yenatch
1045c6a16f OTPartyMon1HP instead of PartyMon1HP - PartyMon1 + OtPartyMon1 2014-02-23 01:10:58 -05:00
yenatch
a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
08a0462c1e use constants for berserk gene, kings rock, scope lens effects 2014-01-20 00:07:51 -05:00
yenatch
92aab1e185 even more battle labels 2014-01-05 07:28:55 -05:00
yenatch
4dbf0d44e0 comment and relabel more battle functions 2014-01-01 08:09:15 -05:00
yenatch
a18cab495d rename Function0x{} labels to Function{} for consistency 2013-12-31 04:10:49 -05:00
yenatch
1ab4b59d86 clean up some labels in battle asm 2013-12-31 04:09:00 -05:00
yenatch
d1d186d1ee rename CallBankF -> CallBattleCore 2013-12-31 03:25:38 -05:00
yenatch
a10ee4e9f1 comment move priority functions 2013-12-30 23:32:37 -05:00
yenatch
bfaad924e7 label more pointers to Moves 2013-12-30 23:22:27 -05:00
yenatch
2172461a60 fleemons are global 2013-12-24 17:19:50 -05:00
yenatch
5f0e279bfa Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
	main.asm
2013-12-23 05:21:12 -05:00
yenatch
7ccb6d91e6 split out the battle engine into battle/core.asm 2013-12-18 01:11:06 -05:00