aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Individual images for party menu icon graphicsRangi2020-06-2710-128/+139
| |/
| * Move mon_nest_icon.png to gfx/town_mapRangi2020-06-272-1/+1
| * Travis builds with rgbds 0.4.0 from sourceRangi2020-06-271-10/+9
| * Create .map files, and don't sort .sym files since rgbds 0.4.0 does thatRangi2020-06-272-4/+4
| * Merge pic/ into gfx/Rangi2020-06-27822-507/+507
| * Fix the slot machine tilemap, and adjust the slot graphicsRangi2020-06-274-0/+3
| * Replace .tilecoll files with tile ID db dataRangi2020-06-2723-45/+83
| * Organize gfx/Rangi2020-06-27100-83/+87
| * Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)Rangi2020-06-27317-2240/+2290
| * Merge pull request #250 from Rangi42/masterDaniel Harding2020-06-2365-2825/+2863
| |\
| | * Move more tables from engine/ to data/Rangi2020-06-2365-2825/+2863
| |/
| * Merge pull request #243 from Nog-Frog/rename-unused-cd40Daniel Harding2020-06-212-2/+2
| |\
| | * Name UnusedCD40Nog-Frog2020-05-292-2/+2
| * | Merge pull request #246 from Akatsuki-py/SubtractAmountPaidFromMoneyDaniel Harding2020-06-142-2/+2
| |\ \
| | * | remove two whitespacesAkatsuki-py2020-06-062-2/+2
| | * | fix SubtractAmountPaidFromMoney commentAkatsuki-py2020-06-052-4/+4
| |/ /
| * | Merge pull request #245 from Nog-Frog/small-changesDaniel Harding2020-06-021-4/+4
| |\ \
| | * | Change wGrassRate to wLinkEnemyTrainerNameNog-Frog2020-06-021-4/+4
| |/ /
| * / Replace hard-coded value of CRY_SFX_STARTdannye2020-05-291-2/+2
| |/
| * Merge pull request #242 from Akatsuki-py/fix_CopyDataUntilDaniel Harding2020-05-271-1/+1
| |\
| | * fix comment in CopyDataUntilakatsuki-py2020-05-281-1/+1
| * | Merge pull request #241 from Nog-Frog/Fix-Sent-To-BoxDaniel Harding2020-05-272-4/+4
| |\ \
| | * | Change "Set to box" to "Sent to box"Nog-Frog2020-05-262-4/+4
| | |/
| * | Merge pull request #239 from Akatsuki-py/use_reptDaniel Harding2020-05-271-9/+2
| |\ \ | | |/ | |/|
| | * use rept macroakatsuki-py2020-05-241-9/+2
| * | Remove accidental file from 6ec4b00dannye2020-05-241-0/+0
| * | Misc minor clean updannye2020-05-245-5/+5
| |/
* | Sync with pokereddannye2020-11-043267-81737/+76470
* | Merge pull request #55 from Deokishisu/patch-1Rangi2020-10-041-2/+2
|\ \
| * | Label Unknown Entries in HappinessChangeTableDeokishisu2020-09-171-2/+2
* | | Merge pull request #56 from SatoMew/masterRangi2020-10-046-6/+9
|\ \ \ | |/ / |/| |
| * | 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 pythonpinksylveon2020-07-091-1/+2
|/ /
* | 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 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 $ffa1akatsuki-py2020-05-211-1/+1
| | |/
| | * Merge pull request #237 from mattbruv/vermilionDaniel Harding2020-05-053-54/+54
| | |\
| | | * 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 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 posAkatsuki-py2020-05-011-1/+1
| | |/
| | * Merge pull request #223 from pret/audio-macrosDaniel Harding2020-02-05455-23700/+23756
| | |\