shithub: pokered

--- a/pokered.asm

+++ b/pokered.asm

@@ -1309,7 +1309,7 @@

 	db "X SPEED@"

 	db "X SPECIAL@"

 	db "COIN CASE@"

-	db "OAK",$BD," PARCEL@"

+	db "OAK's PARCEL@"

 	db "ITEMFINDER@"

 	db "SILPH SCOPE@"

 	db "POKé FLUTE@"

@@ -11357,7 +11357,7 @@

 VictoryRoadName:

 	db "VICTORY ROAD@"

 DiglettsCaveName:

-	db "DIGLETT",$BD," CAVE@"

+	db "DIGLETT's CAVE@"

 RocketHQName:

 	db "ROCKET HQ@"

 SilphCoName:

@@ -12688,7 +12688,7 @@

 _IntroduceRivalText:

 	db 0,"This is my grand-",$4F

-	db "son. He",$BD," been",$55

+	db "son. He's been",$55

 	db "your rival since",$55

 	db "you were a baby.",$51

 	db "...Erm, what is",$4F

@@ -12702,7 +12702,7 @@

 	db "A world of dreams",$4F

 	db "and adventures",$55

 	db "with #MON",$55

-	db "awaits! Let",$BD," go!",$57

+	db "awaits! Let's go!",$57

 INCBIN "baserom.gbc",$8A605,$8000 - $6605

@@ -12737,7 +12737,7 @@

 	db "Take care now!",$57

 _StandByMeText:

-	db 0,"There",$BD," a movie",$4F

+	db 0,"There's a movie",$4F

 	db "on TV. Four boys",$55

 	db "are walking on",$55

 	db "railroad tracks.",$51

@@ -12749,7 +12749,7 @@

 _DaisyInitialText:

 	db 0,"Hi ",$52,"!",$4F

 	db $53," is out at",$55

-	db "Grandpa",$BD," lab.",$57

+	db "Grandpa's lab.",$57

 _DaisyOfferMapText:

 	db 0,"Grandpa asked you",$4F

@@ -12778,7 +12778,7 @@

 	db "them a rest!",$57

 _BluesHouseText3:

-	db 0,"It",$BD," a big map!",$4F

+	db 0,"It's a big map!",$4F

 	db "This is useful!",$57

 INCBIN "baserom.gbc",$94D5B,$4000 - $D5B

@@ -12797,10 +12797,10 @@

 _OakAppearsText:

 	db 0,"OAK: Hey! Wait!",$4F

-	db "Don",$BE," go out!@@"

+	db "Don't go out!@@"

 _OakWalksUpText:

-	db 0,"OAK: It",$BD," unsafe!",$4F

+	db 0,"OAK: It's unsafe!",$4F

 	db "Wild #MON live",$55

 	db "in tall grass!",$51

 	db "You need your own",$4F

@@ -12835,10 +12835,10 @@

 	db "journey await!",$57

 _PalletTownText6:

-	db 0,$52,$BD," house ",$57

+	db 0,$52,"'s house ",$57

 _PalletTownText7:

-	db 0,$53,$BD," house ",$57

+	db 0,$53,"'s house ",$57

 INCBIN "baserom.gbc",$A43CC,$4000 - $3CC

--- a/text/pokedex.asm

+++ b/text/pokedex.asm

@@ -9,7 +9,7 @@

 _KangaskhanDexEntry:

 	db 0,"The infant rarely",$4E

 	db "ventures out of",$4E

-	db "its mother",$BD,$49

+	db "its mother's",$49

 	db "protective pouch",$4E

 	db "until it is 3",$4E

 	db "years old",$5F,"@"

@@ -51,15 +51,15 @@

 	db "powerful tail in",$4E

 	db "battle to smash,",$49

 	db "constrict, then",$4E

-	db "break the prey",$BD,$4E

+	db "break the prey's",$4E

 	db "bones",$5F,"@"

 _SlowbroDexEntry:

 	db 0,"The SHELLDER that",$4E

 	db "is latched onto",$4E

-	db "SLOWPOKE",$BD," tail",$49

+	db "SLOWPOKE's tail",$49

 	db "is said to feed",$4E

-	db "on the host",$BD," left",$4E

+	db "on the host's left",$4E

 	db "over scraps",$5F,"@"

 _IvysaurDexEntry:

@@ -81,7 +81,7 @@

 _LickitungDexEntry:

 	db 0,"Its tongue can be",$4E

 	db "extended like a",$4E

-	db "chameleon",$BD,". It",$49

+	db "chameleon's. It",$49

 	db "leaves a tingling",$4E

 	db "sensation when it",$4E

 	db "licks enemies",$5F,"@"

@@ -131,7 +131,7 @@

 	db "removes its skull",$4E

 	db "helmet, no one",$49

 	db "has ever seen",$4E

-	db "this #MON",$BD,$4E

+	db "this #MON's",$4E

 	db "real face",$5F,"@"

 _RhyhornDexEntry:

@@ -512,7 +512,7 @@

 _DittoDexEntry:

 	db 0,"Capable of copying",$4E

-	db "an enemy",$BD," genetic",$4E

+	db "an enemy's genetic",$4E

 	db "code to instantly",$49

 	db "transform itself",$4E

 	db "into a duplicate",$4E

@@ -692,7 +692,7 @@

 	db "tail is ridged",$49

 	db "with a fin which",$4E

 	db "is often mistaken",$4E

-	db "for a mermaid",$BD,$5F,"@"

+	db "for a mermaid's",$5F,"@"

 _MachopDexEntry:

 	db 0,"Loves to build",$4E

@@ -1079,7 +1079,7 @@

 	db "powerful venom",$5F,"@"

 _NidorinaDexEntry:

-	db 0,"The female",$BD," horn",$4E

+	db 0,"The female's horn",$4E

 	db "develops slowly.",$4E

 	db "Prefers physical",$49

 	db "attacks such as",$4E

@@ -1106,7 +1106,7 @@

 	db 0,"A ferocious, pre-",$4E

 	db "historic #MON",$4E

 	db "that goes for the",$49

-	db "enemy",$BD," throat",$4E

+	db "enemy's throat",$4E

 	db "with its serrated",$4E

 	db "saw-like fangs",$5F,"@"

@@ -1169,7 +1169,7 @@

 _GloomDexEntry:

 	db 0,"The fluid that",$4E

 	db "oozes from its",$4E

-	db "mouth isn",$BE," drool.",$49

+	db "mouth isn't drool.",$49

 	db "It is a nectar",$4E

 	db "that is used to",$4E

 	db "attract prey",$5F,"@"

--- a/textpre.awk

+++ b/textpre.awk

@@ -206,6 +206,8 @@

 char["y"] = "$B8"

 char["z"] = "$B9"

 char["é"] = "$BA"

+char["'s"] = "$BD"

+char["'t"] = "$BE"

 char["'"] = "$E0"

 char["-"] = "$E3"

 char["?"] = "$E6"

@@ -254,6 +256,19 @@

 			c = c substr(f,1,1)

 			f = substr(f,2,length(f) - 1)

+		if (c == "'") {

+			if (substr(f,1,1) == "m" ||

+			    substr(f,1,1) == "r" ||

+			    substr(f,1,1) == "t" ||

+			    substr(f,1,1) == "s" ||

+			    substr(f,1,1) == "v" ||

+			    substr(f,1,1) == "l") {

+				c = c substr(f,1,1)

+				f = substr(f,2,length(f) - 1)

+			}

+		}

 		print char[c]

 		if (length(f))

 			print ","