Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts: # sym_bss.txt
This commit is contained in:
+1
-1
@@ -496,7 +496,7 @@ gUnknown_030012FC: @ 30012FC
|
|||||||
gUnknown_03001300: @ 3001300
|
gUnknown_03001300: @ 3001300
|
||||||
.space 0x770
|
.space 0x770
|
||||||
|
|
||||||
.include "src/agb_flash.o"
|
.include "src/agb_flash.o"
|
||||||
|
|
||||||
.space 0x2
|
.space 0x2
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user