thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

optional and nerfed brock

Browse source
This commit is contained in:
emaskyesmogon 2022-10-14 17:51:37 -06:00
parent c3fd568b7b
commit a35fc22072
4 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/maps/objects/PewterCity.asm
View file

@ -25,6 +25,5 @@ PewterCity_Object:
object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person
object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person
def_warps_to PEWTER_CITY def_warps_to PEWTER_CITY

2
data/trainers/parties.asm
View file

@ -657,7 +657,7 @@ BrunoData:
; db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0 ; db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
BrockData: BrockData:
db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0 db $FF, 13, GEODUDE, 9, OMANYTE, 9, KABUTO, 12, DECILLA, 15, ONIX, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0 ; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0

40
data/trainers/special_moves.asm
View file

@ -19,51 +19,47 @@ SpecialTrainerMoves:
; NOTE: update this to match their new teams ; NOTE: update this to match their new teams
db BROCK, 1 db BROCK, 1
db 2, 3, BIND db 5, 3, BIND
db 2, 4, BIDE db 5, 4, BIDE
db 0 db 0
db MISTY, 1 db MISTY, 1
db 2, 4, BUBBLEBEAM db 5, 4, BUBBLEBEAM
db 0 db 0
db LT_SURGE, 1 db LT_SURGE, 1
db 1, 1, THUNDERBOLT db 5, 1, THUNDERBOLT
db 1, 2, MEGA_PUNCH db 5, 2, MEGA_PUNCH
db 1, 3, MEGA_KICK db 5, 3, MEGA_KICK
db 1, 4, GROWL db 5, 4, GROWL
db 0 db 0
db ERIKA, 1 db ERIKA, 1
db 1, 3, MEGA_DRAIN db 4, 3, MEGA_DRAIN
db 2, 1, RAZOR_LEAF db 1, 1, RAZOR_LEAF
db 3, 1, PETAL_DANCE db 2, 1, PETAL_DANCE
db 0 db 0
db KOGA, 1 db KOGA, 1
db 1, 1, TOXIC db 1, 1, TOXIC
db 1, 2, TACKLE
db 2, 1, TOXIC db 2, 1, TOXIC
db 2, 3, SUPERSONIC
db 3, 1, TOXIC db 3, 1, TOXIC
db 3, 2, DOUBLE_EDGE db 3, 2, DOUBLE_EDGE
db 4, 1, LEECH_LIFE db 1, 1, LEECH_LIFE
db 4, 2, DOUBLE_TEAM db 1, 2, DOUBLE_TEAM
db 4, 3, PSYCHIC_M db 1, 3, PSYCHIC_M
db 4, 4, TOXIC db 1, 4, TOXIC
db 0 db 0
db BLAINE, 1 db BLAINE, 1
db 1, 1, FLAMETHROWER db 5, 1, FLAMETHROWER
db 1, 4, CONFUSE_RAY db 2, 4, CONFUSE_RAY
db 3, 1, FLAMETHROWER db 3, 1, FLAMETHROWER
db 3, 2, FIRE_BLAST db 5, 2, FIRE_BLAST
db 3, 3, REFLECT db 3, 3, REFLECT
db 0 db 0
db SABRINA, 1 db SABRINA, 1
db 1, 1, FLASH
db 2, 1, KINESIS
db 2, 4, PSYWAVE db 2, 4, PSYWAVE
db 3, 1, PSYWAVE db 3, 1, PSYWAVE
db 0 db 0
@ -86,7 +82,7 @@ SpecialTrainerMoves:
db 3, 1, PSYCHIC_M db 3, 1, PSYCHIC_M
db 3, 2, SURF db 3, 2, SURF
db 4, 3, LOVELY_KISS db 4, 3, LOVELY_KISS
db 5, 3, BLIZZARD db 6, 3, BLIZZARD
db 0 db 0
db BRUNO, 1 db BRUNO, 1

4
scripts/PewterCity.asm
View file

@ -6,7 +6,7 @@ PewterCity_Script:
PewterCity_ScriptPointers: PewterCity_ScriptPointers:
dw PewterCityScript0 dw PewterCityScript0
dw PewterCityScript1 ; dw PewterCityScript1
dw PewterCityScript2 dw PewterCityScript2
dw PewterCityScript3 dw PewterCityScript3
dw PewterCityScript4 dw PewterCityScript4
@ -43,7 +43,7 @@ CoordsData_19277:
dbmapcoord 37, 19 dbmapcoord 37, 19
db -1 ; end db -1 ; end
PewterCityScript1: ;PewterCityScript1:
ld a, [wNPCMovementScriptPointerTableNum] ld a, [wNPCMovementScriptPointerTableNum]
and a and a
ret nz ret nz