merge daycare with master

This commit is contained in:
DizzyEggg
2017-11-15 17:18:05 +01:00
2818 changed files with 151329 additions and 5498 deletions
+3 -3
View File
@@ -962,10 +962,10 @@ gUnknown_02039F2A: @ 2039F2A
gUnknown_02039F2B: @ 2039F2B
.space 0x1
gScriptContestCategory: @ 2039F2C
gSpecialVar_ContestCategory: @ 2039F2C
.space 0x2
gUnknown_02039F2E: @ 2039F2E
gSpecialVar_ContestRank: @ 2039F2E
.space 0x2
gUnknown_02039F30: @ 2039F30
@@ -1626,7 +1626,7 @@ gUnknown_0203CE74: @ 203CE74
gUnknown_0203CE78: @ 203CE78
.space 0x4
gScriptItemId: @ 203CE7C
gSpecialVar_ItemId: @ 203CE7C
.space 0x4
gUnknown_0203CE80: @ 203CE80