summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-04Merge pull request #284 from DizzyEggg/patch-1Diegoisawesome
Use constant in a battle script.
2018-08-04Merge pull request #283 from DizzyEggg/battle_pr_againDiegoisawesome
Battle code enums in switches
2018-08-03Use constant in a battle script.DizzyEggg
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
2018-08-02Merge pull request #282 from DizzyEggg/stats_bitsDiegoisawesome
Add some more stat defines for battle scripts
2018-08-02Merge frontier brains, team magma and team aqua framesSlawter666
2018-07-29Merge May frames into sprite sheetsSlawter666
Plus fix Brendan's surfing and watering frame order.
2018-07-29Document a bit of atk47DizzyEggg
2018-07-29Document atk48DizzyEggg
2018-07-29Merge pull request #281 from einstein95/masterDiegoisawesome
Port over preproc commit from pokeruby
2018-07-29Port over ↵einstein95
https://github.com/pret/pokeruby/commit/9d96147bbf8dabc2a28105d73905808e70b73b0f
2018-07-28Decompile a few pokemon summary screen functionsDizzyEggg
2018-07-28Merge "brendan" frames into sprite sheetsSlawter666
2018-07-25Merge pull request #279 from Diegoisawesome/masterDiegoisawesome
Move strings to C, misc cleanup