summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-02Merge branch 'master' into modern_gccPikalaxALT
2019-09-08Merge pull request #743 from garakmon/metatile_labelsPikalaxALT
Name Metatiles
2019-09-08Merge pull request #744 from garakmon/pokenav-dataPikalaxALT
Pokenav Data Decomp (take 2)
2019-09-08Merge pull request #753 from ultima-soul/synchronizePikalaxALT
Synchronize bard_music data organization with pokeemerald
2019-09-05Configure Travis to build nonmatching (#746)PikalaxALT
* Configure Travis to build nonmatching
2019-09-05Merge pull request #755 from garakmon/encounter_jsonPikalaxALT
Wild Encounters to Json
2019-09-05Fix ld script for script_pokemon_util_80C4BF0PikalaxALT
2019-09-05Fix .travis.ymlPikalaxALT
2019-09-05Merge branch 'master' into modern_gccPikalaxALT
2019-09-05Merge pull request #760 from PikalaxALT/match_currentPikalaxALT
Match sub_80D6874
2019-08-30Match sub_80D6874Scott Norton
2019-08-29name event object pointer indicesgarak
2019-08-29allow CRLF line endings in asm files for preprocgarak
2019-08-01use encounter slot constants, fix some gfxgarak
2019-08-01fix buildgarak
2019-08-01revert makefile changesgarak
2019-08-01convert wild encounters to jsongarak
2019-07-31Finish synchronizing bard_music data organization.ultima-soul
2019-07-30Start bard_music synchronization.ultima-soul
2019-07-30Merge pull request #752 from camthesaxman/emerald_diffCameron Hall
resolve some Emerald differences
2019-07-30add jsonproc toolgarak
2019-07-29fix buildcamthesaxman
2019-07-29gMPlay to gMPlayInfocamthesaxman
2019-07-29resolve some Emerald differencescamthesaxman
2019-07-29use more accurate metatile collision expressiongarak
2019-07-29name trainers eye messages, use constants in some pokenav rodatagarak
2019-07-29Merge pull request #751 from pret/revert-colordiffPikalaxALT
Revert migration to `colordiff` in asmdiff.sh
2019-07-29Revert migration to `colordiff` in asmdiff.shPikalaxALT
`colordiff` breaks output piping and invokes an additional dependency that no one needs
2019-07-29Merge branch 'master' into modern_gccPikalaxALT
2019-07-28Merge pull request #750 from camthesaxman/filenames_1Cameron Hall
emerald file names, part 1
2019-07-28Merge branch 'master' into filenames_1camthesaxman
2019-07-28emerald file names, part 1camthesaxman
2019-07-28Merge pull request #749 from camthesaxman/vramRevo
remove hardcoded VRAM and EWRAM addresses
2019-07-28remove hardcoded VRAM and EWRAM addressescamthesaxman
2019-07-28Merge pull request #748 from camthesaxman/match_atk49_moveendRevo
match atk49_moveend
2019-07-28fix buildcamthesaxman
2019-07-28match atk49_moveendcamthesaxman
2019-07-28Merge pull request #747 from camthesaxman/graphics_fixPikalaxALT
combine graphics data that should be in the same object
2019-07-28combine battle interface graphics filescamthesaxman
2019-07-28combine bg2.pal and blank_pal.palcamthesaxman
2019-07-24Merge pull request #745 from pret/PikalaxALT-patch-1Revo
Fix signedness disagreement in sBigMonSizeTable
2019-07-24Fix signedness disagreement in sBigMonSizeTablePikalaxALT
2019-07-24Fix bug with CC1 var assignmentPikalaxALT
2019-07-19change tilemaps to u32garak
2019-07-18fix buildgarak
2019-07-18finish pokenav data decompgarak
2019-07-18continue pokenav data decompilegarak
2019-07-18start decompiling pokenav datagarak
2019-07-18name metatilesgarak
2019-07-07Stack-free IWRAM clearPikalaxALT