Merge branch 'master' into vs_seeker

This commit is contained in:
PikalaxALT
2018-10-08 19:00:01 -04:00
35 changed files with 1041 additions and 1564 deletions
+2 -7
View File
@@ -4999,14 +4999,9 @@ gUnknown_8468B6C:: @ 8468B6C
gUnknown_8468BCC:: @ 8468BCC
.incbin "baserom.gba", 0x468BCC, 0x90
.align 2
gUnknown_8468C5C:: @ 8468C5C
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c"
.align 2
gUnknown_8468C94:: @ 8468C94
.asciz "0"
.section .rodata.8468C98
// seagallop.o
.align 2
gUnknown_8468C98:: @ 8468C98
.incbin "baserom.gba", 0x468C98, 0x520