Dex entries!

data/pokemon/dex_text.asm

@@ -238,14 +238,14 @@ _TentacoolDexEntry::
 	next "its stinging acid"
 	dex
 
-_GastlyDexEntry::
+_GastlyDexEntry::		; Dex entry from Green, swapping the Indian Elephant for Trampel. ~M
-	text "Almost invisible,"
+	text "A being that"
-	next "this gaseous"
+	next "exists as a thin"
-	next "#MON cloaks"
+	next "gas. The gas is"
-
+	
-	page "the target and"
+	page "potent enough to"
-	next "puts it to sleep"
+	next "fell a TRAMPEL"
-	next "without notice"
+	next "in two seconds"
 	dex
 
 _ScytherDexEntry::
@@ -668,14 +668,14 @@ _KrabbyDexEntry::
 	next "sideways"
 	dex
 
-_VulpixDexEntry::
+_VulpixDexEntry::			; Changed to make it not too similar to Mikon's dex entry. ~M
-	text "At the time of"
+	text "As each tail"
-	next "birth, it has"
+	next "grows, its fur"
-	next "just one tail."
+	next "becomes softer."
-
+	
-	page "The tail splits"
+	page "When held, it"
-	next "from its tip as"
+	next "gives off a"
-	next "it grows older"
+	next "slight warmth"
 	dex
 
 _NinetalesDexEntry::

data/pokemon/new_dex_text.asm

@@ -0,0 +1,459 @@
+_GyaoonDexEntry::
+	text "Very dangerous"
+	next "and frequently"
+	next "rampages wildly."
+
+	page "It can crush"
+	next "anything within"
+	next "its huge jaws"
+	dex
+
+_GuardiaDexEntry::
+	text "A caring #MON"
+	next "that adopts"
+	next "orphaned CUBONE"
+
+	page "and raises them"
+	next "until they're"
+	next "ready to evolve"
+	dex
+
+_DeerDexEntry::
+	text "Once hunted"
+	next "in the past for"
+	next "its impressive"
+
+	page "antlers, it's"
+	next "now under strict"
+	next "protection"
+	dex
+
+_MadaamuDexEntry::
+	text "A species that is"
+	next "rarely seen. It"
+	next "always holds a"
+
+	page "spring onion"
+	next "flower, according"
+	next "to studies"
+	dex
+
+_DecillaDexEntry::
+	text "A timid #MON,"
+	next "DECILLA loudly"
+	next "cries out for"
+
+	page "its parents"
+	next "if it ever feels"
+	next "threatened"
+	dex
+
+_BlottleDexEntry::
+	text "A descendant of"
+	next "the ancient"
+	next "OMANYTE. It"
+
+	page "secretes ink"
+	next "from the tips of"
+	next "its tentacles"
+	dex
+
+_KotoraDexEntry::
+	text "As it builds up"
+	next "electricity in"
+	next "its fur, touching"
+
+	page "it is risky. It's"
+	next "a very popular"
+	next "pet regardless"
+	dex
+
+_JaggDexEntry::
+	text "Known as the"
+	next "Sailors' Scourge,"
+	next "it rams its"
+
+	page "proud horn into"
+	next "the hulls of"
+	next "approaching ships"
+	dex
+
+_JabettaDexEntry::
+	text "An ill-tempered"
+	next "#MON, they"
+	next "frequently pick"
+
+	page "fights with"
+	next "each other to"
+	next "claim territory"
+	dex
+
+_GaotoraDexEntry::
+	text "An endangered"
+	next "species, due to"
+	next "hunters targeting"
+
+	page "it for its soft"
+	next "yellow fur and"
+	next "tough fangs"
+	dex
+
+_CactusDexEntry::
+	text "Found in arid"
+	next "regions. Its legs"
+	next "are adapted for"
+
+	page "maneuverability"
+	next "on sandy and"
+	next "rocky terrain"
+	dex
+
+_KonyaDexEntry::
+	text "Its eyesight is"
+	next "still developing,"
+	next "so it cannot see"
+
+	page "very well. KONYA"
+	next "are drawn to very"
+	next "shiny objects"
+	dex
+
+_BittybatDexEntry::
+	text "Due to their tiny"
+	next "size, several of"
+	next "these #MON may"
+
+	page "swarm a victim"
+	next "at once to"
+	next "prey on it"
+	dex
+
+_RibbitoDexEntry::
+	text "Despite its small"
+	next "size, it likes"
+	next "to challenge"
+
+	page "others. It puffs"
+	next "up its chest to"
+	next "appear larger"
+	dex
+
+_CryithanDexEntry::
+	text "During a battle,"
+	next "this #MON cries"
+	next "to dishearten the"
+
+	page "enemy. It strikes"
+	next "once the foe lets"
+	next "their guard down"
+	dex
+
+_BlastykeDexEntry::
+	text "It spews bubbles"
+	next "from the ports"
+	next "on its shell."
+
+	page "This #MON and"
+	next "SQUIRTLE are"
+	next "related species"
+	dex
+
+_BuuDexEntry::
+	text "Long thought to"
+	next "be an urban myth"
+	next "until one was"
+
+	page "found hiding in"
+	next "a secluded cave"
+	next "in the tundra"
+	dex
+
+_SkimperDexEntry::
+	text "Incredibly timid,"
+	next "it flees at the"
+	next "smallest sign of"
+
+	page "danger. Gaining"
+	next "its trust is a"
+	next "difficult task"
+	dex
+
+_BawliguaDexEntry::
+	text "Often basks in"
+	next "the sunlight. If"
+	next "its temperature"
+
+	page "rises too high,"
+	next "it cries to"
+	next "cool itself down"
+	dex
+
+_PuchikoonDexEntry::
+	text "At this stage, it"
+	next "struggles to"
+	next "keep up with"
+
+	page "its parent. Its"
+	next "flame-covered mane"
+	next "is very hot"
+	dex
+
+_GyopinDexEntry::
+	text "It was once scarce"
+	next "and rarely seen,"
+	next "but thanks to a"
+
+	page "dedicated breeder,"
+	next "it has since"
+	next "flourished"
+	dex
+
+_GorochuDexEntry::
+	text "Energizes itself"
+	next "by drawing in"
+	next "electricity. It"
+
+	page "boasts incredible"
+	next "electrical and"
+	next "physical strength"
+	dex
+
+_MikonDexEntry::
+	text "While young, it"
+	next "has three soft,"
+	next "gorgeous tails."
+
+	page "More tails form"
+	next "the older it"
+	next "becomes"
+	dex
+
+_CheepDexEntry::
+	text "It can be seen"
+	next "leaping out of"
+	next "the water and"
+
+	page "quickly flapping"
+	next "its fins in an"
+	next "attempt to fly"
+	dex
+
+_TotartleDexEntry::
+	text "Known for its"
+	next "longevity, the"
+	next "oldest known"
+
+	page "TOTARTLE lived"
+	next "to be almost"
+	next "1,000 years old"
+	dex
+
+_WeirduckDexEntry::
+	text "It exhibits odd"
+	next "mannerisms as"
+	next "it attempts to"
+
+	page "control its"
+	next "developing"
+	next "psychic powers"
+	dex
+
+_CroakozunaDexEntry::
+	text "It intimidates"
+	next "foes by puffing"
+	next "up and stomping."
+
+	page "These stomps can"
+	next "even shake the"
+	next "ground sometimes"
+	dex
+
+_GorotoraDexEntry::
+	text "Its growls sound"
+	next "like rolling"
+	next "thunder. It can"
+
+	page "only be tamed"
+	next "by the bravest"
+	next "#MON TRAINERs"
+	dex
+
+_OmegaDexEntry::
+	text "A mechanical"
+	next "#MON, it was"
+	next "created during"
+
+	page "SILPH CO.'s first"
+	next "efforts to revive"
+	next "a GYAOON"
+	dex
+
+_PurakkusuDexEntry::
+	text "Withstands foes'"
+	next "attacks with its"
+	next "sturdy body, then"
+
+	page "pinches them in"
+	next "its horns before"
+	next "flipping them"
+	dex
+
+_TrampelDexEntry::
+	text "A rare species,"
+	next "this #MON"
+	next "possesses great"
+
+	page "bulk, and also"
+	next "high dexterity"
+	next "using its trunk"
+	dex
+
+_CrockyDexEntry::
+	text "Its huge eyes can"
+	next "glow to brighten"
+	next "its surroundings."
+
+	page "Those who gaze at"
+	next "it for too long"
+	next "become immobile"
+	dex
+
+_PendrakenDexEntry::
+	text "Often clashes"
+	next "with TENTACRUEL."
+	next "Though it lacks"
+
+	page "poison, it can"
+	next "blind foes using"
+	next "its ink"
+	dex
+
+_MagnetiteDexEntry::
+	text "Its magnetic"
+	next "field attracts"
+	next "lots of metal,"
+
+	page "but this can"
+	next "cause it to be"
+	next "unable to float"
+	dex
+
+_NidoreignDexEntry::
+	text "Born from a"
+	next "MOON STONE, it"
+	next "has the combined"
+
+	page "traits of both"
+	next "NIDORINA and"
+	next "NIDORINO"
+	dex
+
+_BarundaDexEntry::
+	text "If it ever feels"
+	next "threatened, it"
+	next "will inflate its"
+
+	page "body to a gigantic"
+	next "size to intimidate"
+	next "attackers"
+	dex
+
+_TsubomittoDexEntry::
+	text "By digging its"
+	next "root-like feet"
+	next "into the earth,"
+
+	page "it can absorb"
+	next "useful nutrients"
+	next "found in the soil"
+	dex
+
+_AnimonDexEntry::
+	text "A sudden mutation"
+	next "of DITTO, its"
+	next "mimicry skills"
+
+	page "have improved. It"
+	next "can copy anything"
+	next "in an instant"
+	dex
+
+_MonjaDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
+_ParaDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
+_HinaazuDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
+_PudiDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
+_BetobebiiDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex
+
+_ScizorDexEntry::
+	text "It swings its eye-"
+	next "patterned pincers"
+	next "up to scare its"
+
+	page "foes. This makes"
+	next "it look like it"
+	next "has three heads"
+	dex
+
+_BellossomDexEntry::
+	text "BELLOSSOM gather"
+	next "at times and"
+	next "appear to dance."
+
+	page "They say that the"
+	next "dance is a ritual"
+	next "to summon the sun"
+	dex
+
+_MissingNoDexEntry::
+	text "This is a newly"
+	next "discovered"
+	next "#MON. It is"
+
+	page "currently under"
+	next "investigation. No"
+	next "info is available"
+	dex

main.asm

@@ -189,15 +189,11 @@ SECTION "Battle Engine 7", ROMX
 INCLUDE "data/moves/moves.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/cries.asm"
-INCLUDE "engine/battle/unused_stats_functions.asm"
 INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
 INCLUDE "engine/battle/trainer_ai.asm"
 INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
-INCLUDE "gfx/trade.asm"
 INCLUDE "engine/pokemon/evos_moves.asm"
 INCLUDE "engine/battle/move_effects/heal.asm"
-INCLUDE "engine/battle/move_effects/transform.asm"
-INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
 
 
 SECTION "Battle Core", ROMX
@@ -212,6 +208,10 @@ INCLUDE "engine/menus/pokedex.asm"
 INCLUDE "engine/movie/trade.asm"
 INCLUDE "engine/movie/intro.asm"
 INCLUDE "engine/movie/trade2.asm"
+INCLUDE "gfx/trade.asm"
+INCLUDE "engine/battle/unused_stats_functions.asm"
+INCLUDE "engine/battle/move_effects/transform.asm"
+INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
 
 
 SECTION "Pokédex Rating", ROMX

text.asm

@@ -270,6 +270,7 @@ INCLUDE "data/text/text_6.asm"
 SECTION "Text 11", ROMX
 
 INCLUDE "data/text/text_7.asm"
+INCLUDE "data/pokemon/new_dex_text.asm"
 
 
 SECTION "Pokédex Text", ROMX