From d2c345dd5925ad14513a8b555c4c146a5b6df5ae Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 28 Nov 2021 00:17:46 -0500 Subject: [PATCH] peasant: using baby in inn now more or less works --- games/peasant/save1.s | 8 ++--- games/peasant/saves/save1_15_pills.s | 46 ++++++++++++++++++++++++++++ games/peasant/text/inn.inc | 17 ++++++++-- 3 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 games/peasant/saves/save1_15_pills.s diff --git a/games/peasant/save1.s b/games/peasant/save1.s index 1f7d1490..2324b134 100644 --- a/games/peasant/save1.s +++ b/games/peasant/save1.s @@ -1,4 +1,4 @@ -; SAVE1 -- After getting the sub +; SAVE1 -- After getting the pills .include "zp.inc" @@ -15,7 +15,7 @@ .byte TALKED_TO_MENDELEV | HALDO_TO_DONGOLEV | ARROW_BEATEN| GARY_SCARED | TRINKET_GIVEN | LADY_GONE ; BABY_IN_WELL | BUCKET_DOWN_WELL ; GAME_STATE_0 = $97 -.byte PUDDLE_WET +.byte FISH_FED | PUDDLE_WET ; RAINING ; FISH_FED | IN_HAY_BALE | NIGHT | POT_ON_HEAD | WEARING_ROBE ; GAME_STATE_1 = $98 @@ -30,13 +30,13 @@ .byte $00 ; ARROW_SCORE = $9D .byte $00 ; SCORE_HUNDREDS= $9E .byte $20 ; SCORE_TENSONES= $9F -.byte INV1_ARROW | INV1_BABY | INV1_KERREK_BELT | INV1_BOW | INV1_MONSTER_MASK | INV1_PEBBLES +.byte INV1_ARROW | INV1_BABY | INV1_KERREK_BELT | INV1_CHICKEN_FEED | INV1_BOW | INV1_MONSTER_MASK | INV1_PEBBLES | INV1_PILLS ; INVENTORY_1 = $A0 .byte INV2_RICHES|INV2_MEATBALL_SUB | INV2_TRINKET ; INVENTORY_2 = $A1 .byte INV3_SHIRT|INV3_MAP ; INVENTORY_3 = $A2 -.byte INV1_ARROW|INV1_PEBBLES +.byte INV1_ARROW| INV1_CHICKEN_FEED | INV1_PEBBLES ; INVENTORY_1_GONE = $A3 .byte INV2_TRINKET ; INVENTORY_2_GONE_= $A4 diff --git a/games/peasant/saves/save1_15_pills.s b/games/peasant/saves/save1_15_pills.s new file mode 100644 index 00000000..2324b134 --- /dev/null +++ b/games/peasant/saves/save1_15_pills.s @@ -0,0 +1,46 @@ +; SAVE1 -- After getting the pills + +.include "zp.inc" + +; want to load this to address $90 + +; +.byte LOAD_PEASANT4 ; WHICH_LOAD = $90 +.byte 10 ; PEASANT_X = $91 +.byte 100 ; PEASANT_Y = $92 +.byte PEASANT_DIR_UP ; PEASANT_DIR = $93 +.byte 0 ; MAP_X = $94 +.byte 1 ; MAP_Y = $95 +.byte LOCATION_OUTSIDE_LADY ; MAP_LOCATION = $96 +.byte TALKED_TO_MENDELEV | HALDO_TO_DONGOLEV | ARROW_BEATEN| GARY_SCARED | TRINKET_GIVEN | LADY_GONE + ; BABY_IN_WELL | BUCKET_DOWN_WELL + ; GAME_STATE_0 = $97 +.byte FISH_FED | PUDDLE_WET + ; RAINING + ; FISH_FED | IN_HAY_BALE | NIGHT | POT_ON_HEAD | WEARING_ROBE + ; GAME_STATE_1 = $98 +.byte TALKED_TO_KNIGHT + ; ON_FIRE | COTTAGE_ROCK_MOVED | KNUCKLES_BLEED + ; DRESSER_OPEN | COVERED_IN_MUD | GOT_MUDDY_ALREADY + ; GAME_STATE_2 = $99 +.byte $00 ; NED_STATUS = $9A +.byte BUSH_1_SEARCHED | BUSH_2_SEARCHED | BUSH_3_SEARCHED | BUSH_4_SEARCHED + ; BUSH_STATUS = $9B +.byte KERREK_ROW1 | KERREK_DECOMPOSING ; KERREK_STATE = $9C +.byte $00 ; ARROW_SCORE = $9D +.byte $00 ; SCORE_HUNDREDS= $9E +.byte $20 ; SCORE_TENSONES= $9F +.byte INV1_ARROW | INV1_BABY | INV1_KERREK_BELT | INV1_CHICKEN_FEED | INV1_BOW | INV1_MONSTER_MASK | INV1_PEBBLES | INV1_PILLS + ; INVENTORY_1 = $A0 +.byte INV2_RICHES|INV2_MEATBALL_SUB | INV2_TRINKET + ; INVENTORY_2 = $A1 +.byte INV3_SHIRT|INV3_MAP + ; INVENTORY_3 = $A2 +.byte INV1_ARROW| INV1_CHICKEN_FEED | INV1_PEBBLES + ; INVENTORY_1_GONE = $A3 +.byte INV2_TRINKET + ; INVENTORY_2_GONE_= $A4 +.byte $00 ; INVENTORY_3_GONE = $A5 +.byte 22 ; KERREK_X = $A6 +.byte 76 ; KERREK_Y = $A7 + diff --git a/games/peasant/text/inn.inc b/games/peasant/text/inn.inc index aa2c3dd2..f5d6768d 100644 --- a/games/peasant/text/inn.inc +++ b/games/peasant/text/inn.inc @@ -95,14 +95,25 @@ inside_inn_give_baby_before_message: ; +5 POINTS ; + give/use baby (by desk) inside_inn_give_baby_message: -.byte 34,"Well lookit that little guy!",34," says the Innkeeper. ",34,"You want a treat, do ya? What do babies like?",34," He fishes around in his pockets.",0 +.byte 34,"Well lookit that little",13 +.byte "guy!",34," says the Innkeeper.",13 +.byte 34,"You want a treat, do ya?",13 +.byte "What do babies like?",34," He",13 +.byte "fishes around in his",13 +.byte "pockets.",0 inside_inn_give_baby2_message: -.byte 34,"Um, how bout my medication!",34," You grab the bottle of pills before he can force them on the baby. ",34,"Hey, those were for him!",34,0 +.byte 34,"Um, how bout my",13 +.byte "medication!",34," You grab the",13 +.byte "bottle of pills before he",13 +.byte "can force them on the baby.",13 +.byte 34,"Hey, those were for him!",34,0 ; + give/use baby (when you already have the pills) inside_inn_give_baby_already_message: -.byte "You already milked that fogey for all the pills he's worth.",0 +.byte "You already milked that",13 +.byte "fogey for all the pills",13 +.byte "he's worth.",0 ; + get a room (without robe) (do you need to be wearing it?) inside_inn_get_room_no_robe_message: