diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 15:17:41 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 15:17:41 -0500 |
| commit | 42dd25b3e50569d94ca78adf47c527a9859089b5 (patch) | |
| tree | 3464a1967318865d483150b38a432fb219e9a0c0 /main.asm | |
| parent | caa83c08a76c5b6ffa0546f395d8c3d5f10643b4 (diff) | |
| parent | 67d38da5b01173d2a78a3e083aff505f40276f2e (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal into scriptmacrorenaming
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15918,7 +15918,7 @@ INCLUDE "misc/mobile_5f.asm" SECTION "Common Text 1", ROMX, BANK[$6C] -INCLUDE "text/common.asm" +INCLUDE "text/stdtext.asm" INCLUDE "text/phone/jack_overworld.asm" INCLUDE "text/phone/beverly_overworld.asm" INCLUDE "text/phone/huey_overworld.asm" |