Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti

This commit is contained in:
GriffinR
2020-07-08 15:45:31 -04:00
109 changed files with 7618 additions and 6664 deletions

View File

@@ -11,6 +11,7 @@
.include "src/union_room.o"
.include "src/mystery_gift.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"