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

scripts/CeruleanCity.asm

@@ -156,6 +156,8 @@ CeruleanCityScript1:
 	ld a, $9
 .done
 	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a 
 
 	xor a
 	ldh [hJoyHeld], a
@@ -168,6 +170,8 @@ CeruleanCityScript2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanCityScript_1948c
+	xor a 
+	ld [wIsTrainerBattle], a 
 	call CeruleanCityScript_1955d
 	ld a, $f0
 	ld [wJoyIgnore], a

scripts/OaksLab.asm

@@ -382,6 +382,8 @@ OaksLabScript11:
 	ret nz
 
 	; define which team rival uses, and fight it
+	ld a, 1
+	ld [wIsTrainerBattle], a
 	ld a, OPP_RIVAL1
 	ld [wCurOpponent], a
 	ld a, [wRivalStarter]
@@ -416,6 +418,8 @@ OaksLabScript11:
 	ret
 
 OaksLabScript12:
+	xor a
+	ld [wIsTrainerBattle], a
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP

scripts/PokemonTower2F.asm

@@ -66,6 +66,8 @@ PokemonTower2Script1:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower2Script_604fe
+	xor a 
+	ld [wIsTrainerBattle], a
 	ld a, $f0
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
@@ -164,6 +166,8 @@ PokemonTower2Text1:
 	ld a, $6
 .done
 	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a
 
 	ld a, $1
 	ld [wPokemonTower2FCurScript], a

scripts/Route12.asm

@@ -33,6 +33,8 @@ Route12Script0:
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLVL], a
+	xor a
+	ld [wIsTrainerBattle], a
 	ld a, HS_ROUTE_12_SNORLAX
 	ld [wMissableObjectIndex], a
 	predef HideObject

scripts/Route16.asm

@@ -33,6 +33,8 @@ Route16Script0:
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLVL], a
+	xor a
+	ld [wIsTrainerBattle], a 
 	ld a, HS_ROUTE_16_SNORLAX
 	ld [wMissableObjectIndex], a
 	predef HideObject

scripts/Route22.asm

@@ -33,6 +33,8 @@ Route22Script_50ed6:
 .asm_50ee1
 	ld a, [hl]
 	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a 
 	ret
 
 Route22MoveRivalSprite:
@@ -149,6 +151,8 @@ Route22Script2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
+	xor a 
+	ld [wIsTrainerBattle], a 
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	and a ; cp SPRITE_FACING_DOWN
 	jr nz, .notDown
@@ -304,6 +308,8 @@ Route22Script5:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
+	xor a 
+	ld [wIsTrainerBattle], a
 	ld a, $2
 	ldh [hSpriteIndex], a
 	ld a, [wcf0d]

scripts/SSAnne2F.asm

@@ -114,6 +114,8 @@ SSAnne2Script1:
 	ld a, $3
 .done
 	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a
 
 	call SSAnne2Script_61416
 	ld a, $2
@@ -124,6 +126,8 @@ SSAnne2Script2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SSAnne2Script_613ab
+	xor a 
+	ld [wIsTrainerBattle], a 
 	call SSAnne2Script_61416
 	ld a, $f0
 	ld [wJoyIgnore], a

scripts/SilphCo7F.asm

@@ -199,6 +199,8 @@ SilphCo7Script3:
 	ld a, $9
 .asm_51cc0
 	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a 
 	ld a, $4
 	jp SilphCo7Text_51c10
 
@@ -206,6 +208,8 @@ SilphCo7Script4:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo7Text_51c0c
+	xor a 
+	ld [wIsTrainerBattle], a
 	ld a, $f0
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_SILPH_CO_RIVAL