summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2018-08-11Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwea...Diegoisawesome
2018-08-11Merge remote-tracking branch 'garakmon/heal-loc-2'Diegoisawesome
2018-08-11Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-08-11Merge pull request #294 from DizzyEggg/learnsetsDiegoisawesome
2018-08-11Merge pull request #292 from DizzyEggg/move_descDiegoisawesome
2018-08-12Make learnsets easier to editDizzyEggg
2018-08-11Fix compile errorDiegoisawesome
2018-08-11Revert "Rename some specials"Diegoisawesome
2018-08-12Move move descriptions to CDizzyEggg
2018-08-11Rename some specialsDiegoisawesome
2018-08-11Finish decompiling field_specialsDiegoisawesome
2018-08-11Update battle_script_commands.cDizzyEggg
2018-08-11Make event data look cleanerDizzyEggg
2018-08-11Merge contests with masterDizzyEggg
2018-08-11port more of slot machineDizzyEggg
2018-08-11start porting slot machineDizzyEggg
2018-08-11change sUnknown_085A1E3C to sMapHealLocationsgarak
2018-08-11merge easy chat with masterDizzyEggg
2018-08-10Continue decompiling field_specialsDiegoisawesome
2018-08-10port larger heal location changes from poke ruby prgarak
2018-08-10Continue decompiling field_specialsDiegoisawesome
2018-08-10Merge remaining overworld framesSlawter666
2018-08-09Merge berry tree framesSlawter666
2018-08-08Continue decompiling field_specialsDiegoisawesome
2018-08-09Merge "pokemon" framesSlawter666
2018-08-08Begin porting/decompiling field_specialsDiegoisawesome
2018-08-07copy heal_location changes from pokerubygarak
2018-08-07Merge https://github.com/pret/pokeemerald into spritesheetSlawter666
2018-08-07Merge remaining "people" overworld framesSlawter666
2018-08-04Fix fanfare constant to use defineDiegoisawesome
2018-08-03Tabs to spacesDizzyEggg
2018-08-03Battle code enums in case switchesDizzyEggg
2018-08-02Merge pull request #280 from DizzyEggg/decompile_part_mon_summaryDiegoisawesome
2018-08-02Merge frontier brains, team magma and team aqua framesSlawter666
2018-07-29Merge May frames into sprite sheetsSlawter666
2018-07-29Document a bit of atk47DizzyEggg
2018-07-29Document atk48DizzyEggg
2018-07-28Decompile a few pokemon summary screen functionsDizzyEggg
2018-07-28Merge "brendan" frames into sprite sheetsSlawter666
2018-07-25Update field_player_avatar.cMCboy
2018-07-25Update field_player_avatar.cMCboy
2018-07-25made file better ?MCboy
2018-07-25Move strings to CDiegoisawesome
2018-07-24Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-07-24Clean up files and add entries to charmapDiegoisawesome
2018-07-24Merge pull request #278 from vblm12/trainer_dataDiegoisawesome
2018-07-24decompiled a bunch of functionsMCboy
2018-07-22merge union room with masterDizzyEggg
2018-07-22make union room compile i guessDizzyEggg
2018-07-20Move some trainer data from data2b.s to c structs.vblm12