Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT
2018-10-15 09:19:30 -05:00
36 changed files with 2576 additions and 3691 deletions
+3 -3
View File
@@ -1,4 +1,4 @@
gUnknown_201C000: @ 201C000
gDecompressionBuffer: @ 201C000
.space 0x20
gUnknown_201C020: @ 201C020
@@ -1208,9 +1208,9 @@ gUnknown_2039A30: @ 2039A30
gUnknown_2039A34: @ 2039A34
.space 0x4
gUnknown_2039A38: @ 2039A38
.space 0x1004
.include "src/save.o"
.align 2
gUnknown_203AA3C: @ 203AA3C
.space 0x74