summaryrefslogtreecommitdiff
path: root/src/berry_blender.c
AgeCommit message (Collapse)Author
2018-12-31Cleanup and documentationDiegoisawesome
2018-12-08Merge remote-tracking branch 'upstream/master'nullableVoidPtr
2018-12-07Use normal apostrophes like adultsMelody
2018-12-06Remove uses of INVALID_ defines, clean up some arrays with constants, and ↵nullableVoidPtr
spaces -> tabs
2018-12-06Fix alloc.c as per #386, define INVALID_ constants and rename malloc to ↵nullableVoidPtr
alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-11-19clean up variables in filesDizzyEggg
2018-11-07Fix incorrect compressed types, part 2Diegoisawesome
2018-11-06Merge remote-tracking branch 'pret/master' into script_menuDiegoisawesome
2018-11-06Finish cleaning up text.cDiegoisawesome
2018-11-05r5/r6 swap on sub_80E2578Diegoisawesome
2018-10-27Window priority to window bgDizzyEggg
2018-10-17begin event flag names, add temporary hidden item macrogarak
2018-09-09Merge branch 'decompile_frontier_2' of ↵Slawter666
https://github.com/DizzyEggg/pokeemerald into factory-data
2018-09-08Standartize AddTextPrinterParametrized functions,DizzyEggg
2018-09-02Format templates in wallclock.cSlawter666
2018-09-02Format WindowTemplate in berry_blender.cSlawter666
2018-09-01Fix the strings length issueDizzyEggg
2018-09-01Bank to battlerDizzyEggg
2018-08-12Prepare learn_move for mergeDiegoisawesome
2018-07-24Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-07-24Clean up files and add entries to charmapDiegoisawesome
2018-07-16Merge with masterDizzyEggg
2018-07-15Document list_menu.c and main_menu.cDiegoisawesome
2018-06-17label and document battle windowsDizzyEggg
2018-05-30Merge pull request #255 from DizzyEggg/decomp_record_mixingDiegoisawesome
Fix pika's Record Mixing PR Also closes #107.
2018-05-27start rom_8034C54 decompDizzyEggg
2018-05-19fix record mixing merge conflictsDizzyEggg
2018-05-03Merge pull request #242 from DizzyEggg/decompile_battle_recordsMarcus Huderle
Decompile battle records
2018-05-01identify and name battle records thingsDizzyEggg
2018-04-29make item compileDizzyEggg
2018-03-02unnecessary externsDizzyEggg
2018-02-14decompile overworldDizzyEggg
2018-02-11Merge branch 'master' into record_mixingPikalaxALT
2018-02-11Merge branch 'master' into linkPikalaxALT
2018-02-07Merge new_menu_helpers and menuDiegoisawesome
2018-02-06Finish menu.s and eliminate TextColorDiegoisawesome
2018-02-03Merge branch 'master' into linkPikalaxALT
2018-01-25Decompile new_menu_helpers.sDiegoisawesome
2018-01-24Fix spelling of 'Parametrized' to 'Parameterized'Diegoisawesome
2018-01-18Merge branch 'master' into linkscnorton
2018-01-09Add symbols to music_player_tableDiegoisawesome
Also rename gMPlay structs to gMPlayInfo
2017-12-22Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songssceptillion
2017-12-22use internal song namessceptillion
2017-12-18fix pokeblock conflictsDizzyEggg
2017-12-17Merge branch 'master' into linkscnorton
2017-12-16Merge branch 'master' into linkPikalaxALT
2017-12-16Import function labels from RubyPikalaxALT
2017-12-16Merge branch 'master' into decompile_use_pokeblockDizzyEggg
2017-12-11convert more constantscamthesaxman
2017-12-11move data from asm to pokeblock.cDizzyEggg