diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 7e1a2fc3..5781a11e 100755 --- a/data/data_081320FC.s +++ b/data/data_081320FC.s @@ -11726,58 +11726,13 @@ gUnk_08692E80:: @ 08692E80 .incbin "baserom.gba", 0x692E80, 0x00000E0 gUnk_08692F60:: @ 08692F60 - .incbin "baserom.gba", 0x692F60, 0x0000BE9 + .incbin "baserom.gba", 0x692F60, 0x0000040 -gUnk_08693B49:: @ 08693B49 - .incbin "baserom.gba", 0x693B49, 0x00001F1 - -gUnk_08693D3A:: @ 08693D3A - .incbin "baserom.gba", 0x693D3A, 0x000014C - -gUnk_08693E86:: @ 08693E86 - .incbin "baserom.gba", 0x693E86, 0x00000C3 - -gUnk_08693F49:: @ 08693F49 - .incbin "baserom.gba", 0x693F49, 0x0001800 - -gUnk_08695749:: @ 08695749 - .incbin "baserom.gba", 0x695749, 0x0000347 - -gUnk_08695A90:: @ 08695A90 - .incbin "baserom.gba", 0x695A90, 0x0000383 - -gUnk_08695E13:: @ 08695E13 - .incbin "baserom.gba", 0x695E13, 0x0000327 - -gUnk_0869613A:: @ 0869613A - .incbin "baserom.gba", 0x69613A, 0x000007C - -gUnk_086961B6:: @ 086961B6 - .incbin "baserom.gba", 0x6961B6, 0x0000DAA - -gUnk_08696F60:: @ 08696F60 - .incbin "baserom.gba", 0x696F60, 0x0000980 - -gUnk_086978E0:: @ 086978E0 - .incbin "baserom.gba", 0x6978E0, 0x0000668 - -gUnk_08697F48:: @ 08697F48 - .incbin "baserom.gba", 0x697F48, 0x0001998 - -gUnk_086998E0:: @ 086998E0 - .incbin "baserom.gba", 0x6998E0, 0x0006720 - -gUnk_086A0000:: @ 086A0000 - .incbin "baserom.gba", 0x6A0000, 0x000141A - -gUnk_086A141A:: @ 086A141A - .incbin "baserom.gba", 0x6A141A, 0x00004C6 - -gUnk_086A18E0:: @ 086A18E0 - .incbin "baserom.gba", 0x6A18E0, 0x0001180 +gUnk_08692FA0:: + .incbin "graphics/font.4bpp" gUnk_086A2A60:: @ 086A2A60 - .incbin "baserom.gba", 0x6A2A60, 0x0000480 + .incbin "baserom.gba", 0x6A2A40, 0x00004A0 gUnk_086A2EE0:: @ 086A2EE0 .incbin "baserom.gba", 0x6A2EE0, 0x0001423 diff --git a/graphics/font.pal b/graphics/font.pal new file mode 100644 index 00000000..199e6c39 --- /dev/null +++ b/graphics/font.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 189 148 +49 131 24 +65 205 24 +74 255 24 +24 90 164 +41 156 255 +74 230 255 +123 41 24 +189 49 32 +255 82 49 +255 246 0 +115 98 98 +172 156 156 +213 197 197 +255 255 255 +0 0 0 diff --git a/graphics/font.png b/graphics/font.png new file mode 100644 index 00000000..73f07257 Binary files /dev/null and b/graphics/font.png differ diff --git a/graphics/gameover.pal b/graphics/gameover.pal deleted file mode 100644 index 32050439..00000000 --- a/graphics/gameover.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 230 0 -255 172 16 -246 115 0 -238 65 0 -230 0 0 -180 65 90 -0 0 90 diff --git a/graphics/gameover.png b/graphics/gameover.png deleted file mode 100644 index f82d6e33..00000000 Binary files a/graphics/gameover.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 6f83b00b..3cd48c6a 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -2,3 +2,9 @@ GFXDIR := graphics $(GFXDIR)/intro/nintendo_capcom.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 123 + +$(GFXDIR)/font.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 2005 + +$(GFXDIR)/kinstones.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 692 \ No newline at end of file