summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-12Merge branch 'master' into player_field_avatarMCboy
2018-08-12god damn it contributers :cMCboy
2018-08-12Merge pull request #295 from DizzyEggg/pokemon_storage_systemDiegoisawesome
Decompile a bit of pokemon storarage system
2018-08-12apply some changesMCboy
2018-08-12add functions to headerMCboy
2018-08-12add function to headerMCboy
2018-08-12define function in headerMCboy
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 pull request #267 from garakmon/masterDiegoisawesome
macOS support
2018-08-11sha1sum -> sha1Garak
2018-08-11change darwin checkGarak
2018-08-11add faster builds and NODEP sections from pokerubyGarak
2018-08-11remove -j4Garak
2018-08-11tone down INSTALL stepsgarak
2018-08-11Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-08-11Merge remote-tracking branch 'garakmon/heal-loc-2'Diegoisawesome
2018-08-11Merge pull request #293 from Diegoisawesome/masterDiegoisawesome
Decompile field_specials
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-11Merge pull request #291 from DizzyEggg/patch-3Diegoisawesome
Update battle_script_commands.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-12make move desc compileDizzyEggg
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 pull request #3 from pret/masterGarak
syncing with source repo