thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-20 17:51:27 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected gym scaling for Brock

Browse source 
Thanks to Chatot4444!
This commit is contained in:
May Evans 2022-12-17 19:00:21 +00:00
parent f582550f55
commit 75b59760df
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -153,6 +153,7 @@ Credits
* Albatross - Several of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...) * Albatross - Several of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...)
* ZumiIsawhat? - Restorations of beta OST * ZumiIsawhat? - Restorations of beta OST
* Helix Chamber, RacieBeep, et al - Prototype Pokémon sprites * Helix Chamber, RacieBeep, et al - Prototype Pokémon sprites
* Chatot4444 - Assisting with gym scaling code
* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with making MissingNo. stable. Assisted in bug fixes. * Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with making MissingNo. stable. Assisted in bug fixes.
* Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld! * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld!

7
scripts/PewterGym.asm
View file

@ -123,7 +123,12 @@ BrockText:
; gym scaling spaghetti code begins here - remove initial parameters as we're making our own ; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
ld a, OPP_BROCK ld a, OPP_BROCK
ld [wCurOpponent], a 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 hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help.
ld b, 1
call CountSetBits
ld a, [wNumSetBits]
inc a
ld [wTrainerNo], a ld [wTrainerNo], a
ld a, 1 ld a, 1