Merge branch 'master' into mauville_old_man

This commit is contained in:
PikalaxALT
2018-05-09 15:30:21 -04:00
20 changed files with 1091 additions and 2334 deletions

View File

@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_08486EF8:: @ 8486EF8
.4byte 0x00000000