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

The Big Bad Bugs and the Lunar Lord!

Browse source
This commit is contained in:
Misty Violet 2023-10-28 01:46:11 -04:00
parent 56bf3ef2b0
commit 672cefbd96
60 changed files with 302 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/items/attributes.asm
View file

@ -297,8 +297,8 @@ ItemAttributes:
; BUG: Dragon Scale, not Dragon Fang, boosts Dragon-type moves (see docs/bugs_and_glitches.md)
; DRAGON_FANG
item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_91
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLK_AUGURITE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; LEFTOVERS
item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_93

6
data/items/descriptions.asm
View file

@ -145,7 +145,7 @@ ItemDescriptions:
dw ShinyStoneDesc
dw MetalCoatDesc
dw DragonFangDesc
dw QuestionMarkDesc
dw BlkAuguriteDesc
dw LeftoversDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
@ -955,3 +955,7 @@ DuskStoneDesc:
ShinyStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"
BlkAuguriteDesc:
db "Evolves certain"
next "kinds of #MON.@"

2
data/items/names.asm
View file

@ -144,7 +144,7 @@ ItemNames::
li "SHINY STONE"
li "METAL COAT"
li "DRAGON FANG"
li "TERU-SAMA"
li "BLK AUGURITE"
li "LEFTOVERS"
li "TERU-SAMA"
li "TERU-SAMA"

42
data/moves/animations.asm
View file

@ -279,6 +279,9 @@ BattleAnimations::
dw BattleAnim_RockSmash
dw BattleAnim_Whirlpool
dw BattleAnim_BeatUp
dw BattleAnim_RockHead
dw BattleAnim_RockSlash
dw BattleAnim_CrossCutter
assert_table_length NUM_ATTACKS + 1
dw BattleAnim_SweetScent2
@ -4592,6 +4595,45 @@ BattleAnim_BeatUp:
anim_wait 8
anim_call BattleAnim_ShowMon_0
anim_ret
BattleAnim_RockHead:
anim_1gfx ANIM_GFX_SHINE
anim_bgeffect ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW, $0, $0, $0
anim_sound 0, 0, SFX_RAGE
anim_obj ANIM_OBJ_GLIMMER, 40, 84, $0
anim_wait 20
anim_1gfx ANIM_GFX_HIT
anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $14, $2, $0
anim_wait 32
anim_call BattleAnim_TargetObj_1Row
anim_bgeffect ANIM_BG_TACKLE, $0, BG_EFFECT_USER, $0
anim_wait 4
anim_sound 0, 1, SFX_EGG_BOMB
anim_obj ANIM_OBJ_HIT_YFIX, 136, 56, $0
anim_wait 8
anim_call BattleAnim_ShowMon_0
anim_ret
BattleAnim_RockSlash: ;uses the Slash animation
anim_1gfx ANIM_GFX_CUT
anim_sound 0, 1, SFX_CUT
anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 152, 40, $0
anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 148, 36, $0
anim_wait 32
anim_ret
BattleAnim_CrossCutter: ;uses the Cross Chop animation
anim_1gfx ANIM_GFX_CUT
anim_sound 0, 1, SFX_CUT
anim_obj ANIM_OBJ_CROSS_CHOP1, 152, 40, $0
anim_obj ANIM_OBJ_CROSS_CHOP2, 120, 72, $0
anim_wait 8
anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $58, $2, $0
anim_wait 92
anim_sound 0, 1, SFX_VICEGRIP
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10
anim_wait 16
anim_ret
BattleAnimSub_Drain:
anim_obj ANIM_OBJ_DRAIN, 132, 44, $0

1
data/moves/critical_hit_moves.asm
View file

@ -6,4 +6,5 @@ CriticalHitMoves:
dw SLASH
dw AEROBLAST
dw CROSS_CHOP
dw CROSS_CUTTER
dw -1

15
data/moves/descriptions.asm
View file

@ -256,6 +256,9 @@ MoveDescriptions1:
dw RockSmashDescription
dw WhirlpoolDescription
dw BeatUpDescription
dw RockHeadDescription
dw RockSlashDescription
dw CrossCutterDescription
.IndirectEnd::
InvalidMoveDescription:
@ -1264,3 +1267,15 @@ WhirlpoolDescription:
BeatUpDescription:
db "Party #MON join"
next "in the attack.@"
RockHeadDescription:
db "An attack that may"
next "cause flinching.@"
RockSlashDescription:
db "A strong imprecise"
next "ROCK-type attack.@" ;the original description was too long I think
CrossCutterDescription:
db "Has a high criti-"
next "cal hit ratio.@"

3
data/moves/moves.asm
View file

@ -269,4 +269,7 @@ Moves1:
move EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 ;ROCK_SMASH
move EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 ;WHIRLPOOL
move EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 ;BEAT_UP
move EFFECT_FLINCH_HIT, 80, ROCK, 100, 15, 30 ;ROCK_HEAD
move EFFECT_NORMAL_HIT, 140, ROCK, 70, 5, 0 ;ROCK_SLASH
move EFFECT_NORMAL_HIT, 50, BUG, 100, 15, 0 ;CROSS_CUTTER
.IndirectEnd::

3
data/moves/names.asm
View file

@ -251,4 +251,7 @@ MoveNames::
li "ROCK SMASH"
li "WHIRLPOOL"
li "BEAT UP"
li "ROCK HEAD"
li "ROCK SLASH"
li "CROSS CUTTER"
assert_list_length NUM_ATTACKS

3
data/pokemon/base_stats.asm
View file

@ -61,6 +61,7 @@ INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
INCLUDE "data/pokemon/base_stats/nidoran_m.asm"
INCLUDE "data/pokemon/base_stats/nidorino.asm"
INCLUDE "data/pokemon/base_stats/nidoking.asm"
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
INCLUDE "data/pokemon/base_stats/clefairy.asm"
INCLUDE "data/pokemon/base_stats/clefable.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
@ -153,10 +154,12 @@ INCLUDE "data/pokemon/base_stats/staryu.asm"
INCLUDE "data/pokemon/base_stats/starmie.asm"
INCLUDE "data/pokemon/base_stats/mr__mime.asm"
INCLUDE "data/pokemon/base_stats/scyther.asm"
INCLUDE "data/pokemon/base_stats/kleavor.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/electabuzz.asm"
INCLUDE "data/pokemon/base_stats/magmar.asm"
INCLUDE "data/pokemon/base_stats/pinsir.asm"
INCLUDE "data/pokemon/base_stats/tricules.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
INCLUDE "data/pokemon/base_stats/magikarp.asm"
INCLUDE "data/pokemon/base_stats/gyarados.asm"

3
data/pokemon/cries.asm
View file

@ -40,6 +40,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M
mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO
mon_cry CRY_RAICHU, 0, 256 ; NIDOKING
mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN
mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY
mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE
mon_cry CRY_VULPIX, 79, 144 ; VULPIX
@ -132,10 +133,12 @@ PokemonCries::
mon_cry CRY_PARAS, 0, 256 ; STARMIE
mon_cry CRY_KRABBY, 8, 192 ; MR__MIME
mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER
mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR
mon_cry CRY_DROWZEE, 255, 383 ; JYNX
mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ
mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR
mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR
mon_cry CRY_RAICHU, 291, 256 ; TRICULES
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS
mon_cry CRY_EKANS, 128, 128 ; MAGIKARP
mon_cry CRY_EKANS, 0, 256 ; GYARADOS

3
data/pokemon/dex_entries.asm
View file

@ -34,6 +34,7 @@ NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoqueen.asm"
NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_m.asm"
NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorino.asm"
NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm"
NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm"
ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm"
ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm"
VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm"
@ -130,10 +131,12 @@ StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm"
StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/starmie.asm"
MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mr__mime.asm"
ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scyther.asm"
KleavorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kleavor.asm"
JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jynx.asm"
ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm"
MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magmar.asm"
PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm"
TriculesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tricules.asm"
TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm"

10
data/pokemon/dex_entries/kleavor.asm Normal file
View file

@ -0,0 +1,10 @@
db "AXE@" ; species name
dw 511, 1962 ; height, weight
db "Pieces from KLEAVOR-"
next "'s axes often fall"
next "in battle, making"
page "them sharper. The"
next "shards can be used"
next "to make tools.@"

10
data/pokemon/dex_entries/nidoreign.asm Normal file
View file

@ -0,0 +1,10 @@
db "LUNAR@" ; species name
dw 405, 1350 ; height, weight
db "Said to come from"
next "the moon. The"
next "poison from its"
page "spikes is often"
next "used in making"
next "powerful medicine."

10
data/pokemon/dex_entries/tricules.asm Normal file
View file

@ -0,0 +1,10 @@
db "BIG HORN@" ; species name
dw 501, 2420 ; height, weight
db "Its elongated hor-"
next "ns contain steel"
next "components. It"
page "easily blocks any"
next "attack with its"
next "iron-like body.@"

3
data/pokemon/dex_entry_pointers.asm
View file

@ -35,6 +35,7 @@ PokedexDataPointerTable:
dba NidoranMPokedexEntry
dba NidorinoPokedexEntry
dba NidokingPokedexEntry
dba NidoreignPokedexEntry
dba ClefairyPokedexEntry
dba ClefablePokedexEntry
dba VulpixPokedexEntry
@ -127,10 +128,12 @@ PokedexDataPointerTable:
dba StarmiePokedexEntry
dba MrMimePokedexEntry
dba ScytherPokedexEntry
dba KleavorPokedexEntry
dba JynxPokedexEntry
dba ElectabuzzPokedexEntry
dba MagmarPokedexEntry
dba PinsirPokedexEntry
dba TriculesPokedexEntry
dba TaurosPokedexEntry
dba MagikarpPokedexEntry
dba GyaradosPokedexEntry

3
data/pokemon/dex_order_alpha.asm
View file

@ -108,6 +108,7 @@ AlphabeticalPokedexOrder:
dw KANGASKHAN
dw KINGDRA
dw KINGLER
dw KLEAVOR
dw KOFFING
dw KRABBY
dw LANTURN
@ -148,6 +149,7 @@ AlphabeticalPokedexOrder:
dw NIDOQUEEN
dw NIDORAN_F
dw NIDORAN_M
dw NIDOREIGN
dw NIDORINA
dw NIDORINO
dw NINETALES
@ -233,6 +235,7 @@ AlphabeticalPokedexOrder:
dw TOGETIC
dw TOTARTLE
dw TOTODILE
dw TRICULES
dw TYPHLOSION
dw TYRANITAR
dw TYROGUE

3
data/pokemon/dex_order_new.asm
View file

@ -103,6 +103,7 @@ NewPokedexOrder:
dw NIDORAN_M
dw NIDORINO
dw NIDOKING
dw NIDOREIGN
dw YANMA
dw SUNKERN
dw SUNFLORA
@ -114,7 +115,9 @@ NewPokedexOrder:
dw VENOMOTH
dw SCYTHER
dw SCIZOR
dw KLEAVOR
dw PINSIR
dw TRICULES
dw HERACROSS
dw KOFFING
dw WEEZING

1
data/pokemon/egg_moves_johto.asm
View file

@ -468,5 +468,6 @@ LarvitarEggMoves:
dw OUTRAGE
dw FOCUS_ENERGY
dw ANCIENTPOWER
dw ROCK_SLASH
NoEggMoves2:
dw -1 ; end

18
data/pokemon/egg_moves_kanto.asm
View file

@ -9,7 +9,7 @@ EggMovePointers1:
dw NoEggMoves1
dw SquirtleEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Totartle
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -35,6 +35,7 @@ EggMovePointers1:
dw NidoranMEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Nidoreign
dw NoEggMoves1
dw NoEggMoves1
dw VulpixEggMoves
@ -119,18 +120,20 @@ EggMovePointers1:
dw KangaskhanEggMoves
dw HorseaEggMoves
dw NoEggMoves1
dw BlastykeEggMoves
dw NoEggMoves1
dw BlastykeEggMoves ; Blastyke
dw NoEggMoves1 ; Blastoise
dw GoldeenEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw MrMimeEggMoves
dw ScytherEggMoves
dw NoEggMoves1 ; Kleavor
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw PinsirEggMoves
dw NoEggMoves1 ; Tricules
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -146,8 +149,8 @@ EggMovePointers1:
dw KabutoEggMoves
dw NoEggMoves1
dw AerodactylEggMoves
dw MunchlaxEggMoves
dw SnorlaxEggMoves
dw MunchlaxEggMoves ; Munchlax
dw SnorlaxEggMoves ; Should this even exist?
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -274,6 +277,7 @@ ParasEggMoves:
dw FLAIL
dw LIGHT_SCREEN
dw PURSUIT
dw ROCK_SLASH
dw -1 ; end
VenonatEggMoves:
@ -365,6 +369,7 @@ TentacoolEggMoves:
GeodudeEggMoves:
dw MEGA_PUNCH
dw ROCK_SLIDE
dw ROCK_SLASH
dw -1 ; end
PonytaEggMoves:
@ -444,6 +449,7 @@ KrabbyEggMoves:
dw AMNESIA
dw FLAIL
dw SLAM
dw ROCK_SLASH
dw -1 ; end
ExeggcuteEggMoves:
@ -462,6 +468,7 @@ CuboneEggMoves:
dw SKULL_BASH
dw PERISH_SONG
dw SWORDS_DANCE
dw ROCK_HEAD
dw -1 ; end
LickitungEggMoves:
@ -552,6 +559,7 @@ ScytherEggMoves:
PinsirEggMoves:
dw FURY_ATTACK
dw FLAIL
dw ROCK_SLASH
dw -1 ; end
LaprasEggMoves:

77
data/pokemon/evos_attacks_kanto.asm
View file

@ -35,6 +35,7 @@ EvosAttacksPointers1::
dw NidoranMEvosAttacks
dw NidorinoEvosAttacks
dw NidokingEvosAttacks
dw NidoreignEvosAttacks
dw ClefairyEvosAttacks
dw ClefableEvosAttacks
dw VulpixEvosAttacks
@ -127,10 +128,12 @@ EvosAttacksPointers1::
dw StarmieEvosAttacks
dw MrMimeEvosAttacks
dw ScytherEvosAttacks
dw KleavorEvosAttacks
dw JynxEvosAttacks
dw ElectabuzzEvosAttacks
dw MagmarEvosAttacks
dw PinsirEvosAttacks
dw TriculesEvosAttacks
dw TaurosEvosAttacks
dw MagikarpEvosAttacks
dw GyaradosEvosAttacks
@ -552,7 +555,9 @@ NidoranFEvosAttacks:
db 0 ; no more level-up moves
NidorinaEvosAttacks:
dbbw EVOLVE_ITEM, MOON_STONE, NIDOQUEEN
dbbw EVOLVE_ITEM, POISON_STONE, NIDOQUEEN
dbbw EVOLVE_LEVEL, 36, NIDOQUEEN
dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN
db 0 ; no more evolutions
dbw 1, GROWL
dbw 1, TACKLE
@ -587,7 +592,9 @@ NidoranMEvosAttacks:
db 0 ; no more level-up moves
NidorinoEvosAttacks:
dbbw EVOLVE_ITEM, MOON_STONE, NIDOKING
dbbw EVOLVE_ITEM, POISON_STONE, NIDOKING
dbbw EVOLVE_LEVEL, 36, NIDOKING
dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN
db 0 ; no more evolutions
dbw 1, LEER
dbw 1, TACKLE
@ -607,6 +614,15 @@ NidokingEvosAttacks:
dbw 1, POISON_STING
dbw 23, THRASH
db 0 ; no more level-up moves
NidoreignEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, SPIKE_CANNON
dbw 1, POISON_STING
dbw 1, TOXIC
dbw 23, ROCK_HEAD
db 0 ; no more level-up moves
ClefairyEvosAttacks:
dbbw EVOLVE_ITEM, MOON_STONE, CLEFABLE
@ -689,6 +705,7 @@ ZubatEvosAttacks:
GolbatEvosAttacks:
dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT
dbbw EVOLVE_LEVEL, 44, CROBAT
db 0 ; no more evolutions
dbw 1, SCREECH
dbw 1, LEECH_LIFE
@ -888,6 +905,7 @@ MankeyEvosAttacks:
dbw 9, LOW_KICK
dbw 15, KARATE_CHOP
dbw 21, FURY_SWIPES
dbw 24, ROCK_HEAD
dbw 27, FOCUS_ENERGY
dbw 33, SEISMIC_TOSS
dbw 39, CROSS_CHOP
@ -904,6 +922,7 @@ PrimeapeEvosAttacks:
dbw 9, LOW_KICK
dbw 15, KARATE_CHOP
dbw 21, FURY_SWIPES
dbw 24, ROCK_HEAD
dbw 27, FOCUS_ENERGY
dbw 28, RAGE
dbw 36, SEISMIC_TOSS
@ -950,6 +969,7 @@ PoliwagEvosAttacks:
PoliwhirlEvosAttacks:
dbbw EVOLVE_ITEM, WATER_STONE, POLIWRATH
dbbw EVOLVE_TRADE, KINGS_ROCK, POLITOED
dbbw EVOLVE_ITEM, HEART_STONE, POLITOED
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, HYPNOSIS
@ -1146,6 +1166,7 @@ GeodudeEvosAttacks:
dbw 31, ROLLOUT
dbw 36, EARTHQUAKE
dbw 41, EXPLOSION
dbw 46, ROCK_HEAD
db 0 ; no more level-up moves
GravelerEvosAttacks:
@ -1162,6 +1183,7 @@ GravelerEvosAttacks:
dbw 34, ROLLOUT
dbw 41, EARTHQUAKE
dbw 48, EXPLOSION
dbw 55, ROCK_HEAD
db 0 ; no more level-up moves
GolemEvosAttacks:
@ -1178,6 +1200,7 @@ GolemEvosAttacks:
dbw 34, ROLLOUT
dbw 41, EARTHQUAKE
dbw 48, EXPLOSION
dbw 55, ROCK_HEAD
db 0 ; no more level-up moves
PonytaEvosAttacks:
@ -1214,6 +1237,7 @@ RapidashEvosAttacks:
SlowpokeEvosAttacks:
dbbw EVOLVE_LEVEL, 37, SLOWBRO
dbbw EVOLVE_TRADE, KINGS_ROCK, SLOWKING
dbbw EVOLVE_ITEM, HEART_STONE, SLOWKING
db 0 ; no more evolutions
dbw 1, CURSE
dbw 1, TACKLE
@ -1432,6 +1456,7 @@ GengarEvosAttacks:
OnixEvosAttacks:
dbbw EVOLVE_TRADE, METAL_COAT, STEELIX
dbbw EVOLVE_LEVEL, 38, STEELIX
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, SCREECH
@ -1439,6 +1464,7 @@ OnixEvosAttacks:
dbw 14, ROCK_THROW
dbw 23, HARDEN
dbw 27, RAGE
dbw 31, ROCK_HEAD
dbw 36, SANDSTORM
dbw 40, SLAM
db 0 ; no more level-up moves
@ -1667,6 +1693,7 @@ RhyhornEvosAttacks:
dbw 19, FURY_ATTACK
dbw 31, SCARY_FACE
dbw 37, HORN_DRILL
dbw 43, ROCK_HEAD
dbw 49, TAKE_DOWN
dbw 55, EARTHQUAKE
db 0 ; no more level-up moves
@ -1681,6 +1708,7 @@ RhydonEvosAttacks:
dbw 19, FURY_ATTACK
dbw 31, SCARY_FACE
dbw 37, HORN_DRILL
dbw 48, ROCK_HEAD
dbw 54, TAKE_DOWN
dbw 65, EARTHQUAKE
db 0 ; no more level-up moves
@ -1857,6 +1885,8 @@ MrMimeEvosAttacks:
ScytherEvosAttacks:
dbbw EVOLVE_TRADE, METAL_COAT, SCIZOR
dbbw EVOLVE_LEVEL, 41, SCIZOR
dbbw EVOLVE_ITEM, BLK_AUGURITE, KLEAVOR
db 0 ; no more evolutions
dbw 1, QUICK_ATTACK
dbw 1, LEER
@ -1869,6 +1899,20 @@ ScytherEvosAttacks:
dbw 42, SWORDS_DANCE
dbw 48, DOUBLE_TEAM
db 0 ; no more level-up moves
KleavorEvosAttacks:
db 0 ; no more evolutions
dbw 1, QUICK_ATTACK
dbw 1, LEER
dbw 6, FOCUS_ENERGY
dbw 12, PURSUIT
dbw 18, FALSE_SWIPE
dbw 24, AGILITY
dbw 30, ROCK_SLASH
dbw 36, SLASH
dbw 42, SWORDS_DANCE
dbw 48, DOUBLE_TEAM
db 0 ; no more level-up moves
JynxEvosAttacks:
db 0 ; no more evolutions
@ -1916,15 +1960,32 @@ MagmarEvosAttacks:
db 0 ; no more level-up moves
PinsirEvosAttacks:
dbbw EVOLVE_TRADE, METAL_COAT, TRICULES
dbbw EVOLVE_LEVEL, 42, TRICULES
db 0 ; no more evolutions
dbw 1, VICEGRIP
dbw 7, FOCUS_ENERGY
dbw 13, BIND
dbw 19, SEISMIC_TOSS
dbw 25, HARDEN
dbw 31, GUILLOTINE
dbw 31, CROSS_CUTTER
dbw 37, SUBMISSION
dbw 43, SWORDS_DANCE
dbw 49, GUILLOTINE
db 0 ; no more level-up moves
TriculesEvosAttacks:
db 0 ; no more evolutions
dbw 1, VICEGRIP
dbw 7, FOCUS_ENERGY
dbw 13, BIND
dbw 19, SEISMIC_TOSS
dbw 25, HARDEN
dbw 31, CROSS_CUTTER
dbw 37, SUBMISSION
dbw 42, METAL_CLAW
dbw 43, SWORDS_DANCE
dbw 49, GUILLOTINE
db 0 ; no more level-up moves
TaurosEvosAttacks:
@ -2105,19 +2166,21 @@ KabutopsEvosAttacks:
dbw 37, ENDURE
dbw 40, SLASH
dbw 51, MEGA_DRAIN
dbw 58, ROCK_SLASH
dbw 65, ANCIENTPOWER
db 0 ; no more level-up moves
AerodactylEvosAttacks:
db 0 ; no more evolutions
dbw 1, WING_ATTACK
dbw 1, TAKE_DOWN
dbw 8, AGILITY
dbw 15, BITE
dbw 22, SUPERSONIC
dbw 29, ANCIENTPOWER
dbw 28, ANCIENTPOWER
dbw 36, SCARY_FACE
dbw 43, TAKE_DOWN
dbw 50, HYPER_BEAM
dbw 40, WING_ATTACK
dbw 48, ROCK_HEAD
dbw 60, HYPER_BEAM
db 0 ; no more level-up moves
MunchlaxEvosAttacks:

3
data/pokemon/first_stages.asm
View file

@ -35,6 +35,7 @@ FirstEvoStages::
dw NIDORAN_M ;20
dw NIDORAN_M
dw NIDORAN_M
dw NIDORAN_F ; Nidoreign, tentative
dw CLEFFA
dw CLEFFA
dw VULPIX
@ -127,10 +128,12 @@ FirstEvoStages::
dw STARYU
dw MR__MIME
dw SCYTHER
dw SCYTHER
dw SMOOCHUM
dw ELEKID
dw MAGBY
dw PINSIR
dw PINSIR
dw TAUROS ;80
dw MAGIKARP
dw MAGIKARP

3
data/pokemon/gen1_base_special.asm
View file

@ -36,6 +36,7 @@ KantoMonSpecials:
db 40 ; NIDORAN_M
db 55 ; NIDORINO
db 75 ; NIDOKING
db 75 ; NIDOREIGN
db 60 ; CLEFAIRY
db 85 ; CLEFABLE
db 65 ; VULPIX
@ -128,10 +129,12 @@ KantoMonSpecials:
db 100 ; STARMIE
db 100 ; MR__MIME
db 55 ; SCYTHER
db 45 ; KLEAVOR
db 95 ; JYNX
db 85 ; ELECTABUZZ
db 85 ; MAGMAR
db 55 ; PINSIR
db 55 ; TRICULES
db 70 ; TAUROS
db 20 ; MAGIKARP
db 100 ; GYARADOS

5
data/pokemon/gen1_order.asm
View file

@ -32,6 +32,7 @@ Pokered_MonIndices:
db TANGELA
db SCIZOR ; MISSINGNO.
db SHUCKLE ; MISSINGNO.
db NIDOREIGN
db GROWLITHE
db ONIX
db FEAROW
@ -120,6 +121,7 @@ Pokered_MonIndices:
db DUGTRIO
db VENOMOTH
db DEWGONG
db TRICULES
db KINGDRA ; MISSINGNO.
db PHANPY ; MISSINGNO.
db CATERPIE
@ -192,7 +194,7 @@ Pokered_MonIndices:
db BELLSPROUT
db WEEPINBELL
db VICTREEBEL
assert_table_length 192 ; gen 1 mon indexes
assert_table_length 194 ; gen 1 mon indexes
db CHIKORITA
db BAYLEEF
db MEGANIUM
@ -257,4 +259,5 @@ Pokered_MonIndices:
db WALKING_WAKE
db SHI_SHI
db MUNCHLAX
db KLEAVOR
assert_table_length NUM_POKEMON - 1

3
data/pokemon/menu_icons.asm
View file

@ -36,6 +36,7 @@ MonMenuIcons:
db ICON_FOX ; NIDORAN_M
db ICON_FOX ; NIDORINO
db ICON_MONSTER ; NIDOKING
db ICON_MONSTER ; NIDOREIGN
db ICON_CLEFAIRY ; CLEFAIRY
db ICON_CLEFAIRY ; CLEFABLE
db ICON_FOX ; VULPIX
@ -128,10 +129,12 @@ MonMenuIcons:
db ICON_STARYU ; STARMIE
db ICON_HUMANSHAPE ; MR__MIME
db ICON_BUG ; SCYTHER
db ICON_BUG ; KLEAVOR
db ICON_HUMANSHAPE ; JYNX
db ICON_HUMANSHAPE ; ELECTABUZZ
db ICON_HUMANSHAPE ; MAGMAR
db ICON_BUG ; PINSIR
db ICON_BUG ; TRICULES
db ICON_EQUINE ; TAUROS
db ICON_FISH ; MAGIKARP
db ICON_GYARADOS ; GYARADOS

3
data/pokemon/names.asm
View file

@ -38,6 +38,7 @@ PokemonNames::
db "NIDORAN♂@@"
db "NIDORINO@@"
db "NIDOKING@@"
db "NIDOREIGN@"
db "CLEFAIRY@@"
db "CLEFABLE@@"
db "VULPIX@@@@"
@ -130,10 +131,12 @@ PokemonNames::
db "STARMIE@@@"
db "MR.MIME@@@"
db "SCYTHER@@@"
db "KLEAVOR@@@"
db "JYNX@@@@@@"
db "ELECTABUZZ"
db "MAGMAR@@@@"
db "PINSIR@@@@"
db "TRICULES@@"
db "TAUROS@@@@"
db "MAGIKARP@@"
db "GYARADOS@@"

6
data/pokemon/palettes.asm
View file

@ -101,6 +101,8 @@ INCBIN "gfx/pokemon/nidorino/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/nidorino/shiny.pal"
INCBIN "gfx/pokemon/nidoking/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/nidoking/shiny.pal"
INCBIN "gfx/pokemon/nidoreign/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/nidoreign/shiny.pal"
INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/clefairy/shiny.pal"
INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors
@ -285,6 +287,8 @@ INCBIN "gfx/pokemon/mr__mime/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mr__mime/shiny.pal"
INCBIN "gfx/pokemon/scyther/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/scyther/shiny.pal"
INCBIN "gfx/pokemon/kleavor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kleavor/shiny.pal"
INCBIN "gfx/pokemon/jynx/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/jynx/shiny.pal"
INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors
@ -293,6 +297,8 @@ INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/magmar/shiny.pal"
INCBIN "gfx/pokemon/pinsir/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pinsir/shiny.pal"
INCBIN "gfx/pokemon/tricules/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/tricules/shiny.pal"
INCBIN "gfx/pokemon/tauros/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/tauros/shiny.pal"
INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors

6
data/pokemon/pic_pointers.asm
View file

@ -81,6 +81,8 @@ PokemonPicPointers::
dba NidorinoBackpic
dba NidokingFrontpic
dba NidokingBackpic
dba NidoreignFrontpic
dba NidoreignBackpic
dba ClefairyFrontpic
dba ClefairyBackpic
dba ClefableFrontpic
@ -265,6 +267,8 @@ PokemonPicPointers::
dba MrMimeBackpic
dba ScytherFrontpic
dba ScytherBackpic
dba KleavorFrontpic
dba KleavorBackpic
dba JynxFrontpic
dba JynxBackpic
dba ElectabuzzFrontpic
@ -273,6 +277,8 @@ PokemonPicPointers::
dba MagmarBackpic
dba PinsirFrontpic
dba PinsirBackpic
dba TriculesFrontpic
dba TriculesBackpic
dba TaurosFrontpic
dba TaurosBackpic
dba MagikarpFrontpic