Merge branch 'master' into decompile_battle_message

This commit is contained in:
DizzyEggg
2017-10-09 13:58:24 +02:00
15 changed files with 410 additions and 638 deletions
+1 -3
View File
@@ -1610,9 +1610,7 @@ gUnknown_0203BCE8: @ 203BCE8
.space 0x4
.include "src/lottery_corner.o"
gUnknown_0203BCF0: @ 203BCF0
.space 0x4
.include "src/diploma.o"
gUnknown_0203BCF4: @ 203BCF4
.space 0x4