Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work

This commit is contained in:
PikalaxALT
2020-05-03 08:30:36 -04:00

View File

@@ -1,5 +1,5 @@
.include "asm/macros.inc"
.include "global.inc
.include "global.inc"
.section .text
.balign 4, 0