summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-17Merge pull request #842 from PikalaxALT/song_volPikalaxALT
Fix volume in mus_me_b_big.mid
2019-10-17Fix volume in mus_me_b_big.midPikalaxALT
2019-10-16Merge branch 'master' into patch-2Sewef
2019-10-16Conflits 3/2Sewef
Nice one, git
2019-10-16Another fix, Conflicts 2/2Sewef
2019-10-16Forgotten fix, conflits 1/2Sewef
2019-10-16Fix labelsSewef
2019-10-16Merge branch 'master' into document-gyms2GriffinR
2019-10-16Condense fallthrough scriptGriffinR
2019-10-16Document rotating_tile_puzzleGriffinR
2019-10-15Condense fallthrough scriptsGriffinR
2019-10-15Document Gym scripts first halfGriffinR
2019-10-15Merge pull request #833 from GriffinRichards/doc-inc2huderlem
Document .incs split from event_scripts Round 2
2019-10-15Finish Mossdeep Gym doc, beging documenting rotating tile puzzleGriffinR
2019-10-15Document Petalburg, Fortree, Sootopolis, and some of Mossdeep GymsGriffinR
2019-10-14Document Oamdata in battle_anim (#838)Sewef
2019-10-14Merge branch 'master' into doc-inc2GriffinR
2019-10-14Merge pull request #830 from GriffinRichards/doc-inchuderlem
Document some .incs split from event_scripts
2019-10-14remove empty groups from wild encounter fields json objectsgarak
2019-10-14replace inja license textgarak
2019-10-14add MIN_LEVEL define to pokemon constantsgarak
2019-10-14add subgroups for fishing rods to encounter jsongarak
2019-10-14update injagarak
2019-10-14Update battle_anim_effects_1.cSewef
2019-10-14Label battle_anim_effects_1Sewef
2019-10-14Revert "More battle_anim_effects_1 labels"Sewef
This reverts commit 00331a644a0ec022bae370058f28d142425eca3b.
2019-10-14More battle_anim_effects_1 labelsSewef
2019-10-14More battle_anim_effects_1 labelsSewef
2019-10-14Document subs & AnimTask in battle_anim_effects_1Sewef
2019-10-14battle_anim_effects_1 main callbacksSewef
2019-10-14Ended battle_anims_effects_1 SpriteTemplatesSewef
2019-10-13Update battle_anim_scripts.sSewef
2019-10-13Started labelling battle_anim_effects_1Sewef
2019-10-13Merge branch 'master' into doc-inc2GriffinR
2019-10-13Fix map script namesGriffinR
2019-10-13Merge conflict resolves into review changesGriffinR
2019-10-13Fix map script namesGriffinR
2019-10-13Merge branch 'master' into doc-incGriffinR
2019-10-12Unify showmonpic and hidemonpic script command names with their function namesMarcus Huderle
2019-10-12Merge pull request #834 from GriffinRichards/document-tradehuderlem
Document trade.c and some Union Room trading board
2019-10-12Merge remote-tracking branch 'upstream/master' into document-tradeMarcus Huderle
2019-10-12Review changes for #835GriffinR
2019-10-12Fix indentationGriffinR
2019-10-12Split text from cable_club.incGriffinR
2019-10-12Document cable_club.incGriffinR
2019-10-11sub_810E520jiangzhengwenjz
2019-10-10Clean up trade.c docGriffinR
2019-10-10Last non-anim trade.c docGriffinR
2019-10-09More trade doc, fix switch indentationsGriffinR
2019-10-09More trade documentationGriffinR