diff --git a/gfx/pics.asm b/gfx/pics.asm index 38345ea..97306c6 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -707,15 +707,14 @@ UnownYBackpic: INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" UnownPBackpic: INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" UnownIBackpic: INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" UnownRBackpic: INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" - - -SECTION "Pics 19", ROMX - UnownExclamationFrontpic: INCBIN "gfx/pokemon/unown_exclamation/front.animated.2bpp.lz" UnownExclamationBackpic: INCBIN "gfx/pokemon/unown_exclamation/back.2bpp.lz" UnownQuestionFrontpic: INCBIN "gfx/pokemon/unown_question/front.animated.2bpp.lz" UnownQuestionBackpic: INCBIN "gfx/pokemon/unown_question/back.2bpp.lz" + +SECTION "Pics 19", ROMX + BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz" BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz" WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz" @@ -736,12 +735,6 @@ LickilickyFrontpic: INCBIN "gfx/pokemon/lickilicky/front.animated.2bpp.lz" LickilickyBackpic: INCBIN "gfx/pokemon/lickilicky/back.2bpp.lz" LickilordFrontpic: INCBIN "gfx/pokemon/lickilord/front.animated.2bpp.lz" LickilordBackpic: INCBIN "gfx/pokemon/lickilord/back.2bpp.lz" -BurgelaFrontpic: INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz" -BurgelaBackpic: INCBIN "gfx/pokemon/burgela/back.2bpp.lz" -TangrowthFrontpic: INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz" -TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" -JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" -JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" MamoswineFrontpic: INCBIN "gfx/pokemon/mamoswine/front.animated.2bpp.lz" MamoswineBackpic: INCBIN "gfx/pokemon/mamoswine/back.2bpp.lz" HirsuswineFrontpic: INCBIN "gfx/pokemon/hirsuswine/front.animated.2bpp.lz" @@ -827,6 +820,12 @@ TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz" TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz" BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" +BurgelaFrontpic: INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz" +BurgelaBackpic: INCBIN "gfx/pokemon/burgela/back.2bpp.lz" +TangrowthFrontpic: INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz" +TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" +JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" +JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" SECTION "Pics 22", ROMX CheepFrontpic: INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz" diff --git a/gfx/pokemon/annihilape/back.png b/gfx/pokemon/annihilape/back.png index 6aa10fd..f6eef78 100644 Binary files a/gfx/pokemon/annihilape/back.png and b/gfx/pokemon/annihilape/back.png differ diff --git a/gfx/pokemon/annihilape/front.png b/gfx/pokemon/annihilape/front.png index b4bc393..95a65a7 100644 Binary files a/gfx/pokemon/annihilape/front.png and b/gfx/pokemon/annihilape/front.png differ diff --git a/gfx/pokemon/tangrowth/back.png b/gfx/pokemon/tangrowth/back.png index c7835c3..7c97afe 100644 Binary files a/gfx/pokemon/tangrowth/back.png and b/gfx/pokemon/tangrowth/back.png differ diff --git a/gfx/pokemon/tangrowth/front.png b/gfx/pokemon/tangrowth/front.png index 3135714..737fc2f 100644 Binary files a/gfx/pokemon/tangrowth/front.png and b/gfx/pokemon/tangrowth/front.png differ diff --git a/gfx/pokemon/ursaluna/back.png b/gfx/pokemon/ursaluna/back.png index 6053762..05858cc 100644 Binary files a/gfx/pokemon/ursaluna/back.png and b/gfx/pokemon/ursaluna/back.png differ diff --git a/gfx/pokemon/ursaluna/front.png b/gfx/pokemon/ursaluna/front.png index 6ceb018..76e7bc7 100644 Binary files a/gfx/pokemon/ursaluna/front.png and b/gfx/pokemon/ursaluna/front.png differ diff --git a/maps/CalsHouse2F.ablk b/maps/CalsHouse2F.ablk index 883ef3d..63fe61f 100644 --- a/maps/CalsHouse2F.ablk +++ b/maps/CalsHouse2F.ablk @@ -1 +1 @@ -  \ No newline at end of file + %&' \ No newline at end of file diff --git a/maps/CalsHouse2F.asm b/maps/CalsHouse2F.asm index d76c66d..121c01a 100644 --- a/maps/CalsHouse2F.asm +++ b/maps/CalsHouse2F.asm @@ -12,6 +12,7 @@ object_const_def const CALSHOUSE_KEN + const CALSHOUSE_BOOK CalsHouse2F_MapScripts: def_scene_scripts @@ -21,6 +22,17 @@ CalsHouse2F_MapScripts: CalsHouseKen: jumptextfaceplayer CalsHouseKenText +CalsHouseBook: + opentext + writetext CalsHouseBookIntro + yesorno + iffalse .Done + writetext CalsHouseBookText + waitbutton +.Done: + closetext + end + CalsHouseKenText: text "CAL? He's my" line "brother!" @@ -37,6 +49,46 @@ CalsHouseKenText: line "He's so cool!" done +CalsHouseBookIntro: + text "There's a book" + line "on CAL's desk…" + + para "MYSTERIES OF" + line "THE EARTH" + + para "It's written by..." + line "GIOVANNI?!" + + para "Read it anyway?" + done + +CalsHouseBookText: + text "In this book, I" + line "will reveal the" + cont "highest form of" + cont "RHYDON." + + para "Its name is" + line "RHYPERIOR." + + para "We can't get it" + line "obtained with" + cont "items native to" + cont "KANTO. We must" + cont "use a PROTECTOR." + + para "Unfortunately," + line "RHYPERIOR does" + cont "not address" + cont "RHYDON's poor" + cont "SPEED. Ergo, it" + cont "cannot use my" + cont "own technique," + cont "FISSURE, to its" + cont "full potential." + done + + ; Usually, there's a thing about Skarmory here, but Silver's House details it, so let's use this unused quote instead. CalsHousePCText: jumpstd SilphPokegearScript @@ -109,3 +161,4 @@ CalsHouse2F_MapEvents: def_object_events object_event 8, 1, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CalsHouseKen, -1 + object_event 1, 5, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CalsHouseBook, -1