thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-25 03:46:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

polishing the added pokemon a little

Browse source
This commit is contained in:
MementoMartha 2022-09-27 22:58:06 +01:00
parent e02394e8d2
commit d8cb5a331f
10 changed files with 109 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
constants/pokemon_constants.asm
View file

@ -209,11 +209,11 @@
const LICKILICKY ; $CD (new) const LICKILICKY ; $CD (new)
const TANGROWTH ; $CE (new) const TANGROWTH ; $CE (new)
const KLEAVOR ; $CF (new) const KLEAVOR ; $CF (new)
const TSUBOMITTO const TSUBOMITTO ; $D0 (new)
const STEELIX const STEELIX ; $D1 (new)
const BLISSEY const BLISSEY ; $D2 (new)
const HITMONTOP const HITMONTOP ; $D3 (new)
const CROBAT const CROBAT ; $D4 (new)
DEF NUM_POKEMON_INDEXES EQU const_value - 1 DEF NUM_POKEMON_INDEXES EQU const_value - 1

8
data/pokemon/cries.asm
View file

@ -208,9 +208,9 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Lickilicky mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
mon_cry SFX_CRY_00, $00, $00 ; Tangrowth mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
mon_cry SFX_CRY_00, $00, $00 ; Kleavor mon_cry SFX_CRY_00, $00, $00 ; Kleavor
mon_cry SFX_CRY_25, $44, $20 ; Tsubomitto mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
mon_cry SFX_CRY_25, $66, $CC ; Steelix mon_cry SFX_CRY_00, $00, $00 ; Steelix
mon_cry SFX_CRY_00, $00, $00 ; Blissey mon_cry SFX_CRY_00, $00, $00 ; Blissey
mon_cry SFX_CRY_25, $44, $20 ; Hitmontop mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop
mon_cry SFX_CRY_25, $66, $CC ; Crobat mon_cry SFX_CRY_1D, $08, $B1 ; Crobat
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES

39
data/pokemon/dex_entries.asm
View file

@ -202,11 +202,11 @@ PokedexEntryPointers:
dw LickilickyDexEntry dw LickilickyDexEntry
dw TangrowthDexEntry dw TangrowthDexEntry
dw KleavorDexEntry dw KleavorDexEntry
dw MissingNoDexEntry ; Tsubomitto dw TsubomittoDexEntry
dw MissingNoDexEntry ; Steelix dw SteelixDexEntry
dw MissingNoDexEntry ; Blissey dw BlisseyDexEntry
dw MissingNoDexEntry ; Hitmontop dw HitmontopDexEntry
dw MissingNoDexEntry ; Crobat dw CrobatDexEntry
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES
; string: species name ; string: species name
@ -1634,3 +1634,32 @@ MonjaDexEntry:
dw 330 dw 330
text_far _MonjaDexEntry text_far _MonjaDexEntry
text_end text_end
SteelixDexEntry:
db "IRON SNAKE@"
db 30,2
dw 8820
text_far _SteelixDexEntry
text_end
HitmontopDexEntry:
db "HEADSTAND@"
db 4,7
dw 1060
text_far _HitmontopDexEntry
text_end
BlisseyDexEntry:
db "HAPPINESS@"
db 4,11
dw 1030
text_far _BlisseyDexEntry
text_end
CrobatDexEntry:
db "BAT@"
db 5,11
dw 1650
text_far _CrobatDexEntry
text_end

46
data/pokemon/evos_moves.asm
View file

@ -335,7 +335,7 @@ ExeggutorEvosMoves:
LickitungEvosMoves: LickitungEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 37, LICKILICKY db EV_LEVEL, 32, LICKILICKY
db 0 db 0
; Learnset ; Learnset
db 7, STOMP db 7, STOMP
@ -565,7 +565,7 @@ PinsirEvosMoves:
TangelaEvosMoves: TangelaEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 34, TANGROWTH db EV_LEVEL, 44, TANGROWTH
db 0 db 0
; Learnset ; Learnset
db 24, BIND db 24, BIND
@ -609,6 +609,7 @@ GrowlitheEvosMoves:
OnixEvosMoves: OnixEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 38, STEELIX
db 0 db 0
; Learnset ; Learnset
db 15, BIND db 15, BIND
@ -683,6 +684,7 @@ GravelerEvosMoves:
ChanseyEvosMoves: ChanseyEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 45, BLISSEY
db 0 db 0
; Learnset ; Learnset
db 12, DOUBLESLAP db 12, DOUBLESLAP
@ -1759,6 +1761,7 @@ HypnoEvosMoves:
GolbatEvosMoves: GolbatEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 44, CROBAT
db 0 db 0
; Learnset ; Learnset
db 10, SUPERSONIC db 10, SUPERSONIC
@ -2041,7 +2044,7 @@ TentacruelEvosMoves:
GyopinEvosMoves: GyopinEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 22, GOLDEEN db EV_LEVEL, 16, GOLDEEN
db 0 db 0
; Learnset ; Learnset
db 7, SUPERSONIC db 7, SUPERSONIC
@ -2114,7 +2117,7 @@ GorotoraEvosMoves:
PuchikoonEvosMoves: PuchikoonEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 25, PONYTA db EV_LEVEL, 20, PONYTA
db 0 db 0
; Learnset ; Learnset
db 7, QUICK_ATTACK db 7, QUICK_ATTACK
@ -2428,6 +2431,7 @@ BellsproutEvosMoves:
WeepinbellEvosMoves: WeepinbellEvosMoves:
; Evolutions ; Evolutions
db EV_ITEM, LEAF_STONE, 1, VICTREEBEL db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
db EV_ITEM, SUN_STONE, 1, TSUBOMITTO
db 0 db 0
; Learnset ; Learnset
db 13, WRAP db 13, WRAP
@ -2450,7 +2454,7 @@ VictreebelEvosMoves:
MonjaEvosMoves: MonjaEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 18, TANGELA db EV_LEVEL, 22, TANGELA
db 0 db 0
; Learnset ; Learnset
db 5, BIND db 5, BIND
@ -2466,7 +2470,7 @@ MonjaEvosMoves:
PudiEvosMoves: PudiEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 14, GROWLITHE db EV_LEVEL, 16, GROWLITHE
db 0 db 0
; Learnset ; Learnset
db 9, EMBER db 9, EMBER
@ -2609,28 +2613,58 @@ TsubomittoEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 48, SOLARBEAM
db 0 db 0
SteelixEvosMoves: SteelixEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 8, IRON_DEFENSE
db 15, BIND
db 19, ROCK_THROW
db 25, RAGE
db 33, SLAM
db 38, IRON_HEAD
db 43, HARDEN
db 0 db 0
BlisseyEvosMoves: BlisseyEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 12, DOUBLESLAP
db 24, SING
db 30, GROWL
db 38, MINIMIZE
db 44, DEFENSE_CURL
db 48, LIGHT_SCREEN
db 54, DOUBLE_EDGE
db 0 db 0
HitmontopEvosMoves: HitmontopEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 7, FOCUS_ENERGY
db 33, QUICK_ATTACK
db 38, COUNTER
db 43, AGILITY
db 48, JUMP_KICK
db 53, DOUBLE_KICK
db 0 db 0
CrobatEvosMoves: CrobatEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 7, GUST
db 10, SUPERSONIC
db 15, BITE
db 17, QUICK_ATTACK
db 21, CONFUSE_RAY
db 26, SLUDGE
db 32, WING_ATTACK
db 43, HAZE
db 50, AGILITY
db 0 db 0

2
data/pokemon/menu_icons.asm
View file

@ -46,7 +46,7 @@ MonPartyData:
nybble ICON_MON ; Bittybat nybble ICON_MON ; Bittybat
nybble ICON_MON ; Zubat nybble ICON_MON ; Zubat
nybble ICON_MON ; Golbat nybble ICON_MON ; Golbat
nybble ICON_BIRD ; Crobat nybble ICON_MON ; Crobat
nybble ICON_GRASS ; Oddish nybble ICON_GRASS ; Oddish
nybble ICON_GRASS ; Gloom nybble ICON_GRASS ; Gloom
nybble ICON_GRASS ; Vileplume nybble ICON_GRASS ; Vileplume

12
data/pokemon/new_dex_text.asm
View file

@ -559,13 +559,13 @@ _HitmontopDexEntry::
dex dex
_BlisseyDexEntry:: _BlisseyDexEntry::
text "Anyone who takes" text "Biting into one"
next "a bite of its" next "of the eggs that"
next "egg becomes" next "it lays will make"
page "unfailingly" page "anyone happy. It"
next "caring and" next "can sense sadness"
next "pleasant to all" next "with its fur"
dex dex
_Porygon2DexEntry:: _Porygon2DexEntry::

10
data/pokemon/palettes.asm
View file

@ -47,7 +47,7 @@ MonsterPalettes:
db PAL_BLUEMON ; BITTYBAT db PAL_BLUEMON ; BITTYBAT
db PAL_BLUEMON ; ZUBAT db PAL_BLUEMON ; ZUBAT
db PAL_BLUEMON ; GOLBAT db PAL_BLUEMON ; GOLBAT
db PAL_PURPLEMON ; Crobat db PAL_PURPLEMON ; CROBAT
db PAL_GREENMON ; ODDISH db PAL_GREENMON ; ODDISH
db PAL_REDMON ; GLOOM db PAL_REDMON ; GLOOM
db PAL_REDMON ; VILEPLUME db PAL_REDMON ; VILEPLUME
@ -84,7 +84,7 @@ MonsterPalettes:
db PAL_GREENMON ; BELLSPROUT db PAL_GREENMON ; BELLSPROUT
db PAL_GREENMON ; WEEPINBELL db PAL_GREENMON ; WEEPINBELL
db PAL_GREENMON ; VICTREEBEL db PAL_GREENMON ; VICTREEBEL
db PAL_GREENMON ; Tsubomitto db PAL_GREENMON ; TSUBOMITTO
db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACOOL
db PAL_CYANMON ; TENTACRUEL db PAL_CYANMON ; TENTACRUEL
db PAL_GREYMON ; GEODUDE db PAL_GREYMON ; GEODUDE
@ -117,7 +117,7 @@ MonsterPalettes:
db PAL_PURPLEMON ; HAUNTER db PAL_PURPLEMON ; HAUNTER
db PAL_PURPLEMON ; GENGAR db PAL_PURPLEMON ; GENGAR
db PAL_GREYMON ; ONIX db PAL_GREYMON ; ONIX
db PAL_GREYMON ; Steelix db PAL_GREYMON ; STEELIX
db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO db PAL_YELLOWMON ; HYPNO
db PAL_YELLOWMON ; KOTORA db PAL_YELLOWMON ; KOTORA
@ -138,7 +138,7 @@ MonsterPalettes:
db PAL_BROWNMON ; KANGASKHAN db PAL_BROWNMON ; KANGASKHAN
db PAL_BROWNMON ; HITMONLEE db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; Hitmontop db PAL_BROWNMON ; HITMONTOP
db PAL_PINKMON ; LICKITUNG db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY db PAL_PINKMON ; LICKILICKY
db PAL_PURPLEMON ; KOFFING db PAL_PURPLEMON ; KOFFING
@ -147,7 +147,7 @@ MonsterPalettes:
db PAL_GREYMON ; RHYDON db PAL_GREYMON ; RHYDON
db PAL_BROWNMON ; RHYPERIOR db PAL_BROWNMON ; RHYPERIOR
db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; Blissey db PAL_PINKMON ; BLISSEY
db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH db PAL_CYANMON ; TANGROWTH

2
data/trainers/parties.asm
View file

@ -300,6 +300,8 @@ BurglarData:
db 38, NINETALES, 0 db 38, NINETALES, 0
; Mansion B1F ; Mansion B1F
db 34, GROWLITHE, PONYTA, 0 db 34, GROWLITHE, PONYTA, 0
; Victory Road - BIG SHOT
db $FF, 47, DITTO, 47, MADAAMU, 50, CRYITHAN, 50, GUARDIA, 50, TANGROWTH, 53, GYARADOS, 0
EngineerData: EngineerData:
; Unused - used in celadon university ; Unused - used in celadon university

2
engine/battle/battle_transitions.asm
View file

@ -81,7 +81,7 @@ BattleTransitions:
dw BattleTransition_Split ; %111 dw BattleTransition_Split ; %111
GetBattleTransitionID_WildOrTrainer: GetBattleTransitionID_WildOrTrainer:
ld a, [wCurOpponent] ld a, [wIsTrainerBattle]
and a and a
jr nz, .trainer jr nz, .trainer
res 0, c res 0, c

4
scripts/ChampionsRoom.asm
View file

@ -82,6 +82,8 @@ GaryScript2:
ld a, $3 ld a, $3
.saveTrainerId .saveTrainerId
ld [wTrainerNo], a ld [wTrainerNo], a
ld a, 1
ld [wIsTrainerBattle], a
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -93,6 +95,8 @@ GaryScript3:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, ResetGaryScript jp z, ResetGaryScript
xor a
ld [wIsTrainerBattle], a
call UpdateSprites call UpdateSprites
SetEvent EVENT_BEAT_CHAMPION_RIVAL SetEvent EVENT_BEAT_CHAMPION_RIVAL
ld a, $f0 ld a, $f0