Merge pull request #737 from salix5/patch

fix: EVENT_BATTLE_END

script/c10032958.lua

@@ -45,7 +45,7 @@ function c10032958.reg(c,opt)
 		local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(10032958,2))
 		e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-		e1:SetCode(EVENT_BATTLE_END)
+		e1:SetCode(EVENT_BATTLED)
 		e1:SetCondition(c10032958.atcon)
 		e1:SetOperation(c10032958.atop)
 		e1:SetReset(RESET_EVENT+0x1ff0000)

script/c10509340.lua

@@ -9,7 +9,7 @@ function c10509340.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c10509340.disop)
 	c:RegisterEffect(e2)
 	--actlimit

script/c12296376.lua

@@ -10,7 +10,7 @@ function c12296376.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c12296376.operation)
 	c:RegisterEffect(e2)
 end

script/c12670770.lua

@@ -68,6 +68,7 @@ function c12670770.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.SelectYesNo(tp,aux.Stringid(12670770,0)) then
 		Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 		c:RegisterFlagEffect(12670770,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
+		c:RegisterFlagEffect(0,RESET_CHAIN,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12670770,1))
 	end
 end
 function c12670770.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

script/c12817939.lua

@@ -3,7 +3,7 @@ function c12817939.initial_effect(c)
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c12817939.disop)
 	c:RegisterEffect(e1)

script/c15935204.lua

@@ -4,7 +4,7 @@ function c15935204.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c15935204.operation)
 	c:RegisterEffect(e1)
 	--damage

script/c16008155.lua

@@ -25,7 +25,7 @@ function c16008155.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e4:SetRange(LOCATION_MZONE)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetOperation(c16008155.desop3)
 	e4:SetLabelObject(e2)
 	c:RegisterEffect(e4)

script/c16516630.lua

@@ -43,7 +43,7 @@ function c16516630.operation(e,tp,eg,ep,ev,re,r,rp)
 	tc:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c16516630.desop)
 	e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 	tc:RegisterEffect(e3)

script/c16909657.lua

@@ -3,7 +3,7 @@ function c16909657.initial_effect(c)
 	--special summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c16909657.checkop)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)

script/c17313545.lua

@@ -12,7 +12,7 @@ function c17313545.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(17313545,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c17313545.atcon)
 	e2:SetOperation(c17313545.atop)
 	c:RegisterEffect(e2)

script/c18013090.lua

@@ -24,7 +24,7 @@ function c18013090.initial_effect(c)
 	e3:SetCategory(CATEGORY_POSITION)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetCondition(c18013090.cacon)
 	e3:SetTarget(c18013090.catg)
 	e3:SetOperation(c18013090.caop)

script/c20470500.lua

@@ -4,7 +4,7 @@ function c20470500.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(20470500,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c20470500.condition)
 	e1:SetOperation(c20470500.operation)

script/c22371016.lua

@@ -5,7 +5,7 @@ function c22371016.initial_effect(c)
 	e1:SetDescription(aux.Stringid(22371016,0))
 	e1:SetCategory(CATEGORY_REMOVE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetTarget(c22371016.rmtg)
 	e1:SetOperation(c22371016.rmop)
 	c:RegisterEffect(e1)

script/c2250266.lua

@@ -38,7 +38,7 @@ function c2250266.initial_effect(c)
 	e5:SetCategory(CATEGORY_POSITION)
 	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e5:SetCode(EVENT_BATTLE_END)
+	e5:SetCode(EVENT_BATTLED)
 	e5:SetCondition(c2250266.cond)
 	e5:SetTarget(c2250266.tgd2)
 	e5:SetOperation(c2250266.opd2)

script/c23118924.lua

@@ -3,7 +3,7 @@ function c23118924.initial_effect(c)
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c23118924.discon)
 	e1:SetOperation(c23118924.disop)
 	c:RegisterEffect(e1)
@@ -11,7 +11,7 @@ function c23118924.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(23118924,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c23118924.atcon)
 	e2:SetOperation(c23118924.atop)
 	c:RegisterEffect(e2)

script/c23205979.lua

@@ -41,7 +41,7 @@ function c23205979.initial_effect(c)
 	local e6=Effect.CreateEffect(c)
 	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e6:SetRange(LOCATION_MZONE)
-	e6:SetCode(EVENT_BATTLE_END)
+	e6:SetCode(EVENT_BATTLED)
 	e6:SetOperation(c23205979.desop3)
 	e6:SetLabelObject(e4)
 	c:RegisterEffect(e6)

script/c23274061.lua

@@ -10,7 +10,7 @@ function c23274061.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(23274061,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c23274061.condition)
 	e2:SetOperation(c23274061.operation)
 	c:RegisterEffect(e2)

script/c23558733.lua

@@ -10,7 +10,7 @@ function c23558733.initial_effect(c)
 	--damage
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c23558733.desop)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)

script/c24104865.lua

@@ -4,7 +4,7 @@ function c24104865.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c24104865.checkop)
 	c:RegisterEffect(e1)
 	local g=Group.CreateGroup()

script/c25345186.lua

@@ -15,7 +15,7 @@ function c25345186.activate(e,tp,eg,ep,ev,re,r,rp)
 	--destroy
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c25345186.regop)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)

script/c26640671.lua

@@ -19,7 +19,7 @@ function c26640671.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c26640671.regop)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)

script/c27618634.lua

@@ -10,7 +10,7 @@ function c27618634.initial_effect(c)
 	--battled
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c27618634.atop)
 	c:RegisterEffect(e2)
 	local g=Group.CreateGroup()

script/c27927359.lua

@@ -3,7 +3,7 @@ function c27927359.initial_effect(c)
 	--Disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c27927359.operation)
 	c:RegisterEffect(e1)

script/c2851070.lua

@@ -15,7 +15,7 @@ function c2851070.initial_effect(c)
 	e1:SetDescription(aux.Stringid(2851070,1))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetTarget(c2851070.destg)
 	e1:SetOperation(c2851070.desop)
 	c:RegisterEffect(e1)

script/c30314994.lua

@@ -13,7 +13,7 @@ function c30314994.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(30314994,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c30314994.atcon)
 	e2:SetOperation(c30314994.atop)
 	c:RegisterEffect(e2)

script/c30353551.lua

@@ -22,7 +22,7 @@ function c30353551.initial_effect(c)
 		c30353551.global_check=true
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_BATTLE_END)
+		ge1:SetCode(EVENT_BATTLED)
 		ge1:SetOperation(c30353551.checkop)
 		Duel.RegisterEffect(ge1,0)
 		local ge2=Effect.CreateEffect(c)

script/c30860696.lua

@@ -18,7 +18,7 @@ function c30860696.initial_effect(c)
 	e3:SetDescription(aux.Stringid(30860696,0))
 	e3:SetCategory(CATEGORY_ATKCHANGE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetCondition(c30860696.racon)
 	e3:SetOperation(c30860696.raop)
 	c:RegisterEffect(e3)

script/c31053337.lua

@@ -30,7 +30,7 @@ function c31053337.initial_effect(c)
 	e4:SetDescription(aux.Stringid(31053337,1))
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetOperation(c31053337.operation2)
 	c:RegisterEffect(e4)
 end

script/c31173519.lua

@@ -4,7 +4,7 @@ function c31173519.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(31173519,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c31173519.condition)
 	e1:SetOperation(c31173519.operation)
 	c:RegisterEffect(e1)

script/c3129635.lua

@@ -27,7 +27,7 @@ function c3129635.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetTarget(c3129635.destg)
 	e1:SetOperation(c3129635.desop)
 	e1:SetReset(RESET_EVENT+0x1fe0000)

script/c31305911.lua

@@ -5,7 +5,7 @@ function c31305911.initial_effect(c)
 	e1:SetDescription(aux.Stringid(31305911,0))
 	e1:SetCategory(CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c31305911.condition)
 	e1:SetTarget(c31305911.target)
 	e1:SetOperation(c31305911.operation)

script/c31632536.lua

@@ -6,7 +6,7 @@ function c31632536.initial_effect(c)
 	--chain attack
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c31632536.caop1)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)

script/c31764700.lua

@@ -16,7 +16,7 @@ function c31764700.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c31764700.batop)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)

script/c32086564.lua

@@ -18,7 +18,7 @@ function c32086564.initial_effect(c)
 	e3:SetDescription(aux.Stringid(32086564,0))
 	e3:SetCategory(CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTarget(c32086564.destg)
 	e3:SetOperation(c32086564.desop)

script/c32240937.lua

@@ -9,7 +9,7 @@ function c32240937.initial_effect(c)
 	--negate
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c32240937.negop)
 	c:RegisterEffect(e2)
 end

script/c35638627.lua

@@ -9,14 +9,14 @@ function c35638627.initial_effect(c)
 	--Disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c35638627.disop)
 	c:RegisterEffect(e2)
 	--chain attack
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(35638627,0))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetCondition(c35638627.atcon)
 	e3:SetOperation(c35638627.atop)
 	c:RegisterEffect(e3)

script/c35975813.lua

@@ -28,7 +28,7 @@ function c35975813.initial_effect(c)
 	--disable
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e5:SetCode(EVENT_BATTLE_END)
+	e5:SetCode(EVENT_BATTLED)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetOperation(c35975813.disop2)
 	c:RegisterEffect(e5)

script/c36042825.lua

@@ -27,7 +27,7 @@ function c36042825.initial_effect(c)
 	e4:SetDescription(aux.Stringid(36042825,0))
 	e4:SetCategory(CATEGORY_DESTROY+CATEGORY_DRAW)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetRange(LOCATION_SZONE)
 	e4:SetCondition(c36042825.drcon)
 	e4:SetTarget(c36042825.drtg)

script/c36088082.lua

@@ -28,7 +28,7 @@ function c36088082.regop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e2)
 		local e3=Effect.CreateEffect(c)
 		e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e3:SetCode(EVENT_BATTLE_END)
+		e3:SetCode(EVENT_BATTLED)
 		e3:SetOperation(c36088082.desop)
 		e3:SetReset(RESET_PHASE+PHASE_DAMAGE)
 		Duel.RegisterEffect(e3,tp)

script/c37083210.lua

@@ -29,7 +29,7 @@ function c37083210.activate(e,tp,eg,ep,ev,re,r,rp)
 		at:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-		e2:SetCode(EVENT_BATTLE_END)
+		e2:SetCode(EVENT_BATTLED)
 		e2:SetOperation(c37083210.desop)
 		e2:SetReset(RESET_PHASE+PHASE_DAMAGE)
 		Duel.RegisterEffect(e2,tp)

script/c37957847.lua

@@ -12,7 +12,7 @@ function c37957847.initial_effect(c)
 	--atkup
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c37957847.atkop)
 	c:RegisterEffect(e2)
 end

script/c39507162.lua

@@ -12,7 +12,7 @@ function c39507162.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCondition(c39507162.discon)
 	e2:SetOperation(c39507162.disop)

script/c41234315.lua

@@ -35,7 +35,7 @@ function c41234315.activate(e,tp,eg,ep,ev,re,r,rp)
 	e3:SetDescription(aux.Stringid(41234315,0))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c41234315.spop)
 	e3:SetReset(RESET_PHASE+PHASE_DAMAGE)
 	Duel.RegisterEffect(e3,tp)

script/c43426903.lua

@@ -5,7 +5,7 @@ function c43426903.initial_effect(c)
 	e1:SetDescription(aux.Stringid(43426903,0))
 	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c43426903.condition)
 	e1:SetOperation(c43426903.operation)
 	c:RegisterEffect(e1)

script/c45450218.lua

@@ -3,7 +3,7 @@ function c45450218.initial_effect(c)
 	--check
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c45450218.checkop)
 	c:RegisterEffect(e1)
 	--draw

script/c45688586.lua

@@ -5,7 +5,7 @@ function c45688586.initial_effect(c)
 	e1:SetDescription(aux.Stringid(45688586,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetTarget(c45688586.target)
 	e1:SetOperation(c45688586.operation)
 	c:RegisterEffect(e1)

script/c45711266.lua

@@ -5,7 +5,7 @@ function c45711266.initial_effect(c)
 	e1:SetDescription(aux.Stringid(45711266,0))
 	e1:SetCategory(CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c45711266.condition)
 	e1:SetTarget(c45711266.target)
 	e1:SetOperation(c45711266.operation)

script/c46427957.lua

@@ -5,7 +5,7 @@ function c46427957.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(46427957,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c46427957.atcon)
 	e1:SetOperation(c46427957.atop)
 	c:RegisterEffect(e1)

script/c48439321.lua

@@ -11,7 +11,7 @@ function c48439321.initial_effect(c)
 	e2:SetCategory(CATEGORY_DAMAGE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetRange(LOCATION_SZONE)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c48439321.damcon)
 	e2:SetTarget(c48439321.damtg)
 	e2:SetOperation(c48439321.damop)

script/c49202331.lua

@@ -18,7 +18,7 @@ function c49202331.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(49202331,1))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c49202331.atcon)
 	e2:SetCost(c49202331.atcost)
 	e2:SetOperation(c49202331.atop)

script/c49551909.lua

@@ -33,7 +33,7 @@ function c49551909.operation(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 		e1:SetCategory(CATEGORY_DESTROY)
 		e1:SetDescription(aux.Stringid(49551909,0))
-		e1:SetCode(EVENT_BATTLE_END)
+		e1:SetCode(EVENT_BATTLED)
 		e1:SetRange(LOCATION_SZONE)
 		e1:SetCondition(c49551909.descon)
 		e1:SetTarget(c49551909.destg)

script/c50400231.lua

@@ -20,7 +20,7 @@ function c50400231.initial_effect(c)
 	--atk clear
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c50400231.retop)
 	c:RegisterEffect(e3)
 end

script/c5284653.lua

@@ -4,7 +4,7 @@ function c5284653.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(5284653,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c5284653.condition)
 	e1:SetOperation(c5284653.operation)
 	c:RegisterEffect(e1)

script/c52913738.lua

@@ -21,7 +21,7 @@ end
 function c52913738.regop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetOperation(c52913738.tdop)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)

script/c5309481.lua

@@ -6,7 +6,7 @@ function c5309481.initial_effect(c)
 	--Disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c5309481.operation)
 	c:RegisterEffect(e1)

script/c53982768.lua

@@ -10,7 +10,7 @@ function c53982768.initial_effect(c)
 	--Disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD + EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetOperation(c53982768.operation)
 	c:RegisterEffect(e2)

script/c54415063.lua

@@ -3,7 +3,7 @@ function c54415063.initial_effect(c)
 	--atk limit
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c54415063.operation)
 	c:RegisterEffect(e1)

script/c54702678.lua

@@ -13,7 +13,7 @@ function c54702678.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(54702678,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c54702678.discon)
 	e2:SetOperation(c54702678.disop)
 	c:RegisterEffect(e2)

script/c56921677.lua

@@ -5,7 +5,7 @@ function c56921677.initial_effect(c)
 	e1:SetDescription(aux.Stringid(56921677,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c56921677.condition)
 	e1:SetTarget(c56921677.target)
 	e1:SetOperation(c56921677.operation)

script/c58206034.lua

@@ -3,7 +3,7 @@ function c58206034.initial_effect(c)
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c58206034.discon)
 	e1:SetOperation(c58206034.disop)

script/c58924378.lua

@@ -8,7 +8,7 @@ function c58924378.initial_effect(c)
 	--atk down
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetOperation(c58924378.atkdn)
 	c:RegisterEffect(e2)

script/c60930169.lua

@@ -13,7 +13,7 @@ function c60930169.initial_effect(c)
 		c60930169.global_check=true
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_BATTLE_END)
+		ge1:SetCode(EVENT_BATTLED)
 		ge1:SetOperation(c60930169.checkop)
 		Duel.RegisterEffect(ge1,0)
 	end

script/c6142213.lua

@@ -5,7 +5,7 @@ function c6142213.initial_effect(c)
 	e1:SetDescription(aux.Stringid(6142213,0))
 	e1:SetCategory(CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c6142213.condition)
 	e1:SetTarget(c6142213.target)
 	e1:SetOperation(c6142213.operation)

script/c62315111.lua

@@ -4,7 +4,7 @@ function c62315111.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(62315111,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c62315111.atcon)
 	e1:SetOperation(c62315111.atop)
 	c:RegisterEffect(e1)

script/c65079854.lua

@@ -39,7 +39,7 @@ function c65079854.initial_effect(c)
 	e6:SetDescription(aux.Stringid(65079854,0))
 	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e6:SetRange(LOCATION_SZONE)
-	e6:SetCode(EVENT_BATTLE_END)
+	e6:SetCode(EVENT_BATTLED)
 	e6:SetCondition(c65079854.adcon)
 	e6:SetOperation(c65079854.adop)
 	c:RegisterEffect(e6)

script/c65260293.lua

@@ -12,7 +12,7 @@ function c65260293.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(65260293,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c65260293.atcon)
 	e2:SetOperation(c65260293.atop)
 	c:RegisterEffect(e2)

script/c66712593.lua

@@ -11,7 +11,7 @@ function c66712593.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c66712593.discon)
 	e2:SetOperation(c66712593.disop)
 	c:RegisterEffect(e2)

script/c67030233.lua

@@ -16,7 +16,7 @@ function c67030233.initial_effect(c)
 	e2:SetDescription(aux.Stringid(67030233,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c67030233.descon)
 	e2:SetTarget(c67030233.destg)
 	e2:SetOperation(c67030233.desop)

script/c67045174.lua

@@ -13,7 +13,7 @@ function c67045174.initial_effect(c)
 		c67045174.global_check=true
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_BATTLE_END)
+		ge1:SetCode(EVENT_BATTLED)
 		ge1:SetOperation(c67045174.checkop)
 		Duel.RegisterEffect(ge1,0)
 	end

script/c68366996.lua

@@ -16,7 +16,7 @@ function c68366996.initial_effect(c)
 	e2:SetDescription(aux.Stringid(68366996,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(aux.IsDualState)
 	e2:SetTarget(c68366996.target)
 	e2:SetOperation(c68366996.operation)

script/c68427465.lua

@@ -26,7 +26,7 @@ function c68427465.initial_effect(c)
 	--negate
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetRange(LOCATION_SZONE)
 	e4:SetOperation(c68427465.negop)
 	c:RegisterEffect(e4)

script/c70902743.lua

@@ -8,7 +8,7 @@ function c70902743.initial_effect(c)
 	e1:SetDescription(aux.Stringid(70902743,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c70902743.condition1)
 	e1:SetTarget(c70902743.target1)
 	e1:SetOperation(c70902743.operation1)

script/c71934924.lua

@@ -9,7 +9,7 @@ function c71934924.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetRange(LOCATION_SZONE)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetOperation(c71934924.atop)
 	c:RegisterEffect(e2)
 	--atkup

script/c72167543.lua

@@ -20,7 +20,7 @@ function c72167543.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(72167543,1))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetOperation(c72167543.rmop)
 	c:RegisterEffect(e3)
 end

script/c72989439.lua

@@ -27,7 +27,7 @@ function c72989439.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(72989439,2))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_BATTLE_END)
+	e3:SetCode(EVENT_BATTLED)
 	e3:SetCondition(c72989439.atcon)
 	e3:SetOperation(c72989439.atop)
 	c:RegisterEffect(e3)

script/c73544866.lua

@@ -16,7 +16,7 @@ function c73544866.initial_effect(c)
 	--negate
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetOperation(c73544866.negop)
 	c:RegisterEffect(e4)
 	--atkup

script/c76372778.lua

@@ -7,7 +7,7 @@ function c76372778.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(76372778,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c76372778.condition)
 	e1:SetCost(c76372778.cost)
 	e1:SetOperation(c76372778.operation)

script/c76650663.lua

@@ -4,7 +4,7 @@ function c76650663.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(76650663,0))
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c76650663.condition)
 	e1:SetOperation(c76650663.operation)
 	c:RegisterEffect(e1)

script/c77336644.lua

@@ -13,7 +13,7 @@ function c77336644.initial_effect(c)
 	e2:SetDescription(aux.Stringid(77336644,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c77336644.descon)
 	e2:SetTarget(c77336644.destg)
 	e2:SetOperation(c77336644.desop)

script/c79965360.lua

@@ -28,7 +28,7 @@ function c79965360.initial_effect(c)
 	e4:SetDescription(aux.Stringid(79965360,0))
 	e4:SetCategory(CATEGORY_DESTROY)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e4:SetCode(EVENT_BATTLE_END)
+	e4:SetCode(EVENT_BATTLED)
 	e4:SetRange(LOCATION_SZONE)
 	e4:SetCondition(c79965360.descon)
 	e4:SetTarget(c79965360.destg)

script/c80071763.lua

@@ -18,7 +18,7 @@ function c80071763.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetOperation(c80071763.disop2)
 	c:RegisterEffect(e2)

script/c80367387.lua

@@ -13,7 +13,7 @@ function c80367387.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(80367387,3))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c80367387.atcon)
 	e2:SetOperation(c80367387.atop)
 	c:RegisterEffect(e2)

script/c81000306.lua

@@ -38,7 +38,7 @@ function c81000306.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-		e4:SetCode(EVENT_BATTLE_END)
+		e4:SetCode(EVENT_BATTLED)
 		e4:SetOperation(c81000306.desop)
 		e4:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e4)

script/c85313220.lua

@@ -3,7 +3,7 @@ function c85313220.initial_effect(c)
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetOperation(c85313220.disop)
 	c:RegisterEffect(e1)

script/c85682655.lua

@@ -5,7 +5,7 @@ function c85682655.initial_effect(c)
 	e1:SetDescription(aux.Stringid(85682655,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1)
 	e1:SetTarget(c85682655.target)

script/c85684223.lua

@@ -44,7 +44,7 @@ function c85684223.initial_effect(c)
 	local e6=Effect.CreateEffect(c)
 	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e6:SetRange(LOCATION_MZONE)
-	e6:SetCode(EVENT_BATTLE_END)
+	e6:SetCode(EVENT_BATTLED)
 	e6:SetOperation(c85684223.desop3)
 	e6:SetLabelObject(e4)
 	c:RegisterEffect(e6)

script/c87880531.lua

@@ -56,7 +56,7 @@ function c87880531.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 		local e4=Effect.CreateEffect(e:GetHandler())
 		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-		e4:SetCode(EVENT_BATTLE_END)
+		e4:SetCode(EVENT_BATTLED)
 		e4:SetOperation(c87880531.disop)
 		e4:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e4)

script/c88132637.lua

@@ -3,7 +3,7 @@ function c88132637.initial_effect(c)
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c88132637.discon)
 	e1:SetOperation(c88132637.disop)

script/c88283496.lua

@@ -5,7 +5,7 @@ function c88283496.initial_effect(c)
 	e1:SetDescription(aux.Stringid(88283496,0))
 	e1:SetCategory(CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c88283496.retcon)
 	e1:SetTarget(c88283496.rettg)
 	e1:SetOperation(c88283496.retop)

script/c89567993.lua

@@ -3,7 +3,7 @@ function c89567993.initial_effect(c)
 	--to deck
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_BATTLE_END)
+	e1:SetCode(EVENT_BATTLED)
 	e1:SetCondition(c89567993.tdcon)
 	e1:SetOperation(c89567993.tdop)
 	c:RegisterEffect(e1)

script/c92755808.lua

@@ -12,7 +12,7 @@ function c92755808.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_BATTLE_END)
+	e2:SetCode(EVENT_BATTLED)
 	e2:SetCondition(c92755808.discon)
 	e2:SetOperation(c92755808.disop)
 	c:RegisterEffect(e2)