diff --git a/README.md b/README.md index 18893fab..75297b3a 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ and more! Known Bugs ==== -- The highest AI level seems to prioritise offensive moves a bit too much? +- Itemfinder fails at its one job of finding items. Evolution Methods for new Pokemon ==== @@ -400,7 +400,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G (back), Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G -Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Slowking-G, Slowbro-G, Sylveon (front, with help from Albatross) +Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Slowking-G (front), Slowbro-G (front, with help from Albatross), Sylveon (front, with help from Albatross) Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Gorillaimo, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 993fd202..68e76430 100644 Binary files a/gfx/pokemon/front/porygon.png and b/gfx/pokemon/front/porygon.png differ diff --git a/gfx/pokemon/front/raichua.png b/gfx/pokemon/front/raichua.png index e77a2d33..436a84c4 100644 Binary files a/gfx/pokemon/front/raichua.png and b/gfx/pokemon/front/raichua.png differ diff --git a/gfx/pokemon/front/slowbrog.png b/gfx/pokemon/front/slowbrog.png index 3130a8cc..4d6a797c 100644 Binary files a/gfx/pokemon/front/slowbrog.png and b/gfx/pokemon/front/slowbrog.png differ diff --git a/gfx/pokemon/front/slowkingg.png b/gfx/pokemon/front/slowkingg.png index dfd85100..5c0bba1b 100644 Binary files a/gfx/pokemon/front/slowkingg.png and b/gfx/pokemon/front/slowkingg.png differ diff --git a/gfx/pokemon/front/zapdosg.png b/gfx/pokemon/front/zapdosg.png index 821e17b1..e942f6e2 100644 Binary files a/gfx/pokemon/front/zapdosg.png and b/gfx/pokemon/front/zapdosg.png differ diff --git a/main.asm b/main.asm index 06dd64bf..aa065b11 100644 --- a/main.asm +++ b/main.asm @@ -339,13 +339,13 @@ INCLUDE "engine/items/itemfinder.asm" SECTION "Vending Machine", ROMX INCLUDE "engine/events/vending_machine.asm" +INCLUDE "gfx/fishing.asm" SECTION "Itemfinder 2", ROMX INCLUDE "engine/menus/league_pc.asm" INCLUDE "engine/events/hidden_items.asm" -INCLUDE "gfx/fishing.asm" SECTION "bank1E", ROMX