summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/gfx/sgb_layouts.asm4
-rw-r--r--gfx/gfx.asm14
-rw-r--r--gfx/sgb/sgb_border.pal80
-rw-r--r--gfx/sgb/sgb_border_alt.pal80
-rw-r--r--slack/unknown_a24c.binbin128 -> 0 bytes
-rw-r--r--slack/unknown_aa9c.binbin128 -> 0 bytes
6 files changed, 171 insertions, 7 deletions
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 07820fc..7097fd7 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -701,8 +701,8 @@ PushSGBBorder:
jr nz, .spaceworld_border
; load alternate border
- ld hl, UnusedSGBBorderGFX
- ld de, UnusedSGBBorderTilemap
+ ld hl, AlternateSGBBorderGFX
+ ld de, AlternateSGBBorderTilemap
ret
.spaceworld_border
diff --git a/gfx/gfx.asm b/gfx/gfx.asm
index 4fa2472..63c4d03 100644
--- a/gfx/gfx.asm
+++ b/gfx/gfx.asm
@@ -35,16 +35,20 @@ SECTION "gfx.asm@SGB GFX", ROMX
INCLUDE "data/pokemon/palettes.inc"
INCLUDE "data/super_palettes.inc"
-UnusedSGBBorderTilemap:
+AlternateSGBBorderTilemap::
INCBIN "gfx/sgb/sgb_border_alt.sgb.tilemap"
-INCBIN "slack/unknown_a24c.bin"
-UnusedSGBBorderGFX::
+AlternateSGBBorderPalettes:
+INCLUDE "gfx/sgb/sgb_border_alt.pal"
+
+AlternateSGBBorderGFX::
INCBIN "gfx/sgb/sgb_border_alt.2bpp"
-SGBBorderTilemap:
+SGBBorderTilemap::
INCBIN "gfx/sgb/sgb_border.sgb.tilemap"
-INCBIN "slack/unknown_aa9c.bin"
+
+SGBBorderPalettes:
+INCLUDE "gfx/sgb/sgb_border.pal"
SGBBorderGFX::
if DEF(GOLD)
diff --git a/gfx/sgb/sgb_border.pal b/gfx/sgb/sgb_border.pal
new file mode 100644
index 0000000..a2613db
--- /dev/null
+++ b/gfx/sgb/sgb_border.pal
@@ -0,0 +1,80 @@
+ RGB 24, 6, 6
+ RGB 0, 0, 0
+ RGB 31, 31, 29
+ RGB 31, 26, 15
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 31, 26, 15
+ RGB 31, 12, 0
+ RGB 0, 0, 0
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 6, 31
+ RGB 26, 28, 31
+ RGB 19, 20, 23
+ RGB 0, 0, 0
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 12, 31, 6
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+ RGB 18, 24, 18
+
diff --git a/gfx/sgb/sgb_border_alt.pal b/gfx/sgb/sgb_border_alt.pal
new file mode 100644
index 0000000..acae6d6
--- /dev/null
+++ b/gfx/sgb/sgb_border_alt.pal
@@ -0,0 +1,80 @@
+ RGB 24, 6, 6
+ RGB 24, 24, 26
+ RGB 14, 15, 20
+ RGB 4, 7, 10
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 18, 24, 18
+ RGB 31, 26, 15
+ RGB 26, 19, 10
+ RGB 12, 7, 5
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 18, 6, 31
+ RGB 31, 31, 29
+ RGB 31, 12, 0
+ RGB 0, 0, 0
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 12, 31, 6
+ RGB 22, 26, 30
+ RGB 16, 17, 21
+ RGB 0, 3, 0
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+ RGB 31, 31, 25
+
diff --git a/slack/unknown_a24c.bin b/slack/unknown_a24c.bin
deleted file mode 100644
index 7b7fd54..0000000
--- a/slack/unknown_a24c.bin
+++ /dev/null
Binary files differ
diff --git a/slack/unknown_aa9c.bin b/slack/unknown_aa9c.bin
deleted file mode 100644
index 9663709..0000000
--- a/slack/unknown_aa9c.bin
+++ /dev/null
Binary files differ