Merge branch 'master' into link

This commit is contained in:
PikalaxALT
2017-12-16 11:27:10 -05:00
196 changed files with 20942 additions and 24990 deletions
+1 -1
View File
@@ -482,7 +482,7 @@ gUnknown_0202499C: @ 202499C
gUnknown_020249B4: @ 20249B4
.space 0x8
.include "src/rng.o"
.include "src/random.o"
.include "src/daycare.o"
.include "src/load_save.o"