summaryrefslogtreecommitdiff
path: root/asm
AgeCommit message (Collapse)Author
2017-12-20fix pokeblock merge conflictsDizzyEggg
2017-12-19Merge branch 'master' of https://github.com/itskobold/pokeemerald into ↵DizzyEggg
kobold_fixes
2017-12-19Merge branch 'master' into decompile_battle1DizzyEggg
2017-12-18decompile trainer seeDizzyEggg
2017-12-18start working on trainer seeDizzyEggg
2017-12-18fix pokeblock conflictsDizzyEggg
2017-12-17Merge remote-tracking branch 'Egg/decompile_mail_data'Diegoisawesome
2017-12-17give batter script command namesDizzyEggg
2017-12-17fix battle setup conflictsDizzyEggg
2017-12-17merge mail with master, fix conflictsDizzyEggg
2017-12-17battle 1 is decompiledDizzyEggg
2017-12-16Import function labels from RubyPikalaxALT
2017-12-16renameDizzyEggg
2017-12-16pokeblock.s is decompiledDizzyEggg
2017-12-16Merge branch 'master' into decompile_use_pokeblockDizzyEggg
2017-12-15Merge branch 'master' into clockPikalaxALT
2017-12-16nerge with master, fix conflictsDizzyEggg
2017-12-16decompile more of pokeblock.sDizzyEggg
2017-12-15Merge remote-tracking branch 'pret/master'Diegoisawesome
2017-12-11convert more constantscamthesaxman
2017-12-11move data from asm to pokeblock.cDizzyEggg
2017-12-10split pokeblock filesDizzyEggg
2017-12-10pokeblock feed is decompiledDizzyEggg
2017-12-09Merge branch 'master' into decompile_use_pokeblockDizzyEggg
2017-12-09start pokeblock feedDizzyEggg
2017-12-05rename rng.c to random.c and rom4.c to overworld.ccamthesaxman
2017-12-05Merge pull request #129 from DizzyEggg/dumb_namingCameron Hall
Name some battle labels
2017-12-04start working on use pokeblockDizzyEggg
2017-12-03decompile and label mailDizzyEggg
2017-12-02move pokeball data to romDizzyEggg
2017-12-02pokeball file is decompiledDizzyEggg
2017-12-02start working on pokeballDizzyEggg
2017-12-02label battle stuffDizzyEggg
2017-12-02give names to some battlescriptsDizzyEggg
2017-12-01merge with masterDizzyEggg
2017-12-01battle setup file is decompiledDizzyEggg
2017-11-29more work on battle setupDizzyEggg
2017-11-29Merge branch 'master' into field_poisonPikalaxALT
2017-11-29Merge branch 'master' of https://github.com/pret/pokeemeraldDiegoisawesome
2017-11-28start working on battle setupDizzyEggg
2017-11-28Merge pull request #122 from PikalaxALT/unk_81BAD84Diegoisawesome
Unk 81 bad84
2017-11-27Merge branch 'master' into clockPikalaxALT
2017-11-27Merge branch 'master' into unk_81BAD84PikalaxALT
2017-11-27Merge branch 'master' into field_poisonPikalaxALT
2017-11-27Merge branch 'master' into coinsPikalaxALT
2017-11-27Merge pull request #120 from PikalaxALT/unk_text_utilDiegoisawesome
Decompile asm/unk_text_util.s
2017-11-27Merge pull request #117 from ProjectRevoTPP/load_saveDiegoisawesome
finish load_save.c
2017-11-27EncyprtionProjectRevoTPP
2017-11-27Merge pull request #124 from DizzyEggg/dump_battlescriptsCameron Hall
Dump Battle Scripts
2017-11-27berry blender review changesDizzyEggg