nerge with master, fix conflicts

This commit is contained in:
DizzyEggg
2017-12-16 01:08:55 +01:00
189 changed files with 20685 additions and 24533 deletions
+1 -1
View File
@@ -543,7 +543,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"