aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use more wram labels and other constantsxCrystal2015-07-2410-59/+65
|
* Merge pull request #107 from YamaArashi/masterDaniel Harding2015-07-22139-1703/+4178
|\ | | | | enumerate events
| * named more constantsYamaArashi2015-07-2110-66/+71
| |
| * comments for event constantsYamaArashi2015-07-212-2563/+2563
| |
| * named most of the used eventsYamaArashi2015-07-2190-468/+485
| |
| * move event macros to separate fileYamaArashi2015-07-203-426/+426
| |
| * gym leader eventsYamaArashi2015-07-2013-57/+57
| |
| * enumerate eventsYamaArashi2015-07-20137-1654/+4107
| |
* | Unify audio bank referencesdannye2015-07-2222-626/+626
| | | | | | | | | | | | 2→1 8→2 1f→3
* | Rename sound effect filesdannye2015-07-22332-2083/+2083
| |
* | Name some battle sound effectsdannye2015-07-2110-358/+360
|/
* Merge pull request #106 from YamaArashi/masterDaniel Harding2015-07-2059-394/+360
|\ | | | | jpab/jpba macros
| * constants for flag actionsYamaArashi2015-07-1916-51/+57
| |
| * namingYamaArashi2015-07-1929-174/+225
| |
| * replace uses of minus oneYamaArashi2015-07-196-7/+12
| |
| * jpab/jpba macrosYamaArashi2015-07-1922-162/+66
|/
* Merge branch 'master' of https://github.com/YamaArashi/pokereddannye2015-07-1967-632/+766
|\ | | | | | | | | | | Conflicts: engine/evos_moves.asm engine/overworld/healing_machine.asm
| * small changesYamaArashi2015-07-187-20/+23
| |
| * miscYamaArashi2015-07-1861-612/+743
| |
* | Name sound effectsdannye2015-07-1956-311/+487
| |
* | Enumerate more constantsdannye2015-07-1910-860/+885
|/
* A few missed TX_ASMdannye2015-07-182-2/+3
|
* A few missed object constantsdannye2015-07-183-3/+3
|
* Fix object constant namesdannye2015-07-18204-830/+830
| | | | | | | | | | swap LEFT and RIGHT FACE is better named STAY because sprites that have no range do not necessarily face any direction STAY has been renamed to NONE because sprites that use this will spin randomly, except for the item/voltorb/electrode sprite I never should have listened to https://github.com/iimarckus/pokered/issues/89
* Map object macrodannye2015-07-18225-1151/+1189
| | | | closes https://github.com/iimarckus/pokered/issues/89
* Consolidate coord macrosdannye2015-07-1858-539/+528
|
* Simplify map connectionsdannye2015-07-1837-137/+154
| | | | | | | | let the macros calculate the connection strip length instead of passing it as an arg don't pass map dimensions since they can be inferred from map ids todo: figure out why certain south and east connections get an extra 3 added to the connection strip length
* Merge pull request #104 from YamaArashi/masterDaniel Harding2015-07-18106-671/+773
|\ | | | | fix variable naming
| * fix variable namingYamaArashi2015-07-18106-671/+773
| |
* | Clean up map connectionsdannye2015-07-1822-31/+31
|/ | | | closes https://github.com/iimarckus/pokered/issues/85
* Enumerate map constantsdannye2015-07-173-310/+312
| | | | closes https://github.com/iimarckus/pokered/issues/86
* Merge pull request #103 from YamaArashi/masterDaniel Harding2015-07-1721-349/+423
|\ | | | | Misc changes again
| * money / coins hram constantsYamaArashi2015-07-1713-89/+95
| |
| * title / diploma / vending machineYamaArashi2015-07-177-121/+159
| |
| * intro stuffYamaArashi2015-07-174-139/+169
|/
* More direction constantsdannye2015-07-1738-247/+445
| | | | facing directions, npc movement, joypad
* Fix Safari Zone check labelsdannye2015-07-161-7/+8
|
* Merge branch 'master' of https://github.com/iimarckus/pokereddannye2015-07-1657-1288/+1639
|\
| * Merge pull request #101 from YamaArashi/masterDaniel Harding2015-07-1657-1288/+1639
| |\ | | | | | | Misc changes
| | * menu stuffYamaArashi2015-07-1526-420/+506
| | |
| | * more movement stuffYamaArashi2015-07-159-137/+192
| | |
| | * commented movement stuffYamaArashi2015-07-157-163/+206
| | |
| | * named wram variablesYamaArashi2015-07-1421-203/+245
| | |
| | * hall of fame / creditsYamaArashi2015-07-1421-179/+221
| | |
| | * field movesYamaArashi2015-07-144-80/+107
| | |
| | * player animations, emotion bubbles, etc.YamaArashi2015-07-1413-110/+166
| |/
* / Swap trade center and battle centerdannye2015-07-1623-85/+85
|/ | | | | also rename battle center to colosseum closes https://github.com/iimarckus/pokered/issues/102
* Comment naming screendannye2015-07-1412-150/+158
| | | | also use more joypad constants
* Use more screen dimension constantsdannye2015-07-1418-85/+88
|
* Merge branch 'master' of https://github.com/YamaArashi/pokereddannye2015-07-1443-847/+1136
|\ | | | | | | | | Conflicts: engine/town_map.asm