From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: 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 --- data/baseStats/marowak.asm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'data/baseStats/marowak.asm') diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 64bfb0d6..35e3f542 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -14,15 +14,9 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db TAIL_WHIP +db 0 +db 0 db 0 ; growth rate ; learnset db %10110001 -- cgit v1.3.1-sl0p