From 7ab84fb95b2dddd4bac657ad76db7fb520f07194 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 1 Dec 2021 00:09:49 -0500
Subject: [PATCH] peasant: update text line breaks

---
 games/peasant/inn_actions.s     |   5 +-
 games/peasant/text/inn.inc      | 198 +++++++++++++++++++++-----------
 games/peasant/text/peasant4.inc |  19 ++-
 3 files changed, 148 insertions(+), 74 deletions(-)

diff --git a/games/peasant/inn_actions.s b/games/peasant/inn_actions.s
index 44aa4fca..42e56587 100644
--- a/games/peasant/inn_actions.s
+++ b/games/peasant/inn_actions.s
@@ -236,9 +236,8 @@ inside_inn_get:
 	jmp	parse_common_get
 
 inn_get_room:
-
-	lda	INVENTORY_2
-	and	#INV2_ROBE	; check if have robe
+	lda	GAME_STATE_1
+	and	#WEARING_ROBE	; check if wearing robe
 	bne	inn_get_room_have_robe
 
 inn_get_room_no_robe:
diff --git a/games/peasant/text/inn.inc b/games/peasant/text/inn.inc
index f5d6768d..37947bdf 100644
--- a/games/peasant/text/inn.inc
+++ b/games/peasant/text/inn.inc
@@ -5,9 +5,21 @@ inn_dialog_start:
 ;==================
 
 ; Type any command while the pot of horse grease is on your head
-.byte "You need to get out of there before that smelly octogenarian gets back.",0
+.byte "You need to get out of",13
+.byte "there before that smelly",13
+.byte "octogenarian gets back.",0
 
-; + look
+; + (exiting inn with pot on head)
+.byte "Phew! You discard the big",13
+.byte "black pot and wipe the",13
+.byte "horse grease from your",13
+.byte "eyes. The hood of your robe",13
+.byte "is still covered in highly",13
+.byte "flammable horse grease,",13
+.byte "though.",0
+
+
+; + look (day)
 inside_inn_look_message:
 .byte "What a dump! Only one bed",13
 .byte "and no minibar? The",13
@@ -15,85 +27,100 @@ inside_inn_look_message:
 .byte "desk and there's a door",13
 .byte "that's closed.",0
 
-; + look window
+; + look (night)
+.byte "It's still dark out. The",13
+.byte "grimey old Innkeeper is",13
+.byte "gone and he left the",13
+.byte "pantry open.",0
+
+; + look window (day/night)
 inside_inn_look_window_message:
 .byte "Check it out! There's a",13
 .byte "Peasantry out there!",0
 
-; + look man
+; + look man (day)
 inside_inn_look_man_message:
 .byte "He's an older peasant with",13
 .byte "big cotton swabs stuffed up",13
 .byte "his nose. Oh wait. Those",13
 .byte "are nose hairs. Grody.",0
 
-; + look painting
+; + look man (night)		not in wiki?
+.byte "He gone.",0
+
+; + look painting (day/night)
 inside_inn_look_painting_message:
 .byte "It's a painting of dogs",13
 .byte "playing 'Magic: The",13
 .byte "Nerdening.'",0
 
-; + look paper / note / parchment
+; + look paper / note / parchment (day/night)
 inside_inn_look_paper_message:
 .byte "It says, ",34,"Note to self:",13
 .byte "Wave arms wildly!",34,0
 
-; + look pillow
+; + look pillow (day/night)
 inside_inn_look_pillow_message:
 .byte "If you sleep in that bed,",13
 .byte "you're NOT putting your",13
 .byte "head on that nasty pillow.",0
 
-; + look pot (after getting a room)
-.byte "It's full of horse grease. I guess that sounds useful.",0
+; + look pot (night)
+.byte "It's full of horse grease.",13
+.byte "I guess that sounds useful.",0
 
-; + look rug
+; + look rug (day/night)
 inside_inn_look_rug_message:
 .byte "Maybe that used to be a",13
 .byte "magic carpet. But it's sure",13
 .byte "a cat pee-stained carpet",13
 .byte "now.",0
 
-; + look bed
+; + look bed (day/night)
 inside_inn_look_bed_message:
 .byte "Is that just a fitted sheet",13
 .byte "over a slab of concrete?",0
 
-; + look bell
+; + look bell (day/note)
 inside_inn_look_bell_message:
 .byte "Tis broked.",0
 
-; + look desk (man there)
+; + look desk (day)
 inside_inn_look_desk_message:
 .byte "There's a broken bell and",13
 .byte "a piece of parchment on",13
 .byte "there. And some crazy old",13
 .byte "guy behind it.",0
 
-; + look (night)
-.byte "It's still dark out. The grimey old Innkeeper is gone and he left the pantry open.",0
-
-; + look desk (night?)
+; + look desk (night)
 .byte "There's a broken bell and",13
 .byte "a piece of parchment on",13
 .byte "there.",0
 
-; + look candle (after getting a room)
-.byte "That candle's not at all on fire.",0
+; + look candle (night)
+.byte "That candle's not at all on",13
+.byte "fire.",0
 
-; + talk man
+
+;==========
+; talk
+
+; + talk man (day)
 inside_inn_talk_man_message:
 .byte 34,"If you're interested in",13
 .byte "staying the night, just",13
 .byte "type 'get a room.'",34,0
 
-; + give/use baby (before you get the baby)
+;==========
+; give
+
+; + give/use baby (before you get the baby) (day) (at night says default)
 inside_inn_give_baby_before_message:
 .byte "You have no baby nor any",13
 .byte "immediate prospects.",0
 
 ; +5 POINTS
-; + give/use baby (by desk)
+; + give/use baby (by desk) (day)
 inside_inn_give_baby_message:
 .byte 34,"Well lookit that little",13
 .byte "guy!",34," says the Innkeeper.",13
@@ -115,6 +142,9 @@ inside_inn_give_baby_already_message:
 .byte "fogey for all the pills",13
 .byte "he's worth.",0
 
+;=================
+; get
+
 ; + get a room (without robe) (do you need to be wearing it?)
 inside_inn_get_room_no_robe_message:
 .byte 34,"I only serve peasants",13
@@ -123,89 +153,134 @@ inside_inn_get_room_no_robe_message:
 .byte "robe?",34,0
 
 ; +3 POINTS
-; + get room (with robe)
+; + get room (with robe) (day) (at night gives default)
 inside_inn_get_room_message:
-.byte 34,"Okay, youngster,",34," says the decrepit old person. ",34,"Just bed on down for the night and I'm sure I'll remember to collect the fee come morning.",34,0
-inside_inn_get_room2_message:
-.byte "Night falls like a bad power point presentation.",0
-inside_inn_get_room3_message:
-.byte "What an uncomfortable bed! You sleep for maybe 20 minutes before the extreme pain in your spine forces you to get up.",0
+.byte 34,"Okay, youngster,",34," says",13
+.byte "the decrepit old person.",
+.byte 34,"Just bed on down for the",13
+.byte "night and I'm sure I'll",13
+.byte "remember to collect the fee",13
+.byte "come morning.",34,0
 
-; + get paper
+; walk over to bed
+; square transition
+
+inside_inn_get_room2_message:
+.byte "Night falls like a bad",13
+.byte "power point presentation.",0
+
+; un-transition
+; rolling around
+
+inside_inn_get_room3_message:
+.byte "What an uncomfortable bed!",13
+.byte "You sleep for maybe 20",13
+.byte "minutes before the extreme",13
+.byte "pain in your spine forces",13
+.byte "you to get up.",0
+
+; + get a room (when on fire)
+.byte 34,"Board of Peasant Health",13	; [sic] in game says \oard
+.byte "says I can't serve any folk",13
+.byte "that's on fire. Nothing",13
+.byte "personal. Well, I mean, I",13
+.byte "don't like you much",13
+.byte "anyway.",34,0
+
+; + get paper (day/night)
 inside_inn_get_paper_message:
 .byte "Naw, it might be important",13
 .byte "to that wrinkly old loon.",0
 
-; + get painting		; WIKI IS WRONG
+; + get painting (day/night)	; WIKI IS WRONG
 inside_inn_get_painting_message:
 .byte "Weird. It's actually just",13
 .byte "painted right onto the",13
 .byte "wall. Like, the frame and",13
 .byte "everything.",0
 
-; + get rug
+; + get rug (day/night)
 inside_inn_get_rug_message:
 .byte "You're not touching that",13
 .byte "thing. Too many",13
 .byte "questionable stains on it.",0
 
-; + get doing-sproings
+; + get doing-sproings (day/night)
 inside_inn_get_doing_message:
 .byte "That's the worst thing",13
 .byte "anyone has ever tried to",13
 .byte "type in this game. Ever.",0
 
-; + get pillow
+; + get pillow (day/night)
 inside_inn_get_pillow_message:
 .byte "Not a chance. There's even",13
 .byte "more questionable stains",13
 .byte "on that pillow than there",13
 .byte "are on that rug.",0
 
-; + get bell
+; + get bell (day/night)
 inside_inn_get_bell_message:
 .byte "You can't. It looks like",13
 .byte "it's been somehow olded to",13
 .byte "the desk.",0
 
-; + get a room (when on fire)
-.byte 34,"Board of Peasant Health says I can't serve any folk that's on fire. Nothing personal. Well, I mean, I don't like you much anyway.",34,0
-
 ; +2 POINTS
-; + get/take/steal pot
-.byte "You reach way up to the top shelf.",0
-.byte "Oh great! Now you can't see a thing and your head is covered in highly flammable horse grease. You better get out of here before that disgusting old man comes back.",0
+; + get/take/steal pot/grease
+.byte "You reach way up to the top",13
+.byte "shelf.",0
 
-; + get pot (if you already have it)
-.byte "You already have a nice greasy swab of it on the corner of your hood.",0
+; points actually happen here
+; falls on your head
 
-; + get candle (at night)
-.byte "It seems like you should be able to do that, doesn't it? Sorry. No dice.",0
+.byte "Oh great! Now you can't see",13
+.byte "a thing and your head is",13
+.byte "covered in highly",13
+.byte "flammable horse grease.",13
+.byte "You better get out of here",13
+.byte "before that disgusting old",13
+.byte "man comes back.",0
 
-; + get grease (at night, already have it)
-.byte "You already have a nice greasy swab of it on the corner of your hood.",0
+; + get pot/greaste (at night, already have it)
+.byte "You already have a nice",13
+.byte "greasy swab of it on the",13
+.byte "corner of your hood.",0
 
-; + get old man rub (in the inn ?? when) (after getting pills?)
+; + get/light candle (night)
+.byte "It seems like you should be",13
+.byte "able to do that, doesn't",13
+.byte "it? Sorry. No dice.",0
+
+; + get old man rub (day/night) (after getting pills?)
 .byte "You disgust me.",0
 
-; + (exiting inn with pot on head)
-.byte "Phew! You discard the big black pot and wipe the horse grease from your eyes. The hood of your robe is still covered in highly flammable horse grease, though.",0
 
-; + ask about fire
+
+; + get bed, sleep/sleep on bed (day)
+inside_inn_get_bed_message:
+inside_inn_sleep_bed_message:
+.byte "You probably want to talk",13
+.byte "to that stinky old guy over",13
+.byte "there about that.",0
+
+
+;==============
+; ask
+
+; + ask about fire (day)
 inside_inn_ask_about_fire_message:
 .byte 34,"I've always preferred",13
 .byte "being on fire at night.",13
 .byte "Looks prettier and keeps",13
 .byte "the butterflies away.",34,0
 
-; + ask about naked ned
+; + ask about naked ned (day)
 inside_inn_ask_about_ned_message:
 .byte 34,"He used to be such a nice,",13
 .byte "clothed young man. Wonder",13
 .byte "what he's done with all his",13
 .byte "old clothes?",34,0
 
-; + ask about robe
+; + ask about robe (day)
 inside_inn_ask_about_robe_message:
 .byte 34,"I wear my robe hood-down",13
 .byte "so it's easier to trim my",13
@@ -213,14 +288,14 @@ inside_inn_ask_about_robe_message:
 .byte "robe, maybe try someone",13
 .byte "that's not using theirs.",34,0
  
-; + ask about smell
+; + ask about smell (day)
 inside_inn_ask_about_smell_message:
 .byte 34,"Well, if you don't stink,",13
 .byte "maybe find something that",13
 .byte "does and wear it. Like a",13
 .byte "dead carcass or summat.",34,0 
 
-; + ask about trogdor
+; + ask about trogdor (day)
 inside_inn_ask_about_trogdor_message:
 .byte 34,"Are you talking about that",13
 .byte "young green boy that lives",13
@@ -228,32 +303,23 @@ inside_inn_ask_about_trogdor_message:
 .byte "tearing my roof off and",13
 .byte "eating my customers.",34,0
 
-; + ask about (unknown)
+; + ask about (unknown) (day)
 inside_inn_ask_about_unknown_message:
 .byte 34,"I don't know nothing about",13
 .byte "no whatever you just said.",34,0
 
-; + ring bell
+; + ring bell (day/night)
 inside_inn_ring_bell_message:
 .byte "Instead of ringing or",13
 .byte "dinging, it just goes",13
 .byte "'DUNG.'",0
  
-; + light candle (at night)
-.byte "It seems like you should be able to do that, doesn't it? Sorry. No dice.",0
-
-; + open door (before getting room)
+; + open door (day)
 inside_inn_open_door_message:
 .byte 34,"That's the pantry,",34," says",13
 .byte "the Innkeeper. ",34,"Employees",13
 .byte "only.",34,0
 
-; + get bed, sleep/sleep on bed (man is there)
-inside_inn_get_bed_message:
-inside_inn_sleep_bed_message:
-.byte "You probably want to talk",13
-.byte "to that stinky old guy over",13
-.byte "there about that.",0
 
 inn_dialog_end:
 
diff --git a/games/peasant/text/peasant4.inc b/games/peasant/text/peasant4.inc
index 0d4227f2..add87c98 100644
--- a/games/peasant/text/peasant4.inc
+++ b/games/peasant/text/peasant4.inc
@@ -362,7 +362,9 @@ crooked_look_day_message:
 .byte "burninated tree.",0
 
 ; + look (night)
-.byte "A burning signal lantern hangs from a severely burninated tree. ",0
+.byte "A burning signal lantern",13
+.byte "hangs from a severely",13
+.byte "burninated tree. ",0
 
 ; + look lantern (unlit)
 crooked_look_lantern_message:
@@ -373,7 +375,8 @@ crooked_look_lantern_message:
 .byte "the prowl.",0
 
 ; + look lantern (lit)
-.byte "It's lit! Musta been a Trogdor sighting tonight.",0
+.byte "It's lit! Musta been a",13
+.byte "Trogdor sighting tonight.",0
 
 ; + look stump
 crooked_look_stump_message:
@@ -387,10 +390,14 @@ crooked_look_tree_message:
 
 ; +10 POINTS
 ; + (walking under candle in burninated trees)
-.byte "Whoa! The horse grease on your robe caught fire! You're a for-real peasant now.",0
+.byte "Whoa! The horse grease on",13
+.byte "your robe caught fire!",13
+.byte "You're a for-real peasant",13
+.byte "now.",0
 
 ; + (exiting on fire)
-.byte "Man, screens sure get light fast around here.",0
+.byte "Man, screens sure get light",13
+.byte "fast around here.",0
 
 ; + light lantern (before lit)
 crooked_tree_light_lantern_message:
@@ -407,7 +414,9 @@ crooked_tree_light_lantern_message:
 .byte "You don't need to get IT. Just let IT get YOU.",0
 
 ; + get fire (at night, after getting on fire)
-.byte "You're already on fire! What? You want to be MORE on fire?",0
+.byte "You're already on fire!",13
+.byte "What? You want to be MORE",13
+.byte "on fire?",0
 
 ; + get lantern
 crooked_tree_get_lantern_message: