summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-21more tag namesgarak
2018-10-21Match GameClear (thanks Egg)Diegoisawesome
2018-10-21Merge branch 'master' into sprite-tagsgarak
2018-10-21begin ANIM_TAG portgarak
2018-10-21more tower, failDizzyEggg
2018-10-21Merge pull request #371 from Diegoisawesome/align_lzDiegoisawesome
Fix LZ compressed data alignment
2018-10-21Fix LZ compressed data alignmentDiegoisawesome
2018-10-20GameClear nonsenseDiegoisawesome
2018-10-21Merge branch 'master' of https://github.com/pret/pokeemerald into synchroniseSlawter666
2018-10-21More battle tower.DizzyEggg
2018-10-20Continue synchronisingSlawter666
2018-10-19Merge pull request #369 from garakmon/pan-constantsDiegoisawesome
Use sound pan constants in data/battle_anim_scripts.s
2018-10-20begin porting and decomping battle towerDizzyEggg
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-19Merge pull request #368 from Diegoisawesome/masterDiegoisawesome
Finish porting/decompiling field_player_avatar
2018-10-19Finish porting/decompiling field_player_avatarDiegoisawesome
2018-10-18name more event flagsgarak
2018-10-18Merge pull request #367 from DizzyEggg/move_blitmapDiegoisawesome
Move Bitmap struct and clear sprite/text files a bit
2018-10-18more event flagsgarak
2018-10-18Move Bitmap struct and clear sprite/text filesDizzyEggg
2018-10-18Merge pull request #366 from Diegoisawesome/masterDiegoisawesome
Finish shop and fldeff_escalator
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-17label a flag in the asmgarak
2018-10-17More synchronisationSlawter666
2018-10-16Merge pull request #364 from Diegoisawesome/masterDiegoisawesome
Port/decompile field_control_avatar
2018-10-16Port/decompile field_control_avatarDiegoisawesome
2018-10-17Further synchronisationSlawter666
2018-10-16Merge pull request #363 from DizzyEggg/patch-1Diegoisawesome
Use constants
2018-10-16Use constantsDizzyEggg
2018-10-16Merge remote-tracking branch 'upstream/master' into event-flagsgarak
2018-10-16Merge pull request #362 from Deokishisu/patch-1Diegoisawesome
Fix "Vigaroth" misspelling in event_objects.h
2018-10-16Fix "Vigaroth" misspelling in May's House 1FDeokishisu
2018-10-16Fix "Vigaroth" misspelling in Brendan's House 1FDeokishisu
2018-10-16Fix "Vigaroth" misspelling to "Vigoroth"Deokishisu
2018-10-16Begin synchronising with pokerubySlawter666
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-14Merge pull request #360 from Deokishisu/Fix-Event-Object-DefinesDiegoisawesome
Update All EVENT_OBJ_GFX References
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 #358 from Deokishisu/LabelOWsProperlyDiegoisawesome
Label OWs More Descriptively