diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
| commit | 31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch) | |
| tree | 6941b2b38a2615223b30e8cceb7aab636768dabd /text.asm | |
| parent | Split default names strings into separate lines to make it less unpleasant to... (diff) | |
| parent | Fix typo: ninetails.asm -> ninetales.asm (diff) | |
| download | pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'text.asm')
| -rw-r--r-- | text.asm | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -15,6 +15,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" +INCLUDE "charmap.asm" INCLUDE "hram.asm" @@ -2338,6 +2339,7 @@ _ColosseumText1:: INCLUDE "text/maps/reds_house_1f.asm" INCLUDE "text/maps/blues_house.asm" INCLUDE "text/maps/oaks_lab.asm" +INCLUDE "text/maps/viridian_pokecenter.asm" INCLUDE "text/maps/viridian_mart.asm" INCLUDE "text/maps/school.asm" INCLUDE "text/maps/viridian_house.asm" |