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

@@ -15397,18 +15397,6 @@ INCLUDE "text/phone/bill.asm"
INCLUDE "text/phone/elm.asm"
INCLUDE "text/phone/trainers1.asm"
SECTION "Common Text 2", ROMX, BANK[$6F]
INCLUDE "text/common_2.asm"
SECTION "Common Text 3", ROMX, BANK[$70]
INCLUDE "text/common_3.asm"
SECTION "Common Text 4", ROMX, BANK[$71]
INCLUDE "text/common_4.asm"
SECTION "bank72", ROMX, BANK[$72]
ItemNames::