Merge branch 'master' into pokenav_unk_2

This commit is contained in:
PikalaxALT
2019-08-05 08:33:45 -04:00
8 changed files with 905 additions and 1205 deletions
+1
View File
@@ -317,6 +317,7 @@ SECTIONS {
src/pokenav_unk_7.o(.text);
src/pokenav_unk_8.o(.text);
asm/pokenav_unk_8.o(.text);
src/pokenav_unk_9.o(.text);
asm/pokenav_unk_9.o(.text);
src/pokenav_unk_10.o(.text);
src/pokenav_match_call_data.o(.text);