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

This commit is contained in:
ultima-soul committed 2021-11-21 10:40:26 -08:00
commit 3ed51d6d91
965 files changed
+54032 -52665

No files matched your search

+5 -5
View File
@@ -9,14 +9,14 @@
.include "src/link_rfu_3.o"
.include "src/link_rfu_2.o"
.include "src/union_room.o"
.include "src/mystery_gift.o"
.include "src/mystery_gift_menu.o"
.include "src/union_room_player_avatar.o"
.include "src/wireless_communication_status_screen.o"
.include "src/union_room_battle.o"
.include "src/mevent2.o"
.include "src/mevent_801BAAC.o"
.include "src/mevent_server.o"
.include "src/mevent_client.o"
.include "src/mystery_gift.o"
.include "src/mystery_gift_view.o"
.include "src/mystery_gift_server.o"
.include "src/mystery_gift_client.o"
.include "src/union_room_chat.o"
.include "src/berry_crush.o"
.include "src/berry_powder.o"