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

@@ -533,7 +533,7 @@ Text_PlayerGotFive: ; 0x9eb7e
text_from_ram StringBuffer4
text "!@"
sound_item
text_waitsfx
text_waitbutton
db "@"
Text_YourPackIsStuffedFull: ; 0x9eb94