Dex entry enhancements

Began the arduous process of giving old Pokemon new dex entries. Like KEP, the main aim is using media not from the mainline games, giving players new insights into the lore surrounding them. New Snap, Ranger, Carddass, TCG art, and more are all on the table. Carddass is prioritised for Gen 1 Pokemon considering its obscurity and...well, general insights into how the Pokemon act, it's pretty awesome.

I've also taken to enhancing some of the existing dex entries!

data/pokemon/dex_entries/abra.asm

@@ -1,10 +1,10 @@
 	db "PSI@" ; species name
 	dw 211, 430 ; height, weight
 
-	db   "It hypnotizes"
+	db   "Lives in urban" ; taken from a lot of other media, not much about this pokemon.
-	next "itself so that it"
+	next "areas. Even when"
-	next "can teleport away"
+	next "sleeping, it can"
 
-	page "when it senses"
+	page "control its PSI"
-	next "danger, even"
+	next "powers, letting it"
-	next "if it is asleep.@"
+	next "easily flee foes.@"

data/pokemon/dex_entries/aerodactyl.asm

@@ -1,10 +1,10 @@
 	db "FOSSIL@" ; species name
 	dw 511, 1300 ; height, weight
 
-	db   "In prehistoric"
+	db   "Its wings were ma-"
-	next "times, this"
+	next "de of a rocky mat-"
-	next "#MON flew"
+	next "erial, strengthen-"
 
-	page "freely and"
+	page "ing WING ATTACK."
-	next "fearlessly through"
+	next "Loves to eat GOLD"
-	next "the skies.@"
+	next "BERRIES.@" ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/b/bd/Bandai_Aerodactyl_card.jpg and that one anime episode

data/pokemon/dex_entries/aipom.asm

@@ -1,10 +1,10 @@
 	db "LONG TAIL@" ; species name
 	dw 207, 250 ; height, weight
 
-	db   "It uses its tail"
+	db   "While it loves ba-"
-	next "to hang on to tree"
+	next "nanas, AIPOM has"
-	next "branches. It uses"
+	next "been seen preying"
 
-	page "its momentum to"
+	page "on SUNKERN. It" ; This references the Ultra Moon dex entry where Bounsweet is said to be its favourite.
-	next "swing from one"
+	next "hunts them by pou-"
-	next "branch to another.@"
+	next "ncing wildly.@"

data/pokemon/dex_entries/alakazam.asm

@@ -1,10 +1,10 @@
 	db "PSI@" ; species name
 	dw 411, 1060 ; height, weight
 
-	db   "It has an IQ of"
+	db   "5,000 IQ helps it"
-	next "5000. It calcu-"
+	next "find tactics its"
-	next "lates many things"
+	next "TRAINER misses."
-
+	
-	page "in order to gain"
+	db   "It defends its we-"
-	next "the edge in every"
+	next "ak body by using"
-	next "battle.@"
+	next "REFLECT.@" ; References Carddass artwork https://archives.bulbagarden.net/media/upload/c/c8/Bandai_Alakazam_card.jpg

data/pokemon/dex_entries/ampharos.asm

@@ -1,10 +1,10 @@
 	db "LIGHT@" ; species name
 	dw 407, 1360 ; height, weight
 
-	db   "When it gets dark,"
+	db   "Thought to be a"
-	next "the light from its"
+	next "spacefaring drag-"
-	next "bright, shiny tail"
+	next "on, remnants of"
 
-	page "can be seen from"
+	page "draconic genes"
-	next "far away on the"
+	next "were found in"
-	next "ocean's surface.@"
+	next "its DNA.@" ; Referencing the Official Pokemon Fanbook, which brought in the rumours of Ampharos once being dragon-type, as well as Mega Ampharos's Pokedex entries.

data/pokemon/dex_entries/arbok.asm

@@ -1,10 +1,12 @@
 	db "COBRA@" ; species name
 	dw 1106, 1430 ; height, weight
 
-	db   "To intimidate"
+	db   "If its terrifying"
-	next "foes, it spreads"
+	next "visage doesn't de-"
-	next "its chest wide and"
+	next "ter foes, it spits"
 
-	page "makes eerie sounds"
+	page "ACID at the eyes"
-	next "by expelling air"
+	next "of its foe, blind-"
-	next "from its mouth.@"
+	next "ing them.@" ; Referencing Carddass artwork and Spitting Cobra ecology.
+	
+; https://archives.bulbagarden.net/media/upload/0/06/Bandai_Arbok_card.jpg

data/pokemon/dex_entries/arcanine.asm

@@ -1,10 +1,10 @@
 	db "LEGENDARY@" ; species name
 	dw 603, 3420 ; height, weight
 
-	db   "An ancient picture"
+	db   "While rarely seen"
-	next "scroll shows that"
+	next "in praries, it is"
-	next "people were"
+	next "easier to find in"
 
-	page "attracted to its"
+	page "volcanoes, where"
-	next "movement as it ran"
+	next "it sleeps in lava" ; Referencing Pokemon Snap.
-	next "through prairies.@"
+	next "pits.@"

data/pokemon/dex_entries/ariados.asm

@@ -1,10 +1,12 @@
 	db "LONG LEG@" ; species name
 	dw 307, 740 ; height, weight
 
-	db   "Rather than mak-"
+	db   "Its silk is extre-"
-	next "ing a nest in one"
+	next "mely strong. To"
-	next "specific spot, it"
+	next "avoid capture,"
 
-	page "wanders in search"
+	page "it spits from the"
-	next "of food after"
+	next "front or rear to"
-	next "darkness falls.@"
+	next "seal # BALLs.@"
+; The way Ariados hunts is contradicted like, all the time, it's kind of ridiculous. 
+; So to avoid the issue entirely, I put together the lore about the silk it spits, among other things, to make this.

data/pokemon/dex_entries/articuno.asm

@@ -2,9 +2,9 @@
 	dw 507, 1220 ; height, weight
 
 	db   "Legendary bird"
-	next "#MON. As it"
+	next "#MON. When"
-	next "flies through the"
+	next "discovered, it"
 
-	page "sky, it cools the"
+	page "whips up a blizz-" ; Referencing Pokemon Ranger: Guardian Signs and Carddass artwork. https://archives.bulbagarden.net/media/upload/4/46/Bandai_Articuno_card.jpg
-	next "air, causing snow"
+	next "ard, freezing" 
-	next "to fall.@"
+	next "the foe forever.@" ; soft-reference to RBY too.

data/pokemon/dex_entries/azumarill.asm

@@ -1,10 +1,12 @@
 	db "AQUARABBIT@" ; species name
 	dw 207, 630 ; height, weight
 
-	db   "The bubble-like"
+	db   "Its tail is sur-"
-	next "pattern on its"
+	next "prisingly heavy."
-	next "stomach helps it"
+	next "To defend its fa-"
 
-	page "camouflage itself"
+	page "mily, it will use"
-	next "when it's in the"
+	next "it as a mace, le-"
-	next "water.@"
+	next "aving a crater.@" ; could be rewritten for clarity, relies on someone knowing what a mace is.
+; Referencing TCG artwork from HeartGold SoulSilver 2
+; https://archives.bulbagarden.net/media/upload/a/aa/AzumarillHeartGoldSoulSilver2.jpg

data/pokemon/dex_entries/balumba.asm

@@ -1,10 +1,11 @@
 	db "BALLOON@" ; species name
 	dw 503, 1210 ; height, weight - temp
 
-	db   "Pulling BALUMBA's"
+	db   "Lives near small"
-	next "string causes it"
+	next "villages. Pulling"
-	next "great pain, maki-"
+	next "BALUMBA's shriek"
-
+	
-	page "ng it shriek."
+	page "causes it great"
-	next "Lives near small"
+	next "pain, making it"
-	next "villages.@"
+	next "shriek.@"
+	

data/pokemon/dex_entries/barreau.asm

@@ -7,4 +7,4 @@
 
 	page "allergic reactions"
 	next "in attackers. It"
-	next "loves nectar.@"
+	next "loves nectar.@" ; could be made honey, and then integrated into other honey tree encounters

data/pokemon/dex_entries/bayleef.asm

@@ -1,10 +1,10 @@
 	db "LEAF@" ; species name
 	dw 311, 350 ; height, weight
 
-	db   "The scent that"
+	db   "Its RAZOR LEAF can"
-	next "wafts from the"
+	next "demolish metal fe-" ; Pokemon Ranger Browser entry
-	next "leaves on its neck"
+	next "nces. The aroma"
 
-	page "causes anyone who"
+	page "it gives off will"
-	next "smells it to"
+	next "energise even sl-" ; Pokemon Sleep reference
-	next "become energetic.@"
+	next "eeping #MON.@"

data/pokemon/dex_entries/beedrill.asm

@@ -1,10 +1,10 @@
 	db "POISON BEE@" ; species name
 	dw 303, 650 ; height, weight
 
-	db   "It uses sharp,"
+	db   "When faced with"
-	next "poisonous stings"
+	next "a fleeing #-"
-	next "to defeat prey,"
+	next "MON, it can shoot"
 
-	page "then takes the"
+	page "its stinger at t-"
-	next "victim back to its"
+	next "hem. It grows ba-"
-	next "nest for food.@"
+	next "ck very quickly.@" ; Referencing Carddass artwork of it using Pin Missile https://archives.bulbagarden.net/media/upload/3/30/Bandai_Beedrill_card.jpg

data/pokemon/dex_entries/bellossom.asm

@@ -1,10 +1,12 @@
 	db "FLOWER@" ; species name
 	dw 104, 130 ; height, weight
 
-	db   "When these dance"
+	db   "Hides in vegetati-" ; New Pokemon Snap
-	next "together, their"
+	next "on. If discovered," ; Ranger
-	next "petals rub against"
+	next "it defends itself"
 
-	page "each other,"
+	page "with a flurry of"
-	next "making pretty,"
+	next "leaves, vines,"
-	next "relaxing sounds.@"
+	next "and petals.@"
+	; kind of sucks and there's definitely media from the anime or something that could be better
+	; rewrite if based

data/pokemon/dex_entries/bellsprout.asm

@@ -1,10 +1,10 @@
 	db "FLOWER@" ; species name
 	dw 204, 90 ; height, weight
 
-	db   "If it notices"
+	db   "To catch prey, it"
-	next "anything that"
+	next "extends its roots"
-	next "moves, it"
+	next "to constrict them." ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/0/02/Bandai_Bellsprout_card.jpg
 
-	page "immediately flings"
+	page "It follows this"
-	next "its vine at the"
+	next "up with ACID and"
-	next "object.@"
+	next "VINE WHIP.@"

data/pokemon/dex_entries/blastoise.asm

@@ -1,10 +1,11 @@
 	db "SHELLFISH@" ; species name
 	dw 503, 1890 ; height, weight
 
-	db   "It firmly plants"
+	db   "Its HYDRO PUMP"
-	next "its feet on the"
+	next "is so powerful,"
-	next "ground before"
+	next "it launches it"
 
-	page "shooting water"
+	page "backwards. Smart"
-	next "from the jets on"
+	next "BLASTOISE use th-"
-	next "its back.@"
+	next "is in battle.@"
+; Derived from Pokken Tournament. Bit shoddily written, feel free to enhance.

data/pokemon/dex_entries/bonsly.asm

@@ -5,6 +5,6 @@
 	next "must be bottle-fed"
 	next "before eating"
 
-	page "solid food."
+	page "solid food. it"
-	next "It cries to expel"
+	next "cries to expel"
 	next "excess moisture.@"

data/pokemon/dex_entries/caretorker.asm

@@ -5,6 +5,6 @@
 	next "young in a bundle"
 	next "made of its own"
 
-	page "down. It is close"
+	page "down. Its broody"
-	next "with GUARDIA and"
+	next "nature is loved"
-	next "KANGASKHAN.@"
+	next "by DAY CAREs.@"

data/pokemon/dex_entries/charmada.asm

@@ -5,6 +5,6 @@
 	next "augmented by"
 	next "SILPH CO. to"
 
-	page "battle TYRANITAR." ; Like a sequel to Omegadge vs Gawarhed!
+	page "battle GAWARHED."
 	next "The three heads"
 	next "work in unison.@"

data/pokemon/dex_entries/cyclorp.asm

@@ -7,4 +7,4 @@
 
 	page "of explorers, much"
 	next "to their horror"
-	next "and disgust.@"
+	next "and disgust.@" ; it's secretly a solifuge,,,

data/pokemon/dex_entries/decilla.asm

@@ -1,10 +1,10 @@
 	db "SHRIEKING@" ; species name
 	dw 37, 1400 ; height, weight
 
-	db   "It once fed on"
+	db   "It's weak, so its" ; this needs rewriting
-	next "weaker mammals."
+	next "mother has to"
-	next "When hungry,"
+	next "feed it. When it's"
 
-	page "it lets out an"
+	page "hungry, it lets"
-	next "ear-piercing"
+	next "out an ear-pier-"
-	next "shriek.@"
+	next "cing shriek.@"

data/pokemon/dex_entries/grenmar.asm

@@ -2,7 +2,7 @@
 	dw 311, 191 ; height, weight - temp
 
 	db   "Popular amongst"
-	next "ringmaster for its"
+	next "ringmasters for its"
 	next "skillful juggling."
 
 	page "Training one is"

data/pokemon/dex_entries/moltres.asm

@@ -1,10 +1,13 @@
 	db "FLAME@" ; species name
 	dw 607, 1320 ; height, weight
 
-	db   "Legendary bird"
+	db   "Said to be a pho-"
-	next "#MON. It is"
+	next "enix. When its"
-	next "said to migrate"
+	next "home is threaten-"
 
-	page "from the south"
+	page "ed, it dive bombs"
-	next "along with the"
+	next "its foes using"
-	next "spring.@"
+	next "SKY ATTACK.@"
+; A lot of early media shows Moltres "dive bombing" foes, like the Fossil TCG card and Carddass artwork. This seems to be rooted in prototype media showing a Flying-type move called Dive Bomb, which later became Fly. Here, we use that old lore.
+; It's to the point that in GSC, it's the only Sky Attack-learning Pokemon!
+; https://archives.bulbagarden.net/media/upload/d/d2/Bandai_Moltres_card.jpg

data/pokemon/dex_entries/porygon_z.asm

@@ -5,6 +5,6 @@
 	next "computers, but"
 	next "its corrupted"
 
-	page "data can often"
+	page "data causes severe"
-	next "cause severe errors"
+	next "errors, glitches,"
-	next "or glitches.@"
+	next "and data loss.@"

data/pokemon/dex_entries/qwilfather.asm

@@ -5,6 +5,6 @@
 	next "enemy. They vie"
 	next "for supremacy for"
 
-	page "the beaches by"
+	page "the beaches by" ; do u think he is winston churchill
 	next "commanding their"
 	next "underlings.@"

data/pokemon/dex_entries/zapdos.asm

@@ -1,10 +1,10 @@
 	db "ELECTRIC@" ; species name
 	dw 503, 1160 ; height, weight
 
-	db   "Legendary bird"
+	db   "To catch prey, it"
-	next "#MON. They say"
+	next "electrifies its"
-	next "lightning caused"
+	next "talons before str-"
 
-	page "by the flapping of"
+	page "iking from the he-"
-	next "its wings causes"
+	next "avens. Nothing"
-	next "summer storms.@"
+	next "survives.@" ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/c/cd/Bandai_Zapdos_card.jpg

maps/PlayersHouse2F.asm

@@ -11,9 +11,6 @@ PlayersHouse2F_MapScripts:
 	callback MAPCALLBACK_NEWMAP, PlayersHouse2FInitializeRoomCallback
 	callback MAPCALLBACK_TILES, PlayersHouse2FSetUpTileDecorationsCallback
 
-PlayersHouse2FNoopScene: ; unreferenced
-	end
-
 PlayersHouse2FInitializeRoomCallback:
 	special ToggleDecorationsVisibility
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
@@ -116,8 +113,11 @@ PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+IF DEF(_DEBUG)
 	warp_event  7,  0, DEBUG_ROOM, 1
-	;warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+else
+	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+endc
 
 	def_coord_events
 

scan_includes.exe.stackdump

@@ -1,15 +1,15 @@
 Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
-rax=FFFFFFF7FFF941B1 rbx=0000000000000352 rcx=0000000800000010
+rax=FFFFFFF7FFF907E1 rbx=000000000000019D rcx=0000000800000010
-rdx=0000000000000000 rsi=000000080005BDC1 rdi=0000000000000000
+rdx=0000000000000000 rsi=000000080005C71B rdi=0000000000000000
 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
-r11=00000001004013C6 r12=000000080006BE50 r13=0000000100403148
+r11=0000000100401282 r12=000000080006F820 r13=0000000100403148
-r14=000000080005BDC0 r15=0000000000000001
+r14=000000080005C71A r15=0000000000000001
 rbp=0000000100403156 rsp=00000000FFFFCA60
-program=C:\cygwin64\home\chipp\jep-hack\tools\scan_includes.exe, pid 4802, thread main
+program=C:\cygwin64\home\chipp\jep-hack\tools\scan_includes.exe, pid 8821, thread main
 cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
 Stack trace:
 Frame        Function    Args
-00100403156  00100401246 (0080005BDC1, 00000000022, 00100403166, 000FFFFCB90)
+00100403156  00100401246 (0080005C71B, 00000000022, 00100403166, 000FFFFCB90)
 00100403156  00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
 00100403178  00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
 000FFFFCD30  00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)