merge with master

This commit is contained in:
DizzyEggg committed 2018-08-12 12:11:35 +02:00
commit 957dcd01b3
148 files changed
+6964 -11586

No files matched your search

+1 -2
View File
@@ -89,8 +89,7 @@ gUnknown_030061C0: @ 30061C0
gUnknown_030061C4: @ 30061C4
.space 0xC
gUnknown_030061D0: @ 30061D0
.space 0x18
.include "field_specials.o"
gCB2_AfterEvolution: @ 30061E8
.space 0x4