Revert unstable species ownership catch gating

engine/battle/core.asm

@@ -1194,18 +1194,13 @@ EnsureEncounterCatchFlagsInitialized:
 	ret
 
 EnableEncounterCatchSRAM_Battle:
-    ld a, $0A
-    ld [$0000], a                 ; enable SRAM
-    ld a, $01
-    ld [$6000], a                 ; MBC1: RAM banking mode (harmless on others)
-    ld a, BANK(sMapEncounterCatchFlags)
-    ld [$4000], a                 ; select SRAM bank that holds the flags
-    ret
+	ld a, BANK(sMapEncounterCatchFlags)
+	call OpenSRAM
+	ret
 
 DisableEncounterCatchSRAM_Battle:
-    xor a
-    ld [$0000], a                 ; disable SRAM
-    ret
+	call CloseSRAM
+	ret
 
 ; asks if you want to use next mon
 ; stores whether you ran in C flag

engine/events/poison.asm

@@ -68,7 +68,9 @@ ApplyOutOfBattlePoisonDamage:
 	callfar PlayPikachuSoundClip
 	callfar_ModifyPikachuHappiness PIKAHAPPY_PSNFNT
 .curMonNotPlayerPikachu
-	call HandlePoisonFaintedMonRanAway
+	ld a, [wWhichPokemon]
+	ld [wPlayerMonNumber], a
+	callfar HandleFaintedPlayerMonRanAway
 	pop de
 	pop hl
 	jr .restartAfterRemoval
@@ -148,34 +150,6 @@ ApplyOutOfBattlePoisonDamage:
 	ld [wOutOfBattleBlackout], a
 	ret
 
-PoisonFaintedMonRanAwayText:
-	text_far _PokemonRanAwayBadTrainingText
-	text_end
-
-HandlePoisonFaintedMonRanAway:
-	ld a, [wPartyCount]
-	cp 1
-	ret z ; don't remove the final party mon to avoid invalid 0-mon party state
-	ld hl, wPartyMonNicks
-	call GetPartyMonName
-	ld hl, PoisonFaintedMonRanAwayText
-	call PrintText
-	xor a
-	ld [wRemoveMonFromBox], a
-	call RemovePokemon
-	ld a, [wPartyCount]
-	and a
-	ret z
-	dec a
-	ld b, a
-	ld a, [wWhichPokemon]
-	cp b
-	jr c, .done
-	ld a, b
-	ld [wWhichPokemon], a
-.done
-	ret
-
 Func_c4c7:
 	ld a, [wStepCounter]
 	and a