Skip to content

Commit 400c2f4

Browse files
committed
Finish SGB
Also clean up code somewhat, saving some bytes (29 remaining)
1 parent c3cd234 commit 400c2f4

File tree

9 files changed

+437
-330
lines changed

9 files changed

+437
-330
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,10 @@ $(RESDIR)/%.size: $(RESDIR)/%
123123
printf 'SIZE = %u' $$(wc -c $< | cut -d ' ' -f 1) > $@
124124

125125

126-
$(RESDIR)/gfx.2bpp: $(RESDIR)/console_tiles.vert.2bpp $(RESDIR)/light_tiles.vert.2bpp $(RESDIR)/font.vert.2bpp $(RESDIR)/draft.uniq.2bpp $(RESDIR)/palettes.bin
126+
# The first row is just some window tiles, they're not part of the image proper
127+
$(RESDIR)/draft.%.tilemap: $(RESDIR)/draft.uniq.%.ofs.tilemap
128+
dd if=$< of=$@ bs=1 skip=20
129+
$(RESDIR)/gfx.%.bin: $(RESDIR)/console_tiles.vert.2bpp $(RESDIR)/light_tiles.vert.2bpp $(RESDIR)/font.vert.2bpp $(RESDIR)/draft.uniq.2bpp $(RESDIR)/palettes.bin $(RESDIR)/draft.%.tilemap
127130
cat $^ > $@
128131

129132
$(RESDIR)/data.bin: $(RESDIR)/text.bin $(RESDIR)/winx.bin

quartet.sym

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
00:25d4 Unpause.done
8989
00:25d7 CompressedStatusTiles
9090
00:2716 PerformVRAMTransfer
91+
00:2749 MASK_ENBlackPacket
92+
00:2759 MASK_ENCancelPacket
9193
00:2769 OBJ_TRNPatchPart1
9294
00:2779 OBJ_TRNPatchPart2
9395
00:2789 OBJ_TRNPatchPart3
@@ -97,10 +99,11 @@
9799
00:27c9 OBJ_TRNPatchPart7
98100
00:27d9 OBJ_TRNPatchPart8
99101
00:27e9 CHR_TRNPacket
100-
00:27f9 UnkPacket
102+
00:27f9 CHR_TRN2ndHalfPacket
101103
00:2809 PCT_TRNPacket
102104
00:2819 OnePlayerPacket
103105
00:2829 TwoPlayerPacket
106+
00:2839 OBJ_TRNPacket
104107
00:2842 Font
105108
00:295b CopyrightScreens
106109
00:2968 CopyrightScreens.sgb

0 commit comments

Comments
 (0)