diff --git a/gfx/pics.asm b/gfx/pics.asm index 97306c6..c3c8002 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -982,12 +982,6 @@ BittybatFrontpic: INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz" BittybatBackpic: INCBIN "gfx/pokemon/bittybat/back.2bpp.lz" ParasporFrontpic: INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz" ParasporBackpic: INCBIN "gfx/pokemon/paraspor/back.2bpp.lz" -VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz" -VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz" -AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" -AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" -PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" -PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz" SECTION "Pics 25", ROMX @@ -1062,6 +1056,15 @@ KuyePic: INCBIN "gfx/trainers/kuye.2bpp.lz" ShamPic: INCBIN "gfx/trainers/executive_f.2bpp.lz" CarlPic: INCBIN "gfx/trainers/executive_m.2bpp.lz" +SECTION "Pics 27", ROMX + +VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz" +VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz" +AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" +AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" +PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" +PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz" + ; spillover KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz" AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz" \ No newline at end of file diff --git a/gfx/pokemon/feradactyl/back.png b/gfx/pokemon/feradactyl/back.png index 903a6d1..3ec8903 100644 Binary files a/gfx/pokemon/feradactyl/back.png and b/gfx/pokemon/feradactyl/back.png differ diff --git a/gfx/pokemon/feradactyl/front.png b/gfx/pokemon/feradactyl/front.png index ff3ade3..25c4f11 100644 Binary files a/gfx/pokemon/feradactyl/front.png and b/gfx/pokemon/feradactyl/front.png differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 1826396..0d9b957 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, BIPULLA + getmonname STRING_BUFFER_3, FERADACTYL writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke BIPULLA, 15, HM_WATER_SPORT + givepoke FERADACTYL, 15, HM_WATER_SPORT closetext end