aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merged with yenatchMarcus Huderle2014-05-121-724/+365
|\
| * Merge remote-tracking branch 'iimarckus/master'yenatch2014-04-271-154/+192
| |\
| * | Comments and labels for saving the last blackout map.yenatch2014-04-271-29/+34
| * | Use callba/callab macros for cross-bank calls.yenatch2014-04-221-576/+192
| * | Comment in-game trade evolution.yenatch2014-04-221-10/+33
| * | More move and effect constants. Use a constant for total move count.yenatch2014-04-221-39/+39
| * | Clean up rst vectors and interrupt labels.yenatch2014-04-211-19/+19
| * | More move effect constants.yenatch2014-04-161-11/+83
| * | Use map constants for hardcoded warp destinations.yenatch2014-04-161-13/+13
| * | Use bits for status constants instead of masks.yenatch2014-04-161-22/+22
* | | Documented/labeled lots of move-effect-related stuff.Marcus Huderle2014-05-121-96/+173
* | | Documented reflect/light screen effect function. Labeled some related text.Marcus Huderle2014-05-121-42/+42
| |/ |/|
* | Comment where gym trainers get deactivated after beating the leader.IIMarckus2014-04-211-7/+34
* | Add labels and comments to the Fan Club.IIMarckus2014-04-211-61/+70
* | Use decimal for levels, and replace some hardcoded RAM addresses.IIMarckus2014-04-211-22/+23
* | Add a missed map constant.IIMarckus2014-04-211-1/+1
* | Improve comments/labels for Silph Co 7F.IIMarckus2014-04-191-54/+55
* | Label a Route 11 gatehouse script better.IIMarckus2014-04-191-9/+9
|/
* Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2014-04-161-34/+44
|\
| * Merge remote-tracking branch 'yenatch/png'yenatch2014-04-151-34/+44
| |\
| | * Fix tile padding for house and ship_port tileset graphics.yenatch2014-04-051-2/+2
| | * Convert pngs in gfx/ to 1bpp and 2bpp.yenatch2014-04-051-34/+44
* | | Replace item constantsU-Fish-PC\Daniel2014-04-071-5/+5
* | | Replace one-byte sound effect pointersU-Fish-PC\Daniel2014-04-071-126/+127
|/ /
* | Merge https://github.com/yenatch/pokeredIIMarckus2014-04-061-690/+707
|\|
| * "Fix" name indentation in credits.yenatch2014-04-041-65/+65
| * Another bank.yenatch2014-04-041-1/+1
| * More tileset constants.yenatch2014-04-041-17/+17
| * Tileset constants in the wild.yenatch2014-04-031-198/+198
| * Name the tilesets and give them constants.yenatch2014-04-031-403/+418
| * Reference more static banks.yenatch2014-04-021-6/+8
* | A little more map name consistencyU-Fish-PC\Daniel2014-04-061-6/+6
* | Use dimension constants in warp data and add map name consisntencyU-Fish-PC\Daniel2014-04-051-991/+991
|/
* Japanese character conversion tables.yenatch2014-04-021-54/+14
* More Red pic labels and misc constants.yenatch2014-04-021-20/+19
* Use labels instead of static addresses in sound pointers.yenatch2014-03-301-6/+6
* Stop using [$ff00+$xx] syntax.yenatch2014-03-301-1325/+1325
* Remove the last "\@"s on local labels.yenatch2014-03-301-13/+13
* Yet another static rom address (Tset15_Coll)yenatch2014-03-301-1/+1
* Merge remote-tracking branch 'origin/master' into masteryenatch2014-03-291-2/+3
|\
| * ledge tiles documentedLin2014-03-261-2/+3
* | Merge remote-tracking branch 'huderlem/master' into masteryenatch2014-03-291-20/+24
|\ \
| * | Removed hardcoded address. Labeled a few functions.Marcus Huderle2014-02-201-18/+22
| * | Labeled Battle Center and Trade Center constants.Marcus Huderle2014-01-291-4/+4
| |/
* | Replace hardcoded song idsU-Fish-PC\Daniel2014-02-021-10/+10
* | Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2014-02-011-20910/+921
|\|
| * Get rid of globals.asm. Use ::s to export labels between objects.yenatch2014-01-271-491/+491
| * added a couple of new moves constantsAdam AKA Coolboyman2014-01-261-10/+10
| * Make text.asm an objectyenatch2014-01-231-2/+0
| * Move text banks into text.asmyenatch2014-01-231-3196/+1