Merge branch 'master' into navdata

This commit is contained in:
garak authored and GitHub committed 2019-07-29 13:06:45 -04:00
commit 5b57c001f5
36 files changed
+1647 -4015

No files matched your search

+3 -2
View File
@@ -316,8 +316,9 @@ SECTIONS {
src/pokenav_unk_3.o(.text*);
src/pokenav_unk_4.o(.text*);
src/pokenav_unk_5.o(.text*);
asm/pokenav_unk_6.o(.text*);
asm/pokenav_unk_7.o(.text*);
src/pokenav_unk_6.o(.text*);
src/pokenav_unk_7.o(.text*);
src/pokenav_unk_8.o(.text*);
asm/pokenav_unk_8.o(.text*);
asm/pokenav_unk_9.o(.text*);
asm/pokenav_unk_10.o(.text*);