aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document move effectsxCrystal2015-04-0811-129/+158
| | | | | | | | | | | | | | | | | | | | | | Document mist effect Document recoil effect Document heal effect Update conversion_effect.asm Update haze_effect.asm Update leech_seed_effect.asm Update pay_day_effect.asm Update reflect_light_screen_effect.asm Update substitute_effect.asm Update transform_effect.asm
* Merge pull request #90 from xCrystal/masteryenatch2015-04-0145-2035/+2092
|\ | | | | Rename/split battle and move effect files. Battle functions, AI, and attack animations
| * Further split bank e stuffxCrystal2015-04-015-432/+435
| |
| * Rename battle files and split move effects Part 5xCrystal2015-04-016-94/+94
| | | | | | | | 15.asm, 16.asm, 1a.asm, 1c.asm
| * Rename battle files and split move effects Part 4xCrystal2015-04-0111-651/+651
| | | | | | | | e.asm, e_2. asm, and 14.asm
| * Rename battle files and split move effects Part 3xCrystal2015-04-017-70/+70
| | | | | | | | b.asm, b_2.asm, c.asm, and d.asm
| * Rename battle files and split move effects Part 2xCrystal2015-04-017-84/+84
| | | | | | | | 5.asm, 9.asm, and a.asm
| * Rename battle files and split move effects Part 1xCrystal2015-04-0114-507/+510
| | | | | | | | 1.asm, 4.asm, and 4_2.asm
| * Document animation types (shake screen/blink pic)xCrystal2015-03-311-24/+26
| |
| * Name more in-battle functions and labelsxCrystal2015-03-312-55/+64
| | | | | | | | and better document some animation related functions
| * Label some attack animation functionsxCrystal2015-03-314-43/+49
| |
| * Label some battle related functionsxCrystal2015-03-311-21/+21
| |
| * Further document AI stuffxCrystal2015-03-313-40/+48
| |
| * Some wram constantsxCrystal2015-03-316-24/+34
| |
| * Split commentary lines that are too longxCrystal2015-03-311-21/+37
|/
* Merge pull request #88 from YamaArashi/masteryenatch2015-03-147-164/+269
|\ | | | | commented trade amim functions
| * commented trade amim functionsYamaArashi2015-03-147-164/+269
|/
* Merge pull request #87 from YamaArashi/masteryenatch2015-03-149-62/+92
|\ | | | | commented mon_party_sprites.asm
| * relabel and add commentYamaArashi2015-03-135-8/+12
| |
| * commented mon_party_sprites.asmYamaArashi2015-03-139-62/+88
|/
* Low health alarm documentationU-Daniel-PC\Daniel2015-03-129-52/+71
| | | | RenaKunisaki
* Merge pull request #82 from dannye/masterDaniel Harding2015-02-262-4/+4
|\ | | | | Label typo
| * Label typoU-Daniel-PC\Daniel2015-02-262-4/+4
| | | | | | | | closes https://github.com/iimarckus/pokered/issues/81
* | Merge pull request #80 from dannye/masterDaniel Harding2015-02-202-2/+2
|\| | | | | Remove hard-coded wPokedexOwned/wPokedexSeen array size
| * Remove hard-coded wPokedexOwned/wPokedexSeen array sizeU-Daniel-PC\Daniel2015-02-202-2/+2
|/
* Merge remote-tracking branch 'origin/master'yenatch2015-02-1349-890/+965
|\
| * Rename some labelsYamaArashi2015-02-088-15/+17
| |
| * named misc functionsYamaArashi2015-02-0812-115/+133
| |
| * move-related thingsYamaArashi2015-02-0810-50/+58
| |
| * fixed hp bar wram label and miscYamaArashi2015-02-0721-161/+169
| |
| * Named wram symbolsYamaArashi2015-02-0720-136/+132
| |
| * commented battle stuffYamaArashi2015-02-0726-253/+272
| |
| * comment drain HP effectYamaArashi2015-02-073-29/+33
| |
| * commented menu stuffYamaArashi2015-02-0715-153/+173
| |
* | rename hJoyHeldLast -> hJoyLastyenatch2015-02-073-10/+19
| |
* | INSTALL: git clone --recursiveyenatch2015-02-071-36/+20
| |
* | Pick off some more static map ids.yenatch2015-02-073-10/+9
|/
* documented bide bugYamaArashi2015-02-071-1/+3
|
* Fix typo in nameYamaArashi2015-02-072-7/+6
|
* serial/trade/miscYamaArashi2015-02-0774-1647/+1933
|
* add constants for volatile statuses and more battle labels/commentary/constantsxCrystal2015-02-0414-302/+341
|
* More battle commentary/labels/constans and fix some spacing issuesxCrystal2015-02-042-149/+160
| | | | | Conflicts: engine/battle/core.asm
* Merge branch 'master' of /tmp/a/pokeredIIMarckus2015-02-048-171/+213
|\
| * Use money macro for TrainerPicAndMoneyPointers.Marcus Huderle2015-02-041-47/+47
| |
| * Added bcd macros with coins and money aliases.Marcus Huderle2015-02-043-111/+125
| |
| * Clean up prizes data.Marcus Huderle2015-01-242-12/+15
| |
| * Better documenting for GetMachinePrice and TechnicalMachinePrices.Marcus Huderle2015-01-243-12/+37
| |
* | More battle sfx idsU-Daniel-PC\Daniel2015-01-271-166/+166
| |
* | Fix some sfx idsU-Daniel-PC\Daniel2015-01-272-3/+3
| |
* | Don't ignore .map filesU-Daniel-PC\Daniel2015-01-241-1/+0
| | | | | | | | it makes it confusing to edit/move the tilemaps in gfx/