Merge branch 'master' into heal_location

This commit is contained in:
PikalaxALT
2017-11-02 07:59:29 -04:00
55 changed files with 17065 additions and 11647 deletions
+1 -9
View File
@@ -1044,15 +1044,7 @@ gUnknown_0203A014: @ 203A014
gUnknown_0203A018: @ 203A018
.space 0x4
gUnknown_0203A01C: @ 203A01C
.space 0x1
gUnknown_0203A01D: @ 203A01D
.space 0x3
gUnknown_0203A020: @ 203A020
.space 0x4
.include "src/secret_base.o"
.include "src/tv.o"
gUnknown_0203A034: @ 203A034