Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts: # sym_bss.txt
This commit is contained in:
commit
7f292ba84e
1 changed files with 1 additions and 1 deletions
|
@ -496,7 +496,7 @@ gUnknown_030012FC: @ 30012FC
|
|||
gUnknown_03001300: @ 3001300
|
||||
.space 0x770
|
||||
|
||||
.include "src/agb_flash.o"
|
||||
.include "src/agb_flash.o"
|
||||
|
||||
.space 0x2
|
||||
|
||||
|
|
Loading…
Reference in a new issue