Skip to content

Commit 2469f30

Browse files
MokhaLeeeMokhaLeee
authored
Merge pull request #724 from BlueAnthem37510/parallel
Convert battle backgrounds to single images
2 parents f2c3620 + d617ad2 commit 2469f30

File tree

101 files changed

+283
-7155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+283
-7155
lines changed

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ clean:
115115
# Remove converted songs
116116
$(RM) -f $(MID_SUBDIR)/*.s
117117
$(RM) -f $(AUTO_GEN_TARGETS)
118-
@find . \( -iname '*.o' -o -iname '*.obj' -o -iname '*.feimg1.bin' -o -iname '*.feimg2.bin' -o -iname '*.fetsa1.bin' -o -iname '*.fetsa2.bin' -o -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.fk' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
118+
@find . \( -iname '*.o' -o -iname '*.obj' -o -iname '*.feimg1.bin' -o -iname '*.feimg2.bin' -o -iname '*.feimg3.bin' -o -iname '*.fetsa1.bin' -o -iname '*.fetsa2.bin' -o -iname '*.fetsa3.bin' -o -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.fk' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
119119

120120
.PHONY: clean
121121

@@ -180,7 +180,10 @@ sound/%.bin: sound/%.aif ; $(AIF2PCM) $< $@
180180

181181
%.feimg2.bin %.fetsa2.bin: %.png
182182
$(FETSATOOL) $< $*.feimg2.bin $*.fetsa2.bin
183-
183+
184+
%.feimg3.bin %.fetsa3.bin: %.png
185+
$(FETSATOOL) $< $*.feimg3.bin $*.fetsa3.bin
186+
184187
# Battle Animation Recipes
185188

186189
$(BANIM_OBJECT): $(shell ./scripts/arm_compressing_linker.py -t linker_script_banim.txt -m)

‎data/data_btl_bg.s‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ gBattleBGDataTable: @875A794
7676
.align 2, 0
7777
.global btl_bg_0_tiles
7878
btl_bg_0_tiles: @875aad0
79-
.incbin "graphics/btl_bg/btl_bg_0.4bpp.lz"
79+
.incbin "graphics/btl_bg/btl_bg_0.feimg3.bin.lz"
8080

8181
.align 2, 0
8282
.global btl_bg_0_palette
@@ -86,12 +86,12 @@ btl_bg_0_palette: @875cfb4
8686
.align 2, 0
8787
.global btl_bg_0_map
8888
btl_bg_0_map: @875d084
89-
.incbin "graphics/btl_bg/btl_bg_0.bin.lz"
89+
.incbin "graphics/btl_bg/btl_bg_0.fetsa3.bin.lz"
9090

9191
.align 2, 0
9292
.global btl_bg_1_tiles
9393
btl_bg_1_tiles: @875d3c8
94-
.incbin "graphics/btl_bg/btl_bg_1.4bpp.lz"
94+
.incbin "graphics/btl_bg/btl_bg_1.feimg3.bin.lz"
9595

9696
.align 2, 0
9797
.global btl_bg_1_palette
@@ -101,12 +101,12 @@ btl_bg_1_palette: @875e530
101101
.align 2, 0
102102
.global btl_bg_1_map
103103
btl_bg_1_map: @875e5d4
104-
.incbin "graphics/btl_bg/btl_bg_1.bin.lz"
104+
.incbin "graphics/btl_bg/btl_bg_1.fetsa3.bin.lz"
105105

106106
.align 2, 0
107107
.global btl_bg_2_tiles
108108
btl_bg_2_tiles: @875e900
109-
.incbin "graphics/btl_bg/btl_bg_2.4bpp.lz"
109+
.incbin "graphics/btl_bg/btl_bg_2.feimg3.bin.lz"
110110

111111
.align 2, 0
112112
.global btl_bg_2_palette
@@ -116,12 +116,12 @@ btl_bg_2_palette: @875f6f8
116116
.align 2, 0
117117
.global btl_bg_2_map
118118
btl_bg_2_map: @875f7e4
119-
.incbin "graphics/btl_bg/btl_bg_2.bin.lz"
119+
.incbin "graphics/btl_bg/btl_bg_2.fetsa3.bin.lz"
120120

121121
.align 2, 0
122122
.global btl_bg_3_tiles
123123
btl_bg_3_tiles: @875f99c
124-
.incbin "graphics/btl_bg/btl_bg_3.4bpp.lz"
124+
.incbin "graphics/btl_bg/btl_bg_3.feimg3.bin.lz"
125125

126126
.align 2, 0
127127
.global btl_bg_3_palette
@@ -131,12 +131,12 @@ btl_bg_3_palette: @8761084
131131
.align 2, 0
132132
.global btl_bg_3_map
133133
btl_bg_3_map: @87611b8
134-
.incbin "graphics/btl_bg/btl_bg_3.bin.lz"
134+
.incbin "graphics/btl_bg/btl_bg_3.fetsa3.bin.lz"
135135

136136
.align 2, 0
137137
.global btl_bg_4_tiles
138138
btl_bg_4_tiles: @8761468
139-
.incbin "graphics/btl_bg/btl_bg_4.4bpp.lz"
139+
.incbin "graphics/btl_bg/btl_bg_4.feimg3.bin.lz"
140140

141141
.align 2, 0
142142
.global btl_bg_4_palette
@@ -146,12 +146,12 @@ btl_bg_4_palette: @8762550
146146
.align 2, 0
147147
.global btl_bg_4_map
148148
btl_bg_4_map: @8762638
149-
.incbin "graphics/btl_bg/btl_bg_4.bin.lz"
149+
.incbin "graphics/btl_bg/btl_bg_4.fetsa3.bin.lz"
150150

151151
.align 2, 0
152152
.global btl_bg_5_tiles
153153
btl_bg_5_tiles: @8762874
154-
.incbin "graphics/btl_bg/btl_bg_5.4bpp.lz"
154+
.incbin "graphics/btl_bg/btl_bg_5.feimg3.bin.lz"
155155

156156
.align 2, 0
157157
.global btl_bg_5_palette
@@ -161,12 +161,12 @@ btl_bg_5_palette: @87638a8
161161
.align 2, 0
162162
.global btl_bg_5_map
163163
btl_bg_5_map: @87639ac
164-
.incbin "graphics/btl_bg/btl_bg_5.bin.lz"
164+
.incbin "graphics/btl_bg/btl_bg_5.fetsa3.bin.lz"
165165

166166
.align 2, 0
167167
.global btl_bg_6_tiles
168168
btl_bg_6_tiles: @8763b74
169-
.incbin "graphics/btl_bg/btl_bg_6.4bpp.lz"
169+
.incbin "graphics/btl_bg/btl_bg_6.feimg3.bin.lz"
170170

171171
.align 2, 0
172172
.global btl_bg_6_palette
@@ -176,12 +176,12 @@ btl_bg_6_palette: @876554c
176176
.align 2, 0
177177
.global btl_bg_6_map
178178
btl_bg_6_map: @8765654
179-
.incbin "graphics/btl_bg/btl_bg_6.bin.lz"
179+
.incbin "graphics/btl_bg/btl_bg_6.fetsa3.bin.lz"
180180

181181
.align 2, 0
182182
.global btl_bg_7_tiles
183183
btl_bg_7_tiles: @87658c8
184-
.incbin "graphics/btl_bg/btl_bg_7.4bpp.lz"
184+
.incbin "graphics/btl_bg/btl_bg_7.feimg3.bin.lz"
185185

186186
.align 2, 0
187187
.global btl_bg_7_palette
@@ -191,12 +191,12 @@ btl_bg_7_palette: @87666e4
191191
.align 2, 0
192192
.global btl_bg_7_map
193193
btl_bg_7_map: @8766790
194-
.incbin "graphics/btl_bg/btl_bg_7.bin.lz"
194+
.incbin "graphics/btl_bg/btl_bg_7.fetsa3.bin.lz"
195195

196196
.align 2, 0
197197
.global btl_bg_8_tiles
198198
btl_bg_8_tiles: @876691c
199-
.incbin "graphics/btl_bg/btl_bg_8.4bpp.lz"
199+
.incbin "graphics/btl_bg/btl_bg_8.feimg3.bin.lz"
200200

201201
.align 2, 0
202202
.global btl_bg_8_palette
@@ -206,12 +206,12 @@ btl_bg_8_palette: @8767bcc
206206
.align 2, 0
207207
.global btl_bg_8_map
208208
btl_bg_8_map: @8767c8c
209-
.incbin "graphics/btl_bg/btl_bg_8.bin.lz"
209+
.incbin "graphics/btl_bg/btl_bg_8.fetsa3.bin.lz"
210210

211211
.align 2, 0
212212
.global btl_bg_10_tiles
213213
btl_bg_10_tiles: @8767e84
214-
.incbin "graphics/btl_bg/btl_bg_10.4bpp.lz"
214+
.incbin "graphics/btl_bg/btl_bg_10.feimg3.bin.lz"
215215

216216
.align 2, 0
217217
.global btl_bg_10_palette
@@ -221,12 +221,12 @@ btl_bg_10_palette: @8768f08
221221
.align 2, 0
222222
.global btl_bg_10_map
223223
btl_bg_10_map: @876900c
224-
.incbin "graphics/btl_bg/btl_bg_10.bin.lz"
224+
.incbin "graphics/btl_bg/btl_bg_10.fetsa3.bin.lz"
225225

226226
.align 2, 0
227227
.global btl_bg_11_tiles
228228
btl_bg_11_tiles: @87692d8
229-
.incbin "graphics/btl_bg/btl_bg_11.4bpp.lz"
229+
.incbin "graphics/btl_bg/btl_bg_11.feimg3.bin.lz"
230230

231231
.align 2, 0
232232
.global btl_bg_11_palette
@@ -236,12 +236,12 @@ btl_bg_11_palette: @876b060
236236
.align 2, 0
237237
.global btl_bg_11_map
238238
btl_bg_11_map: @876b0cc
239-
.incbin "graphics/btl_bg/btl_bg_11.bin.lz"
239+
.incbin "graphics/btl_bg/btl_bg_11.fetsa3.bin.lz"
240240

241241
.align 2, 0
242242
.global btl_bg_12_tiles
243243
btl_bg_12_tiles: @876b3ac
244-
.incbin "graphics/btl_bg/btl_bg_12.4bpp.lz"
244+
.incbin "graphics/btl_bg/btl_bg_12.feimg3.bin.lz"
245245

246246
.align 2, 0
247247
.global btl_bg_12_palette
@@ -251,12 +251,12 @@ btl_bg_12_palette: @876c3c8
251251
.align 2, 0
252252
.global btl_bg_12_map
253253
btl_bg_12_map: @876c454
254-
.incbin "graphics/btl_bg/btl_bg_12.bin.lz"
254+
.incbin "graphics/btl_bg/btl_bg_12.fetsa3.bin.lz"
255255

256256
.align 2, 0
257257
.global btl_bg_13_tiles
258258
btl_bg_13_tiles: @876c62c
259-
.incbin "graphics/btl_bg/btl_bg_13.4bpp.lz"
259+
.incbin "graphics/btl_bg/btl_bg_13.feimg3.bin.lz"
260260

261261
.align 2, 0
262262
.global btl_bg_13_palette
@@ -266,7 +266,7 @@ btl_bg_13_palette: @876d3f0
266266
.align 2, 0
267267
.global btl_bg_13_map
268268
btl_bg_13_map: @876d4ec
269-
.incbin "graphics/btl_bg/btl_bg_13.bin.lz"
269+
.incbin "graphics/btl_bg/btl_bg_13.fetsa3.bin.lz"
270270

271271
.align 2, 0
272272
.global btl_bg_14_tiles
@@ -286,7 +286,7 @@ btl_bg_14_map: @876e350
286286
.align 2, 0
287287
.global btl_bg_15_tiles
288288
btl_bg_15_tiles: @876e52c
289-
.incbin "graphics/btl_bg/btl_bg_15.4bpp.lz"
289+
.incbin "graphics/btl_bg/btl_bg_15.feimg3.bin.lz"
290290

291291
.align 2, 0
292292
.global btl_bg_15_palette
@@ -296,7 +296,7 @@ btl_bg_15_palette: @876f334
296296
.align 2, 0
297297
.global btl_bg_15_map
298298
btl_bg_15_map: @876f41c
299-
.incbin "graphics/btl_bg/btl_bg_15.bin.lz"
299+
.incbin "graphics/btl_bg/btl_bg_15.fetsa3.bin.lz"
300300

301301
.align 2, 0
302302
.global btl_bg_16_palette
@@ -391,7 +391,7 @@ btl_bg_27_map: @8772950
391391
.align 2, 0
392392
.global btl_bg_32_tiles
393393
btl_bg_32_tiles: @8772cbc
394-
.incbin "graphics/btl_bg/btl_bg_32.4bpp.lz"
394+
.incbin "graphics/btl_bg/btl_bg_32.feimg3.bin.lz"
395395

396396
.align 2, 0
397397
.global btl_bg_32_palette
@@ -401,7 +401,7 @@ btl_bg_32_palette: @87741f0
401401
.align 2, 0
402402
.global btl_bg_32_map
403403
btl_bg_32_map: @8774240
404-
.incbin "graphics/btl_bg/btl_bg_32.bin.lz"
404+
.incbin "graphics/btl_bg/btl_bg_32.fetsa3.bin.lz"
405405

406406
.align 2, 0
407407
.global btl_bg_33_tiles
@@ -476,7 +476,7 @@ btl_bg_44_palette: @87777cc
476476
.align 2, 0
477477
.global btl_bg_45_tiles
478478
btl_bg_45_tiles: @8777858
479-
.incbin "graphics/btl_bg/btl_bg_45.4bpp.lz"
479+
.incbin "graphics/btl_bg/btl_bg_45.feimg3.bin.lz"
480480

481481
.align 2, 0
482482
.global btl_bg_45_palette
@@ -486,12 +486,12 @@ btl_bg_45_palette: @87784d8
486486
.align 2, 0
487487
.global btl_bg_45_map
488488
btl_bg_45_map: @8778618
489-
.incbin "graphics/btl_bg/btl_bg_45.bin.lz"
489+
.incbin "graphics/btl_bg/btl_bg_45.fetsa3.bin.lz"
490490

491491
.align 2, 0
492492
.global btl_bg_46_tiles
493493
btl_bg_46_tiles: @87787d0
494-
.incbin "graphics/btl_bg/btl_bg_46.4bpp.lz"
494+
.incbin "graphics/btl_bg/btl_bg_46.feimg3.bin.lz"
495495

496496
.align 2, 0
497497
.global btl_bg_46_palette
@@ -501,12 +501,12 @@ btl_bg_46_palette: @8779750
501501
.align 2, 0
502502
.global btl_bg_46_map
503503
btl_bg_46_map: @8779838
504-
.incbin "graphics/btl_bg/btl_bg_46.bin.lz"
504+
.incbin "graphics/btl_bg/btl_bg_46.fetsa3.bin.lz"
505505

506506
.align 2, 0
507507
.global btl_bg_47_tiles
508508
btl_bg_47_tiles: @8779a1c
509-
.incbin "graphics/btl_bg/btl_bg_47.4bpp.lz"
509+
.incbin "graphics/btl_bg/btl_bg_47.feimg3.bin.lz"
510510

511511
.align 2, 0
512512
.global btl_bg_47_palette
@@ -516,7 +516,7 @@ btl_bg_47_palette: @877abf0
516516
.align 2, 0
517517
.global btl_bg_47_map
518518
btl_bg_47_map: @877acf8
519-
.incbin "graphics/btl_bg/btl_bg_47.bin.lz"
519+
.incbin "graphics/btl_bg/btl_bg_47.fetsa3.bin.lz"
520520

521521
.align 2, 0
522522
.global btl_bg_48_palette
@@ -536,7 +536,7 @@ btl_bg_50_palette: @877b228
536536
.align 2, 0
537537
.global btl_bg_52_tiles
538538
btl_bg_52_tiles: @877b360
539-
.incbin "graphics/btl_bg/btl_bg_52.4bpp.lz"
539+
.incbin "graphics/btl_bg/btl_bg_52.feimg3.bin.lz"
540540

541541
.align 2, 0
542542
.global btl_bg_52_palette
@@ -546,7 +546,7 @@ btl_bg_52_palette: @877c62c
546546
.align 2, 0
547547
.global btl_bg_52_map
548548
btl_bg_52_map: @877c6d4
549-
.incbin "graphics/btl_bg/btl_bg_52.bin.lz"
549+
.incbin "graphics/btl_bg/btl_bg_52.fetsa3.bin.lz"
550550

551551
.align 2, 0
552552
.global btl_bg_53_palette

‎graphics/bg/bg_Black_Temple_Inside.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)