diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 65209c2d..5acf12aa 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -206,6 +206,7 @@ INTRO: intro.o intro.o: intro.s zp.inc qload.inc music.inc \ graphics_peasantry/graphics_intro.inc sprites/peasant_sprites.inc \ graphics_peasantry/priority_intro.inc \ + text/intro.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ hgr_partial_save.s \ diff --git a/games/peasant/intro.s b/games/peasant/intro.s index 7d6a056e..b3b1a86a 100644 --- a/games/peasant/intro.s +++ b/games/peasant/intro.s @@ -153,6 +153,8 @@ mockingboard_notfound2: .include "graphics_peasantry/priority_intro.inc" +.include "text/intro.inc" + skip_text: .byte 0,2,"ESC Skips",0 diff --git a/games/peasant/intro_cottage.s b/games/peasant/intro_cottage.s index a51506b5..b9249ec8 100644 --- a/games/peasant/intro_cottage.s +++ b/games/peasant/intro_cottage.s @@ -191,34 +191,34 @@ done_cottage: ; 01234567 01234567 -cottage_text1: - .byte 0,52,24, 0,253,82 - .byte 9,35,"YOU are Rather Dashing, a",13 - .byte "humble peasant living in",13 - .byte "the peasant kingdom of",13 - .byte "Peasantry.",0 +;cottage_text1: +; .byte 0,52,24, 0,253,82 +; .byte 9,35,"YOU are Rather Dashing, a",13 +; .byte "humble peasant living in",13 +; .byte "the peasant kingdom of",13 +; .byte "Peasantry.",0 ; wait a few seconds -cottage_text2: - .byte 0,41,15, 0,255,96 - .byte 8,25,"You return home from a",13 - .byte "vacation on Scalding Lake",13 - .byte "only to find that TROGDOR",13 - .byte "THE BURNINATOR has",13 - .byte "burninated your thatched",13 - .byte "roof cottage along with all",13 - .byte "your goods and services.",0 +;cottage_text2: +; .byte 0,41,15, 0,255,96 +; .byte 8,25,"You return home from a",13 +; .byte "vacation on Scalding Lake",13 +; .byte "only to find that TROGDOR",13 +; .byte "THE BURNINATOR has",13 +; .byte "burninated your thatched",13 +; .byte "roof cottage along with all",13 +; .byte "your goods and services.",0 ; wait a few seconds, then start walking toward cottage -cottage_text3: - .byte 0,28,20, 0,252,86 - .byte 7,33,"With nothing left to lose,",13 - .byte "you swear to get revenge on",13 - .byte "the Wingaling Dragon in the",13 - .byte "name of burninated peasants",13 - .byte "everywhere.",0 +;cottage_text3: +; .byte 0,28,20, 0,252,86 +; .byte 7,33,"With nothing left to lose,",13 +; .byte "you swear to get revenge on",13 +; .byte "the Wingaling Dragon in the",13 +; .byte "name of burninated peasants",13 +; .byte "everywhere.",0 ; Walk to edge of screen diff --git a/games/peasant/intro_knight.s b/games/peasant/intro_knight.s index 13255d26..44fd8cbe 100644 --- a/games/peasant/intro_knight.s +++ b/games/peasant/intro_knight.s @@ -160,9 +160,9 @@ done_knight: ; stops as approach knight -knight_message1: - .byte 0,35,34, 0,253,72 - .byte 7,49,"OK go for it.",0 +;knight_message1: +; .byte 0,35,34, 0,253,72 +; .byte 7,49,"OK go for it.",0 diff --git a/games/peasant/intro_lake_e.s b/games/peasant/intro_lake_e.s index 28f5da68..ece464b9 100644 --- a/games/peasant/intro_lake_e.s +++ b/games/peasant/intro_lake_e.s @@ -145,15 +145,12 @@ done_lake_e: ; walk sideways, near corner -lake_e_message1: - .byte 0,35,34, 0,253,72 - .byte 7,49,"That's a nice looking lake.",0 +;lake_e_message1: +; .byte 0,35,34, 0,253,72 +; .byte 7,49,"That's a nice looking lake.",0 ; nearly hit head on sign, it goes away, walk off screen - - - lake_e_path: .byte 4,151 .byte 5,151 @@ -320,10 +317,3 @@ bubble_e_sprite5: .byte $A2 ; 001X XX10 .byte $88 ; 1XX0 10XX .byte $AA ; 0010 1010 - - - - - - - diff --git a/games/peasant/intro_lake_w.s b/games/peasant/intro_lake_w.s index 7b448121..53fa0f6e 100644 --- a/games/peasant/intro_lake_w.s +++ b/games/peasant/intro_lake_w.s @@ -151,11 +151,11 @@ done_lake_w: ; walk halfway across the screen -lake_w_message1: - .byte 0,42,24, 0,252,82 - .byte 8,41,"You head east toward the",13 - .byte "mountain atop which",13 - .byte "TROGDOR lives.",0 +;lake_w_message1: +; .byte 0,42,24, 0,252,82 +; .byte 8,41,"You head east toward the",13 +; .byte "mountain atop which",13 +; .byte "TROGDOR lives.",0 ; walk to edge diff --git a/games/peasant/intro_river.s b/games/peasant/intro_river.s index ebd27db2..983a3e5b 100644 --- a/games/peasant/intro_river.s +++ b/games/peasant/intro_river.s @@ -149,10 +149,10 @@ done_river: ; walk up a bit -river_message1: - .byte 0,35,34, 0,253,82 - .byte 7,49,"You can start playing in a",13 - .byte "second here.",0 +;river_message1: +; .byte 0,35,34, 0,253,82 +; .byte 7,49,"You can start playing in a",13 +; .byte "second here.",0 ; walks behind tree diff --git a/games/peasant/text/intro.inc b/games/peasant/text/intro.inc new file mode 100644 index 00000000..005ff0fc --- /dev/null +++ b/games/peasant/text/intro.inc @@ -0,0 +1,65 @@ +; TODO: should we merge this in to use the common text drawing? +; This might save a few bytes due to word compression +; However these are custom box sizes so things would +; change up a bit + + +cottage_text1: + .byte 0,52,24, 0,253,82 + .byte 9,35,"YOU are Rather Dashing, a",13 + .byte "humble peasant living in",13 + .byte "the peasant kingdom of",13 + .byte "Peasantry.",0 + +; wait a few seconds + +cottage_text2: + .byte 0,41,15, 0,255,96 + .byte 8,25,"You return home from a",13 + .byte "vacation on Scalding Lake",13 + .byte "only to find that TROGDOR",13 + .byte "THE BURNINATOR has",13 + .byte "burninated your thatched",13 + .byte "roof cottage along with all",13 + .byte "your goods and services.",0 + +; wait a few seconds, then start walking toward cottage + +cottage_text3: + .byte 0,28,20, 0,252,86 + .byte 7,33,"With nothing left to lose,",13 + .byte "you swear to get revenge on",13 + .byte "the Wingaling Dragon in the",13 + .byte "name of burninated peasants",13 + .byte "everywhere.",0 + +; Walk to edge of screen + + +lake_w_message1: + .byte 0,42,24, 0,252,82 + .byte 8,41,"You head east toward the",13 + .byte "mountain atop which",13 + .byte "TROGDOR lives.",0 + +lake_e_message1: + .byte 0,35,34, 0,253,72 + .byte 7,49,"That's a nice looking lake.",0 + +; walk up a bit + +river_message1: + .byte 0,35,34, 0,253,82 + .byte 7,49,"You can start playing in a",13 + .byte "second here.",0 + +; walks behind tree + + +; continues displaying previous message + +; stops as approach knight + +knight_message1: + .byte 0,35,34, 0,253,72 + .byte 7,49,"OK go for it.",0