Merge branch 'master' into lilycove_lady

This commit is contained in:
PikalaxALT
2017-09-20 23:02:17 -04:00
98 changed files with 11101 additions and 3739 deletions

View File

@@ -1762,12 +1762,7 @@ gUnknown_0203CCDC: @ 203CCDC
gUnknown_0203CCE8: @ 203CCE8
.space 0x4
gUnknown_0203CCEC: @ 203CCEC
.space 0x18
gUnknown_0203CD04: @ 203CD04
.space 0x60
.include "src/battle_dome_cards.o"
.include "src/lilycove_lady.o"
gUnknown_0203CD70: @ 203CD70