aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/fighting_dojo.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
commitc979b3bb03b121dd03a800df74144cd69a74601a (patch)
tree0d6bb48125efe6f6215347967383ba4c3b7da391 /text/maps/fighting_dojo.asm
parentSync with pokered (diff)
parentPart 1 of syncing with pokered. (diff)
downloadpokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'text/maps/fighting_dojo.asm')
-rw-r--r--text/maps/fighting_dojo.asm1
1 files changed, 0 insertions, 1 deletions
diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm
index f5cd5101..a6ccc8c3 100644
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -128,4 +128,3 @@ _OtherHitmonText::
text "Better not get"
line "greedy..."
done
-