diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 830f88bb..b3a61294 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -7,8 +7,8 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions - dw VaporeonPicFront, VaporeonPicBack + INCBIN "gfx/pokemon/front/espeon.pic", 0, 1 ; sprite dimensions + dw EspeonPicFront, EspeonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate @@ -16,9 +16,9 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, DREAM_EATER, \ - REST, PSYWAVE, SUBSTITUTE + REFLECT, BIDE, SWIFT, SKULL_BASH, DREAM_EATER, \ + REST, PSYWAVE, SUBSTITUTE ; end - db BANK(VaporeonPicFront) - assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) + db BANK(EspeonPicFront) + assert BANK(EspeonPicFront) == BANK(EspeonPicBack) diff --git a/data/pokemon/base_stats/glaceon.asm b/data/pokemon/base_stats/glaceon.asm index 02690343..33c84362 100644 --- a/data/pokemon/base_stats/glaceon.asm +++ b/data/pokemon/base_stats/glaceon.asm @@ -7,8 +7,8 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions - dw VaporeonPicFront, VaporeonPicBack + INCBIN "gfx/pokemon/front/glaceon.pic", 0, 1 ; sprite dimensions + dw GlaceonPicFront, GlaceonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, AURORA_BEAM ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate @@ -16,9 +16,9 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, \ BLIZZARD, HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ - SUBSTITUTE + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE ; end - db BANK(VaporeonPicFront) - assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) + db BANK(GlaceonPicFront) + assert BANK(GlaceonPicFront) == BANK(GlaceonPicBack) diff --git a/data/pokemon/base_stats/leafeon.asm b/data/pokemon/base_stats/leafeon.asm index 099be3eb..d5f3178e 100644 --- a/data/pokemon/base_stats/leafeon.asm +++ b/data/pokemon/base_stats/leafeon.asm @@ -7,17 +7,18 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions - dw VaporeonPicFront, VaporeonPicBack + INCBIN "gfx/pokemon/front/leafeon.pic", 0, 1 ; sprite dimensions + dw LeafeonPicFront, LeafeonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, ABSORB ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE ; end - db BANK(VaporeonPicFront) - assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) + db BANK(LeafeonPicFront) + assert BANK(LeafeonPicFront) == BANK(LeafeonPicBack) diff --git a/data/pokemon/base_stats/sylveon.asm b/data/pokemon/base_stats/sylveon.asm index 777ed9d7..31ed215b 100644 --- a/data/pokemon/base_stats/sylveon.asm +++ b/data/pokemon/base_stats/sylveon.asm @@ -7,8 +7,8 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions - dw VaporeonPicFront, VaporeonPicBack + INCBIN "gfx/pokemon/front/sylveon.pic", 0, 1 ; sprite dimensions + dw SylveonPicFront, SylveonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, FAIRY_WIND ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate @@ -16,8 +16,8 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, SKULL_BASH, REST, SUBSTITUTE + SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end - db BANK(VaporeonPicFront) - assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) + db BANK(SylveonPicFront) + assert BANK(SylveonPicFront) == BANK(SylveonPicBack) diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 4385fd46..8be19310 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -7,8 +7,8 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions - dw VaporeonPicFront, VaporeonPicBack + INCBIN "gfx/pokemon/front/umbreon.pic", 0, 1 ; sprite dimensions + dw UmbreonPicFront, UmbreonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, BRUTAL_SWING ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate @@ -16,8 +16,8 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, SKULL_BASH, REST, SUBSTITUTE + SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end - db BANK(VaporeonPicFront) - assert BANK(VaporeonPicFront) == BANK(VaporeonPicBack) + db BANK(UmbreonPicFront) + assert BANK(UmbreonPicFront) == BANK(UmbreonPicBack) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index c5de78dd..8a5dd257 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2583,9 +2583,9 @@ UmbreonEvosMoves: db 16, BRUTAL_SWING db 23, QUICK_ATTACK db 30, FEINT_ATTACK - db 36, BITE ; should be Fake Tears but I can't find that move + db 36, BITE ; should be Fake Tears but it hasn't been added yet db 42, TAKE_DOWN - db 52, NIGHT_SLASH ; should be False Surrender but I can't find that move + db 52, NIGHT_SLASH ; should be False Surrender but it hasn't been added yet LeafeonEvosMoves: ; Evolutions @@ -2607,7 +2607,7 @@ GlaceonEvosMoves: db 16, AURORA_BEAM db 23, QUICK_ATTACK db 30, MIST - db 30, HAZE + db 32, HAZE db 42, TAKE_DOWN db 47, BLIZZARD db 52, BARRIER @@ -2617,7 +2617,7 @@ SylveonEvosMoves: db 0 ; Learnset db 8, SAND_ATTACK - db 16, FAIRY_WIND ; should be Disarming Voice according to KEP docs but I can't find that move + db 16, FAIRY_WIND ; should be Disarming Voice but it hasn't been added yet db 23, QUICK_ATTACK db 30, DRAININGKISS db 36, DAZZLE_GLEAM diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 1818c21b..ff746a8d 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -464,7 +464,7 @@ _EspeonDexEntry:: next "its body to sense" page "air currents and" - next "predicts its" + next "predict its" next "enemy's actions" dex diff --git a/gfx/pics.asm b/gfx/pics.asm index 7166e078..916de155 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -473,3 +473,16 @@ RhyperiorPicBack:: INCBIN "gfx/pokemon/back/rhyperiorb.pic" FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" GhostPic:: INCBIN "gfx/battle/ghost.pic" + +SECTION "Pics 9", ROMX + +EspeonPicFront:: INCBIN "gfx/pokemon/front/espeon.pic" +EspeonPicBack:: INCBIN "gfx/pokemon/back/espeonb.pic" +UmbreonPicFront:: INCBIN "gfx/pokemon/front/umbreon.pic" +UmbreonPicBack:: INCBIN "gfx/pokemon/back/umbreonb.pic" +LeafeonPicFront:: INCBIN "gfx/pokemon/front/leafeon.pic" +LeafeonPicBack:: INCBIN "gfx/pokemon/back/leafeonb.pic" +GlaceonPicFront:: INCBIN "gfx/pokemon/front/glaceon.pic" +GlaceonPicBack:: INCBIN "gfx/pokemon/back/glaceonb.pic" +SylveonPicFront:: INCBIN "gfx/pokemon/front/sylveon.pic" +SylveonPicBack:: INCBIN "gfx/pokemon/back/sylveonb.pic" diff --git a/gfx/pokemon/back/espeonb.png b/gfx/pokemon/back/espeonb.png new file mode 100644 index 00000000..76879c0c Binary files /dev/null and b/gfx/pokemon/back/espeonb.png differ diff --git a/gfx/pokemon/back/glaceonb.png b/gfx/pokemon/back/glaceonb.png new file mode 100644 index 00000000..9ad0b6c1 Binary files /dev/null and b/gfx/pokemon/back/glaceonb.png differ diff --git a/gfx/pokemon/back/leafeonb.png b/gfx/pokemon/back/leafeonb.png new file mode 100644 index 00000000..e9210edc Binary files /dev/null and b/gfx/pokemon/back/leafeonb.png differ diff --git a/gfx/pokemon/back/sylveonb.png b/gfx/pokemon/back/sylveonb.png new file mode 100644 index 00000000..6fa9a74f Binary files /dev/null and b/gfx/pokemon/back/sylveonb.png differ diff --git a/gfx/pokemon/back/umbreonb.png b/gfx/pokemon/back/umbreonb.png new file mode 100644 index 00000000..693dba94 Binary files /dev/null and b/gfx/pokemon/back/umbreonb.png differ diff --git a/gfx/pokemon/front/espeon.png b/gfx/pokemon/front/espeon.png new file mode 100644 index 00000000..1f668ef4 Binary files /dev/null and b/gfx/pokemon/front/espeon.png differ diff --git a/gfx/pokemon/front/glaceon.png b/gfx/pokemon/front/glaceon.png new file mode 100644 index 00000000..8d5b465e Binary files /dev/null and b/gfx/pokemon/front/glaceon.png differ diff --git a/gfx/pokemon/front/leafeon.png b/gfx/pokemon/front/leafeon.png new file mode 100644 index 00000000..5967a502 Binary files /dev/null and b/gfx/pokemon/front/leafeon.png differ diff --git a/gfx/pokemon/front/sylveon.png b/gfx/pokemon/front/sylveon.png new file mode 100644 index 00000000..1c8c1f48 Binary files /dev/null and b/gfx/pokemon/front/sylveon.png differ diff --git a/gfx/pokemon/front/umbreon.png b/gfx/pokemon/front/umbreon.png new file mode 100644 index 00000000..fb23b1f0 Binary files /dev/null and b/gfx/pokemon/front/umbreon.png differ diff --git a/layout.link b/layout.link index eb6f231c..10355e37 100644 --- a/layout.link +++ b/layout.link @@ -181,6 +181,8 @@ ROMX $2D "Pics 7" ROMX $2E "Pics 8" +ROMX $2F + "Pics 9" WRAM0 "Audio RAM" org $c100