From ca9b168d1f0098a3b0417bcfdd2caf7ce24b00a8 Mon Sep 17 00:00:00 2001
From: FexCollects <fex@fexcollects.com>
Date: Tue, 15 Jul 2025 18:46:12 -0600
Subject: [PATCH] Revert "[battle-e] Add custom card (#20)" (#23)

This reverts commit 158c6efa4f9125c94be589537f288249709cb7ce.
---
 battle-e/Makefile         |  3 +--
 battle-e/card-99-A001.asm |  4 ---
 battle-e/trainer_cards.mk |  3 ---
 battle-e/trainers/fex.asm | 51 ---------------------------------------
 4 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 battle-e/card-99-A001.asm
 delete mode 100644 battle-e/trainers/fex.asm

diff --git a/battle-e/Makefile b/battle-e/Makefile
index 0bfd68e..ad6446a 100644
--- a/battle-e/Makefile
+++ b/battle-e/Makefile
@@ -1,6 +1,6 @@
 all: verify 
 
-verify: series_1_en series_2_en 129_promos_en n_promos_en p_promos_en berries custom_series_1_en
+verify: series_1_en series_2_en 129_promos_en n_promos_en p_promos_en berries
 	md5sum --check battle-e.md5
 
 internal_series_nums = 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
@@ -13,7 +13,6 @@ series_2_en: $(internal_series_nums:%=build/card-08-B0%-EN-01.raw)
 n_promos_en: $(internal_promo_nums:%=build/card-08-N0%-EN-01.raw)
 p_promos_en: $(internal_promo_nums:%=build/card-08-P0%-EN-01.raw)
 berries: $(internal_berry_nums:%=build/card-08-K0%-EN-01.raw)
-custom_series_1_en: build/card-99-A001-EN-01.raw
 
 # Include the card id to trainer definition mapping
 include trainer_cards.mk 
diff --git a/battle-e/card-99-A001.asm b/battle-e/card-99-A001.asm
deleted file mode 100644
index 5fdcb1e..0000000
--- a/battle-e/card-99-A001.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE "../macros.asm"
-DEF CLASS EQUS   "collector"
-DEF TRAINER EQUS "fex"
-INCLUDE "battletrainer-{REGION_NAME}.tx"
diff --git a/battle-e/trainer_cards.mk b/battle-e/trainer_cards.mk
index 0dd07ff..bee136f 100644
--- a/battle-e/trainer_cards.mk
+++ b/battle-e/trainer_cards.mk
@@ -112,6 +112,3 @@ build/card-08-P007-EN.o: build/trainers/sagami-EN.mev
 build/card-08-P008-EN.o: build/trainers/mattegoDEMO-EN.mev
 build/card-129-B001-EN.o: build/trainers/nils-EN.mev
 build/card-129-B002-EN.o: build/trainers/astrid-EN.mev
-
-# Custom series trainers
-build/card-99-A001-EN.o: build/trainers/fex-EN.mev
diff --git a/battle-e/trainers/fex.asm b/battle-e/trainers/fex.asm
deleted file mode 100644
index 1bd5b0e..0000000
--- a/battle-e/trainers/fex.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-INCLUDE "trainers/macros.asm"
-
-	Battle_Trainer
-
-	BT_Level MOSSDEEP
-	Class COLLECTOR
-	BT_Floor MOSSDEEP
-        Text_EN "FEX"8
-	OT_ID 00000, 00000
-
-        Intro_EN LET_S,COLLECT,SHINE,POKEMON,TOGETHER,_EX
-	Win_EN   _SPARK,BANG,_FLASH,WOW,EXCELLENT,POKEMON
-	Loss_EN HUH_, BUT, WEIRD, COLOR, POKEMON, _QU_EX 
-
-        Pokemon CORSOLA
-        Holds SITRUS_BERRY
-        Moves CALM_MIND, SURF, RECOVER, ICE_BEAM
-        Level 100
-        PP_Ups 0,0,2,2
-        EVs 252,0,252,0,4,0
-        OT_ID 00000, 00000
-        IVs 31,31,31,31,31,31, CORSOLA_NATURAL_CURE
-        PV SHINY_BOLD_MALE
-        Text_EN "CORSOLA"11
-        Friendship 255
-
-	Pokemon ALTARIA
-	Holds SHELL_BELL
-	Moves TOXIC, FLAMETHROWER, HAZE, REST
-	Level 100
-	PP_Ups 0,3,0,2
-	EVs 248,0,44,0,0,216
-	OT_ID 00000, 00000
-        IVs 31,31,31,31,31,31, ALTARIA_NATURAL_CURE
-	PV SHINY_CALM_FEMALE
-	Text_EN "ALTARIA"11
-	Friendship 255
-
-	Pokemon GRUMPIG
-	Holds LEFTOVERS
-	Moves CALM_MIND, PSYCHIC, ICE_PUNCH, SUBSTITUTE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 200,0,0,220,0,88
-	OT_ID 00000, 00000
-        IVs 31,31,31,31,31,31, GRUMPIG_THICK_FAT
-	PV SHINY_MODEST_MALE
-	Text_EN "GRUMPIG"11
-	Friendship 255
-
-	End_Trainer