summaryrefslogtreecommitdiff
path: root/asm
AgeCommit message (Collapse)Author
2018-02-15Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_pokedex
2018-02-15start decompilinggolem galvanize
2018-02-15merge overworld with masterDizzyEggg
2018-02-15Merge branch 'master' of https://github.com/pret/pokeemeraldKDSKardabox
2018-02-14Decompile fldeff_sweetsecent.cKDSKardabox
2018-02-13fix merge conflictsgolem galvanize
2018-02-13move data to cgolem galvanize
2018-02-14merge overworld with masterDizzyEggg
2018-02-14decompile overworldDizzyEggg
2018-02-13Finish fldeff_strength.sKDSKardabox
2018-02-13[Do not Merge] fldeff_strength.sKDSKardabox
2018-02-13Merge branch 'master' of https://github.com/pret/pokeemeraldKDSKardabox
# Conflicts: # include/strings.h
2018-02-12Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_item_menu
2018-02-12more overworld workDizzyEggg
2018-02-12start decompiling overworld.sDizzyEggg
2018-02-12Port smokescreen.sKDSKardabox
2018-02-12Updating pokedex count function labelsKDSKardabox
2018-02-12Decompile birch_pc.cKDSKardabox
2018-02-11Merge pull request #207 from DizzyEggg/decompile_pokemon_123Diegoisawesome
Decompile and clean pokemon files
2018-02-11Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_item_menu
2018-02-11Merge branch 'master' into linkPikalaxALT
2018-02-11add more const pokemon data, clear includeDizzyEggg
2018-02-11decompile main_menugolem galvanize
2018-02-11more pokemon workDizzyEggg
2018-02-10decompile all pokemon filesDizzyEggg
2018-02-10start pokemon 3DizzyEggg
2018-02-09Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_main_menu
2018-02-09decompile pokemon_item_effectDizzyEggg
2018-02-09decompile pokemon1DizzyEggg
2018-02-09battle labels merge with masterDizzyEggg
2018-02-08Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_item_menu
2018-02-08decompiled up to task_new_game_prof_birch_speech_10golem galvanize
2018-02-08Merge pull request #202 from DizzyEggg/move_mon_dataDiegoisawesome
Move data from asm to pokemon_1.c
2018-02-08more battle labelsDizzyEggg
2018-02-08pokemon and battle constantsDizzyEggg
2018-02-07Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_main_menu
2018-02-07decompile task_new_game_prof_birch_speech_4golem galvanize
2018-02-07Merge branch 'master' of https://github.com/pret/pokeemerald into menuDiegoisawesome
2018-02-07Merge branch 'master' of https://github.com/pret/pokeemerald into ↵golem galvanize
decompile_item_menu
2018-02-07move battle vars to c fileDizzyEggg
2018-02-07move mon data fix conflictsDizzyEggg
2018-02-07I hope this fixes the conflictsgolem galvanize
2018-02-07decompiled up to task_new_game_prof_birch_speech_3golem galvanize
2018-02-07title screen with masterDizzyEggg
2018-02-07Merge pull request #199 from DizzyEggg/decompile_rtc_screenDiegoisawesome
decompile rtc reset screen
2018-02-07Merge pull request #198 from DizzyEggg/decompile_item_iconDiegoisawesome
decompile item icon
2018-02-07Merge pull request #196 from DizzyEggg/decompile_ray_sceneDiegoisawesome
Decompile rayquaza scene
2018-02-07Merge pull request #166 from camthesaxman/battle_refactorCameron Hall
rename/refactor battle code
2018-02-07Merge pull request #197 from DizzyEggg/decompile_berry_tag_screenDiegoisawesome
Decompile berry tag screen
2018-02-06Finish menu.s and eliminate TextColorDiegoisawesome