summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/fame_checker.s3
-rw-r--r--data/fame_checker/img_845ce00.pngbin0 -> 129 bytes
-rw-r--r--data/fame_checker/img_845cf00.pngbin0 -> 240 bytes
-rw-r--r--data/fame_checker/img_845d100.pngbin0 -> 177 bytes
-rw-r--r--data/fame_checker/img_845d520.pngbin0 -> 726 bytes
-rw-r--r--data/fame_checker/pal_45dd20.pal19
-rw-r--r--data/fame_checker/pal_45e540.pal19
-rw-r--r--data/fame_checker/pal_45ed60.pal19
-rw-r--r--data/fame_checker/pal_45f580.pal19
-rw-r--r--data/fame_checker/pal_845d0e0.pal19
-rw-r--r--data/fame_checker/pal_845d500.pal (renamed from data/fame_checker/pal_45f5c0.pal)6
-rw-r--r--data/fame_checker/tilemap_845c600.binbin5920 -> 2048 bytes
-rw-r--r--graphics_file_rules.mk4
-rw-r--r--src/fame_checker.c26
14 files changed, 47 insertions, 87 deletions
diff --git a/data/fame_checker.s b/data/fame_checker.s
index 206be0d0b..3aaaf84dc 100644
--- a/data/fame_checker.s
+++ b/data/fame_checker.s
@@ -4,9 +4,6 @@
.section .rodata
.align 2
-gUnknown_845FB9C:: @ 845FB9C
- .incbin "baserom.gba", 0x45FB9C, 0x40
-
gUnknown_845FBDC:: @ 845FBDC
.incbin "baserom.gba", 0x45FBDC, 0x18
diff --git a/data/fame_checker/img_845ce00.png b/data/fame_checker/img_845ce00.png
new file mode 100644
index 000000000..b0a170e09
--- /dev/null
+++ b/data/fame_checker/img_845ce00.png
Binary files differ
diff --git a/data/fame_checker/img_845cf00.png b/data/fame_checker/img_845cf00.png
new file mode 100644
index 000000000..2d25bb1b3
--- /dev/null
+++ b/data/fame_checker/img_845cf00.png
Binary files differ
diff --git a/data/fame_checker/img_845d100.png b/data/fame_checker/img_845d100.png
new file mode 100644
index 000000000..4cc3e200d
--- /dev/null
+++ b/data/fame_checker/img_845d100.png
Binary files differ
diff --git a/data/fame_checker/img_845d520.png b/data/fame_checker/img_845d520.png
new file mode 100644
index 000000000..4d23c4c87
--- /dev/null
+++ b/data/fame_checker/img_845d520.png
Binary files differ
diff --git a/data/fame_checker/pal_45dd20.pal b/data/fame_checker/pal_45dd20.pal
deleted file mode 100644
index e6dcabf2f..000000000
--- a/data/fame_checker/pal_45dd20.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 90 65
-222 164 82
-180 139 65
-148 106 57
-172 164 189
-255 230 131
-230 205 106
-238 131 90
-90 90 106
-213 205 213
-255 255 255
-0 0 0
diff --git a/data/fame_checker/pal_45e540.pal b/data/fame_checker/pal_45e540.pal
deleted file mode 100644
index 485e27c48..000000000
--- a/data/fame_checker/pal_45e540.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-230 189 156
-205 156 115
-106 74 57
-180 139 213
-139 98 172
-98 65 106
-213 189 131
-189 164 98
-139 123 74
-180 139 115
-156 106 82
-90 74 49
-255 255 255
-0 0 0
diff --git a/data/fame_checker/pal_45ed60.pal b/data/fame_checker/pal_45ed60.pal
deleted file mode 100644
index adf46bf14..000000000
--- a/data/fame_checker/pal_45ed60.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-172 123 98
-213 172 115
-156 123 74
-90 82 65
-205 115 98
-164 213 156
-115 172 106
-90 123 82
-222 230 255
-164 172 197
-255 255 255
-0 0 0
diff --git a/data/fame_checker/pal_45f580.pal b/data/fame_checker/pal_45f580.pal
deleted file mode 100644
index eb6f2f18b..000000000
--- a/data/fame_checker/pal_45f580.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-139 156 164
-205 164 205
-164 123 164
-82 82 57
-213 213 222
-123 123 82
-115 115 115
-197 189 131
-156 156 90
-255 255 255
-0 0 0
diff --git a/data/fame_checker/pal_845d0e0.pal b/data/fame_checker/pal_845d0e0.pal
new file mode 100644
index 000000000..dac232f78
--- /dev/null
+++ b/data/fame_checker/pal_845d0e0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 106 106
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+139 139 139
+189 189 189
+205 205 205
+238 238 238
+230 230 230
+222 222 222
+180 180 180
+255 255 255
+106 106 106
diff --git a/data/fame_checker/pal_45f5c0.pal b/data/fame_checker/pal_845d500.pal
index 4b0812f09..212d9eb69 100644
--- a/data/fame_checker/pal_45f5c0.pal
+++ b/data/fame_checker/pal_845d500.pal
@@ -1,6 +1,7 @@
JASC-PAL
0100
16
+246 222 82
0 0 0
0 0 0
0 0 0
@@ -14,6 +15,5 @@ JASC-PAL
0 0 0
0 0 0
0 0 0
-0 0 0
-0 0 0
-0 0 0
+246 148 41
+255 82 0
diff --git a/data/fame_checker/tilemap_845c600.bin b/data/fame_checker/tilemap_845c600.bin
index 4272a1b41..8ff09b289 100644
--- a/data/fame_checker/tilemap_845c600.bin
+++ b/data/fame_checker/tilemap_845c600.bin
Binary files differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 876262eb2..d511ce7d9 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,4 +1,5 @@
FONTGFXDIR := data/graphics/fonts
+FAMECHECKERGFXDIR := data/fame_checker
$(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png
$(GFX) $< $@
@@ -32,3 +33,6 @@ $(FONTGFXDIR)/font5_jap.fwjpnfont: $(FONTGFXDIR)/font5_jap.png
$(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png
$(GFX) $< $@
+
+$(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 15
diff --git a/src/fame_checker.c b/src/fame_checker.c
index 40c406c18..82cb25812 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -132,12 +132,18 @@ extern const u8 gUnknown_841E5F3[];
extern const u8 gUnknown_841E5F8[];
const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin");
+const u8 gUnknown_845CE00[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp");
+const u8 gUnknown_845CF00[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp");
+const u16 gUnknown_845D0E0[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal");
+const u8 gUnknown_845D100[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp");
+const u16 gUnknown_845D500[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal");
+const u8 gUnknown_845D520[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp");
const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal");
-const u16 gUnknown_845DD40[] = INCBIN_U16("data/fame_checker/img_845dd40.4bpp");
+const u8 gUnknown_845DD40[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp");
const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal");
-const u16 gUnknown_845E560[] = INCBIN_U16("data/fame_checker/img_845e560.4bpp");
+const u8 gUnknown_845E560[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp");
const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal");
-const u16 gUnknown_845ED80[] = INCBIN_U16("data/fame_checker/img_845ed80.4bpp");
+const u8 gUnknown_845ED80[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp");
const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal");
const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal");
const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal");
@@ -318,9 +324,19 @@ const u8 *const gUnknown_845FA1C[] = {
gUnknown_81B1439, gUnknown_81B1442, gUnknown_81B144C, gUnknown_81B1456, gUnknown_81B145F, gUnknown_81B1463
};
-extern const struct BgTemplate gUnknown_845FBF4[4];
-extern const struct SpriteSheet gUnknown_845FB9C[];
+const struct SpriteSheet gUnknown_845FB9C[] = {
+ {gUnknown_845D100, 0x400, SPRITETAG_1000},
+ {gUnknown_845CE00, 0x100, SPRITETAG_1001},
+ {gUnknown_845CF00, 0x1e0, SPRITETAG_1002},
+ {gUnknown_845E560, 0x800, SPRITETAG_1006},
+ {gUnknown_845D520, 0x800, SPRITETAG_1007},
+ {gUnknown_845ED80, 0x800, SPRITETAG_1008},
+ {gUnknown_845DD40, 0x800, SPRITETAG_1009},
+ {}
+};
+
extern const struct SpritePalette gUnknown_845FBDC[];
+extern const struct BgTemplate gUnknown_845FBF4[4];
extern const struct WindowTemplate gUnknown_845FC04[];
extern const struct SpriteTemplate gUnknown_845FC44;
extern const struct SpriteTemplate gUnknown_845FC78;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 20:01:15 +0000