Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-08-15 08:27:41 +00:00
Code Issues Projects Releases Wiki Activity

peasant: consolidate dialog in text directory

Browse Source
This commit is contained in:
Vince Weaver
2024-10-02 23:34:15 -04:00
parent 2c2657d47e
commit bd0af73698
10 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
games/peasant/Makefile
View File

@@ -308,8 +308,8 @@ PEASANT1: peasant1.o
peasant1.o: peasant1.s zp.inc ./inventory/inventory.inc \ peasant1.o: peasant1.s zp.inc ./inventory/inventory.inc \
parse_input.inc \ parse_input.inc \
peasant1_actions.s DIALOG_PEASANT1.ZX02 dialog_peasant1.inc \ peasant1_actions.s \
text/peasant1.inc text/kerrek.inc \ text/DIALOG_PEASANT1.ZX02 text/dialog_peasant1.inc \
kerrek_actions.s peasant_common.s \ kerrek_actions.s peasant_common.s \
sprites/peasant_sprites.inc \ sprites/peasant_sprites.inc \
sprites/kerrek_sprites.inc \ sprites/kerrek_sprites.inc \
@@ -330,7 +330,8 @@ PEASANT2: peasant2.o
peasant2.o: peasant2.s zp.inc ./inventory/inventory.inc \ peasant2.o: peasant2.s zp.inc ./inventory/inventory.inc \
parse_input.inc \ parse_input.inc \
peasant2_actions.s DIALOG_PEASANT2.ZX02 dialog_peasant2.inc \ peasant2_actions.s \
text/DIALOG_PEASANT2.ZX02 text/dialog_peasant2.inc \
graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprites.inc \ graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant2.inc \ graphics_peasantry/priority_peasant2.inc \
sprites/river_bubble_sprites.inc \ sprites/river_bubble_sprites.inc \
@@ -350,7 +351,8 @@ PEASANT3: peasant3.o
peasant3.o: peasant3.s zp.inc ./inventory/inventory.inc \ peasant3.o: peasant3.s zp.inc ./inventory/inventory.inc \
parse_input.inc \ parse_input.inc \
peasant3_actions.s DIALOG_PEASANT3.ZX02 dialog_peasant3.inc \ peasant3_actions.s \
text/DIALOG_PEASANT3.ZX02 text/dialog_peasant3.inc \
graphics_peasantry/graphics_peasant3.inc sprites/peasant_sprites.inc \ graphics_peasantry/graphics_peasant3.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant3.inc \ graphics_peasantry/priority_peasant3.inc \
peasant_common.s \ peasant_common.s \
@@ -370,9 +372,9 @@ PEASANT4: peasant4.o
peasant4.o: peasant4.s zp.inc ./inventory/inventory.inc \ peasant4.o: peasant4.s zp.inc ./inventory/inventory.inc \
parse_input.inc \ parse_input.inc \
sprites/ned_sprites.inc \ sprites/ned_sprites.inc \
peasant4_actions.s DIALOG_PEASANT4.ZX02 dialog_peasant4.inc \ peasant4_actions.s \
text/DIALOG_PEASANT4.ZX02 text/dialog_peasant4.inc \
kerrek_actions.s peasant_common.s \ kerrek_actions.s peasant_common.s \
text/peasant4.inc text/kerrek.inc \
graphics_peasantry/graphics_peasant4.inc sprites/peasant_sprites.inc \ graphics_peasantry/graphics_peasant4.inc sprites/peasant_sprites.inc \
graphics_peasantry/priority_peasant4.inc \ graphics_peasantry/priority_peasant4.inc \
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
@@ -458,85 +460,33 @@ parse_input: parse_input.o
parse_input.o: parse_input.s tokens.inc text/common.inc.lookup parse_input.o: parse_input.s tokens.inc text/common.inc.lookup
ca65 -o parse_input.o parse_input.s -l parse_input.lst ca65 -o parse_input.o parse_input.s -l parse_input.lst
###
text/DIALOG_PEASANT1.ZX02:
cd text && make
text/DIALOG_PEASANT2.ZX02:
cd text && make
text/DIALOG_PEASANT3.ZX02:
cd text && make
text/DIALOG_PEASANT4.ZX02:
cd text && make
### ###
DIALOG_PEASANT1.ZX02: dialog_peasant1 text/dialog_peasant1.inc:
$(ZX02) -f dialog_peasant1 DIALOG_PEASANT1.ZX02 cd text && make
dialog_peasant1: dialog_peasant1.o text/dialog_peasant2.inc:
ld65 -o dialog_peasant1 dialog_peasant1.o -C ../../linker_scripts/apple2_d000.inc cd text && make
dialog_peasant1.o: dialog_peasant1.s text/peasant1.inc text/dialog_peasant3.inc:
ca65 -o dialog_peasant1.o dialog_peasant1.s -l dialog_peasant1.lst cd text && make
### text/dialog_peasant4.inc:
cd text && make
dialog_peasant1.inc: generate_all_symbols dialog_peasant1
./generate_all_symbols -a 0xd000 dialog_peasant1.lst > dialog_peasant1.inc
###
DIALOG_PEASANT2.ZX02: dialog_peasant2
$(ZX02) -f dialog_peasant2 DIALOG_PEASANT2.ZX02
dialog_peasant2: dialog_peasant2.o
ld65 -o dialog_peasant2 dialog_peasant2.o -C ../../linker_scripts/apple2_d000.inc
dialog_peasant2.o: dialog_peasant2.s text/peasant2.inc
ca65 -o dialog_peasant2.o dialog_peasant2.s -l dialog_peasant2.lst
###
dialog_peasant2.inc: generate_all_symbols dialog_peasant2
./generate_all_symbols -a 0xd000 dialog_peasant2.lst > dialog_peasant2.inc
####
DIALOG_PEASANT3.ZX02: dialog_peasant3
$(ZX02) -f dialog_peasant3 DIALOG_PEASANT3.ZX02
dialog_peasant3: dialog_peasant3.o
ld65 -o dialog_peasant3 dialog_peasant3.o -C ../../linker_scripts/apple2_d000.inc
dialog_peasant3.o: dialog_peasant3.s text/peasant3.inc
ca65 -o dialog_peasant3.o dialog_peasant3.s -l dialog_peasant3.lst
###
dialog_peasant3.inc: generate_all_symbols dialog_peasant3
./generate_all_symbols -a 0xd000 dialog_peasant3.lst > dialog_peasant3.inc
####
DIALOG_PEASANT4.ZX02: dialog_peasant4
$(ZX02) -f dialog_peasant4 DIALOG_PEASANT4.ZX02
dialog_peasant4: dialog_peasant4.o
ld65 -o dialog_peasant4 dialog_peasant4.o -C ../../linker_scripts/apple2_d000.inc
dialog_peasant4.o: dialog_peasant4.s text/peasant4.inc
ca65 -o dialog_peasant4.o dialog_peasant4.s -l dialog_peasant4.lst
###
dialog_peasant4.inc: generate_all_symbols dialog_peasant4
./generate_all_symbols -a 0xd000 dialog_peasant4.lst > dialog_peasant4.inc
####
###
DIALOG_KNIGHT_FALLS_ROCK.ZX02: dialog_knight_falls_rock
$(ZX02) -f dialog_knight_falls_rock DIALOG_KNIGHT_FALLS_ROCK.ZX02
dialog_knight_falls_rock: dialog_knight_falls_rock.o
ld65 -o dialog_knight_falls_rock dialog_knight_falls_rock.o -C ../../linker_scripts/apple2_d000.inc
dialog_knight_falls_rock.o: dialog_knight_falls_rock.s text/knight_falls_rock.inc.lookup
ca65 -o dialog_knight_falls_rock.o dialog_knight_falls_rock.s -l dialog_knight_falls_rock.lst
dialog_knight_falls_rock.inc: generate_all_symbols dialog_knight_falls_rock
./generate_all_symbols -a 0xd000 dialog_knight_falls_rock.lst > dialog_knight_falls_rock.inc
### ###

3
games/peasant/dialog_peasant1.s
View File

@@ -1,3 +0,0 @@
.include "text/lookup.inc"
.include "text/peasant1.inc"

3
games/peasant/dialog_peasant2.s
View File

@@ -1,3 +0,0 @@
;.include "text/peasant2.inc"
.include "text/lookup.inc"
.include "text/peasant2.inc"

3
games/peasant/dialog_peasant3.s
View File

@@ -1,3 +0,0 @@
.include "text/lookup.inc"
.include "text/peasant3.inc"

2
games/peasant/dialog_peasant4.s
View File

@@ -1,2 +0,0 @@
.include "text/lookup.inc"
.include "text/peasant4.inc"

77
games/peasant/text/Makefile
View File

@@ -1,11 +1,16 @@
include ../../../Makefile.inc
ZX02 = ~/research/6502_compression/zx02.git/build/zx02
LINKER_SCRIPTS = ../../../linker_scripts
CC = gcc CC = gcc
CFLAGS = -O2 -Wall -g CFLAGS = -O2 -Wall -g
all: dump_text shrink_text \ all: DIALOG_PEASANT1.ZX02 dialog_peasant1.inc \
peasant1.inc \ DIALOG_PEASANT2.ZX02 dialog_peasant2.inc \
peasant2.inc \ DIALOG_PEASANT3.ZX02 dialog_peasant3.inc \
peasant3.inc \ DIALOG_PEASANT4.ZX02 dialog_peasant4.inc \
peasant4.inc \ dump_text shrink_text \
inside.inc.lookup \ inside.inc.lookup \
inn.inc.lookup \ inn.inc.lookup \
cliff_base.inc.lookup \ cliff_base.inc.lookup \
@@ -14,27 +19,73 @@ all: dump_text shrink_text \
common.inc.lookup \ common.inc.lookup \
inventory.inc.lookup inventory.inc.lookup
##################### ###
# derived locations #
#####################
peasant1.inc: gary.inc.lookup kerrek.inc.lookup \ DIALOG_PEASANT1.ZX02: dialog_peasant1
$(ZX02) -f dialog_peasant1 DIALOG_PEASANT1.ZX02
dialog_peasant1: dialog_peasant1.o
ld65 -o dialog_peasant1 dialog_peasant1.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
dialog_peasant1.o: dialog_peasant1.s \
gary.inc.lookup kerrek.inc.lookup \
well.inc.lookup yellow_tree.inc.lookup \ well.inc.lookup yellow_tree.inc.lookup \
falls.inc.lookup falls.inc.lookup
ca65 -o dialog_peasant1.o dialog_peasant1.s -l dialog_peasant1.lst
dialog_peasant1.inc: ../generate_all_symbols dialog_peasant1
../generate_all_symbols -a 0xd000 dialog_peasant1.lst > dialog_peasant1.inc
peasant2.inc: hay.inc.lookup mud.inc.lookup \ ###
DIALOG_PEASANT2.ZX02: dialog_peasant2
$(ZX02) -f dialog_peasant2 DIALOG_PEASANT2.ZX02
dialog_peasant2: dialog_peasant2.o
ld65 -o dialog_peasant2 dialog_peasant2.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
dialog_peasant2.o: dialog_peasant2.s \
hay.inc.lookup mud.inc.lookup \
archery.inc.lookup rock.inc.lookup \ archery.inc.lookup rock.inc.lookup \
knight.inc.lookup knight.inc.lookup
ca65 -o dialog_peasant2.o dialog_peasant2.s -l dialog_peasant2.lst
dialog_peasant2.inc: ../generate_all_symbols dialog_peasant2
../generate_all_symbols -a 0xd000 dialog_peasant2.lst > dialog_peasant2.inc
peasant3.inc: jhonka.inc.lookup cottage.inc.lookup \ ###
DIALOG_PEASANT3.ZX02: dialog_peasant3
$(ZX02) -f dialog_peasant3 DIALOG_PEASANT3.ZX02
dialog_peasant3: dialog_peasant3.o
ld65 -o dialog_peasant3 dialog_peasant3.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
dialog_peasant3.o: dialog_peasant3.s \
jhonka.inc.lookup cottage.inc.lookup \
lake_west.inc.lookup lake_east.inc.lookup \ lake_west.inc.lookup lake_east.inc.lookup \
outside_inn.inc.lookup outside_inn.inc.lookup
ca65 -o dialog_peasant3.o dialog_peasant3.s -l dialog_peasant3.lst
peasant4.inc: ned_cottage.inc.lookup wavy_tree.inc.lookup \ dialog_peasant3.inc: ../generate_all_symbols dialog_peasant3
../generate_all_symbols -a 0xd000 dialog_peasant3.lst > dialog_peasant3.inc
###
DIALOG_PEASANT4.ZX02: dialog_peasant4
$(ZX02) -f dialog_peasant4 DIALOG_PEASANT4.ZX02
dialog_peasant4: dialog_peasant4.o
ld65 -o dialog_peasant4 dialog_peasant4.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
dialog_peasant4.o: dialog_peasant4.s \
ned_cottage.inc.lookup wavy_tree.inc.lookup \
kerrek.inc.lookup lady_cottage.inc.lookup \ kerrek.inc.lookup lady_cottage.inc.lookup \
burninated_tree.inc.lookup burninated_tree.inc.lookup
ca65 -o dialog_peasant4.o dialog_peasant4.s -l dialog_peasant4.lst
dialog_peasant4.inc: ../generate_all_symbols dialog_peasant4
../generate_all_symbols -a 0xd000 dialog_peasant4.lst > dialog_peasant4.inc
#################### ####################
@@ -147,4 +198,4 @@ shrink_text.o: shrink_text.c
### ###
clean: clean:
rm -f *.o *~ dump_text shrink_text *.lookup rm -f *.o *~ dump_text shrink_text *.lookup *.ZX02

6
games/peasant/text/peasant1.inc → games/peasant/text/dialog_peasant1.s
View File

@@ -1,11 +1,15 @@
.include "lookup.inc"
peasant1_dialog_start: peasant1_dialog_start:
.include "gary.inc.lookup" .include "gary.inc.lookup"
.include "kerrek.inc.lookup" .include "kerrek.inc.lookup"
.include "well.inc.lookup" .include "well.inc.lookup"
.include "tree.inc.lookup" .include "yellow_tree.inc.lookup"
.include "falls.inc.lookup" .include "falls.inc.lookup"
peasant1_dialog_end: peasant1_dialog_end:
.assert (>peasant1_dialog_end - >peasant1_dialog_start) < $1E , error, "peasant1 dialog too big" .assert (>peasant1_dialog_end - >peasant1_dialog_start) < $1E , error, "peasant1 dialog too big"

3
games/peasant/text/peasant2.inc → games/peasant/text/dialog_peasant2.s
View File

@@ -1,3 +1,5 @@
.include "lookup.inc"
peasant2_dialog_start: peasant2_dialog_start:
.include "hay.inc.lookup" .include "hay.inc.lookup"
@@ -9,3 +11,4 @@ peasant2_dialog_start:
peasant2_dialog_end: peasant2_dialog_end:
.assert (>peasant2_dialog_end - >peasant2_dialog_start) < $1E , error, "peasant2 dialog too big" .assert (>peasant2_dialog_end - >peasant2_dialog_start) < $1E , error, "peasant2 dialog too big"

3
games/peasant/text/peasant3.inc → games/peasant/text/dialog_peasant3.s
View File

@@ -1,3 +1,5 @@
.include "lookup.inc"
peasant3_dialog_start: peasant3_dialog_start:
.include "jhonka.inc.lookup" .include "jhonka.inc.lookup"
@@ -9,3 +11,4 @@ peasant3_dialog_start:
peasant3_dialog_end: peasant3_dialog_end:
.assert (>peasant3_dialog_end - >peasant3_dialog_start) < $1E , error, "peasant3 dialog too big" .assert (>peasant3_dialog_end - >peasant3_dialog_start) < $1E , error, "peasant3 dialog too big"

3
games/peasant/text/peasant4.inc → games/peasant/text/dialog_peasant4.s
View File

@@ -1,3 +1,5 @@
.include "lookup.inc"
peasant4_dialog_start: peasant4_dialog_start:
.include "ned_cottage.inc.lookup" .include "ned_cottage.inc.lookup"
@@ -9,3 +11,4 @@ peasant4_dialog_start:
peasant4_dialog_end: peasant4_dialog_end:
.assert (>peasant4_dialog_end - >peasant4_dialog_start) < $1E , error, "peasant4 dialog too big" .assert (>peasant4_dialog_end - >peasant4_dialog_start) < $1E , error, "peasant4 dialog too big"