From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
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/trainer_moves.asm | 36 ------------------------------------
 1 file changed, 36 deletions(-)

(limited to 'data/trainer_moves.asm')

diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm
index 432f0fed..ef1d20f5 100755
--- a/data/trainer_moves.asm
+++ b/data/trainer_moves.asm
@@ -1,38 +1,3 @@
-IF !DEF(YELLOW)
-LoneMoves: ; 39d22 (e:5d22)
-; these are used for gym leaders.
-; this is not automatic! you have to write the number you want to W_LONEATTACKNO
-; first. e.g., erika's script writes 4 to W_LONEATTACKNO to get mega drain,
-; the fourth entry in the list.
-
-; first byte:  pokemon in the trainer's party that gets the move
-; second byte: move
-; unterminated
-	db 1,BIDE
-	db 1,BUBBLEBEAM
-	db 2,THUNDERBOLT
-	db 2,MEGA_DRAIN
-	db 3,TOXIC
-	db 3,PSYWAVE
-	db 3,FIRE_BLAST
-	db 4,FISSURE
-
-TeamMoves: ; 39d32 (e:5d32)
-; these are used for elite four.
-; this is automatic, based on trainer class.
-; don't be confused by LoneMoves above, the two data structures are
-	; _completely_ unrelated.
-
-; first byte: trainer (all trainers in this class have this move)
-; second byte: move
-; ff-terminated
-	db LORELEI,BLIZZARD
-	db BRUNO,FISSURE
-	db AGATHA,TOXIC
-	db LANCE,BARRIER
-	db $FF
-
-ELSE
 ; yellow has its own format.
 
 ; entry ≔ trainerclass, trainerid, moveset+, 0
@@ -194,4 +159,3 @@ TeamMoves:
 	db 0
 
 	db $ff
-endc
-- 
cgit v1.3.1-sl0p