aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/route17.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /data/wildPokemon/route17.asm
parentPull a lot of engine out of main.asm (diff)
parentUpdate INSTALL.md (diff)
downloadpokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'data/wildPokemon/route17.asm')
-rwxr-xr-xdata/wildPokemon/route17.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm
index 9cdb18b3..75882ec5 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,4 +1,4 @@
-Route17Mons:
+Route17Mons:
db $19
IF !_YELLOW
db 20,SPEAROW
@@ -12,7 +12,7 @@ Route17Mons:
db 25,FEAROW
db 27,FEAROW
ENDC
-
+
IF _YELLOW
db 26,DODUO
db 27,FEAROW
@@ -25,6 +25,6 @@ Route17Mons:
db 32,PONYTA
db 29,DODRIO
ENDC
-
+
db $00