summaryrefslogtreecommitdiff
path: root/data
AgeCommit message (Collapse)Author
2017-07-09decompile sub_80A52C4 - sub_80A5B78camthesaxman
2017-07-08decompile sub_80A3740 - swap32camthesaxman
2017-07-07option_menu.c datacamthesaxman
2017-07-07berry_tag_screen.c datacamthesaxman
2017-07-07item datacamthesaxman
2017-07-07util.c datacamthesaxman
2017-07-07task.c datacamthesaxman
2017-07-07fix merge conflictscamthesaxman
2017-07-07delete data/diploma.scamthesaxman
2017-07-05Merge remote-tracking branch 'origin/master' into merge-pikayenatch
Conflicts: include/use_pokeblock.h
2017-07-05Merge pull request #351 from Touched/decompile/rotating_gateyenatch
Decompile rotating_gate.s
2017-07-05Merge pull request #349 from PikalaxALT/pokeblockyenatch
Pokeblock
2017-07-05Merge pull request #347 from PikalaxALT/field_tasksyenatch
Field tasks
2017-07-05Merge pull request #346 from ProjectRevoTPP/sound_check_menuyenatch
Sound check menu
2017-06-30add data to C fileProjectRevoTPP
2017-06-30Rename rotating gate exported functionsTouched
2017-06-30Decompile data/rotating_gate.sTouched
2017-06-29Merge remote-tracking branch 'origin/master' into use_pokeblockPikalaxALT
2017-06-29Decompile use_pokeblock dataPikalaxALT
2017-06-29Nonmatching sub_8136DC0PikalaxALT
2017-06-29Merge branch 'master' into pokeblockscnorton
2017-06-29Merge branch 'master' into pokemon_datascnorton
2017-06-28Merge pull request #338 from PikalaxALT/field_specialsyenatch
Field specials
2017-06-27sub_810B998 and ALL the dataPikalaxALT
2017-06-27Merge branch 'master' into pokemon_datascnorton
2017-06-27Merge branch 'master' into field_tasksscnorton
2017-06-27Through sub_806A18CPikalaxALT
2017-06-26decompile up to sub_80BA800ProjectRevoTPP
2017-06-26sub_8069CB8PikalaxALT
2017-06-25Merge branch 'master' of https://github.com/pret/pokeruby into sound_check_menuProjectRevoTPP
2017-06-25start decompiling sound_check_menu.cProjectRevoTPP
2017-06-25Merge pull request #331 from PikalaxALT/field_map_obj_datayenatch
Field map obj data
2017-06-25Merge remote-tracking branch 'origin/master' into de/integrate-data-includesyenatch
Conflicts: asm/battle_anim_8137220.s asm-de/battle_message.s
2017-06-25Merge pull request #329 from camthesaxman/decompile_choose_partyyenatch
decompile choose_party
2017-06-24Make gfx matchMarijn van der Werf
2017-06-24conditionally include other fontMarijn van der Werf
2017-06-23Combine English and German data filesMarijn van der Werf
2017-06-23up through sub_80695E0PikalaxALT
2017-06-22Start decompiling field_tasks.sPikalaxALT
2017-06-21Merge remote-tracking branch 'origin/master' into field_specialsscnorton
2017-06-21Another batch of functions; last of the field specials datascnorton
2017-06-20Up through sub_810F424PikalaxALT
2017-06-20Blow through the glass workshop functionsPikalaxALT
2017-06-20Some elevator menu related functionsscnorton
2017-06-20Petalburg Gym field specialsscnorton
2017-06-20move data to C and introduce CompressedSpriteSheet and CompressedSpritePalettecamthesaxman
2017-06-19merge upstreamcamthesaxman
2017-06-19Battle labels named (#333)DizzyEggg
* Changed battle labels
2017-06-19MauvilleGymSpecial1PikalaxALT
2017-06-19SpawnBerryBlenderLinkPlayerSpritesPikalaxALT