thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gym scaling base

Browse source 
This adds gym scaling for every leader, plus Koichi of the Fighting Dojo.

Me and Ema decided to give Koichi scaling, as he is a gym leader in everything but class. I will likely give Yujirou the same treatment once he's all set up.

The parties have not been set up, assuming Martha is working on them.

An important note: space is somewhat limited on trainers now, so the leaders will need implementing incrementally. You will most likely have to remove unnecessary trainers to make this work.
This commit is contained in:
May Evans 2022-12-17 20:47:39 +00:00
parent 25b61f95be
commit f4f2628f8d
13 changed files with 177 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/maps/objects/FightingDojo.asm
View file

@ -8,11 +8,11 @@ FightingDojo_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 ; koichi
object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 9
object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 10
object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 11
object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 12
object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person

2
data/maps/objects/VictoryRoad2F.asm
View file

@ -13,7 +13,7 @@ VictoryRoad2F_Object:
def_bg_events
def_object_events
object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9
object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 16
object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6

6
data/maps/objects/ViridianGym.asm
View file

@ -12,11 +12,11 @@ ViridianGym_Object:
def_object_events
object_event 4, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 13
object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 14
object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 15
object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
object_event 4, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person

59
data/trainers/parties.asm
View file

@ -486,11 +486,19 @@ BirdKeeperData:
db 28, SPEAROW, DODUO, FEAROW, 0
BlackbeltData:
; Fighting Dojo
db 37, HITMONLEE, HITMONCHAN, 0
db 31, MANKEY, MANKEY, PRIMEAPE, 0
db 32, MACHOP, MACHOKE, 0
db 36, PRIMEAPE, 0
; Koichi parties
db 7, MACHOP, MANKEY, 0
db 18, MACHOP, MANKEY, POLIWHIRL, 0
db 22, MACHOKE, MANKEY, POLIWHIRL, HITMONLEE, HITMONCHAN, 0
db 28, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, HITMONTOP, 0
db 34, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, HITMONTOP, 0
db 39, MACHAMP, PRIMEAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
db 55, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
; Fighting Dojo Trainers
db 31, CHEEP, CHEEP, JABETTA, 0
db 32, MACHOKE, MACHAMP, 0
db 36, SIRFETCHD, 0
db 31, MACHOP, MANKEY, PRIMEAPE, 0
; Viridian Gym - changed to fit the Ground-type gym theme
db 40, GRAVELER, GOLEM, 0
@ -591,32 +599,32 @@ RocketData:
db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
; Unused - this will be used in the Silph Gauntlet
db 65, PERSIAN, ARBOK, WEEZING, CROBAT, HYPNO, GUARDIA, 0
; Silph Co. 2F
db 29, CUBONE, ZUBAT, 0
db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
; Silph Co. 2F - cut
;db 29, CUBONE, ZUBAT, 0
;db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
; Silph Co. 3F
db 28, RATICATE, HYPNO, RATICATE, 0
; Silph Co. 4F
db 29, MACHOP, DROWZEE, 0
db 28, EKANS, ZUBAT, CUBONE, 0
; Silph Co. 5F
db 33, ARBOK, 0
db 33, HYPNO, 0
; Silph Co. 6F
db 29, MACHOP, MACHOKE, 0
db 28, ZUBAT, ZUBAT, GOLBAT, 0
; Silph Co. 4F - cut
;db 29, MACHOP, DROWZEE, 0
;db 28, EKANS, ZUBAT, CUBONE, 0
; Silph Co. 5F - cut
;db 33, ARBOK, 0
;db 33, HYPNO, 0
; Silph Co. 6F - cut
;db 29, MACHOP, MACHOKE, 0
;db 28, ZUBAT, ZUBAT, GOLBAT, 0
; Silph Co. 7F
db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0
db 29, CUBONE, CUBONE, 0
db 29, SANDSHREW, SANDSLASH, 0
; Silph Co. 8F
db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0
db 28, WEEZING, GOLBAT, KOFFING, 0
; Silph Co. 9F
db 28, DROWZEE, GRIMER, MACHOP, 0
db 28, GOLBAT, DROWZEE, HYPNO, 0
; Silph Co. 10F
db 33, MACHOKE, 0
; Silph Co. 8F - cut
;db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0
;db 28, WEEZING, GOLBAT, KOFFING, 0
; Silph Co. 9F - cut
;db 28, DROWZEE, GRIMER, MACHOP, 0
;db 28, GOLBAT, DROWZEE, HYPNO, 0
; Silph Co. 10F - cut
;db 33, MACHOKE, 0
; Silph Co. 11F
db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0
db 32, CUBONE, DROWZEE, MAROWAK, 0
@ -792,4 +800,3 @@ LanceData:
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CHARIZARD, 59, CRYITHAN, 62, DRAGONITE, 0
; post-game rematch team (currently unused)
; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0