summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-11Merge branch 'master' into contestPikalaxALT
2018-05-11through prints_contest_move_descriptionPikalaxALT
2018-05-11Merge pull request #251 from Diegoisawesome/masterDiegoisawesome
Use song constants
2018-05-11Use song constantsDiegoisawesome
2018-05-10Update mauville_old_man.txt to fix warningDiegoisawesome
2018-05-10Merge pull request #250 from Diegoisawesome/masterDiegoisawesome
Port/decompile field_effect
2018-05-10Merge branch 'master' of https://github.com/pret/pokeemeraldDiegoisawesome
2018-05-10Finish porting/decompiling field_effect.cDiegoisawesome
2018-05-10through sub_80DB174PikalaxALT
2018-05-10through sub_80DAFA0PikalaxALT
2018-05-10through sub_80DAE0CPikalaxALT
2018-05-10Merge branch 'master' into contestPikalaxALT
2018-05-10Begin porting field_effectDiegoisawesome
2018-05-10fixing conflictsgolem galvanize
2018-05-10finish decompiling pokedexgolem galvanize
2018-05-09Merge pull request #245 from PikalaxALT/mauville_old_manMarcus Huderle
Mauville old man
2018-05-09Merge branch 'master' into mauville_old_manPikalaxALT
2018-05-09Remove file that should have been ignored. WTF clion?PikalaxALT
2018-05-09Merge pull request #247 from Diegoisawesome/masterDiegoisawesome
Port/decompile fieldmap.c
2018-05-09Fix capitalization on filenameDiegoisawesome
2018-05-09Merge master from pretDiegoisawesome
2018-05-09Port/decompile fieldmap.cDiegoisawesome
2018-05-08through sub_80DAB8CPikalaxALT
2018-05-07through sub_80DA874PikalaxALT
2018-05-07through sub_80DA4F4PikalaxALT
2018-05-07Merge branch 'master' into mauville_old_manPikalaxALT
2018-05-07Rename symbols using Ruby as a referencePikalaxALT
2018-05-07Remaining functions in mauville_old_manPikalaxALT
2018-05-06Merge pull request #240 from Slawter666/masterMarcus Huderle
Move gItems to c
2018-05-06requested changesSlawter666
2018-05-06Formatting item_icon_table.hSlawter666
2018-05-06Convert item_icon_table.inc to CSlawter666
2018-05-06Revert "Convert item_graphics.inc to C"Slawter666
This reverts commit 546217d28124daa204f804469e7d4bc18a048398.
2018-05-05Convert item_graphics.inc to CSlawter666
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
2018-05-05resolve merge conflictsSlawter666
2018-05-04Merge pull request #243 from PikalaxALT/traderMarcus Huderle
Port trader from Ruby
2018-05-04sub_80D8B38PikalaxALT
2018-05-04Merge branch 'master' into traderPikalaxALT
2018-05-03sub_80D8A88PikalaxALT
2018-05-03through sub_80D883CPikalaxALT
2018-05-03through sub_8121178PikalaxALT
2018-05-03through sub_8121064PikalaxALT
2018-05-03through sub_8120D34PikalaxALT
2018-05-03through sub_8120C0CPikalaxALT
2018-05-03through sub_8120748PikalaxALT
2018-05-03Merge pull request #242 from DizzyEggg/decompile_battle_recordsMarcus Huderle
Decompile battle records
2018-05-03Merge pull request #241 from DizzyEggg/decomp_itemMarcus Huderle
Decompile item
2018-05-03through sub_80D8490PikalaxALT
2018-05-02through vblank_cb_battlePikalaxALT
2018-05-02through sub_81203FCPikalaxALT