summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-08decompile RemoveEmptyItemSlots - sub_80A444Ccamthesaxman
2017-07-08decompile sub_80A3740 - swap32camthesaxman
2017-07-08Merge pull request #352 from JaceCearK1/masteryenatch
Fix German Sapphire's Default Nr.1 Player Names
2017-07-07fix buildcamthesaxman
2017-07-07option_menu.c datacamthesaxman
2017-07-07berry_tag_screen.c datacamthesaxman
2017-07-07item datacamthesaxman
2017-07-07util.c formattingcamthesaxman
2017-07-07util.c datacamthesaxman
2017-07-07task.c datacamthesaxman
2017-07-07fix merge conflictscamthesaxman
2017-07-07delete data/diploma.scamthesaxman
2017-07-06Merge pull request #355 from yenatch/fix-warningsyenatch
Fix uncaught cpp warnings
2017-07-06Error on tool warningsyenatch
2017-07-06Fix gbagfx warningyenatch
2017-07-06Error on cpp warningsyenatch
2017-07-06Fix battle_anim_80A7E7C warningsyenatch
Use TASK from task.h
2017-07-06Fix fldeff_softboiled warningsyenatch
2017-07-06fix merge conflictscamthesaxman
2017-07-06decompile sub_80A34B4 - ClearBagcamthesaxman
2017-07-06decompile sub_80A3118 - sub_80A317Ccamthesaxman
2017-07-05Merge pull request #350 from PikalaxALT/use_pokeblockyenatch
Use pokeblock
2017-07-05Merge remote-tracking branch 'origin/master' into merge-pikayenatch
Conflicts: include/use_pokeblock.h
2017-07-05Merge pull request #353 from yenatch/travis-allow-fail-formattingyenatch
travis: allow formatting job to fail instead of falsely reporting passed
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 #348 from marijnvdwerf/clean/file-modesyenatch
Make files non-executable
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-07-05Merge pull request #340 from DizzyEggg/masteryenatch
Battle header and moar labels
2017-07-05Merge branch 'master' into masteryenatch
2017-07-05Fix tab-aligned commentsyenatch
2017-07-05Fix STATUS2_FOCUS_ENERGRYyenatch
2017-07-04Merge pull request #344 from camthesaxman/decompile_battle_10yenatch
decompile battle_10
2017-07-04travis: allow formatting job to fail instead of falsely reporting passedyenatch
2017-07-04battle_10 includesyenatch
Addresses comments in #344
2017-07-03Merge pull request #328 from PikalaxALT/pokemon_datayenatch
Pokémon data
2017-07-03Restore double brackets in evolution data and flat indentyenatch
2017-07-03Use 0b for tm/hm learnsetsyenatch
2017-07-01oopsProjectRevoTPP
2017-07-01i don't want to give this commit a name eitherProjectRevoTPP
2017-07-01i dont want to give this commit a nameProjectRevoTPP
2017-07-01formattingProjectRevoTPP
2017-07-01text definesProjectRevoTPP
2017-07-01sizeofProjectRevoTPP
2017-07-01button definesProjectRevoTPP
2017-07-01win range macrosProjectRevoTPP
2017-07-01Fix German Sapphire's Default #1 Player NamesJaceCearK1
2017-07-01Merge pull request #1 from pret/masterJaceCearK1
Update fork to match main fork.
2017-06-30clean up memcpy size declaresProjectRevoTPP