Add Gym Scaling for Brock

This code has been tested on 8 Badges and loads the rematch team, which implies it works correctly. It needs to be tested with progression and the like, though.

I've also renamed the "Pocket Lapras" a la the "Miraidon's Poke Ball" concept from SV, which can be used later.
This commit is contained in:
May Evans 2022-12-17 06:41:38 +00:00
parent 4dc561d0b5
commit f582550f55
3 changed files with 25 additions and 6 deletions

View file

@ -118,7 +118,19 @@ BrockText:
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
; call InitBattleEnemyParameters ; put this back if you mess up
; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
ld a, OPP_BROCK
ld [wCurOpponent], a
ld a, NUM_BADGES + 1 ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge!
ld [wTrainerNo], a
ld a, 1
ld [wIsTrainerBattle], a
;ends here
ld a, $1
ld [wGymLeaderNo], a
xor a