summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-12-22get rid of pointers in pokedexDizzyEggg
2017-12-22Merge branch 'master' into dump_pointersDizzyEggg
2017-12-22Fix pokeblock songs includeDiegoisawesome
2017-12-22Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songssceptillion
2017-12-22use internal song namessceptillion
2017-12-21Merge remote-tracking branch 'Egg/decompile_use_pokeblock'Diegoisawesome
2017-12-21pokeblock merge conflictsDizzyEggg
2017-12-21Merge remote-tracking branch 'Shanty/script_macros'Diegoisawesome
2017-12-21start dumping pokedexDizzyEggg
2017-12-21Port generic event script macros from pokerubyMarcus Huderle
2017-12-21Fix incorrect slash in battle_bg.cDiegoisawesome
2017-12-20Merge branch 'master' into decompile_trainer_seeDizzyEggg
2017-12-20pokeblock review changesDizzyEggg
2017-12-20fix pokeblock merge conflictsDizzyEggg
2017-12-20Merge remote-tracking branch 'Egg/static_to_s'Diegoisawesome
2017-12-19make battle bg compileDizzyEggg
2017-12-19Merge branch 'master' into decompile_battle1DizzyEggg
2017-12-19ram vars to C filesDizzyEggg
2017-12-19clean up trainer see fileDizzyEggg
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-17static names given s prefixDizzyEggg
2017-12-17add constants trainers fileDizzyEggg
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-16mail review changesDizzyEggg
2017-12-16battle setup review changesDizzyEggg
2017-12-16nerge with master, fix conflictsDizzyEggg
2017-12-16decompile more of pokeblock.sDizzyEggg
2017-12-11convert more constantscamthesaxman
2017-12-11move data from asm to pokeblock.cDizzyEggg
2017-12-10split pokeblock filesDizzyEggg
2017-12-10move more pokeblock data to C and labelDizzyEggg
2017-12-10pokeblock feed is decompiledDizzyEggg
2017-12-09Merge branch 'master' into decompile_use_pokeblockDizzyEggg
2017-12-09start pokeblock feedDizzyEggg
2017-12-05fix merge conflictscamthesaxman
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-05convert some constants to C headerscamthesaxman
2017-12-04start working on use pokeblockDizzyEggg