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"
-	next "itself so that it"
-	next "can teleport away"
+	db   "Lives in urban" ; taken from a lot of other media, not much about this pokemon.
+	next "areas. Even when"
+	next "sleeping, it can"
 
-	page "when it senses"
-	next "danger, even"
-	next "if it is asleep.@"
+	page "control its PSI"
+	next "powers, letting it"
+	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"
-	next "times, this"
-	next "#MON flew"
+	db   "Its wings were ma-"
+	next "de of a rocky mat-"
+	next "erial, strengthen-"
 
-	page "freely and"
-	next "fearlessly through"
-	next "the skies.@"
+	page "ing WING ATTACK."
+	next "Loves to eat GOLD"
+	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"
-	next "to hang on to tree"
-	next "branches. It uses"
+	db   "While it loves ba-"
+	next "nanas, AIPOM has"
+	next "been seen preying"
 
-	page "its momentum to"
-	next "swing from one"
-	next "branch to another.@"
+	page "on SUNKERN. It" ; This references the Ultra Moon dex entry where Bounsweet is said to be its favourite.
+	next "hunts them by pou-"
+	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"
-	next "5000. It calcu-"
-	next "lates many things"
-
-	page "in order to gain"
-	next "the edge in every"
-	next "battle.@"
+	db   "5,000 IQ helps it"
+	next "find tactics its"
+	next "TRAINER misses."
+	
+	db   "It defends its we-"
+	next "ak body by using"
+	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,"
-	next "the light from its"
-	next "bright, shiny tail"
+	db   "Thought to be a"
+	next "spacefaring drag-"
+	next "on, remnants of"
 
-	page "can be seen from"
-	next "far away on the"
-	next "ocean's surface.@"
+	page "draconic genes"
+	next "were found in"
+	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"
-	next "foes, it spreads"
-	next "its chest wide and"
+	db   "If its terrifying"
+	next "visage doesn't de-"
+	next "ter foes, it spits"
 
-	page "makes eerie sounds"
-	next "by expelling air"
-	next "from its mouth.@"
+	page "ACID at the eyes"
+	next "of its foe, blind-"
+	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"
-	next "scroll shows that"
-	next "people were"
+	db   "While rarely seen"
+	next "in praries, it is"
+	next "easier to find in"
 
-	page "attracted to its"
-	next "movement as it ran"
-	next "through prairies.@"
+	page "volcanoes, where"
+	next "it sleeps in lava" ; Referencing Pokemon Snap.
+	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-"
-	next "ing a nest in one"
-	next "specific spot, it"
+	db   "Its silk is extre-"
+	next "mely strong. To"
+	next "avoid capture,"
 
-	page "wanders in search"
-	next "of food after"
-	next "darkness falls.@"
+	page "it spits from the"
+	next "front or rear to"
+	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 "flies through the"
+	next "#MON. When"
+	next "discovered, it"
 
-	page "sky, it cools the"
-	next "air, causing snow"
-	next "to fall.@"
+	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 "ard, freezing" 
+	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"
-	next "pattern on its"
-	next "stomach helps it"
+	db   "Its tail is sur-"
+	next "prisingly heavy."
+	next "To defend its fa-"
 
-	page "camouflage itself"
-	next "when it's in the"
-	next "water.@"
+	page "mily, it will use"
+	next "it as a mace, le-"
+	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"
-	next "string causes it"
-	next "great pain, maki-"
-
-	page "ng it shriek."
-	next "Lives near small"
-	next "villages.@"
+	db   "Lives near small"
+	next "villages. Pulling"
+	next "BALUMBA's shriek"
+	
+	page "causes it great"
+	next "pain, making it"
+	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"
-	next "wafts from the"
-	next "leaves on its neck"
+	db   "Its RAZOR LEAF can"
+	next "demolish metal fe-" ; Pokemon Ranger Browser entry
+	next "nces. The aroma"
 
-	page "causes anyone who"
-	next "smells it to"
-	next "become energetic.@"
+	page "it gives off will"
+	next "energise even sl-" ; Pokemon Sleep reference
+	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,"
-	next "poisonous stings"
-	next "to defeat prey,"
+	db   "When faced with"
+	next "a fleeing #-"
+	next "MON, it can shoot"
 
-	page "then takes the"
-	next "victim back to its"
-	next "nest for food.@"
+	page "its stinger at t-"
+	next "hem. It grows ba-"
+	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"
-	next "together, their"
-	next "petals rub against"
+	db   "Hides in vegetati-" ; New Pokemon Snap
+	next "on. If discovered," ; Ranger
+	next "it defends itself"
 
-	page "each other,"
-	next "making pretty,"
-	next "relaxing sounds.@"
+	page "with a flurry of"
+	next "leaves, vines,"
+	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"
-	next "anything that"
-	next "moves, it"
+	db   "To catch prey, it"
+	next "extends its roots"
+	next "to constrict them." ; Referencing Carddass artwork https://archives.bulbagarden.net/media/upload/0/02/Bandai_Bellsprout_card.jpg
 
-	page "immediately flings"
-	next "its vine at the"
-	next "object.@"
+	page "It follows this"
+	next "up with ACID and"
+	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"
-	next "its feet on the"
-	next "ground before"
+	db   "Its HYDRO PUMP"
+	next "is so powerful,"
+	next "it launches it"
 
-	page "shooting water"
-	next "from the jets on"
-	next "its back.@"
+	page "backwards. Smart"
+	next "BLASTOISE use th-"
+	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."
-	next "It cries to expel"
+	page "solid food. it"
+	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"
-	next "with GUARDIA and"
-	next "KANGASKHAN.@"
+	page "down. Its broody"
+	next "nature is loved"
+	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"
-	next "weaker mammals."
-	next "When hungry,"
+	db   "It's weak, so its" ; this needs rewriting
+	next "mother has to"
+	next "feed it. When it's"
 
-	page "it lets out an"
-	next "ear-piercing"
-	next "shriek.@"
+	page "hungry, it lets"
+	next "out an ear-pier-"
+	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"
-	next "#MON. It is"
-	next "said to migrate"
+	db   "Said to be a pho-"
+	next "enix. When its"
+	next "home is threaten-"
 
-	page "from the south"
-	next "along with the"
-	next "spring.@"
+	page "ed, it dive bombs"
+	next "its foes using"
+	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"
-	next "cause severe errors"
-	next "or glitches.@"
+	page "data causes severe"
+	next "errors, 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"
-	next "#MON. They say"
-	next "lightning caused"
+	db   "To catch prey, it"
+	next "electrifies its"
+	next "talons before str-"
 
-	page "by the flapping of"
-	next "its wings causes"
-	next "summer storms.@"
+	page "iking from the he-"
+	next "avens. Nothing"
+	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
-rdx=0000000000000000 rsi=000000080005BDC1 rdi=0000000000000000
+rax=FFFFFFF7FFF907E1 rbx=000000000000019D rcx=0000000800000010
+rdx=0000000000000000 rsi=000000080005C71B rdi=0000000000000000
 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
-r11=00000001004013C6 r12=000000080006BE50 r13=0000000100403148
-r14=000000080005BDC0 r15=0000000000000001
+r11=0000000100401282 r12=000000080006F820 r13=0000000100403148
+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)