From b9e0f3717de4f873523975b271fb3b02fbd34061 Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Tue, 27 Aug 2024 21:13:18 -0400 Subject: [PATCH] Implement text compression --- Makefile | 26 +- build/text2asm.py | 212 ++++++++ src/dialog.asm | 19 +- src/linker.cfg | 29 +- src/paper.asm | 302 +++++++++++ src/rooms/city_building2.asm | 36 +- src/rooms/city_center.asm | 143 ++---- src/rooms/city_dump.asm | 36 -- src/rooms/city_flower.asm | 27 +- src/rooms/city_outskirts.asm | 52 +- src/rooms/core_boss.asm | 94 +--- src/rooms/core_flower.asm | 31 -- src/rooms/core_lock.asm | 37 +- src/rooms/core_south.asm | 41 +- src/rooms/crypt_center.asm | 38 -- src/rooms/crypt_escape.asm | 31 -- src/rooms/crypt_spiral.asm | 29 -- src/rooms/crypt_tomb.asm | 20 +- src/rooms/factory_bridge.asm | 29 -- src/rooms/factory_east.asm | 63 +-- src/rooms/factory_elevator.asm | 59 +-- src/rooms/factory_upper.asm | 37 -- src/rooms/factory_vault.asm | 139 ++---- src/rooms/factory_west.asm | 27 - src/rooms/garden_crossroad.asm | 29 -- src/rooms/garden_east.asm | 37 +- src/rooms/garden_flower.asm | 31 -- src/rooms/garden_hallway.asm | 29 -- src/rooms/garden_landing.asm | 30 -- src/rooms/garden_shaft.asm | 30 -- src/rooms/garden_shrine.asm | 91 +--- src/rooms/lava_station.asm | 30 -- src/rooms/lava_tunnel.asm | 39 -- src/rooms/lava_vent.asm | 13 +- src/rooms/lava_west.asm | 22 - src/rooms/mermaid_entry.asm | 12 +- src/rooms/mermaid_hut1.asm | 326 +++--------- src/rooms/mermaid_hut2.asm | 45 +- src/rooms/mermaid_hut3.asm | 36 +- src/rooms/mermaid_hut4.asm | 413 ++-------------- src/rooms/mermaid_hut5.asm | 21 +- src/rooms/mermaid_spring.asm | 58 +-- src/rooms/mermaid_village.asm | 179 +------ src/rooms/mine_north.asm | 37 -- src/rooms/prison_cell.asm | 35 -- src/rooms/prison_escape.asm | 30 -- src/rooms/prison_flower.asm | 12 +- src/rooms/prison_lower.asm | 31 -- src/rooms/prison_upper.asm | 123 +---- src/rooms/sewer_basin.asm | 30 -- src/rooms/sewer_pipe.asm | 31 -- src/rooms/sewer_pool.asm | 14 +- src/rooms/sewer_west.asm | 37 -- src/rooms/shadow_descent.asm | 22 - src/rooms/shadow_entry.asm | 28 -- src/rooms/shadow_gate.asm | 18 +- src/rooms/shadow_hall.asm | 30 -- src/rooms/shadow_heart.asm | 30 -- src/rooms/shadow_teleport.asm | 20 +- src/rooms/temple_altar.asm | 12 +- src/rooms/temple_apse.asm | 31 -- src/rooms/temple_chevet.asm | 31 -- src/rooms/temple_entry.asm | 102 +--- src/rooms/temple_foyer.asm | 30 -- src/rooms/temple_nave.asm | 42 +- src/rooms/temple_pit.asm | 32 -- src/rooms/town_house1.asm | 11 +- src/rooms/town_house2.asm | 28 +- src/rooms/town_house3.asm | 21 +- src/rooms/town_house4.asm | 100 +--- src/rooms/town_house5.asm | 34 +- src/rooms/town_house6.asm | 22 +- src/rooms/town_outdoors.asm | 125 +---- src/text.asm | 83 ++++ src/text/text0.txt | 880 +++++++++++++++++++++++++++++++++ src/text/text1.txt | 739 +++++++++++++++++++++++++++ src/text/text2.txt | 448 +++++++++++++++++ src/upgrade.asm | 122 ++--- 78 files changed, 3143 insertions(+), 3306 deletions(-) create mode 100644 build/text2asm.py create mode 100644 src/text.asm create mode 100644 src/text/text0.txt create mode 100644 src/text/text1.txt create mode 100644 src/text/text2.txt diff --git a/Makefile b/Makefile index 1e3e391c..649832be 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ MUSIC_OUT_DIR = $(OUTDIR)/music PCM_OUT_DIR = $(OUTDIR)/pcm ROOM_OUT_DIR = $(OUTDIR)/rooms SIM65_OUT_DIR = $(OUTDIR)/sim65 +TEXT_OUT_DIR = $(OUTDIR)/text TILE_OUT_DIR = $(OUTDIR)/tiles TSET_OUT_DIR = $(OUTDIR)/tilesets @@ -67,6 +68,13 @@ ROOM_ROOM_FILES := \ $(patsubst src/rooms/%.bg,$(ROOM_OUT_DIR)/%.room,$(ROOM_BG_FILES)) ROOM_LIB_FILE = $(LIB_OUT_DIR)/rooms.lib +TEXT_TXT_FILES := $(shell find src/text -name '*.txt' | sort) +TEXT_ASM_FILES := \ + $(patsubst src/text/%.txt,$(TEXT_OUT_DIR)/%.asm,$(TEXT_TXT_FILES)) +TEXT_OBJ_FILES := \ + $(patsubst $(TEXT_OUT_DIR)/%.asm,$(TEXT_OUT_DIR)/%.o,$(TEXT_ASM_FILES)) +TEXT_LIB_FILE = $(LIB_OUT_DIR)/text.lib + TILE_AHI_FILES := $(shell find src/tiles -name '*.ahi' | sort) TILE_CHR_FILES := \ $(patsubst src/tiles/%.ahi,$(TILE_OUT_DIR)/%.chr,$(TILE_AHI_FILES)) @@ -214,6 +222,12 @@ $(MUSIC_OUT_DIR)/%.asm: src/music/%.sng $(SNG2ASM) @$(SNG2ASM) < $< > $@ .SECONDARY: $(MUSIC_ASM_FILES) +$(TEXT_OUT_DIR)/%.asm: src/text/%.txt build/text2asm.py + @echo "Generating $@" + @mkdir -p $(@D) + @python3 build/text2asm.py $< > $@ +.SECONDARY: $(TEXT_ASM_FILES) + $(TSET_OUT_DIR)/%.asm: src/tilesets/%.bg $(BG2TSET) $(TILE_AHI_FILES) @echo "Generating $@" @mkdir -p $(@D) @@ -317,6 +331,10 @@ $(MUSIC_OUT_DIR)/%.o: $(MUSIC_OUT_DIR)/%.asm $(INC_FILES) $(compile-asm) .SECONDARY: $(MUSIC_OBJ_FILES) +$(TEXT_OUT_DIR)/%.o: $(TEXT_OUT_DIR)/%.asm $(INC_FILES) + $(compile-asm) +.SECONDARY: $(TEXT_OBJ_FILES) + $(TSET_OUT_DIR)/%.o: $(TSET_OUT_DIR)/%.asm $(INC_FILES) $(compile-asm) .SECONDARY: $(TSET_OBJ_FILES) @@ -333,6 +351,9 @@ $(MUSIC_LIB_FILE): $(MUSIC_OBJ_FILES) $(ROOM_LIB_FILE): $(ROOM_OBJ_FILES) $(update-archive) +$(TEXT_LIB_FILE): $(TEXT_OBJ_FILES) + $(update-archive) + $(TSET_LIB_FILE): $(TSET_OBJ_FILES) $(update-archive) @@ -341,13 +362,14 @@ $(TSET_LIB_FILE): $(TSET_OBJ_FILES) $(ROM_BIN_FILE) $(ROM_LABEL_FILE): \ tests/lint.py $(ROM_CFG_FILE) $(ROM_OBJ_FILES) \ - $(MUSIC_LIB_FILE) $(ROOM_LIB_FILE) $(TSET_LIB_FILE) + $(MUSIC_LIB_FILE) $(ROOM_LIB_FILE) $(TEXT_LIB_FILE) $(TSET_LIB_FILE) python3 tests/lint.py @echo "Linking $@" @mkdir -p $(@D) @ld65 -Ln $(ROM_LABEL_FILE) -m $(ROM_MAP_FILE) -o $@ \ -C $(ROM_CFG_FILE) $(ROM_OBJ_FILES) \ - $(MUSIC_LIB_FILE) $(ROOM_LIB_FILE) $(TSET_LIB_FILE) + $(MUSIC_LIB_FILE) $(ROOM_LIB_FILE) $(TEXT_LIB_FILE) \ + $(TSET_LIB_FILE) $(ROM_LABEL_FILE): $(ROM_BIN_FILE) #=============================================================================# diff --git a/build/text2asm.py b/build/text2asm.py new file mode 100644 index 00000000..7343e614 --- /dev/null +++ b/build/text2asm.py @@ -0,0 +1,212 @@ +#=============================================================================# +# Copyright 2022 Matthew D. Steele # +# # +# This file is part of Annalog. # +# # +# Annalog is free software: you can redistribute it and/or modify it under # +# the terms of the GNU General Public License as published by the Free # +# Software Foundation, either version 3 of the License, or (at your option) # +# any later version. # +# # +# Annalog is distributed in the hope that it will be useful, but WITHOUT ANY # +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # +# details. # +# # +# You should have received a copy of the GNU General Public License along # +# with Annalog. If not, see . # +#=============================================================================# + +import os +import sys + +#=============================================================================# + +MAX_PAIRS = 0xfd - 0x80 + +HEADER = """\ +;;; This file was generated by text2asm. + +.INCLUDE "../../src/charmap.inc" +.INCLUDE "../../src/dialog.inc" + +;;;=========================================================================;;; + +""" + +FOOTER = """\ + +;;;=========================================================================;;; +""" + +#=============================================================================# + +def parse_text(data): + text = [] + current_chars = [] + original_size = 0 + def finish_string(): + if not current_chars: return + string = ''.join(current_chars) + current_chars.clear() + text.append(('b', string)) + while data: + if data.startswith('{'): + i = data.find('}') + finish_string() + constant = data[1:i] + data = data[i + 1:] + text.append(('c', constant)) + original_size += 1 + elif data.startswith('['): + i = data.find(']') + finish_string() + pair = data[1:i] + data = data[i + 1:] + assert len(pair) == 4 + text.append(('p', (int(pair[:2], 16), int(pair[2:], 16)))) + original_size += 2 + else: + char = data[0] + data = data[1:] + current_chars.append(char) + original_size += 1 + finish_string() + return (text, original_size) + +def parse_input_file(filepath): + texts = {} + current_text_name = None + current_text_data = '' + original_size = 0 + for line in open(filepath): + line = line.rstrip('\n') + if current_text_name is not None: + current_text_data += line + if line.endswith('#') or line.endswith('%'): + (text, size) = parse_text(current_text_data) + texts[current_text_name] = text + original_size += size + current_text_name = None + current_text_data = '' + else: + current_text_data += '$' + else: + if not line: continue + elif line.startswith('#'): continue + elif line.startswith('@'): + current_text_name = line[1:] + else: + raise ValueError('bad line: ' + repr(line)) + assert current_text_name is None + return (texts, original_size) + +def compute_pairs(texts): + forced_pairs = set() + pair_counts = {} + for text in texts.values(): + for kind, value in text: + if kind == 'p': + forced_pairs.add(value) + elif kind == 'b': + for i in range(0, len(value) - 1): + pair = value[i:i + 2] + if pair not in pair_counts: + pair_counts[pair] = 0 + pair_counts[pair] += 1 + sorted_counts = sorted(pair_counts.items(), key=lambda item: -item[1]) + best_pairs = [pair for pair, count in sorted_counts if count > 2] + return sorted(forced_pairs) + best_pairs[:MAX_PAIRS - len(forced_pairs)] + +def compress_text(text, dictionary): + compressed_size = 0 + result_lines = [] + current_line = [] + current_chars = [] + def finish_string(): + if not current_chars: return + string = ''.join(current_chars) + current_chars.clear() + current_line.append(f'"{string}"') + def finish_line(): + finish_string() + if not current_line: return + line = ', '.join(current_line) + current_line.clear() + result_lines.append(f' .byte {line}\n') + for kind, value in text: + if kind == 'b': + while len(value) >= 2: + pair = value[:2] + i = dictionary.get(pair) + if i is not None: + value = value[2:] + finish_string() + current_line.append(f'${i + 0x80:02x}') + compressed_size += 1 + if '$' in pair: finish_line() + else: + char = value[0] + value = value[1:] + current_chars.append(char) + compressed_size += 1 + if char == '$': finish_line() + if value: + current_chars.append(value) + compressed_size += len(value) + if value.endswith('$'): finish_line() + elif kind == 'c': + finish_string() + current_line.append(value) + compressed_size += 1 + elif kind == 'p': + i = dictionary[value] + finish_string() + current_line.append(f'${i + 0x80:02x}') + compressed_size += 1 + else: assert False + finish_line() + return (''.join(result_lines), compressed_size) + +def write_output_file(bank, pairs, texts, original_data_size): + compressed_data_size = 0 + sys.stdout.write(HEADER) + sys.stdout.write(f'.SEGMENT "PRGA_{bank}"\n\n') + sys.stdout.write(f'.EXPORT DataA_{bank}_Strings_u8_arr2_arr\n') + sys.stdout.write(f'.PROC DataA_{bank}_Strings_u8_arr2_arr\n') + for pair in pairs: + if isinstance(pair, str): + sys.stdout.write(f' .byte "{pair}"\n') + else: + sys.stdout.write(f' .byte ${pair[0]:02x}, ${pair[1]:02x}\n') + compressed_data_size += 2 + sys.stdout.write(f'.ENDPROC\n') + dictionary = {pair: i for i, pair in enumerate(pairs)} + for name, text in sorted(texts.items()): + sys.stdout.write(f'\n.EXPORT DataA_{bank}_{name}_u8_arr\n') + sys.stdout.write(f'.PROC DataA_{bank}_{name}_u8_arr\n') + (compressed_asm, compressed_size) = compress_text(text, dictionary) + sys.stdout.write(compressed_asm) + sys.stdout.write(f'.ENDPROC\n') + compressed_data_size += compressed_size + sys.stdout.write(f'\n;;; Original size = {original_data_size:4x}\n') + sys.stdout.write(f';;; Compressed size = {compressed_data_size:4x}\n') + saved = original_data_size - compressed_data_size + sys.stdout.write(f';;; Bytes saved = {saved:4x}\n') + percent = int(round(100 * (1 - compressed_data_size / original_data_size))) + sys.stdout.write(f';;; Percent saved = {percent:3d}%\n') + sys.stdout.write(FOOTER) + +def run(filepath): + filename = os.path.split(filepath)[1] + bank = os.path.splitext(filename)[0].capitalize() + (texts, original_size) = parse_input_file(filepath) + pairs = compute_pairs(texts) + write_output_file(bank, pairs, texts, original_size) + +#=============================================================================# + +if __name__ == '__main__': + run(sys.argv[1]) + +#=============================================================================# diff --git a/src/dialog.asm b/src/dialog.asm index d5c9dda7..82f72d82 100644 --- a/src/dialog.asm +++ b/src/dialog.asm @@ -159,6 +159,7 @@ .IMPORT FuncA_Dialog_PlaySfxDialogText .IMPORT FuncA_Dialog_PlaySfxQuestMarker .IMPORT FuncA_Objects_DrawObjectsForRoom +.IMPORT FuncM_CopyDialogText .IMPORT FuncM_DrawObjectsForRoomAndProcessFrame .IMPORT FuncM_ScrollTowardsAvatar .IMPORT FuncM_ScrollTowardsGoal @@ -422,24 +423,6 @@ _Finish: jmp_prga MainA_Pause_Papers .ENDPROC -;;; Given the bank/pointer returned by FuncA_Dialog_GetNextDialogTextPointer, -;;; switches the PRGA bank and copies the dialog text into -;;; Ram_DialogText_u8_arr. -;;; @param T2 The PRGA bank that contains the dialog text. -;;; @param T1T0 A pointer to the start of the dialog text. -.EXPORT FuncM_CopyDialogText -.PROC FuncM_CopyDialogText - main_prga T2 - ldy #$ff - @loop: - iny - lda (T1T0), y - sta Ram_DialogText_u8_arr, y - cmp #kDialogTextNewline + 1 - blt @loop - rts -.ENDPROC - ;;;=========================================================================;;; .SEGMENT "PRGA_Dialog" diff --git a/src/linker.cfg b/src/linker.cfg index 960e7ee7..e350e915 100644 --- a/src/linker.cfg +++ b/src/linker.cfg @@ -250,21 +250,20 @@ SEGMENTS { PRGA_Text0: load=PRGA_01, type=ro; PRGA_Text1: load=PRGA_03, type=ro; PRGA_Text2: load=PRGA_05, type=ro; - PRGA_Text3: load=PRGA_07, type=ro; - PRGA_Actor: load=PRGA_09, type=ro; - PRGA_Avatar: load=PRGA_0B, type=ro; - PRGA_Console: load=PRGA_0D, type=ro; - PRGA_Cutscene: load=PRGA_0F, type=ro; - PRGA_Death: load=PRGA_11, type=ro; - PRGA_Dialog: load=PRGA_13, type=ro; - PRGA_Machine: load=PRGA_15, type=ro; - PRGA_Objects: load=PRGA_17, type=ro; - PRGA_Pause: load=PRGA_19, type=ro; - PRGA_Room: load=PRGA_1B, type=ro; - PRGA_Terrain: load=PRGA_1D, type=ro; - PRGA_Pcm0: load=PRGA_1F, type=ro; - PRGA_Pcm1: load=PRGA_21, type=ro; - PRGA_Pcm2: load=PRGA_23, type=ro; + PRGA_Actor: load=PRGA_07, type=ro; + PRGA_Avatar: load=PRGA_09, type=ro; + PRGA_Console: load=PRGA_0B, type=ro; + PRGA_Cutscene: load=PRGA_0D, type=ro; + PRGA_Death: load=PRGA_0F, type=ro; + PRGA_Dialog: load=PRGA_11, type=ro; + PRGA_Machine: load=PRGA_13, type=ro; + PRGA_Objects: load=PRGA_15, type=ro; + PRGA_Pause: load=PRGA_17, type=ro; + PRGA_Room: load=PRGA_19, type=ro; + PRGA_Terrain: load=PRGA_1B, type=ro; + PRGA_Pcm0: load=PRGA_1D, type=ro; + PRGA_Pcm1: load=PRGA_1F, type=ro; + PRGA_Pcm2: load=PRGA_21, type=ro; # Fixed-bank PRG segments: PRG8: load=PRG8, type=ro; PRGE_Pcm: load=PRGE, type=ro, align=$100; diff --git a/src/paper.asm b/src/paper.asm index 115e62ad..540ec5c8 100644 --- a/src/paper.asm +++ b/src/paper.asm @@ -29,6 +29,75 @@ .INCLUDE "ppu.inc" .INCLUDE "room.inc" +.IMPORT DataA_Text2_PaperJerome01_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome01_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome02_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome02_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome03_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome03_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome04_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome04_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome05_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome05_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome05_Page3_u8_arr +.IMPORT DataA_Text2_PaperJerome07_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome07_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome08_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome08_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome08_Page3_u8_arr +.IMPORT DataA_Text2_PaperJerome09_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome09_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome09_Page3_u8_arr +.IMPORT DataA_Text2_PaperJerome10_u8_arr +.IMPORT DataA_Text2_PaperJerome11_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome11_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome12_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome12_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome13_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome13_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome14_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome14_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome15_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome15_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome18_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome18_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome19_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome19_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome20_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome21_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome21_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome23_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome23_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome27_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome27_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome27_Page3_u8_arr +.IMPORT DataA_Text2_PaperJerome28_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome28_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome31_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome31_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome34_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome34_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome35_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome35_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome35_Page3_u8_arr +.IMPORT DataA_Text2_PaperJerome36_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome36_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome36_Page3_u8_arr +.IMPORT DataA_Text2_PaperManual1_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual1_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual2_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual2_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual3_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual3_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual4_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual4_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual5_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual5_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual5_Page3_u8_arr +.IMPORT DataA_Text2_PaperManual6_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual6_Page2_u8_arr +.IMPORT DataA_Text2_PaperManual9_Page1_u8_arr +.IMPORT DataA_Text2_PaperManual9_Page2_u8_arr .IMPORT Data_PowersOfTwo_u8_arr8 .IMPORT FuncA_Pause_DirectDrawWindowBlankLine .IMPORT FuncA_Pause_DirectDrawWindowLineSide @@ -610,3 +679,236 @@ _Right: .ENDPROC ;;;=========================================================================;;; + +.SEGMENT "PRGA_Dialog" + +.EXPORT DataA_Dialog_PaperJerome01_sDialog +.PROC DataA_Dialog_PaperJerome01_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome01_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome01_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome02_sDialog +.PROC DataA_Dialog_PaperJerome02_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome02_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome02_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome03_sDialog +.PROC DataA_Dialog_PaperJerome03_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome03_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome03_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome04_sDialog +.PROC DataA_Dialog_PaperJerome04_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome04_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome04_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome05_sDialog +.PROC DataA_Dialog_PaperJerome05_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome05_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome05_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome05_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome07_sDialog +.PROC DataA_Dialog_PaperJerome07_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome07_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome07_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome08_sDialog +.PROC DataA_Dialog_PaperJerome08_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome08_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome08_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome08_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome09_sDialog +.PROC DataA_Dialog_PaperJerome09_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome09_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome09_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome09_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome10_sDialog +.PROC DataA_Dialog_PaperJerome10_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome10_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome11_sDialog +.PROC DataA_Dialog_PaperJerome11_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome11_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome11_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome12_sDialog +.PROC DataA_Dialog_PaperJerome12_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome12_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome12_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome13_sDialog +.PROC DataA_Dialog_PaperJerome13_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome13_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome13_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome14_sDialog +.PROC DataA_Dialog_PaperJerome14_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome14_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome14_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome15_sDialog +.PROC DataA_Dialog_PaperJerome15_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome15_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome15_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome18_sDialog +.PROC DataA_Dialog_PaperJerome18_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome18_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome18_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome19_sDialog +.PROC DataA_Dialog_PaperJerome19_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome19_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome19_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome20_sDialog +.PROC DataA_Dialog_PaperJerome20_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome20_Page1_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome21_sDialog +.PROC DataA_Dialog_PaperJerome21_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome21_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome21_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome23_sDialog +.PROC DataA_Dialog_PaperJerome23_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome23_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome23_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome27_sDialog +.PROC DataA_Dialog_PaperJerome27_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome27_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome27_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome27_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome28_sDialog +.PROC DataA_Dialog_PaperJerome28_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome28_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome28_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome31_sDialog +.PROC DataA_Dialog_PaperJerome31_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome31_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome31_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome34_sDialog +.PROC DataA_Dialog_PaperJerome34_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome34_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome34_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome35_sDialog +.PROC DataA_Dialog_PaperJerome35_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome35_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome35_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome35_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperJerome36_sDialog +.PROC DataA_Dialog_PaperJerome36_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome36_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome36_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome36_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual1_sDialog +.PROC DataA_Dialog_PaperManual1_sDialog + dlg_Text Paper, DataA_Text2_PaperManual1_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual1_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual2_sDialog +.PROC DataA_Dialog_PaperManual2_sDialog + dlg_Text Paper, DataA_Text2_PaperManual2_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual2_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual3_sDialog +.PROC DataA_Dialog_PaperManual3_sDialog + dlg_Text Paper, DataA_Text2_PaperManual3_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual3_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual4_sDialog +.PROC DataA_Dialog_PaperManual4_sDialog + dlg_Text Paper, DataA_Text2_PaperManual4_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual4_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual5_sDialog +.PROC DataA_Dialog_PaperManual5_sDialog + dlg_Text Paper, DataA_Text2_PaperManual5_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual5_Page2_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual5_Page3_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual6_sDialog +.PROC DataA_Dialog_PaperManual6_sDialog + dlg_Text Paper, DataA_Text2_PaperManual6_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual6_Page2_u8_arr + dlg_Done +.ENDPROC + +.EXPORT DataA_Dialog_PaperManual9_sDialog +.PROC DataA_Dialog_PaperManual9_sDialog + dlg_Text Paper, DataA_Text2_PaperManual9_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperManual9_Page2_u8_arr + dlg_Done +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/rooms/city_building2.asm b/src/rooms/city_building2.asm index 73783f23..ea2ba430 100644 --- a/src/rooms/city_building2.asm +++ b/src/rooms/city_building2.asm @@ -17,7 +17,6 @@ ;;; with Annalog. If not, see . ;;; ;;;=========================================================================;;; -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" @@ -28,6 +27,10 @@ .INCLUDE "city_center.inc" .IMPORT DataA_Room_Building_sTileset +.IMPORT DataA_Text0_CityBuilding2Screen_Connected_u8_arr +.IMPORT DataA_Text0_CityBuilding2Screen_Locked_u8_arr +.IMPORT DataA_Text0_CityBuilding2Screen_Question_u8_arr +.IMPORT DataA_Text0_CityBuilding2Screen_Unlocked_u8_arr .IMPORT Data_Empty_sActor_arr .IMPORT FuncA_Objects_Draw1x1Shape .IMPORT FuncA_Objects_MoveShapeLeftByA @@ -221,34 +224,3 @@ _ConnectKeygen: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.EXPORT DataA_Text0_CityBuilding2Screen_Unlocked_u8_arr -.PROC DataA_Text0_CityBuilding2Screen_Unlocked_u8_arr - .byte " SECURITY STATUS$" - .byte "Eastern door: UNLOCKED$" - .byte "Continuous key$" - .byte "randomization: N/A#" -.ENDPROC - -.EXPORT DataA_Text0_CityBuilding2Screen_Locked_u8_arr -.PROC DataA_Text0_CityBuilding2Screen_Locked_u8_arr - .byte " SECURITY STATUS$" - .byte "Eastern door: LOCKED$" - .byte "Continuous key$" - .byte "randomization: ENABLED#" -.ENDPROC - -.PROC DataA_Text0_CityBuilding2Screen_Question_u8_arr - .byte "Connect key generator$" - .byte "to western semaphore?%" -.ENDPROC - -.PROC DataA_Text0_CityBuilding2Screen_Connected_u8_arr - .byte "Western semaphore is$" - .byte "now connected to key$" - .byte "generator output.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/city_center.asm b/src/rooms/city_center.asm index 810e0d73..84e3c39b 100644 --- a/src/rooms/city_center.asm +++ b/src/rooms/city_center.asm @@ -39,6 +39,20 @@ .INCLUDE "city_center.inc" .IMPORT DataA_Room_City_sTileset +.IMPORT DataA_Text1_CityCenterAlex_Part1_u8_arr +.IMPORT DataA_Text1_CityCenterAlex_Part2_u8_arr +.IMPORT DataA_Text1_CityCenterAlex_Part3_u8_arr +.IMPORT DataA_Text1_CityCenterAlex_Part4_u8_arr +.IMPORT DataA_Text1_CityCenterAlex_Part5_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part1_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part2_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part3_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part4_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part5_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part6_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part7_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity1_Part8_u8_arr +.IMPORT DataA_Text1_CityCenterBreakerCity2_Part1_u8_arr .IMPORT FuncA_Machine_SemaphoreTick .IMPORT FuncA_Machine_SemaphoreTryAct .IMPORT FuncA_Machine_SemaphoreTryMove @@ -794,17 +808,17 @@ _ApplyAlexGravity: .EXPORT DataA_Dialog_CityCenterBreakerCity1_sDialog .PROC DataA_Dialog_CityCenterBreakerCity1_sDialog .assert kTileIdBgPortraitGrontaFirst = kTileIdBgPortraitAlexFirst, error - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity1_Part1_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity1_Part1_u8_arr dlg_Call _AlexRaiseArm - dlg_Text ChildAlex, DataA_Text2_CityCenterBreakerCity1_Part2_u8_arr - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity1_Part3_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterBreakerCity1_Part2_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity1_Part3_u8_arr dlg_Call _AlexLowerArm - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity1_Part4_u8_arr - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity1_Part5_u8_arr - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity1_Part6_u8_arr - dlg_Text ChildAlex, DataA_Text2_CityCenterBreakerCity1_Part7_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity1_Part4_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity1_Part5_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity1_Part6_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterBreakerCity1_Part7_u8_arr dlg_Call _GrontaRaiseArm - dlg_Text OrcGrontaShout, DataA_Text2_CityCenterBreakerCity1_Part8_u8_arr + dlg_Text OrcGrontaShout, DataA_Text1_CityCenterBreakerCity1_Part8_u8_arr dlg_Done _AlexRaiseArm: lda #eNpcChild::AlexHolding @@ -822,122 +836,21 @@ _GrontaRaiseArm: .EXPORT DataA_Dialog_CityCenterBreakerCity2_sDialog .PROC DataA_Dialog_CityCenterBreakerCity2_sDialog - dlg_Text OrcGronta, DataA_Text2_CityCenterBreakerCity2_Part1_u8_arr + dlg_Text OrcGronta, DataA_Text1_CityCenterBreakerCity2_Part1_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_CityCenterAlex_sDialog .PROC DataA_Dialog_CityCenterAlex_sDialog dlg_IfSet CityCenterTalkedToAlex, _MarkedMap_sDialog - dlg_Text ChildAlex, DataA_Text2_CityCenterAlex_Part1_u8_arr - dlg_Text ChildAlex, DataA_Text2_CityCenterAlex_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterAlex_Part1_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterAlex_Part2_u8_arr dlg_Quest CityCenterTalkedToAlex _MarkedMap_sDialog: - dlg_Text ChildAlex, DataA_Text2_CityCenterAlex_Part3_u8_arr - dlg_Text ChildAlex, DataA_Text2_CityCenterAlex_Part4_u8_arr - dlg_Text ChildAlex, DataA_Text2_CityCenterAlex_Part5_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterAlex_Part3_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterAlex_Part4_u8_arr + dlg_Text ChildAlex, DataA_Text1_CityCenterAlex_Part5_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_CityCenterBreakerCity1_Part1_u8_arr - .byte "Pfagh, you again? If$" - .byte "you value your life,$" - .byte "boy, you should leave$" - .byte "these ruins to us.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part2_u8_arr - .byte "You're the ones who'd$" - .byte "better leave! This$" - .byte "is a human city. It$" - .byte "belongs to us!#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part3_u8_arr - .byte "Oh? And did YOU build$" - .byte "these buildings? Did$" - .byte "your townsfolk create$" - .byte "these machines?#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part4_u8_arr - .byte "Of course you didn't.$" - .byte "The people who did$" - .byte "have all been dead$" - .byte "for centuries.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part5_u8_arr - .byte "Those humans couldn't$" - .byte "handle the power they$" - .byte "created. And now you$" - .byte "think YOU deserve it?#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part6_u8_arr - .byte "You have less claim$" - .byte "than we do. At least$" - .byte "orcs never collapsed$" - .byte "advanced civilization.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part7_u8_arr - .byte "You never created it,$" - .byte "either. Humans can$" - .byte "learn. And next time,$" - .byte "we'll do it right!#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity1_Part8_u8_arr - .byte "`Next time?' There$" - .byte "will be a `next time'$" - .byte "for humans in charge$" - .byte "over my dead body!#" -.ENDPROC - -.PROC DataA_Text2_CityCenterBreakerCity2_Part1_u8_arr - .byte "...Another circuit?$" - .byte "But that must mean$" - .byte "that the power core$" - .byte "is almost...hmm.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterAlex_Part1_u8_arr - .byte "Anna, you found it!$" - .byte "That's the remote that$" - .byte "the orcs have been$" - .byte "looking for!#" -.ENDPROC - -.PROC DataA_Text2_CityCenterAlex_Part2_u8_arr - .byte "We'll need that to$" - .byte "restore the complex.$" - .byte "But first, there's one$" - .byte "more circuit to find.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterAlex_Part3_u8_arr - .byte "Down in the lava pits,$" - .byte "there's some kind of$" - .byte "gateway. I'll mark it$" - .byte "on your map.#" -.ENDPROC - -.PROC DataA_Text2_CityCenterAlex_Part4_u8_arr - .byte "I don't know how to$" - .byte "use it, but I'm sure$" - .byte "you can figure it out.$" - .byte "We've almost got this!#" -.ENDPROC - -.PROC DataA_Text2_CityCenterAlex_Part5_u8_arr - .byte "Very soon, all this$" - .byte "technology will be$" - .byte "back in human hands!#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/city_dump.asm b/src/rooms/city_dump.asm index eac203f0..5bed1bbb 100644 --- a/src/rooms/city_dump.asm +++ b/src/rooms/city_dump.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -111,37 +109,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome35_sDialog -.PROC DataA_Dialog_PaperJerome35_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome35_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome35_Page2_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome35_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome35_Page1_u8_arr - .byte "Day 35: I have hidden$" - .byte "the remote. Without it$" - .byte "the complex can never$" - .byte "be fully put to use.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome35_Page2_u8_arr - .byte "I can't bring myself$" - .byte "to destroy our work.$" - .byte "Maybe, someday, we'll$" - .byte "be responsible enough.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome35_Page3_u8_arr - .byte "Maybe someday...#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/city_flower.asm b/src/rooms/city_flower.asm index 5eeadae9..5f3072ff 100644 --- a/src/rooms/city_flower.asm +++ b/src/rooms/city_flower.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/orc.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/flower.inc" @@ -31,6 +30,9 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Building_sTileset +.IMPORT DataA_Text0_CityFlowerOrcAngry_u8_arr +.IMPORT DataA_Text0_CityFlowerOrcCalm_Part1_u8_arr +.IMPORT DataA_Text0_CityFlowerOrcCalm_Part2_u8_arr .IMPORT FuncA_Objects_DrawCratePlatform .IMPORT FuncA_Room_RemoveFlowerDeviceIfCarriedOrDelivered .IMPORT FuncA_Room_RespawnFlowerDeviceIfDropped @@ -204,26 +206,3 @@ _MakeOrcAttack: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_CityFlowerOrcAngry_u8_arr - .byte "Hey! Thief! You take$" - .byte "my flower!#" -.ENDPROC - -.PROC DataA_Text0_CityFlowerOrcCalm_Part1_u8_arr - .byte "Who you? Human? Seem$" - .byte "too small to fight...$" - .byte "Not know why we fight$" - .byte "humans.#" -.ENDPROC - -.PROC DataA_Text0_CityFlowerOrcCalm_Part2_u8_arr - .byte "Happier in pretty orc$" - .byte "village. Humans happy$" - .byte "in ugly human village.$" - .byte "Why fight? Pointless.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/city_outskirts.asm b/src/rooms/city_outskirts.asm index 84bcf6de..8957ee37 100644 --- a/src/rooms/city_outskirts.asm +++ b/src/rooms/city_outskirts.asm @@ -36,6 +36,12 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_City_sTileset +.IMPORT DataA_Text1_CityOutskirtsAlex_Part1_u8_arr +.IMPORT DataA_Text1_CityOutskirtsAlex_Part2_u8_arr +.IMPORT DataA_Text1_CityOutskirtsAlex_Part3_u8_arr +.IMPORT DataA_Text1_CityOutskirtsAlex_Part4_u8_arr +.IMPORT DataA_Text1_CityOutskirtsAlex_Part5_u8_arr +.IMPORT DataA_Text1_CityOutskirtsAlex_Part6_u8_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GenericMoveTowardGoalVert .IMPORT FuncA_Machine_GenericTryMoveY @@ -401,49 +407,3 @@ _MakeAlexFaceAnna: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_CityOutskirtsAlex_Part1_u8_arr - .byte "Anna, you made it! I$" - .byte "knew you'd do great.$" - .byte "What did you find out$" - .byte "under the temple?#" -.ENDPROC - -.PROC DataA_Text1_CityOutskirtsAlex_Part2_u8_arr - .byte "Huh? The mermaids were$" - .byte "CREATED by humans? But$" - .byte "how? And...why? Argh,$" - .byte "we know so little...#" -.ENDPROC - -.PROC DataA_Text1_CityOutskirtsAlex_Part3_u8_arr - .byte "I've been out scouting$" - .byte "while you were away,$" - .byte "but I keep coming back$" - .byte "here. I can't help it.#" -.ENDPROC - -.PROC DataA_Text1_CityOutskirtsAlex_Part4_u8_arr - .byte "Do you see all that?$" - .byte "We're on the outskirts$" - .byte "of a human city. Lost$" - .byte "and buried for years.#" -.ENDPROC - -.PROC DataA_Text1_CityOutskirtsAlex_Part5_u8_arr - .byte "At home, we're barely$" - .byte "smithing iron. Can you$" - .byte "believe what we used$" - .byte "to be able to build?#" -.ENDPROC - -.PROC DataA_Text1_CityOutskirtsAlex_Part6_u8_arr - .byte "We've GOT to find a$" - .byte "way into that city.$" - .byte "Meet me down in the$" - .byte "mermaid village, OK?#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/core_boss.asm b/src/rooms/core_boss.asm index c5cd58fd..8df80abb 100644 --- a/src/rooms/core_boss.asm +++ b/src/rooms/core_boss.asm @@ -42,6 +42,19 @@ .INCLUDE "../scroll.inc" .IMPORT DataA_Room_Core_sTileset +.IMPORT DataA_Text1_CoreBossGrontaDying_Part1_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaDying_Part2_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaDying_Part3_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaGive_Part1_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaGive_Part2_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaIntro_Demand_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaIntro_HandItOver_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaIntro_Part1_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaIntro_Part2_u8_arr +.IMPORT DataA_Text1_CoreBossGrontaIntro_PreparedToFight_u8_arr +.IMPORT DataA_Text1_CoreBossScreen_Intro_u8_arr +.IMPORT DataA_Text1_CoreBossScreen_Reactivate_u8_arr +.IMPORT DataA_Text1_CoreBossScreen_SelfDestruct_u8_arr .IMPORT FuncA_Machine_BlasterTick .IMPORT FuncA_Machine_BlasterTryAct .IMPORT FuncA_Machine_BlasterWriteRegM @@ -2120,84 +2133,3 @@ _SelfDestructCutscene_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_CoreBossGrontaIntro_Part1_u8_arr - .byte "Ahhhh...here you are,$" - .byte "little human. You have$" - .byte "the remote, don't you?#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaIntro_Part2_u8_arr - .byte "The remote that will$" - .byte "determine whether it$" - .byte "will be orcs or humans$" - .byte "that rule this place.#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaIntro_Demand_u8_arr - .byte "I demand that you give$" - .byte "it to me!%" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaIntro_HandItOver_u8_arr - .byte "You're just going to$" - .byte "hand it over, then?%" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaIntro_PreparedToFight_u8_arr - .byte "Oh ho! Then are you$" - .byte "prepared to fight me?%" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaGive_Part1_u8_arr - .byte "Bwahahaha! What a$" - .byte "coward!#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaGive_Part2_u8_arr - .byte "Now we orcs shall take$" - .byte "our rightful place as$" - .byte "masters of this world!#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaDying_Part1_u8_arr - .byte "Argh...defeated by a$" - .byte "child!? Technology$" - .byte "gives you so much$" - .byte "power...#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaDying_Part2_u8_arr - .byte "But human civilization$" - .byte "will just fail again!$" - .byte "You'd be better off$" - .byte "with orcs in charge...#" -.ENDPROC - -.PROC DataA_Text1_CoreBossGrontaDying_Part3_u8_arr - .byte "Maybe...after you've$" - .byte "destroyed yourselves$" - .byte "a second time...we'll$" - .byte "get our chance...#" -.ENDPROC - -.PROC DataA_Text1_CoreBossScreen_Intro_u8_arr - .byte "B-REMOTE RECOGNIZED.$" - .byte "CORE IS ONLINE AND$" - .byte "AWAITING COMMANDS.$" - .byte ">>>#" -.ENDPROC - -.PROC DataA_Text1_CoreBossScreen_Reactivate_u8_arr - .byte "REACTIVATE COMPLEX?$" - .byte ">>>%" -.ENDPROC - -.PROC DataA_Text1_CoreBossScreen_SelfDestruct_u8_arr - .byte "BEGIN SELF-DESTRUCT?$" - .byte ">>>%" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/core_flower.asm b/src/rooms/core_flower.asm index 3bdf40b0..1e144bf4 100644 --- a/src/rooms/core_flower.asm +++ b/src/rooms/core_flower.asm @@ -18,10 +18,8 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/flower.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -146,32 +144,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome31_sDialog -.PROC DataA_Dialog_PaperJerome31_sDialog - dlg_Text Paper, DataA_Text3_PaperJerome31_Page1_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome31_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_PaperJerome31_Page1_u8_arr - .byte "Day 31: Despite how we$" - .byte "chose to use all our$" - .byte "technology, it needn't$" - .byte "have gone that way.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome31_Page2_u8_arr - .byte "The complex core and$" - .byte "all these machines$" - .byte "could one day be put$" - .byte "to a different use.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/core_lock.asm b/src/rooms/core_lock.asm index c739b3c7..dd337fdc 100644 --- a/src/rooms/core_lock.asm +++ b/src/rooms/core_lock.asm @@ -35,6 +35,8 @@ .INCLUDE "../sample.inc" .IMPORT DataA_Room_Core_sTileset +.IMPORT DataA_Text1_CoreLockBreakerShadow_Part1_u8_arr +.IMPORT DataA_Text1_CoreLockBreakerShadow_Part2_u8_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_LiftTick .IMPORT FuncA_Machine_LiftTryMove @@ -398,13 +400,6 @@ _ApplyGrontaGravity: .SEGMENT "PRGA_Dialog" -.EXPORT DataA_Dialog_PaperJerome23_sDialog -.PROC DataA_Dialog_PaperJerome23_sDialog - dlg_Text Paper, DataA_Text1_PaperJerome23_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome23_Page2_u8_arr - dlg_Done -.ENDPROC - .EXPORT DataA_Dialog_CoreLockBreakerShadow_sDialog .PROC DataA_Dialog_CoreLockBreakerShadow_sDialog dlg_Text OrcGrontaShout, DataA_Text1_CoreLockBreakerShadow_Part1_u8_arr @@ -413,31 +408,3 @@ _ApplyGrontaGravity: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperJerome23_Page1_u8_arr - .byte "Day 23: But human$" - .byte "nature was still$" - .byte "there. The mermaids$" - .byte "proved this, I think.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome23_Page2_u8_arr - .byte "The orcs, more so.#" -.ENDPROC - -.PROC DataA_Text1_CoreLockBreakerShadow_Part1_u8_arr - .byte "At last! The way to$" - .byte "the core has been$" - .byte "opened!#" -.ENDPROC - -.PROC DataA_Text1_CoreLockBreakerShadow_Part2_u8_arr - .byte "The humans have had$" - .byte "their chance with this$" - .byte "technology. Now it's$" - .byte "OUR turn.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/core_south.asm b/src/rooms/core_south.asm index 69c82823..c3fee18f 100644 --- a/src/rooms/core_south.asm +++ b/src/rooms/core_south.asm @@ -31,6 +31,10 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Core_sTileset +.IMPORT DataA_Text0_CoreSouthCorra_AlreadyHelped_u8_arr +.IMPORT DataA_Text0_CoreSouthCorra_HelloAgain1_u8_arr +.IMPORT DataA_Text0_CoreSouthCorra_HelloAgain2_u8_arr +.IMPORT DataA_Text0_CoreSouthCorra_HelloAgain3_u8_arr .IMPORT FuncA_Objects_Draw1x1Shape .IMPORT FuncA_Objects_DrawCratePlatform .IMPORT FuncA_Objects_MoveShapeDownByA @@ -481,42 +485,13 @@ _AnimateSwimmingUpFunc: .PROC DataA_Dialog_CoreSouthCorra_sDialog dlg_IfSet CoreSouthCorraHelped, _AlreadyHelped_sDialog _HelloAgain_sDialog: - dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra1_HelloAgain1_u8_arr - dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra1_HelloAgain2_u8_arr - dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra1_HelloAgain3_u8_arr + dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra_HelloAgain1_u8_arr + dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra_HelloAgain2_u8_arr + dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra_HelloAgain3_u8_arr dlg_Cutscene eCutscene::CoreSouthCorraHelping _AlreadyHelped_sDialog: - dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra2_u8_arr + dlg_Text MermaidCorra, DataA_Text0_CoreSouthCorra_AlreadyHelped_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_CoreSouthCorra1_HelloAgain1_u8_arr - .byte "Hello again! I heard$" - .byte "that you were going to$" - .byte "try to rescue your$" - .byte "friends from the orcs.#" -.ENDPROC - -.PROC DataA_Text0_CoreSouthCorra1_HelloAgain2_u8_arr - .byte "I've never seen ANY$" - .byte "place like this. Who$" - .byte "could have built$" - .byte "something like this?#" -.ENDPROC - -.PROC DataA_Text0_CoreSouthCorra1_HelloAgain3_u8_arr - .byte "Are you going to climb$" - .byte "up? Let me see if I$" - .byte "can help you...#" -.ENDPROC - -.PROC DataA_Text0_CoreSouthCorra2_u8_arr - .byte "Good luck! And be$" - .byte "careful!#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/crypt_center.asm b/src/rooms/crypt_center.asm index 64a8fac0..91554969 100644 --- a/src/rooms/crypt_center.asm +++ b/src/rooms/crypt_center.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -121,39 +119,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome08_sDialog -.PROC DataA_Dialog_PaperJerome08_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome08_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome08_Page2_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome08_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome08_Page1_u8_arr - .byte "Day 8: The mermaids$" - .byte "seek utopia. They say$" - .byte "they've rid themselves$" - .byte "of hate and violence.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome08_Page2_u8_arr - .byte "Of violence? I admit$" - .byte "that they seem to have$" - .byte "succeeded where humans$" - .byte "have always failed.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome08_Page3_u8_arr - .byte "But of hate? Of pride?$" - .byte "They have only deluded$" - .byte "themselves.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/crypt_escape.asm b/src/rooms/crypt_escape.asm index dc18662f..06f45cf1 100644 --- a/src/rooms/crypt_escape.asm +++ b/src/rooms/crypt_escape.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -147,32 +145,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome21_sDialog -.PROC DataA_Dialog_PaperJerome21_sDialog - dlg_Text Paper, DataA_Text1_PaperJerome21_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome21_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperJerome21_Page1_u8_arr - .byte "Day 21: When Dr. Alda$" - .byte "created the mermaids,$" - .byte "she was trying to help$" - .byte "solve that problem.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome21_Page2_u8_arr - .byte "But frankly, I think$" - .byte "she only made things$" - .byte "worse. Not that I did$" - .byte "any better, of course.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/crypt_spiral.asm b/src/rooms/crypt_spiral.asm index 4020d24b..dcf69292 100644 --- a/src/rooms/crypt_spiral.asm +++ b/src/rooms/crypt_spiral.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -155,30 +153,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome11_sDialog -.PROC DataA_Dialog_PaperJerome11_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome11_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome11_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome11_Page1_u8_arr - .byte "Day 11: And yet, who$" - .byte "am I to judge? Perhaps$" - .byte "they would do better$" - .byte "than we did.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome11_Page2_u8_arr - .byte "It's not as though the$" - .byte "bar is very high.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/crypt_tomb.asm b/src/rooms/crypt_tomb.asm index 6d8a3aaf..d09d413f 100644 --- a/src/rooms/crypt_tomb.asm +++ b/src/rooms/crypt_tomb.asm @@ -33,6 +33,8 @@ .INCLUDE "../spawn.inc" .IMPORT DataA_Room_Crypt_sTileset +.IMPORT DataA_Text0_CryptTombPlaque_Page1_u8_arr +.IMPORT DataA_Text0_CryptTombPlaque_Page2_u8_arr .IMPORT Data_Empty_sActor_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GetWinchHorzSpeed @@ -666,21 +668,3 @@ _SolidFloorZ_u8_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_CryptTombPlaque_Page1_u8_arr - .byte "Here lies Dr. Zoe Alda$" - .byte " 2192-2275$" - .byte "Daughter of humans and$" - .byte "The mother of mermaids#" -.ENDPROC - -.PROC DataA_Text0_CryptTombPlaque_Page2_u8_arr - .byte "May we ever remember$" - .byte " her service,$" - .byte " And never repeat$" - .byte " her mistakes.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_bridge.asm b/src/rooms/factory_bridge.asm index d65e1a0b..83fd0e21 100644 --- a/src/rooms/factory_bridge.asm +++ b/src/rooms/factory_bridge.asm @@ -19,9 +19,7 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/bird.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -119,30 +117,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome07_sDialog -.PROC DataA_Dialog_PaperJerome07_sDialog - dlg_Text Paper, DataA_Text1_PaperJerome07_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome07_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperJerome07_Page1_u8_arr - .byte "Day 7: At least, that$" - .byte "was the idea. Clearly,$" - .byte "it failed.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome07_Page2_u8_arr - .byte "A cautionary tale, if$" - .byte "only there were anyone$" - .byte "left to caution.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_east.asm b/src/rooms/factory_east.asm index d4bba872..fd9c5197 100644 --- a/src/rooms/factory_east.asm +++ b/src/rooms/factory_east.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/lever.inc" @@ -32,6 +31,14 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Factory_sTileset +.IMPORT DataA_Text0_FactoryEastCorra_End_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Intro_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Mid1_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Mid2_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Mid3_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_No_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Question_u8_arr +.IMPORT DataA_Text0_FactoryEastCorra_Yes_u8_arr .IMPORT FuncA_Objects_Draw1x1Shape .IMPORT FuncA_Objects_MoveShapeRightByA .IMPORT FuncA_Objects_MoveShapeRightOneTile @@ -421,57 +428,3 @@ _AlreadyHelped_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_FactoryEastCorra_Intro_u8_arr - .byte "Oh, Anna! Your brother$" - .byte "told me that mermaids$" - .byte "used to be humans.$" - .byte "That we're the same.#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_Question_u8_arr - .byte "But...that can't be$" - .byte "true! Is it?%" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_Yes_u8_arr - .byte "I can't...I can't$" - .byte "believe it...#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_No_u8_arr - .byte "Of course...I knew it$" - .byte "couldn't really be$" - .byte "true...#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_Mid1_u8_arr - .byte "We mermaids are so$" - .byte "different from humans.$" - .byte "We live in peace. We$" - .byte "don't judge others.#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_Mid2_u8_arr - .byte "...Anna, I don't know$" - .byte "what to think. But I$" - .byte "want to help you save$" - .byte "your people.#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_Mid3_u8_arr - .byte "If you're trying to$" - .byte "get into that city$" - .byte "above us, I can help$" - .byte "you climb up.#" -.ENDPROC - -.PROC DataA_Text0_FactoryEastCorra_End_u8_arr - .byte "Good luck, Anna. I$" - .byte "hope that I'll meet$" - .byte "you again someday.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_elevator.asm b/src/rooms/factory_elevator.asm index 60155b2d..02b00bab 100644 --- a/src/rooms/factory_elevator.asm +++ b/src/rooms/factory_elevator.asm @@ -37,6 +37,12 @@ .INCLUDE "elevator.inc" .IMPORT DataA_Room_Factory_sTileset +.IMPORT DataA_Text0_FactoryElevatorBruno_Hi1_u8_arr +.IMPORT DataA_Text0_FactoryElevatorBruno_Hi2_u8_arr +.IMPORT DataA_Text0_FactoryElevatorBruno_Hi3_u8_arr +.IMPORT DataA_Text0_FactoryElevatorBruno_Hi4_u8_arr +.IMPORT DataA_Text0_FactoryElevatorBruno_Hi5_u8_arr +.IMPORT DataA_Text0_FactoryElevatorBruno_Wait_u8_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GenericTryMoveY .IMPORT FuncA_Machine_JetTick @@ -622,7 +628,7 @@ _WriteL: .EXPORT DataA_Dialog_FactoryElevatorBrunoWait_sDialog .PROC DataA_Dialog_FactoryElevatorBrunoWait_sDialog - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Wait_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Wait_u8_arr dlg_Done .ENDPROC @@ -630,55 +636,14 @@ _WriteL: .PROC DataA_Dialog_FactoryElevatorBrunoHi_sDialog dlg_IfSet FactoryElevatorTalkedToBruno, _ALot_sDialog _Whew_sDialog: - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Hi1_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Hi1_u8_arr _ALot_sDialog: - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Hi2_u8_arr - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Hi3_u8_arr - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Hi4_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Hi2_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Hi3_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Hi4_u8_arr dlg_Quest FactoryElevatorTalkedToBruno - dlg_Text ChildBruno, DataA_Text2_FactoryElevatorBruno_Hi5_u8_arr + dlg_Text ChildBruno, DataA_Text0_FactoryElevatorBruno_Hi5_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_FactoryElevatorBruno_Wait_u8_arr - .byte "Hey Anna, wait up!#" -.ENDPROC - -.PROC DataA_Text2_FactoryElevatorBruno_Hi1_u8_arr - .byte "Whew, glad you made it$" - .byte "out of there OK, Anna.$" - .byte "Alex asked me to keep$" - .byte "an eye out for you.#" -.ENDPROC - -.PROC DataA_Text2_FactoryElevatorBruno_Hi2_u8_arr - .byte "A lot's been happening$" - .byte "while you were gone.$" - .byte "Orcs on the move, more$" - .byte "machines turning on...#" -.ENDPROC - -.PROC DataA_Text2_FactoryElevatorBruno_Hi3_u8_arr - .byte "Queen Eirene seems$" - .byte "pretty agitated, but$" - .byte "she's still letting us$" - .byte "stay for now.#" -.ENDPROC - -.PROC DataA_Text2_FactoryElevatorBruno_Hi4_u8_arr - .byte "And, uh...Alex found$" - .byte "something weird. He$" - .byte "wanted you to meet him$" - .byte "when you got back.#" -.ENDPROC - -.PROC DataA_Text2_FactoryElevatorBruno_Hi5_u8_arr - .byte "I'll mark it on your$" - .byte "map.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_upper.asm b/src/rooms/factory_upper.asm index 398853ba..87be87b2 100644 --- a/src/rooms/factory_upper.asm +++ b/src/rooms/factory_upper.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/rotor.inc" @@ -285,39 +284,3 @@ _BottomSmallWheel: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual5_sDialog -.PROC DataA_Dialog_PaperManual5_sDialog - dlg_Text Paper, DataA_Text1_PaperManual5_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperManual5_Page2_u8_arr - dlg_Text Paper, DataA_Text1_PaperManual5_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperManual5_Page1_u8_arr - .byte "CPU FIELD MANUAL p.5:$" - .byte "Common register names:$" - .byte " F:flag D:distance$" - .byte " J:index K:key/lock#" -.ENDPROC - -.PROC DataA_Text1_PaperManual5_Page2_u8_arr - .byte "L/R:lever M:mirror$" - .byte " P:power S:sensor$" - .byte " T:turn U:upper$" - .byte " V:valve W:weight#" -.ENDPROC - -.PROC DataA_Text1_PaperManual5_Page3_u8_arr - .byte " X:horzizontal offset$" - .byte " Y:vertical ascent$" - .byte " Z:vertical descent#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_vault.asm b/src/rooms/factory_vault.asm index 7a845010..f2aa2ce3 100644 --- a/src/rooms/factory_vault.asm +++ b/src/rooms/factory_vault.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/child.inc" .INCLUDE "../avatar.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/dialog.inc" @@ -32,6 +31,20 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Factory_sTileset +.IMPORT DataA_Text0_FactoryVaultAlex1_Part1_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex1_Part2_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex2_Part1_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex2_Part2_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex3_Part1_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex3_Part2_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex3_Part3_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex3_Part4_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex4_Part1_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex4_Part2_u8_arr +.IMPORT DataA_Text0_FactoryVaultAlex4_Part3_u8_arr +.IMPORT DataA_Text0_FactoryVaultScreen_Page1_u8_arr +.IMPORT DataA_Text0_FactoryVaultScreen_Page2_u8_arr +.IMPORT DataA_Text0_FactoryVaultScreen_Page3_u8_arr .IMPORT Func_Noop .IMPORT Func_SetFlag .IMPORT Ppu_ChrObjVillage @@ -219,32 +232,32 @@ _SetFlag: .PROC DataA_Dialog_FactoryVaultAlex1_sDialog dlg_IfSet FactoryVaultTalkedToAlex, _CityGoal_sDialog _LookAtThisPlace_sDialog: - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex1_Part1_u8_arr - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex1_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex1_Part1_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex1_Part2_u8_arr dlg_Cutscene eCutscene::FactoryVaultLookAtTank _CityGoal_sDialog: - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex4_Part1_u8_arr - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex4_Part2_u8_arr - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex4_Part3_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex4_Part1_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex4_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex4_Part3_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_FactoryVaultAlex2_sDialog .PROC DataA_Dialog_FactoryVaultAlex2_sDialog - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex2_Part1_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex2_Part1_u8_arr dlg_Call FuncA_Dialog_FactoryVault_AlexStand - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex2_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex2_Part2_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_FactoryVaultAlex3_sDialog .PROC DataA_Dialog_FactoryVaultAlex3_sDialog - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex3_Part1_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex3_Part1_u8_arr dlg_Call FuncA_Dialog_FactoryVault_AlexStand - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex3_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex3_Part2_u8_arr dlg_Call _LookLeft - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex3_Part3_u8_arr - dlg_Text ChildAlex, DataA_Text2_FactoryVaultAlex3_Part4_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex3_Part3_u8_arr + dlg_Text ChildAlex, DataA_Text0_FactoryVaultAlex3_Part4_u8_arr dlg_Done _LookLeft: lda #bObj::FlipH @@ -260,106 +273,10 @@ _LookLeft: .EXPORT DataA_Dialog_FactoryVaultScreen_sDialog .PROC DataA_Dialog_FactoryVaultScreen_sDialog - dlg_Text Screen, DataA_Text2_FactoryVaultScreen_Page1_u8_arr - dlg_Text Screen, DataA_Text2_FactoryVaultScreen_Page2_u8_arr - dlg_Text Screen, DataA_Text2_FactoryVaultScreen_Page3_u8_arr + dlg_Text Screen, DataA_Text0_FactoryVaultScreen_Page1_u8_arr + dlg_Text Screen, DataA_Text0_FactoryVaultScreen_Page2_u8_arr + dlg_Text Screen, DataA_Text0_FactoryVaultScreen_Page3_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_FactoryVaultAlex1_Part1_u8_arr - .byte "Anna, you're back!$" - .byte "Would you look at this$" - .byte "place? It opened up$" - .byte "while you were gone.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex1_Part2_u8_arr - .byte "I think we finally$" - .byte "found what the ancient$" - .byte "humans were building$" - .byte "in this factory.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex2_Part1_u8_arr - .byte "Hmm, it's got a label.$" - .byte "Let's see...$" - .byte "`Human Mutation Tank$" - .byte " Serial No. 94209382'#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex2_Part2_u8_arr - .byte "Human...mutation?#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex3_Part1_u8_arr - .byte "Anna...remember how$" - .byte "you found out that the$" - .byte "first mermaids were$" - .byte "created by humans?#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex3_Part2_u8_arr - .byte "If I'm understanding$" - .byte "this right...it looks$" - .byte "like those mermaids$" - .byte "were made FROM humans.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex3_Part3_u8_arr - .byte "This was all centuries$" - .byte "ago. And now we're two$" - .byte "different peoples. But$" - .byte "why do any of that?#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex3_Part4_u8_arr - .byte "They had practically$" - .byte "unlimited technology$" - .byte "and knowledge. So why$" - .byte "this? I don't get it.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex4_Part1_u8_arr - .byte "Well, if you got the$" - .byte "pass into the sewers$" - .byte "opened up, then the$" - .byte "city is our next goal.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex4_Part2_u8_arr - .byte "The orcs are already$" - .byte "there, looking for$" - .byte "something. I'm not$" - .byte "exactly sure what.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultAlex4_Part3_u8_arr - .byte "Whatever it is, we've$" - .byte "got to find it first!#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultScreen_Page1_u8_arr - .byte "ERROR: Gene mutation$" - .byte "tank production line$" - .byte "has been stalled.#" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultScreen_Page2_u8_arr - .byte "Current batch: Q6382A$" - .byte "Designated for:$" - .byte " Volunteer group 922$" - .byte " #" -.ENDPROC - -.PROC DataA_Text2_FactoryVaultScreen_Page3_u8_arr - .byte "Due date: 2245 Feb 21$" - .byte "Overdue by: 495 years$" - .byte "Report to supervisor$" - .byte "for instructions.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/factory_west.asm b/src/rooms/factory_west.asm index 3eeeb9d5..23900b7e 100644 --- a/src/rooms/factory_west.asm +++ b/src/rooms/factory_west.asm @@ -258,30 +258,3 @@ _ReadZ: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome18_sDialog -.PROC DataA_Dialog_PaperJerome18_sDialog - dlg_Text Paper, DataA_Text3_PaperJerome18_Page1_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome18_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_PaperJerome18_Page1_u8_arr - .byte "Day 18: We developed$" - .byte "artificial minds so$" - .byte "smart, they could have$" - .byte "ruled us. Enslaved us.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome18_Page2_u8_arr - .byte "But it turned out that$" - .byte "they didn't want to.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_crossroad.asm b/src/rooms/garden_crossroad.asm index fad1c678..60336bff 100644 --- a/src/rooms/garden_crossroad.asm +++ b/src/rooms/garden_crossroad.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/grub.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/lift.inc" @@ -289,31 +288,3 @@ _ReadL: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual3_sDialog -.PROC DataA_Dialog_PaperManual3_sDialog - dlg_Text Paper, DataA_Text2_PaperManual3_Page1_u8_arr - dlg_Text Paper, DataA_Text2_PaperManual3_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_PaperManual3_Page1_u8_arr - .byte "CPU FIELD MANUAL p.3:$" - .byte "A program loops until$" - .byte "an END is reached or$" - .byte "an error occurs.#" -.ENDPROC - -.PROC DataA_Text2_PaperManual3_Page2_u8_arr - .byte "An error occurs if a$" - .byte "machine tries to MOVE$" - .byte "or ACT but cannot.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_east.asm b/src/rooms/garden_east.asm index 74249039..3173177b 100644 --- a/src/rooms/garden_east.asm +++ b/src/rooms/garden_east.asm @@ -35,6 +35,11 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Garden_sTileset +.IMPORT DataA_Text0_GardenEastCorra_MarkMap_u8_arr +.IMPORT DataA_Text0_GardenEastCorra_MeetQueen_u8_arr +.IMPORT DataA_Text0_GardenEastCorra_No_u8_arr +.IMPORT DataA_Text0_GardenEastCorra_Question_u8_arr +.IMPORT DataA_Text0_GardenEastCorra_Yes_u8_arr .IMPORT FuncA_Machine_BridgeTick .IMPORT FuncA_Machine_BridgeTryMove .IMPORT FuncA_Machine_CannonTick @@ -477,35 +482,3 @@ _Later_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_GardenEastCorra_Question_u8_arr - .byte "Are you...a human?$" - .byte "A real human girl?%" -.ENDPROC - -.PROC DataA_Text0_GardenEastCorra_No_u8_arr - .byte "Ha! You can't fool me.#" -.ENDPROC - -.PROC DataA_Text0_GardenEastCorra_Yes_u8_arr - .byte "But...humans aren't$" - .byte "supposed to be down$" - .byte "here! I've never even$" - .byte "met one before.#" -.ENDPROC - -.PROC DataA_Text0_GardenEastCorra_MeetQueen_u8_arr - .byte "You should meet with$" - .byte "our queen. She will$" - .byte "know what to do with$" - .byte "you.#" -.ENDPROC - -.PROC DataA_Text0_GardenEastCorra_MarkMap_u8_arr - .byte "I'll mark her hut on$" - .byte "your map.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_flower.asm b/src/rooms/garden_flower.asm index 21c36001..aee215c0 100644 --- a/src/rooms/garden_flower.asm +++ b/src/rooms/garden_flower.asm @@ -18,10 +18,8 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/flower.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -127,32 +125,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome14_sDialog -.PROC DataA_Dialog_PaperJerome14_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome14_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome14_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome14_Page1_u8_arr - .byte "Day 14: It saddens me$" - .byte "that we couldn't build$" - .byte "a society as robust as$" - .byte "our technology.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome14_Page2_u8_arr - .byte "We had the knowledge,$" - .byte "but not the wisdom$" - .byte "necessary. Nor the$" - .byte "humility we needed.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_hallway.asm b/src/rooms/garden_hallway.asm index cdb531f9..0e03c334 100644 --- a/src/rooms/garden_hallway.asm +++ b/src/rooms/garden_hallway.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../macros.inc" @@ -248,31 +247,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome12_sDialog -.PROC DataA_Dialog_PaperJerome12_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome12_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome12_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome12_Page1_u8_arr - .byte "Day 12: So where do I$" - .byte "even start? We were a$" - .byte "great civilization$" - .byte "once, before the orcs.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome12_Page2_u8_arr - .byte "But we were already$" - .byte "crumbling long before$" - .byte "they attacked.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_landing.asm b/src/rooms/garden_landing.asm index ce5fd301..f4248070 100644 --- a/src/rooms/garden_landing.asm +++ b/src/rooms/garden_landing.asm @@ -18,10 +18,8 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../irq.inc" .INCLUDE "../macros.inc" @@ -283,34 +281,6 @@ _TeleportUp: ;;;=========================================================================;;; -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome13_sDialog -.PROC DataA_Dialog_PaperJerome13_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome13_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome13_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome13_Page1_u8_arr - .byte "Day 13: And now, there$" - .byte "is nothing left of us$" - .byte "but our machines.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome13_Page2_u8_arr - .byte "I wonder for how long$" - .byte "those will keep on$" - .byte "working. A long time.$" - .byte "Maybe forever.#" -.ENDPROC - -;;;=========================================================================;;; - .SEGMENT "PRGE_Irq" ;;; HBlank IRQ handler function for the GardenLanding room when falling. Sets diff --git a/src/rooms/garden_shaft.asm b/src/rooms/garden_shaft.asm index 4902d015..cbc90411 100644 --- a/src/rooms/garden_shaft.asm +++ b/src/rooms/garden_shaft.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/adult.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/bridge.inc" @@ -296,32 +295,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual6_sDialog -.PROC DataA_Dialog_PaperManual6_sDialog - dlg_Text Paper, DataA_Text0_PaperManual6_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperManual6_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperManual6_Page1_u8_arr - .byte "CPU FIELD MANUAL p.6:$" - .byte "It can be useful to$" - .byte "compare one register$" - .byte "directly to another.#" -.ENDPROC - -.PROC DataA_Text0_PaperManual6_Page2_u8_arr - .byte "For example$" - .byte " :IF Y>L$" - .byte " :MOVE ", kTileIdBgArrowDown, "$" - .byte "or the reverse.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/garden_shrine.asm b/src/rooms/garden_shrine.asm index 978c1c0a..b9003928 100644 --- a/src/rooms/garden_shrine.asm +++ b/src/rooms/garden_shrine.asm @@ -31,6 +31,15 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Garden_sTileset +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part1_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part2_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part3_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part4_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part5_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part6_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine1_Part7_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine2_Part1_u8_arr +.IMPORT DataA_Text0_GardenShrineBreakerMine2_Part2_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Func_PlaySfxExplodeBig @@ -189,86 +198,22 @@ _Passages_sPassage_arr: .EXPORT DataA_Dialog_GardenShrineBreakerMine1_sDialog .PROC DataA_Dialog_GardenShrineBreakerMine1_sDialog .assert kTileIdBgPortraitEireneFirst = kTileIdBgPortraitGrontaFirst, error - dlg_Text MermaidEirene, DataA_Text2_GardenShrineBreakerMine1_Part1_u8_arr - dlg_Text OrcGronta, DataA_Text2_GardenShrineBreakerMine1_Part2_u8_arr - dlg_Text OrcGronta, DataA_Text2_GardenShrineBreakerMine1_Part3_u8_arr - dlg_Text MermaidEirene, DataA_Text2_GardenShrineBreakerMine1_Part4_u8_arr - dlg_Text MermaidEirene, DataA_Text2_GardenShrineBreakerMine1_Part5_u8_arr - dlg_Text OrcGronta, DataA_Text2_GardenShrineBreakerMine1_Part6_u8_arr - dlg_Text OrcGronta, DataA_Text2_GardenShrineBreakerMine1_Part7_u8_arr + dlg_Text MermaidEirene, DataA_Text0_GardenShrineBreakerMine1_Part1_u8_arr + dlg_Text OrcGronta, DataA_Text0_GardenShrineBreakerMine1_Part2_u8_arr + dlg_Text OrcGronta, DataA_Text0_GardenShrineBreakerMine1_Part3_u8_arr + dlg_Text MermaidEirene, DataA_Text0_GardenShrineBreakerMine1_Part4_u8_arr + dlg_Text MermaidEirene, DataA_Text0_GardenShrineBreakerMine1_Part5_u8_arr + dlg_Text OrcGronta, DataA_Text0_GardenShrineBreakerMine1_Part6_u8_arr + dlg_Text OrcGronta, DataA_Text0_GardenShrineBreakerMine1_Part7_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_GardenShrineBreakerMine2_sDialog .PROC DataA_Dialog_GardenShrineBreakerMine2_sDialog .assert kTileIdBgPortraitEireneFirst = kTileIdBgPortraitGrontaFirst, error - dlg_Text MermaidEirene, DataA_Text2_GardenShrineBreakerMine2_Part1_u8_arr - dlg_Text OrcGrontaShout, DataA_Text2_GardenShrineBreakerMine2_Part2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_GardenShrineBreakerMine2_Part1_u8_arr + dlg_Text OrcGrontaShout, DataA_Text0_GardenShrineBreakerMine2_Part2_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part1_u8_arr - .byte "If you wish to parley,$" - .byte "speak quickly. You are$" - .byte "not welcome in our$" - .byte "vale, orc.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part2_u8_arr - .byte "Ha! Nor are humans,$" - .byte "and yet you harbor$" - .byte "them even now.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part3_u8_arr - .byte "They are your enemies$" - .byte "as much as we. Maybe$" - .byte "more so. So why do you$" - .byte "protect them from us?#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part4_u8_arr - .byte "I do not consider the$" - .byte "humans enemies, merely$" - .byte "dangerous fools. Much$" - .byte "like you.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part5_u8_arr - .byte "I admit, I had hoped$" - .byte "that they might listen$" - .byte "to reason.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part6_u8_arr - .byte "You act all wise, fish$" - .byte "woman, but unlike us,$" - .byte "you have no vision and$" - .byte "no will.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine1_Part7_u8_arr - .byte "The humans failed. You$" - .byte "mermaids are cowards.$" - .byte "So it falls to orcs to$" - .byte "lead the way forward.#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine2_Part1_u8_arr - .byte "Oh? And will you$" - .byte "destroy yourselves, as$" - .byte "the humans did?#" -.ENDPROC - -.PROC DataA_Text2_GardenShrineBreakerMine2_Part2_u8_arr - .byte "Better death than to$" - .byte "rot down here, as you$" - .byte "have apparently chosen$" - .byte "to do!#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/lava_station.asm b/src/rooms/lava_station.asm index 44ac6d47..cce14de9 100644 --- a/src/rooms/lava_station.asm +++ b/src/rooms/lava_station.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/boiler.inc" @@ -240,32 +239,3 @@ _ValvePipePlatformIndex_u8_arr4: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual4_sDialog -.PROC DataA_Dialog_PaperManual4_sDialog - dlg_Text Paper, DataA_Text0_PaperManual4_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperManual4_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperManual4_Page1_u8_arr - .byte "CPU FIELD MANUAL p.4:$" - .byte "Every machine has an$" - .byte "`A' register that you$" - .byte "can COPY values into.#" -.ENDPROC - -.PROC DataA_Text0_PaperManual4_Page2_u8_arr - .byte "Unlike other registers$" - .byte "it does nothing on its$" - .byte "own, but it can store$" - .byte "a value for later.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/lava_tunnel.asm b/src/rooms/lava_tunnel.asm index c6c395d4..2660fa42 100644 --- a/src/rooms/lava_tunnel.asm +++ b/src/rooms/lava_tunnel.asm @@ -17,9 +17,7 @@ ;;; with Annalog. If not, see . ;;; ;;;=========================================================================;;; -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -122,40 +120,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome27_sDialog -.PROC DataA_Dialog_PaperJerome27_sDialog - dlg_Text Paper, DataA_Text3_PaperJerome27_Page1_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome27_Page2_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome27_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_PaperJerome27_Page1_u8_arr - .byte "Day 27: By 2250 things$" - .byte "had settled down a$" - .byte "bit, but the mistrust$" - .byte "never really ended.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome27_Page2_u8_arr - .byte "We built the Peace$" - .byte "Temple together with$" - .byte "the mermaids, but it$" - .byte "was a feeble gesture.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome27_Page3_u8_arr - .byte "The orcs continued to$" - .byte "seethe. The mermaids$" - .byte "soon grew disgusted$" - .byte "with us both.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/lava_vent.asm b/src/rooms/lava_vent.asm index f3ecd7f5..7f9d4292 100644 --- a/src/rooms/lava_vent.asm +++ b/src/rooms/lava_vent.asm @@ -32,6 +32,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Lava_sTileset +.IMPORT DataA_Text0_LavaVentSign_u8_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_LiftTick .IMPORT FuncA_Machine_LiftTryMove @@ -213,18 +214,8 @@ _Passages_sPassage_arr: .EXPORT DataA_Dialog_LavaVentSign_sDialog .PROC DataA_Dialog_LavaVentSign_sDialog - dlg_Text Sign, DataA_Text2_LavaVentSign_u8_arr + dlg_Text Sign, DataA_Text0_LavaVentSign_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_LavaVentSign_u8_arr - .byte "Salt Mines ", kTileIdBgArrowRight, "$" - .byte "$" - .byte kTileIdBgArrowDown, " Geothermal Station#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/lava_west.asm b/src/rooms/lava_west.asm index 0e865349..de7b16c0 100644 --- a/src/rooms/lava_west.asm +++ b/src/rooms/lava_west.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/lavaball.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/boiler.inc" @@ -398,24 +397,3 @@ _ValvePipePlatformIndex_u8_arr4: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome10_sDialog -.PROC DataA_Dialog_PaperJerome10_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome10_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome10_u8_arr - .byte "Day 10: The orcs would$" - .byte "rule in our place, if$" - .byte "we let them. I doubt$" - .byte "that would go well.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_entry.asm b/src/rooms/mermaid_entry.asm index 53978a09..10b8b524 100644 --- a/src/rooms/mermaid_entry.asm +++ b/src/rooms/mermaid_entry.asm @@ -18,7 +18,6 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" @@ -28,6 +27,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Mermaid_sTileset +.IMPORT DataA_Text0_MermaidEntrySign_u8_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjSewer @@ -153,13 +153,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_MermaidEntrySign_u8_arr - .byte kTileIdBgArrowLeft, " Hanging Gardens$" - .byte "$" - .byte "Mermaid Village ", kTileIdBgArrowRight, "#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_hut1.asm b/src/rooms/mermaid_hut1.asm index ad0984d6..31a1bd48 100644 --- a/src/rooms/mermaid_hut1.asm +++ b/src/rooms/mermaid_hut1.asm @@ -34,6 +34,39 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Hut_sTileset +.IMPORT DataA_Text0_MermaidHut1AlexPetition_Part1_u8_arr +.IMPORT DataA_Text0_MermaidHut1AlexPetition_Part2_u8_arr +.IMPORT DataA_Text0_MermaidHut1AlexPetition_Part3_u8_arr +.IMPORT DataA_Text0_MermaidHut1AlexPetition_Part4_u8_arr +.IMPORT DataA_Text0_MermaidHut1AlexPetition_Part5_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part1_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part2_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part3_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part4_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part5_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part6_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerCrypt_Part7_u8_arr +.IMPORT DataA_Text0_MermaidHut1BreakerGarden_u8_arr +.IMPORT DataA_Text0_MermaidHut1Guard_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_FindYourFriends_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_FirstMeeting1_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_FirstMeeting2_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_FirstMeeting3_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_FirstMeeting4_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_GardenBossDead1_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_GardenBossDead2_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_GrantAsylum_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_HelpFarmers_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_KidsRescued1_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_KidsRescued2_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_OtherRuins_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleBossDead1_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleBossDead2_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleBossDead3_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleBossDead4_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleBossDead5_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleEntry_u8_arr +.IMPORT DataA_Text0_MermaidHut1Queen_TempleProblem_u8_arr .IMPORT Func_Noop .IMPORT Func_PlaySfxExplodeBig .IMPORT Func_SetFlag @@ -298,7 +331,7 @@ _RemoveAlex: .EXPORT DataA_Dialog_MermaidHut1Guard_sDialog .PROC DataA_Dialog_MermaidHut1Guard_sDialog - dlg_Text AdultMan, DataA_Text2_MermaidHut1Guard_u8_arr + dlg_Text AdultMan, DataA_Text0_MermaidHut1Guard_u8_arr dlg_Done .ENDPROC @@ -356,300 +389,73 @@ _Quest3Func: ldya #_OtherRuins_sDialog rts _FirstMeeting_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_FirstMeeting1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_FirstMeeting2_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_FirstMeeting3_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_FirstMeeting4_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_FirstMeeting1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_FirstMeeting2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_FirstMeeting3_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_FirstMeeting4_u8_arr _GrantAsylum_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_GrantAsylum_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_GrantAsylum_u8_arr dlg_Quest MermaidHut1MetQueen - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_HelpFarmers_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_HelpFarmers_u8_arr dlg_Done _GardenBossDead_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_GardenBossDead1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_GardenBossDead2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_GardenBossDead1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_GardenBossDead2_u8_arr _TempleProblem_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleProblem_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleProblem_u8_arr dlg_Quest TempleEntryPermission - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleEntry_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleEntry_u8_arr dlg_Done _TempleBossDead_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleBossDead1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleBossDead2_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleBossDead3_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleBossDead4_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_TempleBossDead5_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleBossDead1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleBossDead2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleBossDead3_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleBossDead4_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_TempleBossDead5_u8_arr _OtherRuins_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_OtherRuins_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_OtherRuins_u8_arr dlg_Quest CoreSouthCorraWaiting - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_FindYourFriends_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_FindYourFriends_u8_arr dlg_Done _KidsRescued_sDialog: - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_KidsRescued1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1Queen_KidsRescued2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_KidsRescued1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1Queen_KidsRescued2_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_MermaidHut1BreakerGarden_sDialog .PROC DataA_Dialog_MermaidHut1BreakerGarden_sDialog - dlg_Text MermaidEireneShout, DataA_Text2_MermaidHut1BreakerGarden_u8_arr + dlg_Text MermaidEireneShout, DataA_Text0_MermaidHut1BreakerGarden_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_MermaidHut1AlexPetition_sDialog .PROC DataA_Dialog_MermaidHut1AlexPetition_sDialog .assert kTileIdBgPortraitAlexFirst = kTileIdBgPortraitEireneFirst, error - dlg_Text ChildAlex, DataA_Text2_MermaidHut1AlexPetition_Part1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1AlexPetition_Part2_u8_arr - dlg_Text ChildAlex, DataA_Text2_MermaidHut1AlexPetition_Part3_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1AlexPetition_Part4_u8_arr - dlg_Text ChildAlex, DataA_Text2_MermaidHut1AlexPetition_Part5_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1AlexPetition_Part1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1AlexPetition_Part2_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1AlexPetition_Part3_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1AlexPetition_Part4_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1AlexPetition_Part5_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_MermaidHut1BreakerCrypt1_sDialog .PROC DataA_Dialog_MermaidHut1BreakerCrypt1_sDialog .assert kTileIdBgPortraitAlexFirst = kTileIdBgPortraitEireneFirst, error - dlg_Text ChildAlex, DataA_Text2_MermaidHut1BreakerCrypt_Part1_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1BreakerCrypt_Part2_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1BreakerCrypt_Part3_u8_arr - dlg_Text ChildAlex, DataA_Text2_MermaidHut1BreakerCrypt_Part4_u8_arr - dlg_Text ChildAlex, DataA_Text2_MermaidHut1BreakerCrypt_Part5_u8_arr - dlg_Text MermaidEirene, DataA_Text2_MermaidHut1BreakerCrypt_Part6_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1BreakerCrypt_Part1_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1BreakerCrypt_Part2_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1BreakerCrypt_Part3_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1BreakerCrypt_Part4_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1BreakerCrypt_Part5_u8_arr + dlg_Text MermaidEirene, DataA_Text0_MermaidHut1BreakerCrypt_Part6_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_MermaidHut1BreakerCrypt2_sDialog .PROC DataA_Dialog_MermaidHut1BreakerCrypt2_sDialog - dlg_Text ChildAlex, DataA_Text2_MermaidHut1BreakerCrypt_Part7_u8_arr + dlg_Text ChildAlex, DataA_Text0_MermaidHut1BreakerCrypt_Part7_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_MermaidHut1Guard_u8_arr - .byte "All hail Queen Eirene!#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_FirstMeeting1_u8_arr - .byte "So, you must be the$" - .byte "human I've heard is$" - .byte "running around.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_FirstMeeting2_u8_arr - .byte "Humans belong on the$" - .byte "surface, not here. So$" - .byte "what are you doing$" - .byte "down here among us?#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_FirstMeeting3_u8_arr - .byte "...I see. So the orcs$" - .byte "attacked, and now you$" - .byte "are a refugee. This$" - .byte "complicates things.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_FirstMeeting4_u8_arr - .byte "I will be honest: I do$" - .byte "not trust humans.$" - .byte "However, I don't care$" - .byte "for the orcs either.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_GrantAsylum_u8_arr - .byte "I will grant you safe$" - .byte "asylum in our village,$" - .byte "on one condition: that$" - .byte "you help us in return.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_HelpFarmers_u8_arr - .byte "Speak with our farmers$" - .byte "in this village. They$" - .byte "have a problem a human$" - .byte "could perhaps solve.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_GardenBossDead1_u8_arr - .byte "I heard you helped our$" - .byte "farmers. And you even$" - .byte "survived. I thank you.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_GardenBossDead2_u8_arr - .byte "Perhaps...perhaps you$" - .byte "could help us with one$" - .byte "more problem.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleProblem_u8_arr - .byte "There's a temple west$" - .byte "of the gardens. It's$" - .byte "very important to us.$" - .byte "At least, it once was.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleEntry_u8_arr - .byte "I'd like you to visit$" - .byte "the temple. The guards$" - .byte "east of my hut can$" - .byte "tell you more.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleBossDead1_u8_arr - .byte "I take it that you've$" - .byte "seen the whole of the$" - .byte "ruined temple? Maybe$" - .byte "now you understand.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleBossDead2_u8_arr - .byte "Our two peoples built$" - .byte "it together, centuries$" - .byte "ago. It was to be a$" - .byte "symbol of peace.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleBossDead3_u8_arr - .byte "But before long, the$" - .byte "humans desecrated it$" - .byte "into a mechanized$" - .byte "fortress instead.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleBossDead4_u8_arr - .byte "Humans are just like$" - .byte "the orcs. Violent and$" - .byte "untrustworthy, despite$" - .byte "our best efforts.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_TempleBossDead5_u8_arr - .byte "But enough. My scouts$" - .byte "tell me there is a way$" - .byte "for you to reach your$" - .byte "fellow villagers.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_OtherRuins_u8_arr - .byte "There are...another$" - .byte "kind of ruins buried$" - .byte "just above our humble$" - .byte "vale. Older ones.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_FindYourFriends_u8_arr - .byte "If you climb upwards$" - .byte "through there, you may$" - .byte "be able to find and$" - .byte "rescue your friends.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_KidsRescued1_u8_arr - .byte "The children from your$" - .byte "village have arrived$" - .byte "safely. I have granted$" - .byte "them asylum for now.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1Queen_KidsRescued2_u8_arr - .byte "You can find them in$" - .byte "the southeastern hut$" - .byte "of this village.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerGarden_u8_arr - .byte "What the...What did$" - .byte "that human girl just$" - .byte "do!?#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1AlexPetition_Part1_u8_arr - .byte "Please, your highness,$" - .byte "I need to know more$" - .byte "about that complex$" - .byte "above here!#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1AlexPetition_Part2_u8_arr - .byte "Knowledge can be a$" - .byte "dangerous thing,$" - .byte "child. Just leave$" - .byte "those ruins alone.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1AlexPetition_Part3_u8_arr - .byte "But that technology$" - .byte "could benefit all of$" - .byte "us! How did all that$" - .byte "end up forgotten?#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1AlexPetition_Part4_u8_arr - .byte "That technology would$" - .byte "destroy you. Just like$" - .byte "before. I will speak$" - .byte "no more of it.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1AlexPetition_Part5_u8_arr - .byte "...fine, then, keep$" - .byte "your secrets. I guess$" - .byte "I'll just have to$" - .byte "figure it out myself.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part1_u8_arr - .byte "Why are you so afraid$" - .byte "of the old technology,$" - .byte "anyway? Why won't you$" - .byte "help us revive it?#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part2_u8_arr - .byte "More technology gives$" - .byte "you more power. And$" - .byte "too much power always,$" - .byte "always corrupts.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part3_u8_arr - .byte "Don't take MY word for$" - .byte "it. Human civilization$" - .byte "collapsed! You can't$" - .byte "be trusted with it.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part4_u8_arr - .byte "So what, we should all$" - .byte "go back to being poor,$" - .byte "and spending winters$" - .byte "trying not to starve?#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part5_u8_arr - .byte "If high civilization$" - .byte "failed last time, we$" - .byte "should learn from it,$" - .byte "and try again!#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part6_u8_arr - .byte "If you had learned$" - .byte "anything, you would$" - .byte "give up on this path.$" - .byte "It's a dead end.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut1BreakerCrypt_Part7_u8_arr - .byte "And if you'd learned$" - .byte "anything about humans,$" - .byte "you'd know that we$" - .byte "NEVER give up.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_hut2.asm b/src/rooms/mermaid_hut2.asm index 0cded15c..fa6ed5dd 100644 --- a/src/rooms/mermaid_hut2.asm +++ b/src/rooms/mermaid_hut2.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" @@ -28,6 +27,10 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Hut_sTileset +.IMPORT DataA_Text1_MermaidHut2Guard_Impressed1_u8_arr +.IMPORT DataA_Text1_MermaidHut2Guard_Impressed2_u8_arr +.IMPORT DataA_Text1_MermaidHut2Guard_WatchOut1_u8_arr +.IMPORT DataA_Text1_MermaidHut2Guard_WatchOut2_u8_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjVillage @@ -114,45 +117,13 @@ _Devices_sDevice_arr: .PROC DataA_Dialog_MermaidHut2Guard_sDialog dlg_IfSet CityCenterEnteredCity, _Impressed_sDialog _WatchOut_sDialog: - dlg_Text AdultMan, DataA_Text2_MermaidHut2Guard_WatchOut1_u8_arr - dlg_Text AdultMan, DataA_Text2_MermaidHut2Guard_WatchOut2_u8_arr + dlg_Text AdultMan, DataA_Text1_MermaidHut2Guard_WatchOut1_u8_arr + dlg_Text AdultMan, DataA_Text1_MermaidHut2Guard_WatchOut2_u8_arr dlg_Done _Impressed_sDialog: - dlg_Text AdultMan, DataA_Text2_MermaidHut2Guard_Impressed1_u8_arr - dlg_Text AdultMan, DataA_Text2_MermaidHut2Guard_Impressed2_u8_arr + dlg_Text AdultMan, DataA_Text1_MermaidHut2Guard_Impressed1_u8_arr + dlg_Text AdultMan, DataA_Text1_MermaidHut2Guard_Impressed2_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_MermaidHut2Guard_WatchOut1_u8_arr - .byte "The queen would never$" - .byte "let the orcs into our$" - .byte "vale, nor could they$" - .byte "best us by force.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut2Guard_WatchOut2_u8_arr - .byte "Still, be wary if you$" - .byte "ever face their war$" - .byte "rhinos. They are not$" - .byte "to be trifled with.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut2Guard_Impressed1_u8_arr - .byte "I heard that the orcs$" - .byte "and their war rhinos$" - .byte "have invaded the old$" - .byte "human ruins.#" -.ENDPROC - -.PROC DataA_Text2_MermaidHut2Guard_Impressed2_u8_arr - .byte "Is it true that you$" - .byte "faced them alone, and$" - .byte "survived? If so, I am$" - .byte "impressed.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_hut3.asm b/src/rooms/mermaid_hut3.asm index 0dae5a70..09baf540 100644 --- a/src/rooms/mermaid_hut3.asm +++ b/src/rooms/mermaid_hut3.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" @@ -29,6 +28,10 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Hut_sTileset +.IMPORT DataA_Text0_MermaidHut3Daphne_Closed_u8_arr +.IMPORT DataA_Text0_MermaidHut3Daphne_Intro_u8_arr +.IMPORT DataA_Text0_MermaidHut3Daphne_Open_u8_arr +.IMPORT DataA_Text0_MermaidHut3Phoebe_u8_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjVillage @@ -148,34 +151,3 @@ _HotSpringClosed_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_MermaidHut3Daphne_Intro_u8_arr - .byte "There's a natural hot$" - .byte "spring just east of$" - .byte "this village.#" -.ENDPROC - -.PROC DataA_Text0_MermaidHut3Daphne_Open_u8_arr - .byte "The water is heated by$" - .byte "magma flows far below.$" - .byte "It's a great place to$" - .byte "relax.#" -.ENDPROC - -.PROC DataA_Text0_MermaidHut3Daphne_Closed_u8_arr - .byte "Unfortunately, all the$" - .byte "water got drained out$" - .byte "somehow. So now we$" - .byte "can't use it.#" -.ENDPROC - -.PROC DataA_Text0_MermaidHut3Phoebe_u8_arr - .byte "You're so lucky that$" - .byte "you get to go on an$" - .byte "adventure. I'm stuck$" - .byte "here at home.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_hut4.asm b/src/rooms/mermaid_hut4.asm index f0e80595..c34c569e 100644 --- a/src/rooms/mermaid_hut4.asm +++ b/src/rooms/mermaid_hut4.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/flower.inc" @@ -31,6 +30,59 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Hut_sTileset +.IMPORT DataA_Text1_MermaidHut4Florist_AllDone_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Brought_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eight1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eight2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eight3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eight4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eleven1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eleven2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eleven3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Eleven4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Five1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Five2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Five3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Five4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Four1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Four2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Four3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Four4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Meet1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Meet2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_NeverMind1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_NeverMind2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Nine1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Nine2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Nine3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Nine4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_One1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_One2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_One3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Seven1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Seven2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Seven3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Seven4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Six1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Six2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Six3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Six4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Ten1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Ten2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Ten3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Ten4_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Three1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Three2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Three3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Twelve1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Twelve2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Twelve3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Two1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Two2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Two3_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Zero1_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Zero2_u8_arr +.IMPORT DataA_Text1_MermaidHut4Florist_Zero3_u8_arr .IMPORT FuncA_Objects_Draw1x1Shape .IMPORT Func_CountDeliveredFlowers .IMPORT Func_DropFlower @@ -353,362 +405,3 @@ _AllDone_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_MermaidHut4Florist_Meet1_u8_arr - .byte "Ah...you must be that$" - .byte "human that I've been$" - .byte "hearing about.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Meet2_u8_arr - .byte "I don't suppose you'd$" - .byte "like to do me a favor?%" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_NeverMind1_u8_arr - .byte "Yes, well, I suppose$" - .byte "you must be very busy,$" - .byte "running around and$" - .byte "causing trouble.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_NeverMind2_u8_arr - .byte "Come back if you ever$" - .byte "change your mind.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Zero1_u8_arr - .byte "As you can see, my$" - .byte "home is looking rather$" - .byte "drab. Could you bring$" - .byte "me a flower?#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Zero2_u8_arr - .byte "If you go east from$" - .byte "this village and then$" - .byte "up a bit, you'll find$" - .byte "the one I want.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Zero3_u8_arr - .byte "It's very delicate.$" - .byte "Don't get hurt and$" - .byte "break it, or you'll$" - .byte "have to get another.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Brought_u8_arr - .byte "Ah, I see you've$" - .byte "brought me a flower!$" - .byte "How kind of you.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_One1_u8_arr - .byte "It does look nice up$" - .byte "there, don't you$" - .byte "think?#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_One2_u8_arr - .byte "Only...it seems lonely$" - .byte "by itself. I suppose$" - .byte "you'll need to find$" - .byte "some more.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_One3_u8_arr - .byte "Not from where you got$" - .byte "this one, of course.$" - .byte "You'll have to look$" - .byte "elsewhere.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Two1_u8_arr - .byte "You may be wondering$" - .byte "why our queen doesn't$" - .byte "trust humans. I assure$" - .byte "you, she has reasons.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Two2_u8_arr - .byte "Truth be told, I don't$" - .byte "trust humans either.$" - .byte "Though your bringing$" - .byte "me flowers does help.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Two3_u8_arr - .byte "Perhaps I could$" - .byte "trouble you to find$" - .byte "another? I would so$" - .byte "appreciate it.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Three1_u8_arr - .byte "Humans and mermaids$" - .byte "used to be close$" - .byte "friends, you know.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Three2_u8_arr - .byte "But humans were never$" - .byte "able to shed their$" - .byte "violent ways, the way$" - .byte "we mermaids have.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Three3_u8_arr - .byte "And not just violence.$" - .byte "Shortsightedness in$" - .byte "general. Which is why$" - .byte "so few humans remain.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Four1_u8_arr - .byte "I suppose there's no$" - .byte "hiding it: by now you$" - .byte "have seen the complex$" - .byte "above our vale.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Four2_u8_arr - .byte "Unlike our temple,$" - .byte "it was built by humans$" - .byte "alone. It predates$" - .byte "even us mermaids.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Four3_u8_arr - .byte "And who knows? If not$" - .byte "for it, perhaps human$" - .byte "civilization could$" - .byte "have survived.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Four4_u8_arr - .byte "Probably not, though.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Five1_u8_arr - .byte "We've noticed you've$" - .byte "been restoring power$" - .byte "to those ancient$" - .byte "circuits, one by one.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Five2_u8_arr - .byte "The queen isn't happy$" - .byte "about it. But we are a$" - .byte "people of peace, and$" - .byte "she promised you aid.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Five3_u8_arr - .byte "If you really want to$" - .byte "doom your people all$" - .byte "over again, I suppose$" - .byte "that's your choice.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Five4_u8_arr - .byte "But woe be upon you if$" - .byte "you bring that down on$" - .byte "us mermaids as well.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Six1_u8_arr - .byte "Did you know there$" - .byte "used to be a human$" - .byte "city near here,$" - .byte "centuries ago?#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Six2_u8_arr - .byte "It was once the center$" - .byte "of everything around$" - .byte "here. A shining beacon$" - .byte "on a hill.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Six3_u8_arr - .byte "The humans reveled in$" - .byte "all that they had$" - .byte "built: civilization,$" - .byte "sophistication.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Six4_u8_arr - .byte "Now it's all forgotten$" - .byte "and forever buried$" - .byte "under the rubble.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Seven1_u8_arr - .byte "...You've been inside$" - .byte "the crypt, haven't$" - .byte "you? Perhaps the only$" - .byte "living soul who has.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Seven2_u8_arr - .byte "We know it's there,$" - .byte "but we don't like$" - .byte "to talk about it. Too$" - .byte "much painful history.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Seven3_u8_arr - .byte "Very few mermaids who$" - .byte "are alive today have$" - .byte "even heard the name of$" - .byte "Zoe Alda.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Seven4_u8_arr - .byte "As for me, suffice to$" - .byte "say I have...mixed$" - .byte "feelings about her$" - .byte "and her work.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eight1_u8_arr - .byte "I'm sure you know by$" - .byte "now why the orcs$" - .byte "attacked your town.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eight2_u8_arr - .byte "They want to claim the$" - .byte "ancient complex here$" - .byte "for themselves. They$" - .byte "think they deserve it.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eight3_u8_arr - .byte "And you poor people$" - .byte "didn't even know you$" - .byte "lived atop such an$" - .byte "attractive nuisance.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eight4_u8_arr - .byte "Like the Pearl Of The$" - .byte "World, you would have$" - .byte "been better off$" - .byte "without it.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Nine1_u8_arr - .byte "One wonders why the$" - .byte "orcs have never tried$" - .byte "to seize the ancient$" - .byte "ruins before now.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Nine2_u8_arr - .byte "Perhaps the orcs of$" - .byte "centuries past simply$" - .byte "didn't want to?#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Nine3_u8_arr - .byte "Unlike the orcs of$" - .byte "today, they remembered$" - .byte "what happened to the$" - .byte "people who built them.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Nine4_u8_arr - .byte "I'm sure over time,$" - .byte "they've forgotten as$" - .byte "much history as you$" - .byte "humans obviously have.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Ten1_u8_arr - .byte "I know you know where$" - .byte "we mermaids came from.$" - .byte "And now, you know that$" - .byte "I know you know.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Ten2_u8_arr - .byte "Most mermaids today$" - .byte "don't, and they would$" - .byte "be ashamed to learn we$" - .byte "came from humans.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Ten3_u8_arr - .byte "I am not ashamed. My$" - .byte "human ancestors who$" - .byte "chose to become$" - .byte "mermaids chose well!#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Ten4_u8_arr - .byte "But the question is,$" - .byte "did Zoe Alda and her$" - .byte "colleagues choose well$" - .byte "for humanity?#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eleven1_u8_arr - .byte "By now I'm sure you've$" - .byte "seen the ruins of the$" - .byte "ancient human city$" - .byte "with your own eyes.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eleven2_u8_arr - .byte "It wasn't destroyed in$" - .byte "the war with the orcs.$" - .byte "Most of the buildings$" - .byte "there still stand!#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eleven3_u8_arr - .byte "No, it simply wasted$" - .byte "away, after human$" - .byte "civilization finished$" - .byte "tearing itself apart.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Eleven4_u8_arr - .byte "The forces were always$" - .byte "there, but it was your$" - .byte "technology that made$" - .byte "the rupture possible.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Twelve1_u8_arr - .byte "And that makes an even$" - .byte "dozen! How lovely. I$" - .byte "do appreciate all your$" - .byte "help, young one.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Twelve2_u8_arr - .byte "In exchange for this$" - .byte "gift of beauty...I'd$" - .byte "like to give you the$" - .byte "gift of music.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_Twelve3_u8_arr - .byte "I'll unlock my cellar.$" - .byte "You may take what you$" - .byte "find there.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut4Florist_AllDone_u8_arr - .byte "Perhaps this gift will$" - .byte "give you a better use$" - .byte "for all those terrible$" - .byte "machines.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_hut5.asm b/src/rooms/mermaid_hut5.asm index 67c7dbe1..3cbed799 100644 --- a/src/rooms/mermaid_hut5.asm +++ b/src/rooms/mermaid_hut5.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/child.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" @@ -29,6 +28,8 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Hut_sTileset +.IMPORT DataA_Text1_MermaidHut5Marie_u8_arr +.IMPORT DataA_Text1_MermaidHut5Nora_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjTown @@ -191,21 +192,3 @@ _Devices_sDevice_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_MermaidHut5Marie_u8_arr - .byte "The mermaid queen is$" - .byte "letting us stay here,$" - .byte "but she doesn't seem$" - .byte "happy about it.#" -.ENDPROC - -.PROC DataA_Text1_MermaidHut5Nora_u8_arr - .byte "Well...if we're stuck$" - .byte "here, I guess I may as$" - .byte "well potty train my$" - .byte "little sister.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_spring.asm b/src/rooms/mermaid_spring.asm index d2f11aed..96496e32 100644 --- a/src/rooms/mermaid_spring.asm +++ b/src/rooms/mermaid_spring.asm @@ -40,6 +40,13 @@ .INCLUDE "../scroll.inc" .IMPORT DataA_Room_Mermaid_sTileset +.IMPORT DataA_Text0_MermaidSpringAlex_Part1_u8_arr +.IMPORT DataA_Text0_MermaidSpringAlex_Part2_u8_arr +.IMPORT DataA_Text0_MermaidSpringAlex_Part3_u8_arr +.IMPORT DataA_Text0_MermaidSpringAlex_Part4_u8_arr +.IMPORT DataA_Text0_MermaidSpringAlex_Part5_u8_arr +.IMPORT DataA_Text0_MermaidSpringSign_Closed_u8_arr +.IMPORT DataA_Text0_MermaidSpringSign_Open_u8_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GenericTryMoveY .IMPORT FuncA_Machine_PumpTick @@ -544,54 +551,3 @@ _Closed_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_MermaidSpringAlex_Part1_u8_arr - .byte "Thanks for coming. I$" - .byte "hate to ask, but...$" - .byte "well, you're the best$" - .byte "with these machines.#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringAlex_Part2_u8_arr - .byte "I'm convinced we'll$" - .byte "find answers in that$" - .byte "city, but every way$" - .byte "in is blocked off.#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringAlex_Part3_u8_arr - .byte "However, I think we$" - .byte "can get there via the$" - .byte "caves, by approaching$" - .byte "from below.#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringAlex_Part4_u8_arr - .byte "The mermaids aren't$" - .byte "helping. But I found$" - .byte "something they had$" - .byte "stashed away...#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringAlex_Part5_u8_arr - .byte "What do you think? I'd$" - .byte "say it's time to start$" - .byte "delving deeper around$" - .byte "here.#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringSign_Open_u8_arr - .byte " - Hot Spring -$" - .byte "Please enjoy a restful$" - .byte "and relaxing soak.#" -.ENDPROC - -.PROC DataA_Text0_MermaidSpringSign_Closed_u8_arr - .byte " - Hot Spring -$" - .byte "Currently closed for$" - .byte "maintenance.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mermaid_village.asm b/src/rooms/mermaid_village.asm index ef2b6616..35ac2eab 100644 --- a/src/rooms/mermaid_village.asm +++ b/src/rooms/mermaid_village.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" .INCLUDE "../actors/child.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" @@ -31,6 +30,28 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Mermaid_sTileset +.IMPORT DataA_Text1_MermaidVillageAlex_Part1_u8_arr +.IMPORT DataA_Text1_MermaidVillageAlex_Part2_u8_arr +.IMPORT DataA_Text1_MermaidVillageAlex_Part3_u8_arr +.IMPORT DataA_Text1_MermaidVillageAlex_Part4_u8_arr +.IMPORT DataA_Text1_MermaidVillageAlex_Part5_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexAtSpring_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexExploring_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexInCity_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexInTemple_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexNearCity_u8_arr +.IMPORT DataA_Text1_MermaidVillageBruno_AlexWithQueen_u8_arr +.IMPORT DataA_Text1_MermaidVillageCorra_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_Farming_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_LookingFor_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_Monster_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_NeedHelp_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_OpenTheWay_u8_arr +.IMPORT DataA_Text1_MermaidVillageFarmer_ThankYou_u8_arr +.IMPORT DataA_Text1_MermaidVillageGuard_Guarding_u8_arr +.IMPORT DataA_Text1_MermaidVillageGuard_Temple1_u8_arr +.IMPORT DataA_Text1_MermaidVillageGuard_Temple2_u8_arr +.IMPORT DataA_Text1_MermaidVillageGuard_Temple3_u8_arr .IMPORT Func_Noop .IMPORT Func_SetFlag .IMPORT Ppu_ChrObjVillage @@ -555,159 +576,3 @@ _AlexExploring_sDialog: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_MermaidVillageAlex_Part1_u8_arr - .byte "Anna! Did you SEE that$" - .byte "place we went through$" - .byte "to get down here? It's$" - .byte "right under our town!#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageAlex_Part2_u8_arr - .byte "It must be where that$" - .byte "metal thing I found is$" - .byte "from! ...And what the$" - .byte "orcs came looking for.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageAlex_Part3_u8_arr - .byte "We need to learn more.$" - .byte "But the queen won't$" - .byte "help! She's all upset$" - .byte "about some temple...#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageAlex_Part4_u8_arr - .byte "Wait...she said humans$" - .byte "put machines in the$" - .byte "temple? Maybe we could$" - .byte "find some clues there.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageAlex_Part5_u8_arr - .byte "I'm going to go check$" - .byte "it out. Meet up with$" - .byte "me there later, OK?$" - .byte "I'll see you there.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageGuard_Guarding_u8_arr - .byte "I am helping to guard$" - .byte "this village. See that$" - .byte "you behave honorably$" - .byte "while you are here.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageGuard_Temple1_u8_arr - .byte "You'll find the temple$" - .byte "entrance just beyond$" - .byte "the northwest end of$" - .byte "the gardens.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageGuard_Temple2_u8_arr - .byte "The queen has already$" - .byte "sent word to the guard$" - .byte "there to allow you to$" - .byte "enter.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageGuard_Temple3_u8_arr - .byte "Just be careful. The$" - .byte "temple is not as safe$" - .byte "a place as it once$" - .byte "was.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_Farming_u8_arr - .byte "I am farming seaweed.$" - .byte "The harvest has not$" - .byte "been good this year,$" - .byte "though.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_NeedHelp_u8_arr - .byte "The queen sent you?$" - .byte "Thank goodness. We$" - .byte "could use your help.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_Monster_u8_arr - .byte "West of our village,$" - .byte "there is a tower in$" - .byte "the gardens. A monster$" - .byte "has taken it over.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_OpenTheWay_u8_arr - .byte "Perhaps one with your$" - .byte "ingenuity could get$" - .byte "rid of it? We'll open$" - .byte "the way up for you.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_ThankYou_u8_arr - .byte "You did it! Thank you$" - .byte "for your help. You$" - .byte "should go see the$" - .byte "queen.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageFarmer_LookingFor_u8_arr - .byte "Are you looking for$" - .byte "Corra? I think she$" - .byte "went exploring in the$" - .byte "caves above our vale.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageCorra_u8_arr - .byte "Oh, hi! I met you back$" - .byte "in the gardens. I'm$" - .byte "Corra, by the way.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexWithQueen_u8_arr - .byte "If you're looking for$" - .byte "Alex, I think he went$" - .byte "to go talk with the$" - .byte "mermaid queen.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexInTemple_u8_arr - .byte "If you're looking for$" - .byte "Alex, I think he's$" - .byte "waiting for you in the$" - .byte "temple.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexNearCity_u8_arr - .byte "If you're looking for$" - .byte "Alex, I think he went$" - .byte "back up to that core$" - .byte "place up above.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexAtSpring_u8_arr - .byte "If you're looking for$" - .byte "Alex, he's waiting for$" - .byte "you at the hot spring,$" - .byte "east of the village.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexInCity_u8_arr - .byte "If you're looking for$" - .byte "Alex, I think he went$" - .byte "up to explore that$" - .byte "ancient human city.#" -.ENDPROC - -.PROC DataA_Text1_MermaidVillageBruno_AlexExploring_u8_arr - .byte "I think Alex went off$" - .byte "exploring somewhere.$" - .byte "Not sure where he is$" - .byte "right now.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/mine_north.asm b/src/rooms/mine_north.asm index 7e5fca20..b0bc8fcd 100644 --- a/src/rooms/mine_north.asm +++ b/src/rooms/mine_north.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/wasp.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/conveyor.inc" @@ -384,39 +383,3 @@ _MotionOffset_i8_arr10: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome09_sDialog -.PROC DataA_Dialog_PaperJerome09_sDialog - dlg_Text Paper, DataA_Text1_PaperJerome09_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome09_Page2_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome09_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperJerome09_Page1_u8_arr - .byte "Day 9: Meanwhile, the$" - .byte "orcs value conviction.$" - .byte "Honor. Valor. All fine$" - .byte "qualities.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome09_Page2_u8_arr - .byte "But I fear they are$" - .byte "fast losing sight of$" - .byte "what they claim their$" - .byte "convictions stand for.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome09_Page3_u8_arr - .byte "And so they, too, are$" - .byte "no better than us$" - .byte "humans.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/prison_cell.asm b/src/rooms/prison_cell.asm index d2e3a944..660f2a1e 100644 --- a/src/rooms/prison_cell.asm +++ b/src/rooms/prison_cell.asm @@ -27,7 +27,6 @@ .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/console.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/launcher.inc" @@ -793,40 +792,6 @@ _ParticleAngle_u8_arr: ;;;=========================================================================;;; -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome36_sDialog -.PROC DataA_Dialog_PaperJerome36_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome36_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome36_Page2_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome36_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome36_Page1_u8_arr - .byte "Day 36: By now there's$" - .byte "probably not much time$" - .byte "left to finish this.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome36_Page2_u8_arr - .byte "I'm going to start$" - .byte "pinning up all these$" - .byte "pages. Maybe someday$" - .byte "someone'll find them.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome36_Page3_u8_arr - .byte "By then, I'm sure I'll$" - .byte "be long gone.#" -.ENDPROC - -;;;=========================================================================;;; - .SEGMENT "PRG8" ;;; Mode to switch PRGC banks and load the PrisonCell room, then start the diff --git a/src/rooms/prison_escape.asm b/src/rooms/prison_escape.asm index eb2cc288..8dbd5b34 100644 --- a/src/rooms/prison_escape.asm +++ b/src/rooms/prison_escape.asm @@ -21,7 +21,6 @@ .INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../macros.inc" @@ -236,32 +235,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual2_sDialog -.PROC DataA_Dialog_PaperManual2_sDialog - dlg_Text Paper, DataA_Text0_PaperManual2_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperManual2_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperManual2_Page1_u8_arr - .byte "CPU FIELD MANUAL p.2:$" - .byte "Programs are saved$" - .byte "automatically when$" - .byte "a console is closed.#" -.ENDPROC - -.PROC DataA_Text0_PaperManual2_Page2_u8_arr - .byte "Progress is also saved$" - .byte "automatically whenever$" - .byte "entering or leaving a$" - .byte "room.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/prison_flower.asm b/src/rooms/prison_flower.asm index 0430a61c..6b0e5409 100644 --- a/src/rooms/prison_flower.asm +++ b/src/rooms/prison_flower.asm @@ -18,7 +18,6 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../devices/flower.inc" @@ -30,6 +29,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Prison_sTileset +.IMPORT DataA_Text0_PrisonFlowerSign_u8_arr .IMPORT FuncA_Room_RemoveFlowerDeviceIfCarriedOrDelivered .IMPORT FuncA_Room_RespawnFlowerDeviceIfDropped .IMPORT Func_Noop @@ -131,13 +131,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PrisonFlowerSign_u8_arr - .byte "Surface Access ", kTileIdBgArrowRight, "$" - .byte "$" - .byte kTileIdBgArrowLeft, " Holding Cells#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/prison_lower.asm b/src/rooms/prison_lower.asm index c3756d00..ece813f7 100644 --- a/src/rooms/prison_lower.asm +++ b/src/rooms/prison_lower.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -108,32 +106,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome15_sDialog -.PROC DataA_Dialog_PaperJerome15_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome15_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome15_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome15_Page1_u8_arr - .byte "Day 15: Now facing our$" - .byte "apocalypse, I find$" - .byte "myself musing on how$" - .byte "it came to happen.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome15_Page2_u8_arr - .byte "Our demise always$" - .byte "seemed likely, but$" - .byte "oddly, none of the$" - .byte "likely causes arose.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/prison_upper.asm b/src/rooms/prison_upper.asm index c4af1786..f6ab32e8 100644 --- a/src/rooms/prison_upper.asm +++ b/src/rooms/prison_upper.asm @@ -22,7 +22,6 @@ .INCLUDE "../actors/orc.inc" .INCLUDE "../actors/toddler.inc" .INCLUDE "../avatar.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" @@ -40,6 +39,23 @@ .INCLUDE "../scroll.inc" .IMPORT DataA_Room_Prison_sTileset +.IMPORT DataA_Text0_PrisonUpperAlexCell_GetDoorOpen_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexCell_Intro_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexFree_Part1_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexFree_Part2_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexLast_Part1_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexLast_Part2_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexLast_Part3_u8_arr +.IMPORT DataA_Text0_PrisonUpperAlexLast_Part4_u8_arr +.IMPORT DataA_Text0_PrisonUpperBreakerTemple1_Part1_u8_arr +.IMPORT DataA_Text0_PrisonUpperBreakerTemple1_Part2_u8_arr +.IMPORT DataA_Text0_PrisonUpperBreakerTemple2_u8_arr +.IMPORT DataA_Text0_PrisonUpperBruno_Adults_u8_arr +.IMPORT DataA_Text0_PrisonUpperBruno_ClimbUp_u8_arr +.IMPORT DataA_Text0_PrisonUpperMarie_GoTalkToAlex_u8_arr +.IMPORT DataA_Text0_PrisonUpperMarie_LooseBrick_u8_arr +.IMPORT DataA_Text0_PrisonUpperMarie_StandCareful_u8_arr +.IMPORT DataA_Text0_PrisonUpperNora_u8_arr .IMPORT Data_Empty_sDialog .IMPORT FuncA_Objects_DrawStepstonePlatform .IMPORT FuncC_Prison_DrawGatePlatform @@ -744,108 +760,3 @@ _LockScrolling: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PrisonUpperBreakerTemple1_Part1_u8_arr - .byte "Oktok! Chief Gronta$" - .byte "say come quick!#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperBreakerTemple1_Part2_u8_arr - .byte "More machines, they$" - .byte "are turning on!#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperBreakerTemple2_u8_arr - .byte "...Hey! What about us?#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexCell_Intro_u8_arr - .byte "Anna! Thank goodness$" - .byte "you're here! The orcs$" - .byte "threw us in here, but$" - .byte "they're gone now.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexCell_GetDoorOpen_u8_arr - .byte "See if you can find a$" - .byte "way to get this door$" - .byte "open.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexFree_Part1_u8_arr - .byte "Thanks! That door was$" - .byte "too heavy, but I think$" - .byte "I can pick the locks$" - .byte "on the other cells.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexFree_Part2_u8_arr - .byte "I'll let the others$" - .byte "out, then scout ahead.$" - .byte "Be right back.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexLast_Part1_u8_arr - .byte "Bad news: the passage$" - .byte "up to the surface has$" - .byte "collapsed. I don't$" - .byte "know another way yet.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexLast_Part2_u8_arr - .byte "We'll need a safe spot$" - .byte "to camp. Where have$" - .byte "you been staying since$" - .byte "you escaped, Anna?#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexLast_Part3_u8_arr - .byte "...Mermaid village?$" - .byte "Wait, seriously?$" - .byte "Mermaids are real?#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperAlexLast_Part4_u8_arr - .byte "All right. I'll lead$" - .byte "the other kids down$" - .byte "and meet up with you$" - .byte "there. See you soon.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperBruno_Adults_u8_arr - .byte "Are the adults OK?#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperBruno_ClimbUp_u8_arr - .byte "I think you're going$" - .byte "to have to climb up$" - .byte "top.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperMarie_GoTalkToAlex_u8_arr - .byte "It's Anna! Quick, go$" - .byte "talk to Alex! He's in$" - .byte "the cell up ahead.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperMarie_LooseBrick_u8_arr - .byte "I can help. There's a$" - .byte "loose brick up there.$" - .byte "If I push it, I can$" - .byte "get you a foothold.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperMarie_StandCareful_u8_arr - .byte "There! I think you can$" - .byte "stand on that brick if$" - .byte "you're careful.#" -.ENDPROC - -.PROC DataA_Text0_PrisonUpperNora_u8_arr - .byte "My sister STILL keeps$" - .byte "peeing her pants!#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/sewer_basin.asm b/src/rooms/sewer_basin.asm index 83c699a0..9621c4e7 100644 --- a/src/rooms/sewer_basin.asm +++ b/src/rooms/sewer_basin.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/jelly.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/multiplexer.inc" @@ -370,32 +369,3 @@ _Finish: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome19_sDialog -.PROC DataA_Dialog_PaperJerome19_sDialog - dlg_Text Paper, DataA_Text3_PaperJerome19_Page1_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome19_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_PaperJerome19_Page1_u8_arr - .byte "Day 19: We sought$" - .byte "better life through$" - .byte "chemistry. We spewed$" - .byte "substances recklessly.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome19_Page2_u8_arr - .byte "And yet, we eventually$" - .byte "got most of it cleaned$" - .byte "up. Enough of it,$" - .byte "anyway.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/sewer_pipe.asm b/src/rooms/sewer_pipe.asm index 77e283ea..0c3ece02 100644 --- a/src/rooms/sewer_pipe.asm +++ b/src/rooms/sewer_pipe.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -236,32 +234,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome03_sDialog -.PROC DataA_Dialog_PaperJerome03_sDialog - dlg_Text Paper, DataA_Text1_PaperJerome03_Page1_u8_arr - dlg_Text Paper, DataA_Text1_PaperJerome03_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text1" - -.PROC DataA_Text1_PaperJerome03_Page1_u8_arr - .byte "Day 3: In 2235 we had$" - .byte "the breakthrough that$" - .byte "made the creation of$" - .byte "the mermaids possible.#" -.ENDPROC - -.PROC DataA_Text1_PaperJerome03_Page2_u8_arr - .byte "Dr. Alda envisioned a$" - .byte "newfound freedom for$" - .byte "anyone who wanted a$" - .byte "new life.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/sewer_pool.asm b/src/rooms/sewer_pool.asm index dfce47ad..7a97c795 100644 --- a/src/rooms/sewer_pool.asm +++ b/src/rooms/sewer_pool.asm @@ -30,6 +30,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Sewer_sTileset +.IMPORT DataA_Text1_SewerPoolSign_u8_arr .IMPORT FuncA_Room_SewagePushAvatar .IMPORT Func_FindEmptyActorSlot .IMPORT Func_GetRandomByte @@ -187,19 +188,8 @@ _ThrowDuckFood: .EXPORT DataA_Dialog_SewerPoolSign_sDialog .PROC DataA_Dialog_SewerPoolSign_sDialog - dlg_Text Sign, DataA_Text2_SewerPoolSign_u8_arr + dlg_Text Sign, DataA_Text1_SewerPoolSign_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_SewerPoolSign_u8_arr - .byte " - NOTICE -$" - .byte "$" - .byte " Please do ", $ad, $ae, $af, "$" - .byte " feed the ducks.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/sewer_west.asm b/src/rooms/sewer_west.asm index 347f4eff..76be0cbc 100644 --- a/src/rooms/sewer_west.asm +++ b/src/rooms/sewer_west.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/multiplexer.inc" @@ -301,39 +300,3 @@ _Finish: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome05_sDialog -.PROC DataA_Dialog_PaperJerome05_sDialog - dlg_Text Paper, DataA_Text3_PaperJerome05_Page1_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome05_Page2_u8_arr - dlg_Text Paper, DataA_Text3_PaperJerome05_Page3_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_PaperJerome05_Page1_u8_arr - .byte "Day 5: Indeed, most$" - .byte "who chose to become$" - .byte "mermaids were highly$" - .byte "idealistic.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome05_Page2_u8_arr - .byte "They felt that they$" - .byte "could create a new$" - .byte "society without the$" - .byte "baggage of humanity.#" -.ENDPROC - -.PROC DataA_Text3_PaperJerome05_Page3_u8_arr - .byte "A perfect society,$" - .byte "free of conflict and$" - .byte "greed.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_descent.asm b/src/rooms/shadow_descent.asm index cdc6a9a6..374dee2b 100644 --- a/src/rooms/shadow_descent.asm +++ b/src/rooms/shadow_descent.asm @@ -18,9 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -274,23 +272,3 @@ _RaiseBothBarriers: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome20_sDialog -.PROC DataA_Dialog_PaperJerome20_sDialog - dlg_Text Paper, DataA_Text2_PaperJerome20_Page1_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_PaperJerome20_Page1_u8_arr - .byte "Day 20: In the end,$" - .byte "the problem wasn't our$" - .byte "technology. It was us.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_entry.asm b/src/rooms/shadow_entry.asm index 3a832d90..70821722 100644 --- a/src/rooms/shadow_entry.asm +++ b/src/rooms/shadow_entry.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/firefly.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/lift.inc" @@ -248,30 +247,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome01_sDialog -.PROC DataA_Dialog_PaperJerome01_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome01_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome01_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome01_Page1_u8_arr - .byte "Day 1: My name is$" - .byte "Jerome. It was I who$" - .byte "created the orcs.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome01_Page2_u8_arr - .byte "In these pages, I feel$" - .byte "compelled to make my$" - .byte "confession.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_gate.asm b/src/rooms/shadow_gate.asm index 33386a70..dd623851 100644 --- a/src/rooms/shadow_gate.asm +++ b/src/rooms/shadow_gate.asm @@ -28,6 +28,8 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Shadow_sTileset +.IMPORT DataA_Text0_ShadowGateScreen_Page1_u8_arr +.IMPORT DataA_Text0_ShadowGateScreen_Page2_u8_arr .IMPORT FuncA_Room_GetDarknessZoneFade .IMPORT Func_Noop .IMPORT Func_SetAndTransferBgFade @@ -180,19 +182,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_ShadowGateScreen_Page1_u8_arr - .byte "Our social divide is$" - .byte "irreparable. We want$" - .byte "to live different. We$" - .byte "want to BE different.#" -.ENDPROC - -.PROC DataA_Text0_ShadowGateScreen_Page2_u8_arr - .byte "Finally, we can now$" - .byte "make that a reality.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_hall.asm b/src/rooms/shadow_hall.asm index 74b5357e..e903dd10 100644 --- a/src/rooms/shadow_hall.asm +++ b/src/rooms/shadow_hall.asm @@ -20,7 +20,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/minigun.inc" @@ -568,32 +567,3 @@ _Broken: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome02_sDialog -.PROC DataA_Dialog_PaperJerome02_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome02_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome02_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome02_Page1_u8_arr - .byte "Day 2: I had joined$" - .byte "the research effort as$" - .byte "a junior bioengineer$" - .byte "in early 2230.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome02_Page2_u8_arr - .byte "It was a great honor$" - .byte "for me to be working$" - .byte "alongside the famed$" - .byte "Dr. Zoe Alda.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_heart.asm b/src/rooms/shadow_heart.asm index 4a29deb1..d1ad1fe4 100644 --- a/src/rooms/shadow_heart.asm +++ b/src/rooms/shadow_heart.asm @@ -21,7 +21,6 @@ .INCLUDE "../actors/adult.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../fade.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" @@ -387,32 +386,3 @@ _BeamLength_u8_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome04_sDialog -.PROC DataA_Dialog_PaperJerome04_sDialog - dlg_Text Paper, DataA_Text2_PaperJerome04_Page1_u8_arr - dlg_Text Paper, DataA_Text2_PaperJerome04_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_PaperJerome04_Page1_u8_arr - .byte "Day 4: As much as I$" - .byte "admired Dr. Alda, I$" - .byte "felt that we needed$" - .byte "a counterbalance.#" -.ENDPROC - -.PROC DataA_Text2_PaperJerome04_Page2_u8_arr - .byte "Surely, not everyone$" - .byte "who wanted to change$" - .byte "would subscribe to the$" - .byte "mermaids' ideals.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/shadow_teleport.asm b/src/rooms/shadow_teleport.asm index a1a24bcc..f69a7581 100644 --- a/src/rooms/shadow_teleport.asm +++ b/src/rooms/shadow_teleport.asm @@ -32,6 +32,8 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Shadow_sTileset +.IMPORT DataA_Text0_ShadowTeleportScreen_Page1_u8_arr +.IMPORT DataA_Text0_ShadowTeleportScreen_Page2_u8_arr .IMPORT Data_Empty_sActor_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_FieldTick @@ -200,21 +202,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_ShadowTeleportScreen_Page1_u8_arr - .byte "Long have we tried and$" - .byte "failed to use modern$" - .byte "technology to solve$" - .byte "old social problems.#" -.ENDPROC - -.PROC DataA_Text0_ShadowTeleportScreen_Page2_u8_arr - .byte "And yet, sometimes an$" - .byte "advancement can render$" - .byte "a seemingly unsolvable$" - .byte "problem irrelevant.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_altar.asm b/src/rooms/temple_altar.asm index d788d08e..80669be0 100644 --- a/src/rooms/temple_altar.asm +++ b/src/rooms/temple_altar.asm @@ -34,6 +34,7 @@ .INCLUDE "../spawn.inc" .IMPORT DataA_Room_Temple_sTileset +.IMPORT DataA_Text0_TempleAltarPlaque_u8_arr .IMPORT FuncA_Machine_CarriageTryMove .IMPORT FuncA_Machine_GenericMoveTowardGoalHorz .IMPORT FuncA_Machine_GenericMoveTowardGoalVert @@ -616,14 +617,3 @@ _WriteR: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TempleAltarPlaque_u8_arr - .byte "- Temple of Peace -$" - .byte " Built together by$" - .byte "mermaids and humans.$" - .byte " - A.D. 2250 -#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_apse.asm b/src/rooms/temple_apse.asm index 800d3dc9..eb8afd12 100644 --- a/src/rooms/temple_apse.asm +++ b/src/rooms/temple_apse.asm @@ -18,10 +18,8 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -145,32 +143,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual9_sDialog -.PROC DataA_Dialog_PaperManual9_sDialog - dlg_Text Paper, DataA_Text0_PaperManual9_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperManual9_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperManual9_Page1_u8_arr - .byte "CPU FIELD MANUAL p.9:$" - .byte "An IF can guard a TIL$" - .byte "loop whose condition$" - .byte "is already met.#" -.ENDPROC - -.PROC DataA_Text0_PaperManual9_Page2_u8_arr - .byte "For example:$" - .byte " :IF X<5$" - .byte " :MOVE ", kTileIdBgArrowRight, "$" - .byte " :TIL X", kTileIdBgCmpGe, "5#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_chevet.asm b/src/rooms/temple_chevet.asm index 80b54a07..37a76272 100644 --- a/src/rooms/temple_chevet.asm +++ b/src/rooms/temple_chevet.asm @@ -18,10 +18,8 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../oam.inc" @@ -104,32 +102,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome28_sDialog -.PROC DataA_Dialog_PaperJerome28_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome28_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome28_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome28_Page1_u8_arr - .byte "Day 28: We tried to$" - .byte "make peace with them,$" - .byte "of course. In the end$" - .byte "it wasn't possible.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome28_Page2_u8_arr - .byte "But after all, that's$" - .byte "why we and they were$" - .byte "different in the first$" - .byte "place, isn't it?#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_entry.asm b/src/rooms/temple_entry.asm index 7b26e2c9..887137cf 100644 --- a/src/rooms/temple_entry.asm +++ b/src/rooms/temple_entry.asm @@ -36,6 +36,17 @@ .INCLUDE "../spawn.inc" .IMPORT DataA_Room_Temple_sTileset +.IMPORT DataA_Text1_TempleEntryCorra_AlexAsked_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_MarkMap_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_No_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_Question_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_Taught_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_Wait_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_Whom_u8_arr +.IMPORT DataA_Text1_TempleEntryCorra_Yes_u8_arr +.IMPORT DataA_Text1_TempleEntryGuard_Enter_u8_arr +.IMPORT DataA_Text1_TempleEntryGuard_Intro_u8_arr +.IMPORT DataA_Text1_TempleEntryGuard_NoPermission_u8_arr .IMPORT FuncC_Temple_DrawColumnPlatform .IMPORT Func_IsPointInPlatform .IMPORT Func_MovePlatformTopTowardPointY @@ -381,7 +392,7 @@ _MoveColumn: .EXPORT DataA_Dialog_TempleEntryCorraWait_sDialog .PROC DataA_Dialog_TempleEntryCorraWait_sDialog - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_Wait_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_Wait_u8_arr dlg_Done .ENDPROC @@ -389,32 +400,32 @@ _MoveColumn: .PROC DataA_Dialog_TempleEntryCorraHi_sDialog dlg_IfSet TempleEntryTalkedToCorra, _AlexAsked_sDialog _Question_sDialog: - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_Question_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_Question_u8_arr dlg_IfYes _YesAnswer_sDialog _NoAnswer_sDialog: - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_No_u8_arr - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_Taught_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_No_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_Taught_u8_arr dlg_Goto _AlexAsked_sDialog _YesAnswer_sDialog: - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_Yes_u8_arr - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_Whom_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_Yes_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_Whom_u8_arr _AlexAsked_sDialog: - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_AlexAsked_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_AlexAsked_u8_arr dlg_Quest TempleEntryTalkedToCorra - dlg_Text MermaidCorra, DataA_Text2_TempleEntryCorra_MarkMap_u8_arr + dlg_Text MermaidCorra, DataA_Text1_TempleEntryCorra_MarkMap_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_TempleEntryGuard_sDialog .PROC DataA_Dialog_TempleEntryGuard_sDialog - dlg_Text MermaidGuardF, DataA_Text2_TempleEntryGuard_Intro_u8_arr + dlg_Text MermaidGuardF, DataA_Text1_TempleEntryGuard_Intro_u8_arr dlg_IfSet TempleEntryPermission, _Enter_sDialog _NoPermission_sDialog: - dlg_Text MermaidGuardF, DataA_Text2_TempleEntryGuard_NoPermission_u8_arr + dlg_Text MermaidGuardF, DataA_Text1_TempleEntryGuard_NoPermission_u8_arr dlg_Done _Enter_sDialog: dlg_Call _RaiseColumn - dlg_Text MermaidGuardF, DataA_Text2_TempleEntryGuard_Enter_u8_arr + dlg_Text MermaidGuardF, DataA_Text1_TempleEntryGuard_Enter_u8_arr dlg_Done _RaiseColumn: ldx #eFlag::TempleEntryColumnRaised ; param: flag @@ -422,72 +433,3 @@ _RaiseColumn: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_TempleEntryCorra_Wait_u8_arr - .byte "Hey Anna, wait up!#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_Question_u8_arr - .byte "Hi! Did you come to$" - .byte "the temple to pray?%" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_Yes_u8_arr - .byte "Me too! I was taught$" - .byte "to pray always for$" - .byte "peace. I didn't think$" - .byte "humans did that.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_Whom_u8_arr - .byte "I'm not sure whom I'm$" - .byte "praying to, though.$" - .byte "...I guess they never$" - .byte "taught me that.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_No_u8_arr - .byte "Oh, right...humans$" - .byte "never evolved to seek$" - .byte "after peace, like we$" - .byte "did...#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_Taught_u8_arr - .byte "Er, at least, that's$" - .byte "what I was taught.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_AlexAsked_u8_arr - .byte "Oh, I almost forgot!$" - .byte "Alex asked me to tell$" - .byte "you where to find him$" - .byte "if I saw you.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryCorra_MarkMap_u8_arr - .byte "Here, I'll just mark$" - .byte "it on your map.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryGuard_Intro_u8_arr - .byte "I am guarding the$" - .byte "entrance to the temple$" - .byte "you see above us.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryGuard_NoPermission_u8_arr - .byte "I cannot help you to$" - .byte "enter it without the$" - .byte "queen's permission.#" -.ENDPROC - -.PROC DataA_Text2_TempleEntryGuard_Enter_u8_arr - .byte "Our queen has sent$" - .byte "word: I am to allow$" - .byte "you to enter.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_foyer.asm b/src/rooms/temple_foyer.asm index 3191968a..eecd8d3b 100644 --- a/src/rooms/temple_foyer.asm +++ b/src/rooms/temple_foyer.asm @@ -21,7 +21,6 @@ .INCLUDE "../audio.inc" .INCLUDE "../charmap.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../machine.inc" .INCLUDE "../machines/carriage.inc" @@ -323,32 +322,3 @@ _MoveToBottomRight: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperManual1_sDialog -.PROC DataA_Dialog_PaperManual1_sDialog - dlg_Text Paper, DataA_Text0_PaperManual1_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperManual1_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperManual1_Page1_u8_arr - .byte "CPU FIELD MANUAL p.1:$" - .byte "Basic console control:$" - .byte " A: confirm$" - .byte " B: cancel/exit#" -.ENDPROC - -.PROC DataA_Text0_PaperManual1_Page2_u8_arr - .byte " SELECT: insert new$" - .byte " instruction$" - .byte " START: activate$" - .byte " debugger#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_nave.asm b/src/rooms/temple_nave.asm index 9d658ba0..c39adeac 100644 --- a/src/rooms/temple_nave.asm +++ b/src/rooms/temple_nave.asm @@ -36,6 +36,11 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_Temple_sTileset +.IMPORT DataA_Text0_TempleNaveAlexBoost1_u8_arr +.IMPORT DataA_Text0_TempleNaveAlexBoost2_u8_arr +.IMPORT DataA_Text0_TempleNaveAlexStand_Part1_u8_arr +.IMPORT DataA_Text0_TempleNaveAlexStand_Part2_u8_arr +.IMPORT DataA_Text0_TempleNaveAlexStand_Part3_u8_arr .IMPORT FuncA_Machine_CarriageTryMove .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GenericMoveTowardGoalHorz @@ -712,40 +717,3 @@ _SetUpBoostingPlatform: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TempleNaveAlexStand_Part1_u8_arr - .byte "Good to see you, Anna.$" - .byte "I've been exploring$" - .byte "this temple. Learning$" - .byte "a lot.#" -.ENDPROC - -.PROC DataA_Text0_TempleNaveAlexStand_Part2_u8_arr - .byte "I guess humans and$" - .byte "mermaids used to be$" - .byte "friends. They built$" - .byte "this place together.#" -.ENDPROC - -.PROC DataA_Text0_TempleNaveAlexStand_Part3_u8_arr - .byte "But all this advanced$" - .byte "technology...it's from$" - .byte "humans. How did we$" - .byte "lose that knowledge?#" -.ENDPROC - -.PROC DataA_Text0_TempleNaveAlexBoost1_u8_arr - .byte "Anna, I think there's$" - .byte "something hidden under$" - .byte "this temple. We should$" - .byte "find out what it is.#" -.ENDPROC - -.PROC DataA_Text0_TempleNaveAlexBoost2_u8_arr - .byte "Hop on up. I'll give$" - .byte "you a boost.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/temple_pit.asm b/src/rooms/temple_pit.asm index 66450647..8c05a1c7 100644 --- a/src/rooms/temple_pit.asm +++ b/src/rooms/temple_pit.asm @@ -18,10 +18,7 @@ ;;;=========================================================================;;; .INCLUDE "../actor.inc" -.INCLUDE "../charmap.inc" -.INCLUDE "../cpu.inc" .INCLUDE "../device.inc" -.INCLUDE "../dialog.inc" .INCLUDE "../flag.inc" .INCLUDE "../macros.inc" .INCLUDE "../platform.inc" @@ -92,32 +89,3 @@ _Passages_sPassage_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Dialog" - -.EXPORT DataA_Dialog_PaperJerome34_sDialog -.PROC DataA_Dialog_PaperJerome34_sDialog - dlg_Text Paper, DataA_Text0_PaperJerome34_Page1_u8_arr - dlg_Text Paper, DataA_Text0_PaperJerome34_Page2_u8_arr - dlg_Done -.ENDPROC - -;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_PaperJerome34_Page1_u8_arr - .byte "Day 34: Our technology$" - .byte "is amazing, but lest$" - .byte "we forget, we're all$" - .byte "still just mortals.#" -.ENDPROC - -.PROC DataA_Text0_PaperJerome34_Page2_u8_arr - .byte "No matter how high we$" - .byte "build, in the end the$" - .byte "grave still comes for$" - .byte "us all.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house1.asm b/src/rooms/town_house1.asm index 6d3090fb..19ff8853 100644 --- a/src/rooms/town_house1.asm +++ b/src/rooms/town_house1.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/child.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" @@ -28,6 +27,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text0_TownHouse1Nora_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjTown @@ -114,12 +114,3 @@ _Devices_sDevice_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TownHouse1Nora_u8_arr - .byte "My baby sister keeps$" - .byte "peeing her pants!#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house2.asm b/src/rooms/town_house2.asm index a75e69d7..f4cf311f 100644 --- a/src/rooms/town_house2.asm +++ b/src/rooms/town_house2.asm @@ -32,6 +32,9 @@ .INCLUDE "../spawn.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text0_TownHouse2Stela_Part1_u8_arr +.IMPORT DataA_Text0_TownHouse2Stela_Part2_u8_arr +.IMPORT DataA_Text0_TownHouse2Stela_Part3_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjTown @@ -159,29 +162,10 @@ _Devices_sDevice_arr: .EXPORT DataA_Dialog_TownHouse2Stela_sDialog .PROC DataA_Dialog_TownHouse2Stela_sDialog - dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Page1_u8_arr - dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Page2_u8_arr - dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Page3_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Part1_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Part2_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse2Stela_Part3_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TownHouse2Stela_Page1_u8_arr - .byte "Can't sleep, Anna?#" -.ENDPROC - -.PROC DataA_Text0_TownHouse2Stela_Page2_u8_arr - .byte "Your brother Alex is$" - .byte "up late, too.#" -.ENDPROC - -.PROC DataA_Text0_TownHouse2Stela_Page3_u8_arr - .byte "I think he went$" - .byte "outside somewhere. Why$" - .byte "don't you go find him?#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house3.asm b/src/rooms/town_house3.asm index 499e86fa..39d1a0e7 100644 --- a/src/rooms/town_house3.asm +++ b/src/rooms/town_house3.asm @@ -19,7 +19,6 @@ .INCLUDE "../actor.inc" .INCLUDE "../actors/adult.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../device.inc" .INCLUDE "../dialog.inc" @@ -28,6 +27,8 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text0_TownHouse3Smith_Part1_u8_arr +.IMPORT DataA_Text0_TownHouse3Smith_Part2_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT FuncA_Room_PlaySfxMetallicClang .IMPORT Func_Noop @@ -164,21 +165,3 @@ _Devices_sDevice_arr: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TownHouse3Smith_Part1_u8_arr - .byte "You lookin' fer yer$" - .byte "brother? Haven't seen$" - .byte "`im. Probably pokin'$" - .byte "around somewhere.#" -.ENDPROC - -.PROC DataA_Text0_TownHouse3Smith_Part2_u8_arr - .byte "That boy's a good$" - .byte "apprentice. Good smith$" - .byte "someday. Too curious$" - .byte "fer `is own good, tho.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house4.asm b/src/rooms/town_house4.asm index 9a4a69c4..04ee086d 100644 --- a/src/rooms/town_house4.asm +++ b/src/rooms/town_house4.asm @@ -32,6 +32,16 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text0_TownHouse4BreakerLava1_Part1_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava1_Part2_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava1_Part3_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava1_Part4_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava2_Part1_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava2_Part2_u8_arr +.IMPORT DataA_Text0_TownHouse4BreakerLava3_u8_arr +.IMPORT DataA_Text0_TownHouse4Laura_Waiting1_u8_arr +.IMPORT DataA_Text0_TownHouse4Laura_Waiting2_u8_arr +.IMPORT DataA_Text0_TownHouse4Martin_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Func_PlaySfxExplodeBig @@ -235,32 +245,32 @@ _RemoveThurg: .EXPORT DataA_Dialog_TownHouse4Laura_sDialog .PROC DataA_Dialog_TownHouse4Laura_sDialog - dlg_Text AdultWoman, DataA_Text2_TownHouse4Laura_Waiting1_u8_arr - dlg_Text AdultWoman, DataA_Text2_TownHouse4Laura_Waiting2_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse4Laura_Waiting1_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse4Laura_Waiting2_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_TownHouse4Martin_sDialog .PROC DataA_Dialog_TownHouse4Martin_sDialog - dlg_Text AdultMan, DataA_Text2_TownHouse4Martin_u8_arr + dlg_Text AdultMan, DataA_Text0_TownHouse4Martin_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_TownHouse4BreakerLava1_sDialog .PROC DataA_Dialog_TownHouse4BreakerLava1_sDialog .assert kTileIdBgPortraitOrcFirst = kTileIdBgPortraitWomanFirst, error - dlg_Text OrcMale, DataA_Text2_TownHouse4BreakerLava1_Part1_u8_arr - dlg_Text AdultWoman, DataA_Text2_TownHouse4BreakerLava1_Part2_u8_arr - dlg_Text OrcMale, DataA_Text2_TownHouse4BreakerLava1_Part3_u8_arr - dlg_Text AdultWoman, DataA_Text2_TownHouse4BreakerLava1_Part4_u8_arr + dlg_Text OrcMale, DataA_Text0_TownHouse4BreakerLava1_Part1_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse4BreakerLava1_Part2_u8_arr + dlg_Text OrcMale, DataA_Text0_TownHouse4BreakerLava1_Part3_u8_arr + dlg_Text AdultWoman, DataA_Text0_TownHouse4BreakerLava1_Part4_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_TownHouse4BreakerLava2_sDialog .PROC DataA_Dialog_TownHouse4BreakerLava2_sDialog - dlg_Text OrcMaleShout, DataA_Text2_TownHouse4BreakerLava2_Part1_u8_arr + dlg_Text OrcMaleShout, DataA_Text0_TownHouse4BreakerLava2_Part1_u8_arr dlg_Call _ThurgStanding - dlg_Text OrcMale, DataA_Text2_TownHouse4BreakerLava2_Part2_u8_arr + dlg_Text OrcMale, DataA_Text0_TownHouse4BreakerLava2_Part2_u8_arr dlg_Done _ThurgStanding: lda #eNpcOrc::GruntStanding @@ -270,78 +280,8 @@ _ThurgStanding: .EXPORT DataA_Dialog_TownHouse4BreakerLava3_sDialog .PROC DataA_Dialog_TownHouse4BreakerLava3_sDialog - dlg_Text OrcMale, DataA_Text2_TownHouse4BreakerLava3_u8_arr + dlg_Text OrcMale, DataA_Text0_TownHouse4BreakerLava3_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_TownHouse4Laura_Waiting1_u8_arr - .byte "Your Uncle Martin and$" - .byte "I are waiting here for$" - .byte "Elder Roman to meet$" - .byte "with us.#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4Laura_Waiting2_u8_arr - .byte "I wonder what's taking$" - .byte "him so long?#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4Martin_u8_arr - .byte "I hope Nora is taking$" - .byte "good care of her baby$" - .byte "sister Nina back at$" - .byte "home...#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava1_Part1_u8_arr - .byte "I ask only one more$" - .byte "time: where is the$" - .byte "B-Remote?#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava1_Part2_u8_arr - .byte "What's a bee-re-moat?$" - .byte "I don't know what$" - .byte "you're talking about!#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava1_Part3_u8_arr - .byte "You cannot hide it$" - .byte "from me! We orcs WILL$" - .byte "take over control of$" - .byte "all your machines!#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava1_Part4_u8_arr - .byte "What machines? All we$" - .byte "humans have is farming$" - .byte "and smithing. The same$" - .byte "as you brutes!#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava2_Part1_u8_arr - .byte "How dare talk back to$" - .byte "me? I am Thurg, son of$" - .byte "Gurg! Lieutenent of$" - .byte "great Chief Gronta!#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava2_Part2_u8_arr - .byte "Humans aren't fit to$" - .byte "wield even their own$" - .byte "inventions. Now is OUR$" - .byte "turn to show you how.#" -.ENDPROC - -.PROC DataA_Text2_TownHouse4BreakerLava3_u8_arr - .byte "Grunt Hobok! Continue$" - .byte "the interrogation. I$" - .byte "go now to report to$" - .byte "the Chief.#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house5.asm b/src/rooms/town_house5.asm index 8ec6b7ca..7c6cf03f 100644 --- a/src/rooms/town_house5.asm +++ b/src/rooms/town_house5.asm @@ -28,6 +28,9 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text1_TownHouse5Bruno_u8_arr +.IMPORT DataA_Text1_TownHouse5Marie_Part1_u8_arr +.IMPORT DataA_Text1_TownHouse5Marie_Part2_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjTown @@ -121,40 +124,15 @@ _Devices_sDevice_arr: .EXPORT DataA_Dialog_TownHouse5Bruno_sDialog .PROC DataA_Dialog_TownHouse5Bruno_sDialog - dlg_Text ChildBruno, DataA_Text2_TownHouse5Bruno_u8_arr + dlg_Text ChildBruno, DataA_Text1_TownHouse5Bruno_u8_arr dlg_Done .ENDPROC .EXPORT DataA_Dialog_TownHouse5Marie_sDialog .PROC DataA_Dialog_TownHouse5Marie_sDialog - dlg_Text ChildMarie, DataA_Text2_TownHouse5Marie_Part1_u8_arr - dlg_Text ChildMarie, DataA_Text2_TownHouse5Marie_Part2_u8_arr + dlg_Text ChildMarie, DataA_Text1_TownHouse5Marie_Part1_u8_arr + dlg_Text ChildMarie, DataA_Text1_TownHouse5Marie_Part2_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_TownHouse5Bruno_u8_arr - .byte "If you're looking for$" - .byte "Alex, he wanted to$" - .byte "show you something at$" - .byte "the east end of town.#" -.ENDPROC - -.PROC DataA_Text2_TownHouse5Marie_Part1_u8_arr - .byte "They try not to show$" - .byte "it, but the adults all$" - .byte "seem pretty worried$" - .byte "lately.#" -.ENDPROC - -.PROC DataA_Text2_TownHouse5Marie_Part2_u8_arr - .byte "What will we do if we$" - .byte "don't have enough food$" - .byte "to last through the$" - .byte "winter?#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_house6.asm b/src/rooms/town_house6.asm index dbecc221..e5cd2514 100644 --- a/src/rooms/town_house6.asm +++ b/src/rooms/town_house6.asm @@ -28,6 +28,8 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_House_sTileset +.IMPORT DataA_Text0_TownHouse6Elder_Part1_u8_arr +.IMPORT DataA_Text0_TownHouse6Elder_Part2_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_Noop .IMPORT Ppu_ChrObjVillage @@ -143,25 +145,9 @@ _Devices_sDevice_arr: .EXPORT DataA_Dialog_TownHouse6Elder_sDialog .PROC DataA_Dialog_TownHouse6Elder_sDialog - dlg_Text AdultElder, DataA_Text2_TownHouse6Elder_Part1_u8_arr - dlg_Text AdultElder, DataA_Text2_TownHouse6Elder_Part2_u8_arr + dlg_Text AdultElder, DataA_Text0_TownHouse6Elder_Part1_u8_arr + dlg_Text AdultElder, DataA_Text0_TownHouse6Elder_Part2_u8_arr dlg_Done .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text2" - -.PROC DataA_Text2_TownHouse6Elder_Part1_u8_arr - .byte "...zzz...When're Laura$" - .byte "and Martin going to be$" - .byte "here?...#" -.ENDPROC - -.PROC DataA_Text2_TownHouse6Elder_Part2_u8_arr - .byte "...Old Man Roman has$" - .byte "been waiting here for$" - .byte "a long time...zzz...#" -.ENDPROC - -;;;=========================================================================;;; diff --git a/src/rooms/town_outdoors.asm b/src/rooms/town_outdoors.asm index ddf15b7a..a518cfc1 100644 --- a/src/rooms/town_outdoors.asm +++ b/src/rooms/town_outdoors.asm @@ -22,7 +22,6 @@ .INCLUDE "../actors/child.inc" .INCLUDE "../actors/orc.inc" .INCLUDE "../avatar.inc" -.INCLUDE "../charmap.inc" .INCLUDE "../cpu.inc" .INCLUDE "../cutscene.inc" .INCLUDE "../device.inc" @@ -38,6 +37,24 @@ .INCLUDE "../scroll.inc" .IMPORT DataA_Room_Outdoors_sTileset +.IMPORT DataA_Text0_TownOutdoorsAlex1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex2_Part1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex2_Part2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex2_Part3_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_Attack1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_Attack2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_Explore1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_Explore2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_HandleThis_u8_arr +.IMPORT DataA_Text0_TownOutdoorsAlex3_WhaWhat_u8_arr +.IMPORT DataA_Text0_TownOutdoorsGronta_Search1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsGronta_Search2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsGronta_YesChief_u8_arr +.IMPORT DataA_Text0_TownOutdoorsIvan_Part1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsIvan_Part2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsSandra_Part1_u8_arr +.IMPORT DataA_Text0_TownOutdoorsSandra_Part2_u8_arr +.IMPORT DataA_Text0_TownOutdoorsSign_u8_arr .IMPORT Data_Empty_sPlatform_arr .IMPORT Func_AckIrqAndLatchWindowFromParam4 .IMPORT Func_AckIrqAndSetLatch @@ -463,112 +480,6 @@ _SetFace: ;;;=========================================================================;;; -.SEGMENT "PRGA_Text0" - -.PROC DataA_Text0_TownOutdoorsAlex1_u8_arr - .byte "Hi, Anna! I wanted to$" - .byte "show you something.$" - .byte "Look at what I found$" - .byte "in the dirt over here!#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex2_Part1_u8_arr - .byte "It's some weird metal$" - .byte "thing. But nothing$" - .byte "like the iron or steel$" - .byte "Smith Dominic uses.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex2_Part2_u8_arr - .byte "No idea what it is. It$" - .byte "almost looks like part$" - .byte "of a machine, but it$" - .byte "seems so...advanced.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex2_Part3_u8_arr - .byte "I wonder where a thing$" - .byte "like this could have$" - .byte "come from...#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_Explore1_u8_arr - .byte "Do you ever wish we$" - .byte "could just leave this$" - .byte "town and go exploring?$" - .byte "You and me?#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_Explore2_u8_arr - .byte "Mom always says it's$" - .byte "too dangerous, but I$" - .byte "bet we could handle$" - .byte "anything out there...#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_HandleThis_u8_arr - .byte "Handle THIS, human.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_WhaWhat_u8_arr - .byte "Wha- what?#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_Attack1_u8_arr - .byte "Orcs, attaaaaaack!#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsAlex3_Attack2_u8_arr - .byte "Anna, run!#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsGronta_Search1_u8_arr - .byte "Lieutenent Thurg! Have$" - .byte "the grunts round up$" - .byte "the townsfolk and lock$" - .byte "these kids up.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsGronta_Search2_u8_arr - .byte "Then we can begin our$" - .byte "search.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsGronta_YesChief_u8_arr - .byte "Yes, Chief Gronta!#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsIvan_Part1_u8_arr - .byte "The harvest isn't$" - .byte "looking good, Sandra.$" - .byte "This might be a tough$" - .byte "winter for all of us.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsIvan_Part2_u8_arr - .byte "Oh, sorry Anna, I$" - .byte "didn't see you there.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsSandra_Part1_u8_arr - .byte "Looking for Alex? He$" - .byte "popped by the house$" - .byte "earlier to see Bruno$" - .byte "and Marie.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsSandra_Part2_u8_arr - .byte "One of them might know$" - .byte "where he went.#" -.ENDPROC - -.PROC DataA_Text0_TownOutdoorsSign_u8_arr - .byte "$" - .byte " Bartik Town Hall#" -.ENDPROC - -;;;=========================================================================;;; - .SEGMENT "PRGA_Cutscene" .EXPORT DataA_Cutscene_TownOutdoorsOrcAttack_sCutscene diff --git a/src/text.asm b/src/text.asm new file mode 100644 index 00000000..b0c40eb5 --- /dev/null +++ b/src/text.asm @@ -0,0 +1,83 @@ +;;;=========================================================================;;; +;;; Copyright 2022 Matthew D. Steele ;;; +;;; ;;; +;;; This file is part of Annalog. ;;; +;;; ;;; +;;; Annalog is free software: you can redistribute it and/or modify it ;;; +;;; under the terms of the GNU General Public License as published by the ;;; +;;; Free Software Foundation, either version 3 of the License, or (at your ;;; +;;; option) any later version. ;;; +;;; ;;; +;;; Annalog is distributed in the hope that it will be useful, but WITHOUT ;;; +;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;;; +;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;;; +;;; for more details. ;;; +;;; ;;; +;;; You should have received a copy of the GNU General Public License along ;;; +;;; with Annalog. If not, see . ;;; +;;;=========================================================================;;; + +.INCLUDE "cpu.inc" +.INCLUDE "dialog.inc" +.INCLUDE "macros.inc" +.INCLUDE "mmc3.inc" + +.IMPORT DataA_Text0_Strings_u8_arr2_arr +.IMPORT DataA_Text1_Strings_u8_arr2_arr +.IMPORT DataA_Text2_Strings_u8_arr2_arr +.IMPORT Ram_DialogText_u8_arr + +;;;=========================================================================;;; + +.SEGMENT "PRG8" + +;;; Given the bank/pointer returned by FuncA_Dialog_GetNextDialogTextPointer, +;;; switches the PRGA bank and decompresses the dialog text into +;;; Ram_DialogText_u8_arr. +;;; @param T2 The PRGA bank that contains the compressed dialog text. +;;; @param T1T0 A pointer to the start of the compressed dialog text. +.EXPORT FuncM_CopyDialogText +.PROC FuncM_CopyDialogText + main_prga T2 + ldy #0 + ldx #0 + beq @readChar ; unconditional + @writeChar: + sta Ram_DialogText_u8_arr, x + inx + iny + @readChar: + lda (T1T0), y + bpl @writeChar + cmp #kDialogTextNewline + beq @writeChar + bge @finish + @substring: + and #$7f + mul #2 + sty T3 ; main string byte index + tay ; substring offset + .linecont + + .assert DataA_Text1_Strings_u8_arr2_arr = \ + DataA_Text0_Strings_u8_arr2_arr, error + .assert DataA_Text2_Strings_u8_arr2_arr = \ + DataA_Text0_Strings_u8_arr2_arr, error + .linecont - + lda DataA_Text0_Strings_u8_arr2_arr, y + sta Ram_DialogText_u8_arr, x + inx + iny + lda DataA_Text0_Strings_u8_arr2_arr, y + cmp #kDialogTextNewline + 1 + bge @finish + sta Ram_DialogText_u8_arr, x + inx + ldy T3 ; main string byte index + iny + bne @readChar ; unconditional + @finish: + sta Ram_DialogText_u8_arr, x + rts +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/text/text0.txt b/src/text/text0.txt new file mode 100644 index 00000000..1bff3304 --- /dev/null +++ b/src/text/text0.txt @@ -0,0 +1,880 @@ +@CityBuilding2Screen_Unlocked + SECURITY STATUS +Eastern door: UNLOCKED +Continuous key +randomization: N/A# + +@CityBuilding2Screen_Locked + SECURITY STATUS +Eastern door: LOCKED +Continuous key +randomization: ENABLED# + +@CityBuilding2Screen_Question +Connect key generator +to western semaphore?% + +@CityBuilding2Screen_Connected +Western semaphore is +now connected to key +generator output.# + +@CityFlowerOrcAngry +Hey! Thief! You take +my flower!# + +@CityFlowerOrcCalm_Part1 +Who you? Human? Seem +too small to fight... +Not know why we fight +humans.# + +@CityFlowerOrcCalm_Part2 +Happier in pretty orc +village. Humans happy +in ugly human village. +Why fight? Pointless.# + +@CoreSouthCorra_HelloAgain1 +Hello again! I heard +that you were going to +try to rescue your +friends from the orcs.# + +@CoreSouthCorra_HelloAgain2 +I've never seen ANY +place like this. Who +could have built +something like this?# + +@CoreSouthCorra_HelloAgain3 +Are you going to climb +up? Let me see if I +can help you...# + +@CoreSouthCorra_AlreadyHelped +Good luck! And be +careful!# + +@CryptTombPlaque_Page1 +Here lies Dr. Zoe Alda + 2192-2275 +Daughter of humans and +The mother of mermaids# + +@CryptTombPlaque_Page2 +May we ever remember + her service, + And never repeat + her mistakes.# + +@GardenEastCorra_Question +Are you...a human? +A real human girl?% + +@GardenEastCorra_No +Ha! You can't fool me.# + +@GardenEastCorra_Yes +But...humans aren't +supposed to be down +here! I've never even +met one before.# + +@GardenEastCorra_MeetQueen +You should meet with +our queen. She will +know what to do with +you.# + +@GardenEastCorra_MarkMap +I'll mark her hut on +your map.# + +@FactoryEastCorra_Intro +Oh, Anna! Your brother +told me that mermaids +used to be humans. +That we're the same.# + +@FactoryEastCorra_Question +But...that can't be +true! Is it?% + +@FactoryEastCorra_Yes +I can't...I can't +believe it...# + +@FactoryEastCorra_No +Of course...I knew it +couldn't really be +true...# + +@FactoryEastCorra_Mid1 +We mermaids are so +different from humans. +We live in peace. We +don't judge others.# + +@FactoryEastCorra_Mid2 +...Anna, I don't know +what to think. But I +want to help you save +your people.# + +@FactoryEastCorra_Mid3 +If you're trying to +get into that city +above us, I can help +you climb up.# + +@FactoryEastCorra_End +Good luck, Anna. I +hope that I'll meet +you again someday.# + +@GardenShrineBreakerMine1_Part1 +If you wish to parley, +speak quickly. You are +not welcome in our +vale, orc.# + +@GardenShrineBreakerMine1_Part2 +Ha! Nor are humans, +and yet you harbor +them even now.# + +@GardenShrineBreakerMine1_Part3 +They are your enemies +as much as we. Maybe +more so. So why do you +protect them from us?# + +@GardenShrineBreakerMine1_Part4 +I do not consider the +humans enemies, merely +dangerous fools. Much +like you.# + +@GardenShrineBreakerMine1_Part5 +I admit, I had hoped +that they might listen +to reason.# + +@GardenShrineBreakerMine1_Part6 +You act all wise, fish +woman, but unlike us, +you have no vision and +no will.# + +@GardenShrineBreakerMine1_Part7 +The humans failed. You +mermaids are cowards. +So it falls to orcs to +lead the way forward.# + +@GardenShrineBreakerMine2_Part1 +Oh? And will you +destroy yourselves, as +the humans did?# + +@GardenShrineBreakerMine2_Part2 +Better death than to +rot down here, as you +have apparently chosen +to do!# + +@FactoryElevatorBruno_Wait +Hey Anna, wait up!# + +@FactoryElevatorBruno_Hi1 +Whew, glad you made it +out of there OK, Anna. +Alex asked me to keep +an eye out for you.# + +@FactoryElevatorBruno_Hi2 +A lot's been happening +while you were gone. +Orcs on the move, more +machines turning on...# + +@FactoryElevatorBruno_Hi3 +Queen Eirene seems +pretty agitated, but +she's still letting us +stay for now.# + +@FactoryElevatorBruno_Hi4 +And, uh...Alex found +something weird. He +wanted you to meet him +when you got back.# + +@FactoryElevatorBruno_Hi5 +I'll mark it on your +map.# + +@FactoryVaultAlex1_Part1 +Anna, you're back! +Would you look at this +place? It opened up +while you were gone.# + +@FactoryVaultAlex1_Part2 +I think we finally +found what the ancient +humans were building +in this factory.# + +@FactoryVaultAlex2_Part1 +Hmm, it's got a label. +Let's see... +`Human Mutation Tank + Serial No. 94209382'# + +@FactoryVaultAlex2_Part2 +Human...mutation?# + +@FactoryVaultAlex3_Part1 +Anna...remember how +you found out that the +first mermaids were +created by humans?# + +@FactoryVaultAlex3_Part2 +If I'm understanding +this right...it looks +like those mermaids +were made FROM humans.# + +@FactoryVaultAlex3_Part3 +This was all centuries +ago. And now we're two +different peoples. But +why do any of that?# + +@FactoryVaultAlex3_Part4 +They had practically +unlimited technology +and knowledge. So why +this? I don't get it.# + +@FactoryVaultAlex4_Part1 +Well, if you got the +pass into the sewers +opened up, then the +city is our next goal.# + +@FactoryVaultAlex4_Part2 +The orcs are already +there, looking for +something. I'm not +exactly sure what.# + +@FactoryVaultAlex4_Part3 +Whatever it is, we've +got to find it first!# + +@FactoryVaultScreen_Page1 +ERROR: Gene mutation +tank production line +has been stalled.# + +@FactoryVaultScreen_Page2 +Current batch: Q6382A +Designated for: + Volunteer group 922 + # + +@FactoryVaultScreen_Page3 +Due date: 2245 Feb 21 +Overdue by: 495 years +Report to supervisor +for instructions.# + +@LavaVentSign +Salt Mines {kTileIdBgArrowRight} + +{kTileIdBgArrowDown} Geothermal Station# + +@MermaidEntrySign +{kTileIdBgArrowLeft} Hanging Gardens + +Mermaid Village {kTileIdBgArrowRight}# + +@MermaidHut1Guard +All hail Queen Eirene!# + +@MermaidHut1Queen_FirstMeeting1 +So, you must be the +human I've heard is +running around.# + +@MermaidHut1Queen_FirstMeeting2 +Humans belong on the +surface, not here. So +what are you doing +down here among us?# + +@MermaidHut1Queen_FirstMeeting3 +...I see. So the orcs +attacked, and now you +are a refugee. This +complicates things.# + +@MermaidHut1Queen_FirstMeeting4 +I will be honest: I do +not trust humans. +However, I don't care +for the orcs either.# + +@MermaidHut1Queen_GrantAsylum +I will grant you safe +asylum in our village, +on one condition: that +you help us in return.# + +@MermaidHut1Queen_HelpFarmers +Speak with our farmers +in this village. They +have a problem a human +could perhaps solve.# + +@MermaidHut1Queen_GardenBossDead1 +I heard you helped our +farmers. And you even +survived. I thank you.# + +@MermaidHut1Queen_GardenBossDead2 +Perhaps...perhaps you +could help us with one +more problem.# + +@MermaidHut1Queen_TempleProblem +There's a temple west +of the gardens. It's +very important to us. +At least, it once was.# + +@MermaidHut1Queen_TempleEntry +I'd like you to visit +the temple. The guards +east of my hut can +tell you more.# + +@MermaidHut1Queen_TempleBossDead1 +I take it that you've +seen the whole of the +ruined temple? Maybe +now you understand.# + +@MermaidHut1Queen_TempleBossDead2 +Our two peoples built +it together, centuries +ago. It was to be a +symbol of peace.# + +@MermaidHut1Queen_TempleBossDead3 +But before long, the +humans desecrated it +into a mechanized +fortress instead.# + +@MermaidHut1Queen_TempleBossDead4 +Humans are just like +the orcs. Violent and +untrustworthy, despite +our best efforts.# + +@MermaidHut1Queen_TempleBossDead5 +But enough. My scouts +tell me there is a way +for you to reach your +fellow villagers.# + +@MermaidHut1Queen_OtherRuins +There are...another +kind of ruins buried +just above our humble +vale. Older ones.# + +@MermaidHut1Queen_FindYourFriends +If you climb upwards +through there, you may +be able to find and +rescue your friends.# + +@MermaidHut1Queen_KidsRescued1 +The children from your +village have arrived +safely. I have granted +them asylum for now.# + +@MermaidHut1Queen_KidsRescued2 +You can find them in +the southeastern hut +of this village.# + +@MermaidHut1BreakerGarden +What the...What did +that human girl just +do!?# + +@MermaidHut1AlexPetition_Part1 +Please, your highness, +I need to know more +about that complex +above here!# + +@MermaidHut1AlexPetition_Part2 +Knowledge can be a +dangerous thing, +child. Just leave +those ruins alone.# + +@MermaidHut1AlexPetition_Part3 +But that technology +could benefit all of +us! How did all that +end up forgotten?# + +@MermaidHut1AlexPetition_Part4 +That technology would +destroy you. Just like +before. I will speak +no more of it.# + +@MermaidHut1AlexPetition_Part5 +...fine, then, keep +your secrets. I guess +I'll just have to +figure it out myself.# + +@MermaidHut1BreakerCrypt_Part1 +Why are you so afraid +of the old technology, +anyway? Why won't you +help us revive it?# + +@MermaidHut1BreakerCrypt_Part2 +More technology gives +you more power. And +too much power always, +always corrupts.# + +@MermaidHut1BreakerCrypt_Part3 +Don't take MY word for +it. Human civilization +collapsed! You can't +be trusted with it.# + +@MermaidHut1BreakerCrypt_Part4 +So what, we should all +go back to being poor, +and spending winters +trying not to starve?# + +@MermaidHut1BreakerCrypt_Part5 +If high civilization +failed last time, we +should learn from it, +and try again!# + +@MermaidHut1BreakerCrypt_Part6 +If you had learned +anything, you would +give up on this path. +It's a dead end.# + +@MermaidHut1BreakerCrypt_Part7 +And if you'd learned +anything about humans, +you'd know that we +NEVER give up.# + +@MermaidHut3Daphne_Intro +There's a natural hot +spring just east of +this village.# + +@MermaidHut3Daphne_Open +The water is heated by +magma flows far below. +It's a great place to +relax.# + +@MermaidHut3Daphne_Closed +Unfortunately, all the +water got drained out +somehow. So now we +can't use it.# + +@MermaidHut3Phoebe +You're so lucky that +you get to go on an +adventure. I'm stuck +here at home.# + +@MermaidSpringAlex_Part1 +Thanks for coming. I +hate to ask, but... +well, you're the best +with these machines.# + +@MermaidSpringAlex_Part2 +I'm convinced we'll +find answers in that +city, but every way +in is blocked off.# + +@MermaidSpringAlex_Part3 +However, I think we +can get there via the +caves, by approaching +from below.# + +@MermaidSpringAlex_Part4 +The mermaids aren't +helping. But I found +something they had +stashed away...# + +@MermaidSpringAlex_Part5 +What do you think? I'd +say it's time to start +delving deeper around +here.# + +@MermaidSpringSign_Open + - Hot Spring - +Please enjoy a restful +and relaxing soak.# + +@MermaidSpringSign_Closed + - Hot Spring - +Currently closed for +maintenance.# + +@PrisonFlowerSign +Surface Access {kTileIdBgArrowRight} + +{kTileIdBgArrowLeft} Holding Cells# + +@PrisonUpperBreakerTemple1_Part1 +Oktok! Chief Gronta +say come quick!# + +@PrisonUpperBreakerTemple1_Part2 +More machines, they +are turning on!# + +@PrisonUpperBreakerTemple2 +...Hey! What about us?# + +@PrisonUpperAlexCell_Intro +Anna! Thank goodness +you're here! The orcs +threw us in here, but +they're gone now.# + +@PrisonUpperAlexCell_GetDoorOpen +See if you can find a +way to get this door +open.# + +@PrisonUpperAlexFree_Part1 +Thanks! That door was +too heavy, but I think +I can pick the locks +on the other cells.# + +@PrisonUpperAlexFree_Part2 +I'll let the others +out, then scout ahead. +Be right back.# + +@PrisonUpperAlexLast_Part1 +Bad news: the passage +up to the surface has +collapsed. I don't +know another way yet.# + +@PrisonUpperAlexLast_Part2 +We'll need a safe spot +to camp. Where have +you been staying since +you escaped, Anna?# + +@PrisonUpperAlexLast_Part3 +...Mermaid village? +Wait, seriously? +Mermaids are real?# + +@PrisonUpperAlexLast_Part4 +All right. I'll lead +the other kids down +and meet up with you +there. See you soon.# + +@PrisonUpperBruno_Adults +Are the adults OK?# + +@PrisonUpperBruno_ClimbUp +I think you're going +to have to climb up +top.# + +@PrisonUpperMarie_GoTalkToAlex +It's Anna! Quick, go +talk to Alex! He's in +the cell up ahead.# + +@PrisonUpperMarie_LooseBrick +I can help. There's a +loose brick up there. +If I push it, I can +get you a foothold.# + +@PrisonUpperMarie_StandCareful +There! I think you can +stand on that brick if +you're careful.# + +@PrisonUpperNora +My sister STILL keeps +peeing her pants!# + +@ShadowGateScreen_Page1 +Our social divide is +irreparable. We want +to live different. We +want to BE different.# + +@ShadowGateScreen_Page2 +Finally, we can now +make that a reality.# + +@ShadowTeleportScreen_Page1 +Long have we tried and +failed to use modern +technology to solve +old social problems.# + +@ShadowTeleportScreen_Page2 +And yet, sometimes an +advancement can render +a seemingly unsolvable +problem irrelevant.# + +@TempleAltarPlaque +- Temple of Peace - + Built together by +mermaids and humans. + - A.D. 2250 -# + +@TempleNaveAlexStand_Part1 +Good to see you, Anna. +I've been exploring +this temple. Learning +a lot.# + +@TempleNaveAlexStand_Part2 +I guess humans and +mermaids used to be +friends. They built +this place together.# + +@TempleNaveAlexStand_Part3 +But all this advanced +technology...it's from +humans. How did we +lose that knowledge?# + +@TempleNaveAlexBoost1 +Anna, I think there's +something hidden under +this temple. We should +find out what it is.# + +@TempleNaveAlexBoost2 +Hop on up. I'll give +you a boost.# + +@TownHouse1Nora +My baby sister keeps +peeing her pants!# + +@TownHouse2Stela_Part1 +Can't sleep, Anna?# + +@TownHouse2Stela_Part2 +Your brother Alex is +up late, too.# + +@TownHouse2Stela_Part3 +I think he went +outside somewhere. Why +don't you go find him?# + +@TownHouse3Smith_Part1 +You lookin' fer yer +brother? Haven't seen +`im. Probably pokin' +around somewhere.# + +@TownHouse3Smith_Part2 +That boy's a good +apprentice. Good smith +someday. Too curious +fer `is own good, tho.# + +@TownHouse4Laura_Waiting1 +Your Uncle Martin and +I are waiting here for +Elder Roman to meet +with us.# + +@TownHouse4Laura_Waiting2 +I wonder what's taking +him so long?# + +@TownHouse4Martin +I hope Nora is taking +good care of her baby +sister Nina back at +home...# + +@TownHouse4BreakerLava1_Part1 +I ask only one more +time: where is the +B-Remote?# + +@TownHouse4BreakerLava1_Part2 +What's a bee-re-moat? +I don't know what +you're talking about!# + +@TownHouse4BreakerLava1_Part3 +You cannot hide it +from me! We orcs WILL +take over control of +all your machines!# + +@TownHouse4BreakerLava1_Part4 +What machines? All we +humans have is farming +and smithing. The same +as you brutes!# + +@TownHouse4BreakerLava2_Part1 +How dare talk back to +me? I am Thurg, son of +Gurg! Lieutenent of +great Chief Gronta!# + +@TownHouse4BreakerLava2_Part2 +Humans aren't fit to +wield even their own +inventions. Now is OUR +turn to show you how.# + +@TownHouse4BreakerLava3 +Grunt Hobok! Continue +the interrogation. I +go now to report to +the Chief.# + +@TownHouse6Elder_Part1 +...zzz...When're Laura +and Martin going to be +here?...# + +@TownHouse6Elder_Part2 +...Old Man Roman has +been waiting here for +a long time...zzz...# + +@TownOutdoorsAlex1 +Hi, Anna! I wanted to +show you something. +Look at what I found +in the dirt over here!# + +@TownOutdoorsAlex2_Part1 +It's some weird metal +thing. But nothing +like the iron or steel +Smith Dominic uses.# + +@TownOutdoorsAlex2_Part2 +No idea what it is. It +almost looks like part +of a machine, but it +seems so...advanced.# + +@TownOutdoorsAlex2_Part3 +I wonder where a thing +like this could have +come from...# + +@TownOutdoorsAlex3_Explore1 +Do you ever wish we +could just leave this +town and go exploring? +You and me?# + +@TownOutdoorsAlex3_Explore2 +Mom always says it's +too dangerous, but I +bet we could handle +anything out there...# + +@TownOutdoorsAlex3_HandleThis +Handle THIS, human.# + +@TownOutdoorsAlex3_WhaWhat +Wha- what?# + +@TownOutdoorsAlex3_Attack1 +Orcs, attaaaaaack!# + +@TownOutdoorsAlex3_Attack2 +Anna, run!# + +@TownOutdoorsGronta_Search1 +Lieutenent Thurg! Have +the grunts round up +the townsfolk and lock +these kids up.# + +@TownOutdoorsGronta_Search2 +Then we can begin our +search.# + +@TownOutdoorsGronta_YesChief +Yes, Chief Gronta!# + +@TownOutdoorsIvan_Part1 +The harvest isn't +looking good, Sandra. +This might be a tough +winter for all of us.# + +@TownOutdoorsIvan_Part2 +Oh, sorry Anna, I +didn't see you there.# + +@TownOutdoorsSandra_Part1 +Looking for Alex? He +popped by the house +earlier to see Bruno +and Marie.# + +@TownOutdoorsSandra_Part2 +One of them might know +where he went.# + +@TownOutdoorsSign + + Bartik Town Hall# diff --git a/src/text/text1.txt b/src/text/text1.txt new file mode 100644 index 00000000..802beaff --- /dev/null +++ b/src/text/text1.txt @@ -0,0 +1,739 @@ +@CityCenterBreakerCity1_Part1 +Pfagh, you again? If +you value your life, +boy, you should leave +these ruins to us.# + +@CityCenterBreakerCity1_Part2 +You're the ones who'd +better leave! This +is a human city. It +belongs to us!# + +@CityCenterBreakerCity1_Part3 +Oh? And did YOU build +these buildings? Did +your townsfolk create +these machines?# + +@CityCenterBreakerCity1_Part4 +Of course you didn't. +The people who did +have all been dead +for centuries.# + +@CityCenterBreakerCity1_Part5 +Those humans couldn't +handle the power they +created. And now you +think YOU deserve it?# + +@CityCenterBreakerCity1_Part6 +You have less claim +than we do. At least +orcs never collapsed +advanced civilization.# + +@CityCenterBreakerCity1_Part7 +You never created it, +either. Humans can +learn. And next time, +we'll do it right!# + +@CityCenterBreakerCity1_Part8 +`Next time?' There +will be a `next time' +for humans in charge +over my dead body!# + +@CityCenterBreakerCity2_Part1 +...Another circuit? +But that must mean +that the power core +is almost...hmm.# + +@CityCenterAlex_Part1 +Anna, you found it! +That's the remote that +the orcs have been +looking for!# + +@CityCenterAlex_Part2 +We'll need that to +restore the complex. +But first, there's one +more circuit to find.# + +@CityCenterAlex_Part3 +Down in the lava pits, +there's some kind of +gateway. I'll mark it +on your map.# + +@CityCenterAlex_Part4 +I don't know how to +use it, but I'm sure +you can figure it out. +We've almost got this!# + +@CityCenterAlex_Part5 +Very soon, all this +technology will be +back in human hands!# + +@CityOutskirtsAlex_Part1 +Anna, you made it! I +knew you'd do great. +What did you find out +under the temple?# + +@CityOutskirtsAlex_Part2 +Huh? The mermaids were +CREATED by humans? But +how? And...why? Argh, +we know so little...# + +@CityOutskirtsAlex_Part3 +I've been out scouting +while you were away, +but I keep coming back +here. I can't help it.# + +@CityOutskirtsAlex_Part4 +Do you see all that? +We're on the outskirts +of a human city. Lost +and buried for years.# + +@CityOutskirtsAlex_Part5 +At home, we're barely +smithing iron. Can you +believe what we used +to be able to build?# + +@CityOutskirtsAlex_Part6 +We've GOT to find a +way into that city. +Meet me down in the +mermaid village, OK?# + +@CoreBossGrontaIntro_Part1 +Ahhhh...here you are, +little human. You have +the remote, don't you?# + +@CoreBossGrontaIntro_Part2 +The remote that will +determine whether it +will be orcs or humans +that rule this place.# + +@CoreBossGrontaIntro_Demand +I demand that you give +it to me!% + +@CoreBossGrontaIntro_HandItOver +You're just going to +hand it over, then?% + +@CoreBossGrontaIntro_PreparedToFight +Oh ho! Then are you +prepared to fight me?% + +@CoreBossGrontaGive_Part1 +Bwahahaha! What a +coward!# + +@CoreBossGrontaGive_Part2 +Now we orcs shall take +our rightful place as +masters of this world!# + +@CoreBossGrontaDying_Part1 +Argh...defeated by a +child!? Technology +gives you so much +power...# + +@CoreBossGrontaDying_Part2 +But human civilization +will just fail again! +You'd be better off +with orcs in charge...# + +@CoreBossGrontaDying_Part3 +Maybe...after you've +destroyed yourselves +a second time...we'll +get our chance...# + +@CoreBossScreen_Intro +B-REMOTE RECOGNIZED. +CORE IS ONLINE AND +AWAITING COMMANDS. +>>># + +@CoreBossScreen_Reactivate +REACTIVATE COMPLEX? +>>>% + +@CoreBossScreen_SelfDestruct +BEGIN SELF-DESTRUCT? +>>>% + +@CoreLockBreakerShadow_Part1 +At last! The way to +the core has been +opened!# + +@CoreLockBreakerShadow_Part2 +The humans have had +their chance with this +technology. Now it's +OUR turn.# + +@MermaidHut2Guard_WatchOut1 +The queen would never +let the orcs into our +vale, nor could they +best us by force.# + +@MermaidHut2Guard_WatchOut2 +Still, be wary if you +ever face their war +rhinos. They are not +to be trifled with.# + +@MermaidHut2Guard_Impressed1 +I heard that the orcs +and their war rhinos +have invaded the old +human ruins.# + +@MermaidHut2Guard_Impressed2 +Is it true that you +faced them alone, and +survived? If so, I am +impressed.# + +@MermaidHut4Florist_Meet1 +Ah...you must be that +human that I've been +hearing about.# + +@MermaidHut4Florist_Meet2 +I don't suppose you'd +like to do me a favor?% + +@MermaidHut4Florist_NeverMind1 +Yes, well, I suppose +you must be very busy, +running around and +causing trouble.# + +@MermaidHut4Florist_NeverMind2 +Come back if you ever +change your mind.# + +@MermaidHut4Florist_Zero1 +As you can see, my +home is looking rather +drab. Could you bring +me a flower?# + +@MermaidHut4Florist_Zero2 +If you go east from +this village and then +up a bit, you'll find +the one I want.# + +@MermaidHut4Florist_Zero3 +It's very delicate. +Don't get hurt and +break it, or you'll +have to get another.# + +@MermaidHut4Florist_Brought +Ah, I see you've +brought me a flower! +How kind of you.# + +@MermaidHut4Florist_One1 +It does look nice up +there, don't you +think?# + +@MermaidHut4Florist_One2 +Only...it seems lonely +by itself. I suppose +you'll need to find +some more.# + +@MermaidHut4Florist_One3 +Not from where you got +this one, of course. +You'll have to look +elsewhere.# + +@MermaidHut4Florist_Two1 +You may be wondering +why our queen doesn't +trust humans. I assure +you, she has reasons.# + +@MermaidHut4Florist_Two2 +Truth be told, I don't +trust humans either. +Though your bringing +me flowers does help.# + +@MermaidHut4Florist_Two3 +Perhaps I could +trouble you to find +another? I would so +appreciate it.# + +@MermaidHut4Florist_Three1 +Humans and mermaids +used to be close +friends, you know.# + +@MermaidHut4Florist_Three2 +But humans were never +able to shed their +violent ways, the way +we mermaids have.# + +@MermaidHut4Florist_Three3 +And not just violence. +Shortsightedness in +general. Which is why +so few humans remain.# + +@MermaidHut4Florist_Four1 +I suppose there's no +hiding it: by now you +have seen the complex +above our vale.# + +@MermaidHut4Florist_Four2 +Unlike our temple, +it was built by humans +alone. It predates +even us mermaids.# + +@MermaidHut4Florist_Four3 +And who knows? If not +for it, perhaps human +civilization could +have survived.# + +@MermaidHut4Florist_Four4 +Probably not, though.# + +@MermaidHut4Florist_Five1 +We've noticed you've +been restoring power +to those ancient +circuits, one by one.# + +@MermaidHut4Florist_Five2 +The queen isn't happy +about it. But we are a +people of peace, and +she promised you aid.# + +@MermaidHut4Florist_Five3 +If you really want to +doom your people all +over again, I suppose +that's your choice.# + +@MermaidHut4Florist_Five4 +But woe be upon you if +you bring that down on +us mermaids as well.# + +@MermaidHut4Florist_Six1 +Did you know there +used to be a human +city near here, +centuries ago?# + +@MermaidHut4Florist_Six2 +It was once the center +of everything around +here. A shining beacon +on a hill.# + +@MermaidHut4Florist_Six3 +The humans reveled in +all that they had +built: civilization, +sophistication.# + +@MermaidHut4Florist_Six4 +Now it's all forgotten +and forever buried +under the rubble.# + +@MermaidHut4Florist_Seven1 +...You've been inside +the crypt, haven't +you? Perhaps the only +living soul who has.# + +@MermaidHut4Florist_Seven2 +We know it's there, +but we don't like +to talk about it. Too +much painful history.# + +@MermaidHut4Florist_Seven3 +Very few mermaids who +are alive today have +even heard the name of +Zoe Alda.# + +@MermaidHut4Florist_Seven4 +As for me, suffice to +say I have...mixed +feelings about her +and her work.# + +@MermaidHut4Florist_Eight1 +I'm sure you know by +now why the orcs +attacked your town.# + +@MermaidHut4Florist_Eight2 +They want to claim the +ancient complex here +for themselves. They +think they deserve it.# + +@MermaidHut4Florist_Eight3 +And you poor people +didn't even know you +lived atop such an +attractive nuisance.# + +@MermaidHut4Florist_Eight4 +Like the Pearl Of The +World, you would have +been better off +without it.# + +@MermaidHut4Florist_Nine1 +One wonders why the +orcs have never tried +to seize the ancient +ruins before now.# + +@MermaidHut4Florist_Nine2 +Perhaps the orcs of +centuries past simply +didn't want to?# + +@MermaidHut4Florist_Nine3 +Unlike the orcs of +today, they remembered +what happened to the +people who built them.# + +@MermaidHut4Florist_Nine4 +I'm sure over time, +they've forgotten as +much history as you +humans obviously have.# + +@MermaidHut4Florist_Ten1 +I know you know where +we mermaids came from. +And now, you know that +I know you know.# + +@MermaidHut4Florist_Ten2 +Most mermaids today +don't, and they would +be ashamed to learn we +came from humans.# + +@MermaidHut4Florist_Ten3 +I am not ashamed. My +human ancestors who +chose to become +mermaids chose well!# + +@MermaidHut4Florist_Ten4 +But the question is, +did Zoe Alda and her +colleagues choose well +for humanity?# + +@MermaidHut4Florist_Eleven1 +By now I'm sure you've +seen the ruins of the +ancient human city +with your own eyes.# + +@MermaidHut4Florist_Eleven2 +It wasn't destroyed in +the war with the orcs. +Most of the buildings +there still stand!# + +@MermaidHut4Florist_Eleven3 +No, it simply wasted +away, after human +civilization finished +tearing itself apart.# + +@MermaidHut4Florist_Eleven4 +The forces were always +there, but it was your +technology that made +the rupture possible.# + +@MermaidHut4Florist_Twelve1 +And that makes an even +dozen! How lovely. I +do appreciate all your +help, young one.# + +@MermaidHut4Florist_Twelve2 +In exchange for this +gift of beauty...I'd +like to give you the +gift of music.# + +@MermaidHut4Florist_Twelve3 +I'll unlock my cellar. +You may take what you +find there.# + +@MermaidHut4Florist_AllDone +Perhaps this gift will +give you a better use +for all those terrible +machines.# + +@MermaidHut5Marie +The mermaid queen is +letting us stay here, +but she doesn't seem +happy about it.# + +@MermaidHut5Nora +Well...if we're stuck +here, I guess I may as +well potty train my +little sister.# + +@MermaidVillageAlex_Part1 +Anna! Did you SEE that +place we went through +to get down here? It's +right under our town!# + +@MermaidVillageAlex_Part2 +It must be where that +metal thing I found is +from! ...And what the +orcs came looking for.# + +@MermaidVillageAlex_Part3 +We need to learn more. +But the queen won't +help! She's all upset +about some temple...# + +@MermaidVillageAlex_Part4 +Wait...she said humans +put machines in the +temple? Maybe we could +find some clues there.# + +@MermaidVillageAlex_Part5 +I'm going to go check +it out. Meet up with +me there later, OK? +I'll see you there.# + +@MermaidVillageGuard_Guarding +I am helping to guard +this village. See that +you behave honorably +while you are here.# + +@MermaidVillageGuard_Temple1 +You'll find the temple +entrance just beyond +the northwest end of +the gardens.# + +@MermaidVillageGuard_Temple2 +The queen has already +sent word to the guard +there to allow you to +enter.# + +@MermaidVillageGuard_Temple3 +Just be careful. The +temple is not as safe +a place as it once +was.# + +@MermaidVillageFarmer_Farming +I am farming seaweed. +The harvest has not +been good this year, +though.# + +@MermaidVillageFarmer_NeedHelp +The queen sent you? +Thank goodness. We +could use your help.# + +@MermaidVillageFarmer_Monster +West of our village, +there is a tower in +the gardens. A monster +has taken it over.# + +@MermaidVillageFarmer_OpenTheWay +Perhaps one with your +ingenuity could get +rid of it? We'll open +the way up for you.# + +@MermaidVillageFarmer_ThankYou +You did it! Thank you +for your help. You +should go see the +queen.# + +@MermaidVillageFarmer_LookingFor +Are you looking for +Corra? I think she +went exploring in the +caves above our vale.# + +@MermaidVillageCorra +Oh, hi! I met you back +in the gardens. I'm +Corra, by the way.# + +@MermaidVillageBruno_AlexWithQueen +If you're looking for +Alex, I think he went +to go talk with the +mermaid queen.# + +@MermaidVillageBruno_AlexInTemple +If you're looking for +Alex, I think he's +waiting for you in the +temple.# + +@MermaidVillageBruno_AlexNearCity +If you're looking for +Alex, I think he went +back up to that core +place up above.# + +@MermaidVillageBruno_AlexAtSpring +If you're looking for +Alex, he's waiting for +you at the hot spring, +east of the village.# + +@MermaidVillageBruno_AlexInCity +If you're looking for +Alex, I think he went +up to explore that +ancient human city.# + +@MermaidVillageBruno_AlexExploring +I think Alex went off +exploring somewhere. +Not sure where he is +right now.# + +@SewerPoolSign + - NOTICE - + + Please do[00ad][aeaf] + feed the ducks.# + +@TempleEntryCorra_Wait +Hey Anna, wait up!# + +@TempleEntryCorra_Question +Hi! Did you come to +the temple to pray?% + +@TempleEntryCorra_Yes +Me too! I was taught +to pray always for +peace. I didn't think +humans did that.# + +@TempleEntryCorra_Whom +I'm not sure whom I'm +praying to, though. +...I guess they never +taught me that.# + +@TempleEntryCorra_No +Oh, right...humans +never evolved to seek +after peace, like we +did...# + +@TempleEntryCorra_Taught +Er, at least, that's +what I was taught.# + +@TempleEntryCorra_AlexAsked +Oh, I almost forgot! +Alex asked me to tell +you where to find him +if I saw you.# + +@TempleEntryCorra_MarkMap +Here, I'll just mark +it on your map.# + +@TempleEntryGuard_Intro +I am guarding the +entrance to the temple +you see above us.# + +@TempleEntryGuard_NoPermission +I cannot help you to +enter it without the +queen's permission.# + +@TempleEntryGuard_Enter +Our queen has sent +word: I am to allow +you to enter.# + +@TownHouse5Bruno +If you're looking for +Alex, he wanted to +show you something at +the east end of town.# + +@TownHouse5Marie_Part1 +They try not to show +it, but the adults all +seem pretty worried +lately.# + +@TownHouse5Marie_Part2 +What will we do if we +don't have enough food +to last through the +winter?# diff --git a/src/text/text2.txt b/src/text/text2.txt new file mode 100644 index 00000000..cd2239e7 --- /dev/null +++ b/src/text/text2.txt @@ -0,0 +1,448 @@ +@PaperJerome01_Page1 +Day 1: My name is +Jerome. It was I who +created the orcs.# + +@PaperJerome01_Page2 +In these pages, I feel +compelled to make my +confession.# + +@PaperJerome02_Page1 +Day 2: I had joined +the research effort as +a junior bioengineer +in early 2230.# + +@PaperJerome02_Page2 +It was a great honor +for me to be working +alongside the famed +Dr. Zoe Alda.# + +@PaperJerome03_Page1 +Day 3: In 2235 we had +the breakthrough that +made the creation of +the mermaids possible.# + +@PaperJerome03_Page2 +Dr. Alda envisioned a +newfound freedom for +anyone who wanted a +new life.# + +@PaperJerome04_Page1 +Day 4: As much as I +admired Dr. Alda, I +felt that we needed +a counterbalance.# + +@PaperJerome04_Page2 +Surely, not everyone +who wanted to change +would subscribe to the +mermaids' ideals.# + +@PaperJerome05_Page1 +Day 5: Indeed, most +who chose to become +mermaids were highly +idealistic.# + +@PaperJerome05_Page2 +They felt that they +could create a new +society without the +baggage of humanity.# + +@PaperJerome05_Page3 +A perfect society, +free of conflict and +greed.# + +@PaperJerome07_Page1 +Day 7: At least, that +was the idea. Clearly, +it failed.# + +@PaperJerome07_Page2 +A cautionary tale, if +only there were anyone +left to caution.# + +@PaperJerome08_Page1 +Day 8: The mermaids +seek utopia. They say +they've rid themselves +of hate and violence.# + +@PaperJerome08_Page2 +Of violence? I admit +that they seem to have +succeeded where humans +have always failed.# + +@PaperJerome08_Page3 +But of hate? Of pride? +They have only deluded +themselves.# + +@PaperJerome09_Page1 +Day 9: Meanwhile, the +orcs value conviction. +Honor. Valor. All fine +qualities.# + +@PaperJerome09_Page2 +But I fear they are +fast losing sight of +what they claim their +convictions stand for.# + +@PaperJerome09_Page3 +And so they, too, are +no better than us +humans.# + +@PaperJerome10 +Day 10: The orcs would +rule in our place, if +we let them. I doubt +that would go well.# + +@PaperJerome11_Page1 +Day 11: And yet, who +am I to judge? Perhaps +they would do better +than we did.# + +@PaperJerome11_Page2 +It's not as though the +bar is very high.# + +@PaperJerome12_Page1 +Day 12: So where do I +even start? We were a +great civilization +once, before the orcs.# + +@PaperJerome12_Page2 +But we were already +crumbling long before +they attacked.# + +@PaperJerome13_Page1 +Day 13: And now, there +is nothing left of us +but our machines.# + +@PaperJerome13_Page2 +I wonder for how long +those will keep on +working. A long time. +Maybe forever.# + +@PaperJerome14_Page1 +Day 14: It saddens me +that we couldn't build +a society as robust as +our technology.# + +@PaperJerome14_Page2 +We had the knowledge, +but not the wisdom +necessary. Nor the +humility we needed.# + +@PaperJerome15_Page1 +Day 15: Now facing our +apocalypse, I find +myself musing on how +it came to happen.# + +@PaperJerome15_Page2 +Our demise always +seemed likely, but +oddly, none of the +likely causes arose.# + +@PaperJerome18_Page1 +Day 18: We developed +artificial minds so +smart, they could have +ruled us. Enslaved us.# + +@PaperJerome18_Page2 +But it turned out that +they didn't want to.# + +@PaperJerome19_Page1 +Day 19: We sought +better life through +chemistry. We spewed +substances recklessly.# + +@PaperJerome19_Page2 +And yet, we eventually +got most of it cleaned +up. Enough of it, +anyway.# + +@PaperJerome20_Page1 +Day 20: In the end, +the problem wasn't our +technology. It was us.# + +@PaperJerome21_Page1 +Day 21: When Dr. Alda +created the mermaids, +she was trying to help +solve that problem.# + +@PaperJerome21_Page2 +But frankly, I think +she only made things +worse. Not that I did +any better, of course.# + +@PaperJerome23_Page1 +Day 23: But human +nature was still +there. The mermaids +proved this, I think.# + +@PaperJerome23_Page2 +The orcs, more so.# + +@PaperJerome27_Page1 +Day 27: By 2250 things +had settled down a +bit, but the mistrust +never really ended.# + +@PaperJerome27_Page2 +We built the Peace +Temple together with +the mermaids, but it +was a feeble gesture.# + +@PaperJerome27_Page3 +The orcs continued to +seethe. The mermaids +soon grew disgusted +with us both.# + +@PaperJerome28_Page1 +Day 28: We tried to +make peace with them, +of course. In the end +it wasn't possible.# + +@PaperJerome28_Page2 +But after all, that's +why we and they were +different in the first +place, isn't it?# + +@PaperJerome31_Page1 +Day 31: Despite how we +chose to use all our +technology, it needn't +have gone that way.# + +@PaperJerome31_Page2 +The complex core and +all these machines +could one day be put +to a different use.# + +@PaperJerome34_Page1 +Day 34: Our technology +is amazing, but lest +we forget, we're all +still just mortals.# + +@PaperJerome34_Page2 +No matter how high we +build, in the end the +grave still comes for +us all.# + +@PaperJerome35_Page1 +Day 35: I have hidden +the remote. Without it +the complex can never +be fully put to use.# + +@PaperJerome35_Page2 +I can't bring myself +to destroy our work. +Maybe, someday, we'll +be responsible enough.# + +@PaperJerome35_Page3 +Maybe someday...# + +@PaperJerome36_Page1 +Day 36: By now there's +probably not much time +left to finish this.# + +@PaperJerome36_Page2 +I'm going to start +pinning up all these +pages. Maybe someday +someone'll find them.# + +@PaperJerome36_Page3 +By then, I'm sure I'll +be long gone.# + +@PaperManual1_Page1 +CPU FIELD MANUAL p.1: +Basic console control: + A: confirm + B: cancel/exit# + +@PaperManual1_Page2 + SELECT: insert new + instruction + START: activate + debugger# + +@PaperManual2_Page1 +CPU FIELD MANUAL p.2: +Programs are saved +automatically when +a console is closed.# + +@PaperManual2_Page2 +Progress is also saved +automatically whenever +entering or leaving a +room.# + +@PaperManual3_Page1 +CPU FIELD MANUAL p.3: +A program loops until +an END is reached or +an error occurs.# + +@PaperManual3_Page2 +An error occurs if a +machine tries to MOVE +or ACT but cannot.# + +@PaperManual4_Page1 +CPU FIELD MANUAL p.4: +Every machine has an +`A' register that you +can COPY values into.# + +@PaperManual4_Page2 +Unlike other registers +it does nothing on its +own, but it can store +a value for later.# + +@PaperManual5_Page1 +CPU FIELD MANUAL p.5: +Common register names: + F:flag D:distance + J:index K:key/lock# + +@PaperManual5_Page2 +L/R:lever M:mirror + P:power S:sensor + T:turn U:upper + V:valve W:weight# + +@PaperManual5_Page3 + X:horzizontal offset + Y:vertical ascent + Z:vertical descent# + +@PaperManual6_Page1 +CPU FIELD MANUAL p.6: +It can be useful to +compare one register +directly to another.# + +@PaperManual6_Page2 +For example: + :IF Y>L + :MOVE {kTileIdBgArrowDown} +or the reverse.# + +@PaperManual9_Page1 +CPU FIELD MANUAL p.9: +An IF can guard a TIL +loop whose condition +is already met.# + +@PaperManual9_Page2 +For example: + :IF X<5 + :MOVE {kTileIdBgArrowRight} + :TIL X{kTileIdBgCmpGe}5# + +@UpgradeRam + PROGRAM RAM +Increases max program +size by 2 instructions.# + +@UpgradeBRemote + B-REMOTE +Uses the B button to +control the B register.# + +@UpgradeOpIf + IF OPCODE +Skips next instruction +unless condition is met.# + +@UpgradeOpTil + TIL OPCODE +Repeats last instruction +until condition is met.# + +@UpgradeOpCopy + COPY OPCODE +Copies a value into a +register.# + +@UpgradeOpAddSub + ADD/SUB OPCODES +Adds or subtracts one +value from another.# + +@UpgradeOpMul + MUL OPCODE +Multiplies one value by +another.# + +@UpgradeOpGoto + GOTO OPCODE +Jumps directly to a +specific instruction.# + +@UpgradeOpSkip + SKIP OPCODE +Skips over a variable +number of instructions.# + +@UpgradeOpRest + REST OPCODE +Pauses execution for a +short time.# + +@UpgradeOpSync + SYNC OPCODE +Pauses execution until +all machines sync.# + +@UpgradeOpBeep + BEEP OPCODE +Plays one of ten musical +tones.# diff --git a/src/upgrade.asm b/src/upgrade.asm index fb578c36..5fdc2ce8 100644 --- a/src/upgrade.asm +++ b/src/upgrade.asm @@ -35,6 +35,18 @@ .INCLUDE "upgrade.inc" .INCLUDE "window.inc" +.IMPORT DataA_Text2_UpgradeBRemote_u8_arr +.IMPORT DataA_Text2_UpgradeOpAddSub_u8_arr +.IMPORT DataA_Text2_UpgradeOpBeep_u8_arr +.IMPORT DataA_Text2_UpgradeOpCopy_u8_arr +.IMPORT DataA_Text2_UpgradeOpGoto_u8_arr +.IMPORT DataA_Text2_UpgradeOpIf_u8_arr +.IMPORT DataA_Text2_UpgradeOpMul_u8_arr +.IMPORT DataA_Text2_UpgradeOpRest_u8_arr +.IMPORT DataA_Text2_UpgradeOpSkip_u8_arr +.IMPORT DataA_Text2_UpgradeOpSync_u8_arr +.IMPORT DataA_Text2_UpgradeOpTil_u8_arr +.IMPORT DataA_Text2_UpgradeRam_u8_arr .IMPORT FuncM_CopyDialogText .IMPORT FuncM_DrawObjectsForRoomAndProcessFrame .IMPORT FuncM_ScrollTowardsAvatar @@ -230,7 +242,7 @@ _CollectUpgrade: sta T0 lda DataA_Avatar_UpgradeText_ptr_1_arr, x sta T1 - lda #<.bank(DataA_Text3_UpgradeRam_u8_arr) + lda #<.bank(DataA_Text2_UpgradeRam_u8_arr) sta T2 ;; Set the upgrade's flag in SRAM. jsr Func_SetFlag ; preserves T0+ @@ -274,22 +286,22 @@ _CollectUpgrade: D_TABLE_LO table, DataA_Avatar_UpgradeText_ptr_0_arr D_TABLE_HI table, DataA_Avatar_UpgradeText_ptr_1_arr D_TABLE kNumUpgradeFlags + kFirstUpgradeFlag - d_entry table, eFlag::None, DataA_Text3_UpgradeRam_u8_arr - d_entry table, eFlag::UpgradeRam1, DataA_Text3_UpgradeRam_u8_arr - d_entry table, eFlag::UpgradeRam2, DataA_Text3_UpgradeRam_u8_arr - d_entry table, eFlag::UpgradeRam3, DataA_Text3_UpgradeRam_u8_arr - d_entry table, eFlag::UpgradeRam4, DataA_Text3_UpgradeRam_u8_arr - d_entry table, eFlag::UpgradeBRemote, DataA_Text3_UpgradeBRemote_u8_arr - d_entry table, eFlag::UpgradeOpIf, DataA_Text3_UpgradeOpIf_u8_arr - d_entry table, eFlag::UpgradeOpTil, DataA_Text3_UpgradeOpTil_u8_arr - d_entry table, eFlag::UpgradeOpCopy, DataA_Text3_UpgradeOpCopy_u8_arr - d_entry table, eFlag::UpgradeOpAddSub, DataA_Text3_UpgradeOpAddSub_u8_arr - d_entry table, eFlag::UpgradeOpMul, DataA_Text3_UpgradeOpMul_u8_arr - d_entry table, eFlag::UpgradeOpBeep, DataA_Text3_UpgradeOpBeep_u8_arr - d_entry table, eFlag::UpgradeOpGoto, DataA_Text3_UpgradeOpGoto_u8_arr - d_entry table, eFlag::UpgradeOpSkip, DataA_Text3_UpgradeOpSkip_u8_arr - d_entry table, eFlag::UpgradeOpRest, DataA_Text3_UpgradeOpRest_u8_arr - d_entry table, eFlag::UpgradeOpSync, DataA_Text3_UpgradeOpSync_u8_arr + d_entry table, eFlag::None, DataA_Text2_UpgradeRam_u8_arr + d_entry table, eFlag::UpgradeRam1, DataA_Text2_UpgradeRam_u8_arr + d_entry table, eFlag::UpgradeRam2, DataA_Text2_UpgradeRam_u8_arr + d_entry table, eFlag::UpgradeRam3, DataA_Text2_UpgradeRam_u8_arr + d_entry table, eFlag::UpgradeRam4, DataA_Text2_UpgradeRam_u8_arr + d_entry table, eFlag::UpgradeBRemote, DataA_Text2_UpgradeBRemote_u8_arr + d_entry table, eFlag::UpgradeOpIf, DataA_Text2_UpgradeOpIf_u8_arr + d_entry table, eFlag::UpgradeOpTil, DataA_Text2_UpgradeOpTil_u8_arr + d_entry table, eFlag::UpgradeOpCopy, DataA_Text2_UpgradeOpCopy_u8_arr + d_entry table, eFlag::UpgradeOpAddSub, DataA_Text2_UpgradeOpAddSub_u8_arr + d_entry table, eFlag::UpgradeOpMul, DataA_Text2_UpgradeOpMul_u8_arr + d_entry table, eFlag::UpgradeOpBeep, DataA_Text2_UpgradeOpBeep_u8_arr + d_entry table, eFlag::UpgradeOpGoto, DataA_Text2_UpgradeOpGoto_u8_arr + d_entry table, eFlag::UpgradeOpSkip, DataA_Text2_UpgradeOpSkip_u8_arr + d_entry table, eFlag::UpgradeOpRest, DataA_Text2_UpgradeOpRest_u8_arr + d_entry table, eFlag::UpgradeOpSync, DataA_Text2_UpgradeOpSync_u8_arr D_END .ENDREPEAT @@ -442,79 +454,3 @@ _YOffsets_u8_arr16: .ENDPROC ;;;=========================================================================;;; - -.SEGMENT "PRGA_Text3" - -.PROC DataA_Text3_UpgradeRam_u8_arr - .byte " PROGRAM RAM$" - .byte "Increases max program$" - .byte "size by 2 instructions.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeBRemote_u8_arr - .byte " B-REMOTE$" - .byte "Uses the B button to$" - .byte "control the B register.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpIf_u8_arr - .byte " IF OPCODE$" - .byte "Skips next instruction$" - .byte "unless condition is met.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpTil_u8_arr - .byte " TIL OPCODE$" - .byte "Repeats last instruction$" - .byte "until condition is met.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpCopy_u8_arr - .byte " COPY OPCODE$" - .byte "Copies a value into a$" - .byte "register.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpAddSub_u8_arr - .byte " ADD/SUB OPCODES$" - .byte "Adds or subtracts one$" - .byte "value from another.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpMul_u8_arr - .byte " MUL OPCODE$" - .byte "Multiplies one value by$" - .byte "another.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpGoto_u8_arr - .byte " GOTO OPCODE$" - .byte "Jumps directly to a$" - .byte "specific instruction.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpSkip_u8_arr - .byte " SKIP OPCODE$" - .byte "Skips over a variable$" - .byte "number of instructions.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpRest_u8_arr - .byte " REST OPCODE$" - .byte "Pauses execution for a$" - .byte "short time.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpSync_u8_arr - .byte " SYNC OPCODE$" - .byte "Pauses execution until$" - .byte "all machines sync.#" -.ENDPROC - -.PROC DataA_Text3_UpgradeOpBeep_u8_arr - .byte " BEEP OPCODE$" - .byte "Plays one of ten musical$" - .byte "tones.#" -.ENDPROC - -;;;=========================================================================;;;