summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-04Merge branch 'master' into traderPikalaxALT
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-02through sub_81203FCPikalaxALT
2018-05-02through SetMauvilleOldManPikalaxALT
2018-05-01Port trader from RubyPikalaxALT
2018-05-01make battle records compileDizzyEggg
2018-05-01battle records decompiled and documentedDizzyEggg
2018-05-01identify and name battle records thingsDizzyEggg
2018-05-01battle records more decomp and subtle name changesDizzyEggg
2018-05-01start decompiling battle recordsDizzyEggg
2018-04-30decompiled up to sub_80BFCF4golem galvanize
2018-04-29make item compileDizzyEggg
2018-04-29clear item, save and load save filesDizzyEggg
2018-04-29decompile itemDizzyEggg
2018-04-25Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_pokedex
2018-04-25convert data/items.inc to include/data/items.hSlawter666
OK
2018-04-25Convert item_descriptions.inc to .hSlawter666
OK
2018-04-24Move files to include/dataSlawter666
2018-04-24minor documentation of constants/items.hSlawter666
2018-04-23Updated items.cSlawter666
Working but non-matching
2018-04-23Update items.cSlawter666
2018-04-23Convert item data files to .c (not compiling)Slawter666
2018-04-18Merge pull request #239 from DizzyEggg/patch-1Diegoisawesome
Use DMA large macro in option menu