aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/pokemontower6.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/pokemontower6.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/pokemontower6.asm')
-rwxr-xr-xdata/wildPokemon/pokemontower6.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm
index 4f2d9594..abd2969a 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,6 +1,6 @@
-TowerMons6:
+TowerMons6:
db $0F
-
+
IF !_YELLOW
db 21,GASTLY
db 22,GASTLY
@@ -13,7 +13,7 @@ TowerMons6:
db 24,CUBONE
db 28,HAUNTER
ENDC
-
+
IF _YELLOW
db 22,GASTLY
db 23,GASTLY
@@ -26,6 +26,6 @@ TowerMons6:
db 22,HAUNTER
db 27,HAUNTER
ENDC
-
+
db $00