Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming

This commit is contained in:
PikalaxALT
2015-12-24 14:30:32 -05:00
11 changed files with 3263 additions and 4158 deletions

View File

@@ -46,7 +46,7 @@ text_low: macro
endm
enum WAIT_BUTTON
text_waitsfx: macro
text_waitbutton: macro
db WAIT_BUTTON
endm