summaryrefslogtreecommitdiff
path: root/data
AgeCommit message (Collapse)Author
2018-10-21battle_anims.s data to Cgarak
2018-10-21more tag namesgarak
2018-10-21Merge branch 'master' into sprite-tagsgarak
2018-10-21begin ANIM_TAG portgarak
2018-10-21more tower, failDizzyEggg
2018-10-21Merge branch 'master' of https://github.com/pret/pokeemerald into synchroniseSlawter666
2018-10-21More battle tower.DizzyEggg
2018-10-19Merge pull request #369 from garakmon/pan-constantsDiegoisawesome
Use sound pan constants in data/battle_anim_scripts.s
2018-10-19fix merge conflicts in battle_anim_scriptsgarak
2018-10-19Merge remote-tracking branch 'upstream/master' into pan-constantsgarak
2018-10-19use sound panning constants in battle_anim_scriptsgarak
2018-10-19Merge pull request #365 from garakmon/event-flagsDiegoisawesome
[WIP] Event flags
2018-10-19clean flags and remove temp macrogarak
2018-10-19finish event object flagsgarak
2018-10-18name more event flagsgarak
2018-10-18more event flagsgarak
2018-10-18Finish shop and fldeff_escalatorDiegoisawesome
2018-10-17begin event flag names, add temporary hidden item macrogarak
2018-10-17Merge branch 'master' into event-flagsgarak
2018-10-17label temp flags, test replace scriptgarak
2018-10-17use event flags in event scriptsgarak
2018-10-16Port/decompile field_control_avatarDiegoisawesome
2018-10-17Further synchronisationSlawter666
2018-10-16Fix "Vigaroth" misspelling in May's House 1FDeokishisu
2018-10-16Fix "Vigaroth" misspelling in Brendan's House 1FDeokishisu
2018-10-14Merge pull request #352 from huderlem/shopDiegoisawesome
[WIP] Shop
2018-10-14Merge pull request #359 from Slawter666/label_field_effect_helpersDiegoisawesome
Label field_effect_helpers.c
2018-10-14Update All EVENT_OBJ_GFX ReferencesDeokishisu
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14label field_effect_helpersSlawter666
2018-10-14Merge pull request #351 from DizzyEggg/apprenticeDiegoisawesome
Decompile apprentice
2018-10-14Merge pull request #349 from golemgalvanize/decompile_field_effect_helpersDiegoisawesome
Decompile field effect helpers
2018-10-14Finish documenting apprentice for nowDizzyEggg
2018-10-14Merge pull request #25 from Slawter666/apprentice-dataDizzyEggg
Move apprentice data to C
2018-10-14document more of apprenticeDizzyEggg
2018-10-14Move apprentice data to CSlawter666
2018-10-14Merge branch 'master' into apprenticeDizzyEggg
2018-10-14Document more of apprenticeDizzyEggg
2018-10-14Decompile apprenticeDizzyEggg
2018-10-13Merge record mixing, pokemon and global with apprenticeDizzyEggg
2018-10-13Merge branch 'master' into shopDiegoisawesome
2018-10-13Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-10-13Port/decompile cable_club.sDiegoisawesome
2018-10-13Merge remote-tracking branch 'upstream/master' into shopMarcus Huderle
# Conflicts: # asm/shop.s
2018-10-10finish porting field_effect_helpersgolem galvanize
2018-10-09ported some of field_effect_helpersgolem galvanize
2018-10-07port 80d51acDizzyEggg
2018-10-07Decompile battle_anim_80A9C70DizzyEggg
2018-10-07battle anim 80a5c6c decompiledDizzyEggg
2018-10-06Start porting ruby battle anim fileDizzyEggg
2018-10-06Merge pull request #320 from DizzyEggg/animsMarcus Huderle
Document battle animation scripts