summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-08-12Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_moveDiegoisawesome
2018-08-12Merge pull request #296 from DizzyEggg/event_dataDiegoisawesome
Event data
2018-08-12event data review changesDizzyEggg
2018-08-12Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_moveDiegoisawesome
2018-08-12Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into ↵DizzyEggg
event_data
2018-08-12Prepare learn_move for mergeDiegoisawesome
2018-08-12Merge pull request #288 from DizzyEggg/slot_machineDiegoisawesome
Port a little bit of slot machine
2018-08-12Merge pull request #287 from DizzyEggg/easy_chatDiegoisawesome
Pikalax's Easy chat
2018-08-12Merge pull request #277 from atasro2/player_field_avatarDiegoisawesome
decompile a portion of field_player_avatar.s
2018-08-12Merge pull request #289 from DizzyEggg/contestsDiegoisawesome
Pikalax's contests
2018-08-12Merge branch 'master' into player_field_avatarMCboy
2018-08-12apply some changesMCboy
2018-08-12Decompile a bit of pokemon storarage systemDizzyEggg
2018-08-12merge with masterDizzyEggg
2018-08-12Contest review changesDizzyEggg
2018-08-12slot machine review changesDizzyEggg
2018-08-12Easy chat review changesDizzyEggg
2018-08-11Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into ↵Diegoisawesome
Edwearth-learn_move
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
Make learnsets easier to edit
2018-08-11Merge pull request #292 from DizzyEggg/move_descDiegoisawesome
Move move descriptions to C
2018-08-12Make learnsets easier to editDizzyEggg
2018-08-11Fix compile errorDiegoisawesome
2018-08-11Revert "Rename some specials"Diegoisawesome
This reverts commit 658f9351fe9349eb16edab8d5d503ef741449d4a.
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
Decompile a few pokemon summary screen functions