summaryrefslogtreecommitdiff
path: root/asm
AgeCommit message (Collapse)Author
2018-09-04Bring labels for overworld.c over from pokerubySlawter666
2018-09-02Label event_object_movement.cSlawter666
2018-09-01Bank to battlerDizzyEggg
2018-08-30Merge pull request #308 from DizzyEggg/pyramid_bagDiegoisawesome
Decompile pyramid bag
2018-08-30Finish decompiling pyramid bag.DizzyEggg
2018-08-30Do some pyramid bagDizzyEggg
2018-08-29Use gbafix to generate header and checksumDiegoisawesome
2018-08-29battle tent review changesDizzyEggg
2018-08-26rename battle pyramid to battle pyramid bagDizzyEggg
2018-08-26try battle tent and failDizzyEggg
2018-08-25Some labelsDizzyEggg
2018-08-25Merge branch 'master' into decompile_battle_frontier_1DizzyEggg
2018-08-25Up To CopyDomeTrainerNameDizzyEggg
2018-08-25up to CB2_BattleDomeDizzyEggg
2018-08-21More battle domeDizzyEggg
2018-08-20DisplayMatchInfoOnCard decompiledDizzyEggg
2018-08-19battle dome - more workDizzyEggg
2018-08-19Cant believe Ive matched thisDizzyEggg
2018-08-19This is impossibleDizzyEggg
2018-08-19battle dome cards sensibly renamedDizzyEggg
2018-08-18this file is too muchDizzyEggg
2018-08-18battle dome - a couple more functionsDizzyEggg
2018-08-16Merge with masterDizzyEggg
2018-08-15Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-08-15More battle domeDizzyEggg
2018-08-15Begin battle frontier 1DizzyEggg
2018-08-15Contest AI clean-upDizzyEggg
2018-08-15Port contest ai from pokerubyDizzyEggg
2018-08-15Document and cleanup pokemon_summary_screenDiegoisawesome
2018-08-14Finish pokemon_summary_screenDiegoisawesome
2018-08-13match contest effectDizzyEggg
2018-08-12Cleanup and document learn_moveDiegoisawesome
2018-08-12copy contest effect from rubyDizzyEggg
2018-08-12Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_moveDiegoisawesome
2018-08-12Prepare learn_move for mergeDiegoisawesome
2018-08-12Merge pull request #288 from DizzyEggg/slot_machineDiegoisawesome
Port a little bit of slot machine
2018-08-12Merge pull request #287 from DizzyEggg/easy_chatDiegoisawesome
Pikalax's Easy chat
2018-08-12Merge pull request #277 from atasro2/player_field_avatarDiegoisawesome
decompile a portion of field_player_avatar.s
2018-08-12Merge pull request #289 from DizzyEggg/contestsDiegoisawesome
Pikalax's contests
2018-08-12Merge branch 'master' into player_field_avatarMCboy
2018-08-12Decompile a bit of pokemon storarage systemDizzyEggg
2018-08-12merge with masterDizzyEggg
2018-08-11Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into ↵Diegoisawesome
Edwearth-learn_move
2018-08-11Revert "Rename some specials"Diegoisawesome
This reverts commit 658f9351fe9349eb16edab8d5d503ef741449d4a.
2018-08-11Rename some specialsDiegoisawesome
2018-08-11Finish decompiling field_specialsDiegoisawesome
2018-08-11Merge contests with masterDizzyEggg
2018-08-11port more of slot machineDizzyEggg
2018-08-11start porting slot machineDizzyEggg
2018-08-11merge easy chat with masterDizzyEggg