summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-30Merge branch 'master' of https://github.com/pret/pokeruby into refactor_srcProjectRevoTPP
2017-09-30Merge pull request #437 from huderlem/name_labelsMarcus Huderle
Name labels
2017-09-30Add missing extern to included textsMarcus Huderle
2017-09-30Merge remote-tracking branch 'upstream/master' into name_labelsMarcus Huderle
2017-09-30mergeProjectRevoTPP
2017-09-29Merge pull request #399 from Doesnty/battle4Marcus Huderle
Improve battle_4
2017-09-29Merge pull request #433 from PikalaxALT/field_map_objMarcus Huderle
Field map obj, 2
2017-09-29Merge branch 'master' into field_map_objPikalaxALT
2017-09-29Merge pull request #431 from PikalaxALT/field_effect_helpersMarcus Huderle
Field effect helpers
2017-09-29Merge branch 'master' into field_effect_helpersPikalaxALT
2017-09-29Merge pull request #426 from PikalaxALT/daycareMarcus Huderle
Decompile asm/daycare.s
2017-09-29Lazy remove "Created by" IDE linesPikalaxALT
2017-09-29Rename daycare structs to be slightly less insensiblePikalaxALT
2017-09-28Merge branch 'master' into daycarePikalaxALT
2017-09-28Remove all hardcoded labels in sym_bss.txtPikalaxALT
2017-09-28mergeProjectRevoTPP
2017-09-21More use of FLDEFF constantsPikalaxALT
2017-09-21Merge branch 'master' into field_effect_helpersPikalaxALT
2017-09-21gFieldEffectSpawnParams -> gFieldEffectArgumentsPikalaxALT
2017-09-16Fix nonmatching typesPikalaxALT
2017-09-16Finish decompiling field_map_obj.sPikalaxALT
2017-09-16Matching state_to_directionPikalaxALT
2017-09-16Begin to fix state_to_direction memesPikalaxALT
2017-09-13Merge pull request #430 from camthesaxman/scrcmd_renamingCameron Hall
(don't merge yet) rename script commands
2017-09-13fix German buildcamthesaxman
2017-09-13more labelingcamthesaxman
2017-09-12more labels and fix buildcamthesaxman
2017-09-12move data to overworld.ccamthesaxman
2017-09-12fix German buildcamthesaxman
2017-09-12rename rom_4.c to overworld.ccamthesaxman
2017-09-12lots more relabelingcamthesaxman
2017-09-10fix German buildcamthesaxman
2017-09-10stuffcamthesaxman
2017-09-10Fix nonmatching UpdateFieldObjectCoordsForCameraUpdatescnorton
2017-09-10fix German buildcamthesaxman
2017-09-10lots more renamingcamthesaxman
2017-09-10Cleanupscnorton
2017-09-10sub_812882C nonmatchingscnorton
2017-09-10sub_8128800scnorton
2017-09-10sub_81287C4scnorton
2017-09-10sub_8128774scnorton
2017-09-10FldEff_Sparklescnorton
2017-09-10sub_81286C4scnorton
2017-09-10sub_81285ACscnorton
2017-09-10Disguise effectsscnorton
2017-09-10FldEff_BerryTreeGrowthSparklescnorton
2017-09-10sub_8128410scnorton
2017-09-10FldEff_Bubblesscnorton
2017-09-10sub_81282E0scnorton
2017-09-10FldEff_SandPilescnorton