diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
| commit | 980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb (patch) | |
| tree | 745646bc2baccb60da67d83e3428f4d62cd923c3 /text.asm | |
| parent | 106251da1f1412dbca66db8c0e0fe7fe9eb63968 (diff) | |
| parent | f3de3a20dfccb8a57cdf9feb860bf1e89a733f50 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'text.asm')
| -rw-r--r-- | text.asm | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -818,12 +818,12 @@ _ViridianSchoolNotebookText4:: line "#MON LEAGUE!" prompt -_FightingDojoText_52a10:: +_EnemiesOnEverySideText:: text "Enemies on every" line "side!" done -_FightingDojoText_52a1d:: +_WhatGoesAroundComesAroundText:: text "What goes around" line "comes around!" done @@ -2501,6 +2501,7 @@ _ColosseumText1:: INCLUDE "text/maps/reds_house_1f.asm" INCLUDE "text/maps/blues_house.asm" INCLUDE "text/maps/oaks_lab.asm" +INCLUDE "text/pokedex_ratings.asm" INCLUDE "text/maps/viridian_mart.asm" INCLUDE "text/maps/school.asm" INCLUDE "text/maps/viridian_house.asm" |