Skip to content

Commit 0ee44ad

Browse files
authored
Town map: unpack descriptions data & generate text bank (#798)
1 parent 4abbaaf commit 0ee44ad

File tree

12 files changed

+3401
-1013
lines changed

12 files changed

+3401
-1013
lines changed

platinum.us/filesys.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ res/prebuilt/data/t3_fl_p.nsbtx,/data/t3_fl_p.nsbtx
9292
res/prebuilt/data/t3_fl_r.nsbtx,/data/t3_fl_r.nsbtx
9393
res/prebuilt/data/t3_fl_y.nsbtx,/data/t3_fl_y.nsbtx
9494
res/prebuilt/data/test.atr,/data/test.atr
95-
res/prebuilt/data/tmap_block.dat,/data/tmap_block.dat
96-
res/prebuilt/data/tmap_flags.dat,/data/tmap_flags.dat
95+
res/town_map/town_map_blocks.dat,/data/tmap_block.dat
96+
res/town_map/town_map_flags.dat,/data/tmap_flags.dat
9797
res/prebuilt/data/tmapn_canm.resdat,/data/tmapn_canm.resdat
9898
res/prebuilt/data/tmapn_celact.cldat,/data/tmapn_celact.cldat
9999
res/prebuilt/data/tmapn_celact.txt,/data/tmapn_celact.txt

platinum.us/filesys.sha1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ aa3240383bc0d0ed15b4848616698a25623a6d22 *res/prebuilt/data/t3_fl_p.nsbtx
9191
2aead045ba9169c7eaf35d4e82ac8f37f5e615bf *res/prebuilt/data/t3_fl_r.nsbtx
9292
efcb17fc440548aefb1ec4b830955fa9e7954025 *res/prebuilt/data/t3_fl_y.nsbtx
9393
b5b6089df980ad54540fad84c76f76bcde0bb464 *res/prebuilt/data/test.atr
94-
337f8bd7788eaea30946c8632bdbc9ef9b12b51f *res/prebuilt/data/tmap_block.dat
95-
973dc6f187a2b7469c6a1a11d5c4c0c41b2f221c *res/prebuilt/data/tmap_flags.dat
94+
337f8bd7788eaea30946c8632bdbc9ef9b12b51f *res/town_map/town_map_blocks.dat
95+
973dc6f187a2b7469c6a1a11d5c4c0c41b2f221c *res/town_map/town_map_flags.dat
9696
aba8f43ada2b1919151c50366ec00df4f875350d *res/prebuilt/data/tmapn_canm.resdat
9797
b350396f553cf8c70888aca59e327310812b1ee9 *res/prebuilt/data/tmapn_celact.cldat
9898
b2d44b4083a618fa1da3e463e757b7af5e839bb3 *res/prebuilt/data/tmapn_celact.txt

res/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ copy_gen = generator(find_program('cp'),
7676
# is a dependency of some later build-rule.
7777
subdir('pokemon')
7878
subdir('trainers')
79+
subdir('graphics')
80+
subdir('town_map')
7981
subdir('text')
8082

8183
# Common generator for "scripting" files, i.e. field and battle scripts

res/prebuilt/data/meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ prebuilt_files = [
9393
't3_fl_r.nsbtx',
9494
't3_fl_y.nsbtx',
9595
'test.atr',
96-
'tmap_block.dat',
97-
'tmap_flags.dat',
9896
'tmapn_canm.resdat',
9997
'tmapn_celact.cldat',
10098
'tmapn_celact.txt',

res/prebuilt/data/tmap_block.dat

-4.27 KB
Binary file not shown.

res/prebuilt/data/tmap_flags.dat

-732 Bytes
Binary file not shown.

res/text/meson.build

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,16 @@ frontier_text_bank_names = [
4848
'frontier_trainer_names.json'
4949
]
5050

51+
town_map_text_bank_name = [
52+
'town_map.json'
53+
]
54+
5155
# This list will be what's used hereafter when referring to any-and-all generated banks.
5256
generated_text_banks = [
5357
species_text_bank_names,
5458
trainer_text_bank_names,
5559
frontier_text_bank_names,
60+
town_map_text_bank_name,
5661
]
5762

5863
# 2. All other files must be static. Pull these from `generated/text_banks.txt`. This allows us
@@ -139,6 +144,18 @@ frontier_text_banks = custom_target('frontier_text_banks',
139144

140145
text_bank_files += frontier_text_banks
141146

147+
town_map_text_bank = custom_target('town_map_text_bank',
148+
output: town_map_text_bank_name,
149+
command: [
150+
'cp',
151+
'@OUTDIR@/../town_map/town_map.json',
152+
'@OUTDIR@'
153+
],
154+
depends: [ town_map_data ]
155+
)
156+
157+
text_bank_files += town_map_text_bank
158+
142159
text_banks = custom_target('pl_msg.narc',
143160
output: 'pl_msg.narc',
144161
input: json_to_bin_gen.process(text_bank_files),

0 commit comments

Comments
 (0)