Merge remote-tracking branch 'refs/remotes/pret/master'

# Conflicts:
#	sym_bss.txt
This commit is contained in:
Diegoisawesome 2016-11-01 18:17:27 -05:00
commit 7f292ba84e

View file

@ -496,7 +496,7 @@ gUnknown_030012FC: @ 30012FC
gUnknown_03001300: @ 3001300
.space 0x770
.include "src/agb_flash.o"
.include "src/agb_flash.o"
.space 0x2