aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #56 from SatoMew/masterRangi2020-10-046-6/+9
|\ | | | | Give ghost Marowak a constant
| * Add constant for ghost Marowak like pokeredSatoMew2020-09-276-6/+9
|/
* Merge pull request #53 from pinksylveon/patch-2Daniel Harding2020-07-091-1/+2
|\ | | | | Added only python
| * Added only pythonpinksylveon2020-07-091-1/+2
|/ | | Fixed the reverting thing regarding too much description
* Update Audio 4 sfx namesdannye2020-05-2556-285/+284
|
* Fix bad label referencedannye2020-05-241-1/+1
|
* Merge pull request #50 from dannye/masterDaniel Harding2020-05-202106-38964/+39106
|\ | | | | merge pokered
| * Merge remote-tracking branch 'pokered/master'dannye2020-05-200-0/+0
| |\
| | * Merge pull request #238 from Akatsuki-py/fix_ffa1Daniel Harding2020-05-201-1/+1
| | |\ | | | | | | | | add "hMoney + 2" label for $ffa1
| | | * add "hMoney + 2" label for $ffa1akatsuki-py2020-05-211-1/+1
| | |/
| | * Merge pull request #237 from mattbruv/vermilionDaniel Harding2020-05-053-54/+54
| | |\ | | | | | | | | Documented Vermilion Gym
| | | * change input hex to constantsMatt2020-05-051-1/+1
| | | |
| | | * document vermilion gymMatt2020-05-053-53/+53
| | | |
| | * | Merge pull request #236 from mattbruv/vermilionDaniel Harding2020-05-033-39/+39
| | |\| | | | | | | | | label hardcoded HRAM address, start documenting Vermilion
| | | * label npc conditional textMatt2020-05-032-8/+8
| | | |
| | | * clean up vermilion labelsMatt2020-05-032-28/+28
| | | |
| | | * label hardcoded HRAM address, start documenting VermilionMatt2020-05-031-3/+3
| | |/
| | * Merge pull request #234 from Akatsuki-py/fix_commentDaniel Harding2020-04-301-1/+1
| | |\ | | | | | | | | Fix comment from Y pos to X pos
| | | * Fix comment from Y pos to X posAkatsuki-py2020-05-011-1/+1
| | |/
| | * Merge pull request #223 from pret/audio-macrosDaniel Harding2020-02-05455-23700/+23756
| | |\ | | | | | | | | Audio macros
| | | * Rename dnote to drum_note and dspeed to drum_speeddannye2019-09-0321-1100/+1100
| | | |
| | | * Make pitch_sweep pitch change argument consistent with the other signed ↵dannye2019-08-2546-46/+51
| | | | | | | | | | | | | | | | magnitude arguments
| | | * Finish cleaning up audio macro arguments and descriptionsdannye2019-08-18150-331/+362
| | | | | | | | | | | | | | | | | | | | | | | | break up arguments for stereo_panning and duty_cycle_pattern note_type fade is signed properly document arguments for vibrato, tempo, pitch_slide etc
| | | * Update labels to match new audio macro namesdannye2019-08-177-1298/+1439
| | | | | | | | | | | | | | | | and synchronize engine_2 and engine_3 with engine_1
| | | * Use generic names for noise instrumentsdannye2019-07-2882-2440/+2350
| | | | | | | | | | | | | | | | coming up with satisfactory names is hard, besides this will improve compatibility with crystal
| | | * Update audio macro namesdannye2019-07-27392-20009/+19978
| | | | | | | | | | | | | | | | | | | | | | | | change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names
| | * | New Discord invite linkmid-kid2019-12-111-1/+1
| | | | | | | | | | | | Something something community.
| | * | Merge pull request #229 from ketsuban/percent-macromid-kid2019-11-231-21/+21
| | |\ \ | | | | | | | | | | Use percent macro for trainer AI packages
| | | * | Use percent macro for trainer AI packagesThomas Winwood2019-11-231-21/+21
| | |/ /
| | * | Deobfuscate Pewter citydeak311andris2019-10-071-8/+8
| | | |
| | * | Deobfuscate Viridian Citydeak311andris2019-10-071-22/+22
| | | |
| | * | Deobfuscate gyms consistentlydeak311andris2019-10-079-77/+77
| | | |
| | * | OaksLab deobfuscationdeak311andris2019-10-031-23/+23
| | | |
| | * | Merge pull request #224 from UrsSchmidt/masterDaniel Harding2019-08-251-3/+3
| | |\ \ | | | |/ | | |/| Fixed some wrong wram addresses within comments.
| | | * Fixed some wrong wram addresses within comments.Urs-Björn Schmidt2019-08-251-3/+3
| | |/
| | * Merge pull request #220 from Rangi42/masterDaniel Harding2019-07-1718-30/+37
| | |\ | | | | | | | | Replace some hard-coded values with constants
| | | * Merge branch 'master' of https://github.com/pret/pokeredRangi2019-07-079-12/+12
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #201 from SatoMew/masterDaniel Harding2019-05-208-10/+10
| | |\ \ | | | | | | | | | | Make Cerulean Cave labels consistent throughout the project
| | | * | Replace the few instances of Unknown Dungeon with Cerulean CaveSatoMew2019-04-088-10/+10
| | | | |
| | * | | A few missed SFX constant IDsdannye2019-04-211-2/+2
| | |/ /
| | | * Replace some hard-coded values with constantsRangi2019-07-0718-30/+37
| | |/
| | * Merge pull request #196 from Rangi42/polishedmapsDaniel Harding2019-01-131398-6166/+6631
| | |\ | | | | | | | | Rename map files, labels, and constants to be consistent and work with Polished Map
| | | * Rename map files, labels, and constants to be consistent and work with ↵Rangi2019-01-011398-6166/+6631
| | | | | | | | | | | | | | | | Polished Map
| | * | Merge pull request #195 from Rangi42/masterDaniel Harding2019-01-138-20/+4477
| | |\ \ | | | |/ | | |/| Remove 'extras' submodule; and add 'make tidy'
| | | * Make tools/gfx.py executableRangi2018-12-311-0/+3
| | | |
| | | * Reorganize Makefile similarly to pokecrystalRangi2018-12-311-17/+37
| | | |
| | | * 'make tidy' preserved compressed graphics, like pokecrystalRangi2018-12-311-1/+5
| | | |
| | | * Remove the 'extras' submodule and include a local gfx.py tool insteadRangi2018-12-317-3/+4433
| | |/
| | * Merge pull request #193 from luckytyphlosion/masterDaniel Harding2018-11-199-210/+302
| | |\ | | | | | | | | Fix spritestatedata macros and clean up pre-linkerscript remnants.
| | | * SpriteImageBaseOffset -> ImageBaseOffsetluckytyphlosion2018-11-181-1/+1
| | | |