expanded Pokemon size

Rhyperior files are dummies and will need to be properly edited with sprites, Rhydon evo data, etc, but it (and the other files included) show that the trainer and pokemon sprite indexes have been separated, which allows us to add the other KEP mons

engine/battle/battle_transitions.asm

@@ -82,8 +82,8 @@ BattleTransitions:
 
 GetBattleTransitionID_WildOrTrainer:
 	ld a, [wCurOpponent]
-	cp OPP_ID_OFFSET
-	jr nc, .trainer
+	and a 
+	jr nz, .trainer
 	res 0, c
 	ret
 .trainer

engine/battle/core.asm

@@ -955,6 +955,12 @@ TrainerBattleVictory:
 ; win money
 	ld hl, MoneyForWinningText
 	call PrintText
+	
+	xor a
+	ld [wIsTrainerBattle], a
+	ld a, 1
+	ld [wWasTrainerBattle], a
+	
 	ld de, wPlayerMoney + 2
 	ld hl, wAmountMoneyWon + 2
 	ld c, $3
@@ -1142,6 +1148,8 @@ ChooseNextMon:
 ; called when player is out of usable mons.
 ; prints appropriate lose message, sets carry flag if player blacked out (special case for initial rival fight)
 HandlePlayerBlackOut:
+    xor a
+	ld [wIsTrainerBattle], a 
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jr z, .notRival1Battle
@@ -6801,9 +6809,11 @@ InitBattleCommon:
 	push af
 	res 1, [hl]
 	callfar InitBattleVariables
+	ld a, [wIsTrainerBattle]
+	and a
+	jp z, InitWildBattle
 	ld a, [wEnemyMonSpecies2]
 	sub OPP_ID_OFFSET
-	jp c, InitWildBattle
 	ld [wTrainerClass], a
 	call GetTrainerInformation
 	callfar ReadTrainer

engine/battle/wild_encounters.asm

@@ -99,6 +99,7 @@ TryDoWildEncounter:
 	ret
 .willEncounter
 	xor a
+	ld [wIsTrainerBattle], a
 	ret
 
 INCLUDE "data/wild/probabilities.asm"