Bug: In the Battle Tower, opponents that manually switch out will not take Spikes damage

[DogShrapnel]

During a battle in the Battle Tower, trainers that manually switch out their Pokémon will fail to trigger spikes damage, other methods seem to work fine otherwise, such as Whirlwind.

Source

[Grate-Oracle-Lewot]

This appears to work:

Battle_EnemyFirst:
	...

.switch_item
	call SetEnemyTurn
+	call EnemySwitchSpikes
+	jp z, HandleEnemyMonFaint
	call ResidualDamage
	jp z, HandleEnemyMonFaint
	...
	ret

Battle_PlayerFirst:
	xor a
	ld [wEnemyGoesFirst], a
	call SetEnemyTurn
	callfar AI_SwitchOrTryItem
	push af
+	call EnemySwitchSpikes
+	jr z, .spikes_faint
	call PlayerTurn_EndOpponentProtectEndureDestinyBond
	pop bc
	...

.switched_or_used_item
	...
	ret
+
+.spikes_faint
+	pop af ; realign stack, don't care about values
+	jp HandleEnemyMonFaint

...
...

+EnemySwitchSpikes:
+	ld a, [wEnemyIsSwitching]
+	and a
+	jr z, .no
+	call SpikesDamage
+	jp HasEnemyFainted
+
+.no
+; return nz
+	ld a, $1
+	and a
+	ret

I tested player going first, enemy going first, spikes causing a faint, player and enemy both switching, set mode vs switch mode... seemed like it was all okay, but I'd appreciate someone else testing in case I missed something.

[Frank995]

Was it a bug of OG pokemon crystal as well?