aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/route25.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-06 13:51:06 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-01 17:32:39 -0400
commit8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch)
tree08106f9eec9cff1137269c20ccf848cfeffa71c6 /data/wildPokemon/route25.asm
parenttext.o (diff)
downloadpokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.gz
pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.xz
pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.zip
Build only Yellow
Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm
Diffstat (limited to 'data/wildPokemon/route25.asm')
-rwxr-xr-xdata/wildPokemon/route25.asm45
1 files changed, 1 insertions, 44 deletions
diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm
index 4609c7cd..1546dd74 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/wildPokemon/route25.asm
@@ -1,47 +1,6 @@
Route25Mons:
db $0F
-
- IF DEF(_RED)
- db 8,WEEDLE
- db 9,KAKUNA
- db 13,PIDGEY
- db 12,ODDISH
- db 13,ODDISH
- db 12,ABRA
- db 14,ODDISH
- db 10,ABRA
- db 7,METAPOD
- db 8,CATERPIE
- ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
- db 8,CATERPIE
- db 9,METAPOD
- db 13,PIDGEY
- db 12,BELLSPROUT
- db 13,BELLSPROUT
- db 12,ABRA
- db 14,BELLSPROUT
- db 10,ABRA
- db 7,KAKUNA
- db 8,WEEDLE
- ENDC
-
- IF DEF(_JAPAN) && DEF(_BLUE)
- db 8,CATERPIE
- db 9,METAPOD
- db 13,PIDGEY
- db 12,ODDISH
- db 13,ODDISH
- db 12,ABRA
- db 14,ODDISH
- db 10,ABRA
- db 7,KAKUNA
- db 8,WEEDLE
- ENDC
-
- IF DEF(_YELLOW)
- db 12,ODDISH
+ db 12,ODDISH
db 12,BELLSPROUT
db 13,PIDGEY
db 14,ODDISH
@@ -51,7 +10,5 @@ Route25Mons:
db 16,VENONAT
db 17,PIDGEY
db 17,PIDGEOTTO
- ENDC
-
db $00