Merge branch 'master' into heal_location

This commit is contained in:
PikalaxALT
2017-11-15 09:01:56 -05:00
2869 changed files with 155560 additions and 13742 deletions
+3 -2
View File
@@ -54,8 +54,9 @@ gUnknown_030011F6: @ 30011F6
gUnknown_030011F7: @ 30011F7
.space 0x1
gUnknown_030011F8: @ 30011F8
.space 0x4
.include "src/starter_choose.o"
.align 0x2
gUnknown_030011FC: @ 30011FC
.space 0x2