aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/victoryroad3.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/victoryroad3.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/victoryroad3.asm')
-rwxr-xr-xdata/wildPokemon/victoryroad3.asm35
1 files changed, 10 insertions, 25 deletions
diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm
index 7c1b2c1c..ed4d773b 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wildPokemon/victoryroad3.asm
@@ -1,29 +1,14 @@
PlateauMons3:
db $0F
-
- IF DEF(_YELLOW)
- db 36,GEODUDE
- db 44,GOLBAT
- db 41,GEODUDE
- db 49,ONIX
- db 46,GEODUDE
- db 41,GRAVELER
- db 42,MACHOKE
- db 45,MACHOKE
- db 47,GRAVELER
- db 47,GRAVELER
- ELSE
- db 24,MACHOP
- db 26,GEODUDE
- db 22,ZUBAT
- db 42,ONIX
- db 40,VENOMOTH
- db 45,ONIX
- db 43,GRAVELER
- db 41,GOLBAT
- db 42,MACHOKE
- db 45,MACHOKE
- ENDC
-
+ db 36,GEODUDE
+ db 44,GOLBAT
+ db 41,GEODUDE
+ db 49,ONIX
+ db 46,GEODUDE
+ db 41,GRAVELER
+ db 42,MACHOKE
+ db 45,MACHOKE
+ db 47,GRAVELER
+ db 47,GRAVELER
db $00