Merge branch 'master' of github.com:pret/pokeemerald into trade

This commit is contained in:
Diegoisawesome
2018-12-31 02:30:30 -06:00
779 changed files with 5227 additions and 8501 deletions
+1 -2
View File
@@ -278,8 +278,7 @@ gUnknown_0203CD88: @ 203CD88
.include "src/dynamic_placeholder_text_util.o"
.include "src/item_icon.o"
.include "src/party_menu.o"
.include "src/fossil_specials.o"
.include "src/fldeff_groundshake.o"
.include "src/mirage_tower.o"
.include "src/pokemon_summary_screen.o"
.include "src/unk_pokedex_area_screen_helper.o"
.include "src/battle_pyramid_bag.o"