Merge branch 'master' into decompile_use_pokeblock

This commit is contained in:
DizzyEggg
2017-12-09 21:24:47 +01:00
91 changed files with 3260 additions and 5046 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"