diff options
| -rw-r--r-- | constants/pokedex_constants.asm | 3 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 2 | ||||
| -rwxr-xr-x | data/baseStats/leafeon.asm | 28 | ||||
| -rwxr-xr-x | data/base_stats.asm | 2 | ||||
| -rwxr-xr-x | data/cries.asm | 2 | ||||
| -rwxr-xr-x | data/evos_moves.asm | 12 | ||||
| -rwxr-xr-x | data/mon_palettes.asm | 1 | ||||
| -rwxr-xr-x | data/mon_party_sprites.asm | 2 | ||||
| -rwxr-xr-x | data/pokedex_entries.asm | 9 | ||||
| -rwxr-xr-x | data/pokedex_order.asm | 2 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | pic/bmon/leafeon.png | bin | 0 -> 522 bytes | |||
| -rwxr-xr-x | pic/monback/leafeonb.png | bin | 0 -> 528 bytes | |||
| -rwxr-xr-x | text/monster_names.asm | 2 | ||||
| -rw-r--r-- | text/pokedex.asm | 10 |
16 files changed, 77 insertions, 10 deletions
diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 360fbb4c..8add08bc 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -151,5 +151,6 @@ const_value = 1 const DEX_DRAGONITE ; 149 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 + const DEX_LEAFEON ; 152 -NUM_POKEMON EQU 151 +NUM_POKEMON EQU 152 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 96d44ef5..5958effa 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -30,7 +30,7 @@ const_value = 1 const BLASTOISE ; $1C const PINSIR ; $1D const TANGELA ; $1E - const MISSINGNO_1F ; $1F + const LEAFEON ; $1F const MISSINGNO_20 ; $20 const GROWLITHE ; $21 const ONIX ; $22 diff --git a/data/baseStats/leafeon.asm b/data/baseStats/leafeon.asm new file mode 100755 index 00000000..9e9b84d9 --- /dev/null +++ b/data/baseStats/leafeon.asm @@ -0,0 +1,28 @@ +db DEX_LEAFEON ; pokedex id +db 130 ; base hp +db 65 ; base attack +db 60 ; base defense +db 65 ; base speed +db 110 ; base special +db GRASS ; species type 1 +db GRASS ; species type 2 +db 45 ; catch rate +db 196 ; base exp yield +INCBIN "pic/bmon/leafeon.pic",0,1 ; 77, sprite dimensions +dw LeafeonPicFront +dw LeafeonPicBack +; attacks known at lvl 0 +db TACKLE +db SAND_ATTACK +db QUICK_ATTACK +db RAZOR_LEAF +db 0 ; growth rate +; learnset + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 +db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm index a84693a4..f3774118 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -148,3 +148,5 @@ INCLUDE "data/baseStats/dratini.asm" INCLUDE "data/baseStats/dragonair.asm" INCLUDE "data/baseStats/dragonite.asm" INCLUDE "data/baseStats/mewtwo.asm" +INCLUDE "data/baseStats/mew.asm" +INCLUDE "data/baseStats/leafeon.asm" diff --git a/data/cries.asm b/data/cries.asm index 7031536e..1a1e68fe 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -30,7 +30,7 @@ CryData: db $13, $00, $80; Blastoise db $14, $00, $80; Pinsir db $12, $00, $80; Tangela - db $00, $00, $00; MissingNo. + db $1A, $AA, $FF; Leafeon db $00, $00, $00; MissingNo. db $1F, $20, $40; Growlithe db $17, $FF, $C0; Onix diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 2371fb83..38f2e63d 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -29,7 +29,7 @@ EvosMovesPointerTable: dw Mon009_EvosMoves dw Mon127_EvosMoves dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo + dw Mon152_EvosMoves dw Mon153_EvosMoves ;MissingNo dw Mon058_EvosMoves dw Mon095_EvosMoves @@ -566,10 +566,17 @@ Mon114_EvosMoves: db 0 Mon152_EvosMoves: -;MISSINGNO +;LEAFEON ;Evolutions db 0 ;Learnset + db 7,LEECH_SEED + db 13,VINE_WHIP + db 22,POISONPOWDER + db 30,RAZOR_LEAF + db 43,GROWTH + db 55,SLEEP_POWDER + db 65,SOLARBEAM db 0 Mon153_EvosMoves: @@ -1341,6 +1348,7 @@ Mon040_EvosMoves: Mon133_EvosMoves: ;EEVEE ;Evolutions + db EV_ITEM,LEAF_STONE,1,LEAFEON db EV_ITEM,FIRE_STONE,1,FLAREON db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index 8c4d0bc0..7bbea1fd 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -151,3 +151,4 @@ MonsterPalettes: db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW + db PAL_GREENMON ; LEAFEON diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 987d8d28..1535d25a 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -74,4 +74,4 @@ MonPartyData: dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding + dn SPRITE_MON, SPRITE_QUADRUPED ;Mew/Leafeon diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..3af53f3a 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -29,7 +29,7 @@ PokedexEntryPointers: dw BlastoiseDexEntry dw PinsirDexEntry dw TangelaDexEntry - dw MissingNoDexEntry + dw LeafeonDexEntry dw MissingNoDexEntry dw GrowlitheDexEntry dw OnixDexEntry @@ -405,6 +405,13 @@ TangelaDexEntry: TX_FAR _TangelaDexEntry db "@" +LeafeonDexEntry: + db "LEAF@" + db 3,3 + dw 640 + TX_FAR _LeafeonDexEntry + db "@" + GrowlitheDexEntry: db "PUPPY@" db 2,4 diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 0e293946..79cd933e 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -29,7 +29,7 @@ PokedexOrder: db DEX_BLASTOISE db DEX_PINSIR db DEX_TANGELA - db 0 ; MISSINGNO. + db DEX_LEAFEON db 0 ; MISSINGNO. db DEX_GROWLITHE db DEX_ONIX @@ -736,6 +736,10 @@ UncompressMonSprite:: ld a,BANK(MewPicFront) jr z,.GotBank ld a,b + cp LEAFEON + ld a,BANK(LeafeonPicFront) + jr z,.GotBank + ld a,b cp FOSSIL_KABUTOPS ld a,BANK(FossilKabutopsPic) jr z,.GotBank @@ -10,6 +10,7 @@ PICS_2 EQU $A PICS_3 EQU $B PICS_4 EQU $C PICS_5 EQU $D +PICS_6 EQU $2D INCLUDE "home.asm" @@ -69,7 +70,6 @@ ResetStatusAndHalveMoneyOnBlackout:: MewPicFront:: INCBIN "pic/bmon/mew.pic" MewPicBack:: INCBIN "pic/monback/mewb.pic" -INCLUDE "data/baseStats/mew.asm" INCLUDE "engine/battle/safari_zone.asm" @@ -6711,3 +6711,9 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" + + +SECTION "Pics 6", ROMX, BANK[PICS_6] + +LeafeonPicFront:: INCBIN "pic/bmon/leafeon.pic" +LeafeonPicBack:: INCBIN "pic/monback/leafeonb.pic" diff --git a/pic/bmon/leafeon.png b/pic/bmon/leafeon.png Binary files differnew file mode 100755 index 00000000..374e9ef0 --- /dev/null +++ b/pic/bmon/leafeon.png diff --git a/pic/monback/leafeonb.png b/pic/monback/leafeonb.png Binary files differnew file mode 100755 index 00000000..436444df --- /dev/null +++ b/pic/monback/leafeonb.png diff --git a/text/monster_names.asm b/text/monster_names.asm index a62b1bd9..dcb96e5f 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -29,7 +29,7 @@ MonsterNames: db "BLASTOISE@" db "PINSIR@@@@" db "TANGELA@@@" - db "MISSINGNO." + db "LEAFEON@@@" db "MISSINGNO." db "GROWLITHE@" db "ONIX@@@@@@" diff --git a/text/pokedex.asm b/text/pokedex.asm index 65f3d89d..a777b9d8 100644 --- a/text/pokedex.asm +++ b/text/pokedex.asm @@ -298,6 +298,16 @@ _TangelaDexEntry:: next "shake as it walks" dex +_LeafeonDexEntry:: + text "LEAFEON is always" + next "surrounded by" + next "fresh clean air" + + page "because it uses" + next "photosynthesis" + next "just like a plant" + dex + _GrowlitheDexEntry:: text "Very protective" next "of its territory." |
