Evolutions sprites and a few other minor fixes

This commit is contained in:
MementoMartha 2022-09-05 16:12:16 +01:00
parent 09433cbeff
commit 702724642b
14 changed files with 53 additions and 84 deletions

View file

@ -1,19 +1,19 @@
PrizeMonLevelDictionary:
IF DEF(_RED)
db CUBONE, 12
db CLEFAIRY, 12
db NIDORINA, 18
db CUBONE, 12
db BLASTYKE, 12
db CLEFAIRY, 18
db CACTUS, 25
db SCYTHER, 25
db PORYGON, 30
db CACTUS, 25
db SCYTHER, 25
db PORYGON, 30
ENDC
IF DEF(_BLUE)
db ABRA, 12
db CLEFAIRY, 12
db NIDORINO, 18
db CUBONE, 12
db BLASTYKE, 12
db JIGGLYPUFF, 18
db CACTUS, 25
db PINSIR, 25
db PORYGON, 30
db CACTUS, 25
db PINSIR, 25
db PORYGON, 30
ENDC

View file

@ -18,14 +18,8 @@ ENDC
db "@"
PrizeMenuMon1Cost:
IF DEF(_RED)
bcd2 180
bcd2 500
ENDC
IF DEF(_BLUE)
bcd2 120
bcd2 750
ENDC
bcd2 200
bcd2 700
bcd2 1200
db "@"
@ -41,16 +35,9 @@ ENDC
db "@"
PrizeMenuMon2Cost:
IF DEF(_RED)
bcd2 2500
bcd2 4600
bcd2 6500
ENDC
IF DEF(_BLUE)
bcd2 2500
bcd2 4600
bcd2 6500
ENDC
db "@"
PrizeMenuTMsEntries:

View file

@ -2,14 +2,14 @@ TradeMons:
; entries correspond to TRADE_FOR_* constants
table_width 3 + NAME_LENGTH, TradeMons
; give mon, get mon, dialog id, nickname
db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@"
db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Jynx trade replaces the useless Nidorino one
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@"
db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@"
db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@"
db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@"
db POLIWHIRL, JYNX, TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@"
db RAICHU, ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@"
db MACHOKE, HAUNTER, TRADE_DIALOGSET_POLITE, "GHOSUKE@@@@" ; From JP Blue
db KADABRA, GRAVELER, TRADE_DIALOGSET_POLITE, "SABURO@@@@@" ; From JP Blue
db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@"
db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@"
assert_table_length NUM_NPC_TRADES

View file

@ -5,10 +5,10 @@
db BUG, ROCK ; type
db 45 ; catch rate
db 187 ; base exp
db 204 ; base exp
INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions
dw ScytherPicFront, ScytherPicBack
INCBIN "gfx/pokemon/front/kleavor.pic", 0, 1 ; sprite dimensions
dw KleavorPicFront, KleavorPicBack
db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -19,5 +19,5 @@
SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT
; end
db BANK(ScytherPicFront)
assert BANK(ScytherPicFront) == BANK(ScytherPicBack)
db BANK(KleavorPicFront)
assert BANK(KleavorPicFront) == BANK(KleavorPicBack)

View file

@ -1,14 +1,14 @@
db DEX_LICKILICKY ; pokedex id
db 110, 85, 55, 50, 80
db 110, 85, 95, 50, 80
; hp atk def spd spc
db NORMAL, NORMAL ; type
db 45 ; catch rate
db 127 ; base exp
db 30 ; catch rate
db 193 ; base exp
INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions
dw LickitungPicFront, LickitungPicBack
INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions
dw LickilickyPicFront, LickilickyPicBack
db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -22,5 +22,5 @@
REST, SUBSTITUTE, CUT, SURF, STRENGTH
; end
db BANK(LickitungPicFront)
assert BANK(LickitungPicFront) == BANK(LickitungPicBack)
db BANK(LickilickyPicFront)
assert BANK(LickilickyPicFront) == BANK(LickilickyPicBack)

View file

@ -4,11 +4,11 @@
; hp atk def spd spc
db GRASS, GRASS ; type
db 45 ; catch rate
db 166 ; base exp
db 30 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions
dw TangelaPicFront, TangelaPicBack
INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions
dw TangrowthPicFront, TangrowthPicBack
db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -16,10 +16,10 @@
; tm/hm learnset
tmhm MEGA_PUNCH, SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \
ROCK_SLIDE, SUBSTITUTE, CUT
RAGE, MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \
ROCK_SLIDE, SUBSTITUTE, CUT
; end
db BANK(TangelaPicFront)
assert BANK(TangelaPicFront) == BANK(TangelaPicBack)
db BANK(TangrowthPicFront)
assert BANK(TangrowthPicFront) == BANK(TangrowthPicBack)