diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm index 84ed4eb..1d7a704 100644 --- a/data/pokemon/dex_entries/cloyster.asm +++ b/data/pokemon/dex_entries/cloyster.asm @@ -1,10 +1,10 @@ db "BIVALVE@" ; species name dw 411, 2920 ; height, weight - db "Its shell is as" - next "hard as diamonds." - next "Its SPIKE CANNON" + db "Only KINGLER can" + next "break its shell." + next "To defend itself," - page "ensures nothing" - next "can get close e-" - next "nough to open it.@" + page "it closes up and" + next "fires its two" + next "large spikes.@" ; Carddass reference. diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm index 27360dc..f1857a2 100644 --- a/data/pokemon/dex_entries/exeggcute.asm +++ b/data/pokemon/dex_entries/exeggcute.asm @@ -1,10 +1,10 @@ db "EGG@" ; species name dw 104, 60 ; height, weight - db "If even one is" - next "separated from the" - next "group, the energy" + db "When a member goes" + next "missing, the group" + next "panics and tries" - page "bond between the" - next "six will make them" - next "rejoin instantly.@" + page "to replace it. TO-" + next "GEPI is a very co-" + next "mmon victim.@" ; Pikachu's Rescue Adventure reference. diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm index 31ba01a..6110824 100644 --- a/data/pokemon/dex_entries/exeggutor.asm +++ b/data/pokemon/dex_entries/exeggutor.asm @@ -1,10 +1,10 @@ db "COCONUT@" ; species name dw 607, 2650 ; height, weight - db "Living in a good" - next "environment makes" - next "it grow lots of" + db "Against smaller" + next "foes, EXEGGUTOR" + next "laughs and squashes" - page "heads. A head that" - next "drops off becomes" - next "an EXEGGCUTE.@" + page "them with a STOMP." + next "Each head has a" + next "different laugh.@" ; Carddass reference and generally contextualised. diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm index 8b2f978..468a4b5 100644 --- a/data/pokemon/dex_entries/hitmonchan.asm +++ b/data/pokemon/dex_entries/hitmonchan.asm @@ -1,10 +1,10 @@ db "PUNCHING@" ; species name dw 407, 1110 ; height, weight - db "To increase the" - next "strength of all" - next "its punch moves," + db "Its body carries" ; Illustrated book lore + next "the spirit of a" + next "boxer. This lets" ; RIP 海老原博幸 Hiroyuki Ebihara. - page "it spins its arms" - next "just before making" - next "contact.@" + page "it quickly block" + next "any attack and" + next "swiftly COUNTER.@" ; Carddass reference. diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm index 0df1bf2..b3aaa29 100644 --- a/data/pokemon/dex_entries/hitmonlee.asm +++ b/data/pokemon/dex_entries/hitmonlee.asm @@ -1,10 +1,10 @@ db "KICKING@" ; species name dw 411, 1100 ; height, weight - db "It is also called" - next "the Kick Master." - next "It uses its" + db "Its body carries" ; Illustrated book lore + next "the spirit of a" + next "kickboxer. This" ; RIP 沢村忠 Tadashi Sawamura. - page "elastic legs to" - next "execute every" - next "known kick.@" + page "gives it full" + next "control over" + next "its ligaments.@" ; Could have more clarity, but in general, tying together lore from the illustrated book with modern lore. diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm index 53f6ec7..27cb0f2 100644 --- a/data/pokemon/dex_entries/horsea.asm +++ b/data/pokemon/dex_entries/horsea.asm @@ -1,10 +1,10 @@ db "DRAGON@" ; species name dw 104, 180 ; height, weight - db "When they're in a" - next "safe location," - next "they can be seen" + db "Lives in tropical" ; Seahorses usually live in these types of places. + next "oceans. The EGGs" ; Illustrated book, used for GSC-like flair: Breeding is rare. + next "it lays will be" - page "playfully tangling" - next "their tails" - next "together.@" + page "raised by males" ; Likewise, genders are new. + next "that spin the str-" + next "ongest WHIRLPOOLs.@" ; Shield data, contextualised into GSC given it's new and can be a sign of power. diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm index 482302a..60b90c8 100644 --- a/data/pokemon/dex_entries/seadra.asm +++ b/data/pokemon/dex_entries/seadra.asm @@ -1,10 +1,10 @@ db "DRAGON@" ; species name dw 311, 550 ; height, weight - db "The male raises" - next "the young. If it" - next "is approached, it" + db "Its scales contain" ; Alluding to Kingdra and the Dragon Scale. + next "draconic DNA that" + next "has stumped rese-" - page "uses its toxic" - next "spikes to fend off" - next "the intruder.@" + page "archers. Its dor-" + next "sal fin contains" ; General data. I want to mention it's stronger in mating season given it's GSC, but no space. + next "strong toxins.@" diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm index ac5bdbc..08b1519 100644 --- a/data/pokemon/dex_entries/seel.asm +++ b/data/pokemon/dex_entries/seel.asm @@ -1,10 +1,10 @@ db "SEA LION@" ; species name dw 307, 1980 ; height, weight - db "The light blue fur" - next "that covers it" - next "keeps it protected" + db "RESTs on icebergs." ; Carddass! + next "When it wakes up," + next "it haphazardly" - page "against the cold." - next "It loves iceberg-" - next "filled oceans.@" + page "waddles into 14F" + next "oceans without a" ; -10C. + next "care in the world.@" diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm index 43d3c05..ba53114 100644 --- a/data/pokemon/dex_entries/shellder.asm +++ b/data/pokemon/dex_entries/shellder.asm @@ -1,10 +1,10 @@ db "BIVALVE@" ; species name dw 100, 90 ; height, weight - db "Clamping on to an" - next "opponent reveals" - next "its vulnerable" + db "For some reason," + next "CLAMPing to SLOW-" + next "POKETAILs causes" ; Alluding to DISTURBAN, but this may be too elaborate and explicit given it's already present in the Pokedex. Consider revising to be more of a dichotomy. - page "parts, so it uses" - next "this move only as" - next "a last resort.@" + page "a sudden mutation." + next "This has stumped" + next "specialists.@" ; Alluding to Prof. Westwood V. diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm index c7aa783..7af11c1 100644 --- a/data/pokemon/dex_entries/starmie.asm +++ b/data/pokemon/dex_entries/starmie.asm @@ -1,10 +1,10 @@ db "MYSTERIOUS@" ; species name dw 307, 1760 ; height, weight - db "It is said that it" - next "uses the seven-" - next "colored core of" + db "Because of its PSI" + next "abilites and herm-" + next "aphroditism, some" - page "its body to send" - next "electric waves" - next "into outer space.@" + page "think it comes fr-" ; General context combined with the illustrated book. + next "om space. Its core" + next "flashes when weak.@" ; Anime reference diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm index f18678d..aec3b57 100644 --- a/data/pokemon/dex_entries/staryu.asm +++ b/data/pokemon/dex_entries/staryu.asm @@ -1,10 +1,10 @@ db "STARSHAPE@" ; species name dw 207, 760 ; height, weight - db "When the stars" - next "twinkle at night," - next "it floats up from" + db "SHARPOON love to" + next "eat its arms, but" + next "they grow back." ; Reworded version of future dex entries, contextualised to Jagg instead. - page "the sea floor, and" - next "its body's center" - next "core flickers.@" + page "It sometimes drif-" + next "ts into estuaries" + next "and river mouths.@" ; Pokemon Snap reference diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm index 9a0a6ac..a61c26f 100644 --- a/data/pokemon/dex_entries/tangela.asm +++ b/data/pokemon/dex_entries/tangela.asm @@ -6,5 +6,5 @@ next "the more the vines" page "on its body conti-" - next "nue to grow. Its" - next "face is obscured.@" ; last bit is filler; rest is prototype dex entry. feel free to enhance. + next "nue to grow. This" + next "obscures its face.@" ; prototype dex entry. diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm index 6571e9f..112c2b3 100644 --- a/data/pokemon/dex_entries/tyrogue.asm +++ b/data/pokemon/dex_entries/tyrogue.asm @@ -1,10 +1,10 @@ db "SCUFFLE@" ; species name dw 204, 460 ; height, weight - db "To brush up on its" - next "fighting skills," - next "it will challenge" + db "It's still learn-" + next "ing to fight. The" + next "battles ahead will" - page "anyone. It has a" - next "very strong com-" - next "petitive spirit.@" + page "determine its fu-" ; Vaguely alluding to how Tyrogue evolves. You wouldn't believe it, but no game actually explains this. + next "ture. Hates chea-" + next "ters like RIBBITO.@" ; May as well add a sense of honour to it, given its appearance. diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index afb87b4..3be5291 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,3 +1,6 @@ +; Set to become a Gym Leader rematch area like HGSS. +; Additionally, I want there to be Dojogoers explaining Tyrogue and other bits. Tyrogue is extremely poorly explained. + object_const_def const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL