ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 07:27:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sym_bss.txt
This commit is contained in:
Diegoisawesome 2016-11-01 18:17:27 -05:00
commit 7f292ba84e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sym_bss.txt
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