From c738318dc08a356077b413efda1c20e9a7b0712e Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 15 Sep 2013 17:08:10 -0400 Subject: [PATCH] move part of an incbin into predef/cgb.asm --- main.asm | 2 +- predef/cgb.asm | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/main.asm b/main.asm index 657e5817d..c49f0409a 100644 --- a/main.asm +++ b/main.asm @@ -12530,7 +12530,7 @@ INCBIN "baserom.gbc", $8d05, $8d55 - $8d05 INCLUDE "predef/cgb.asm" -INCBIN "baserom.gbc", $95e0, $9610 - $95e0 +INCBIN "baserom.gbc", $95f0, $9610 - $95f0 Function9610: ; 9610 diff --git a/predef/cgb.asm b/predef/cgb.asm index aadc66a3d..5017506aa 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -889,7 +889,7 @@ Function9578: ; 9578 ; 9591 Function9591: ; 9591 - ld hl, $55e0 + ld hl, Palette95e0 ld de, Unkn1Pals ld bc, $0010 ld a, $5 @@ -920,3 +920,15 @@ Function9591: ; 9591 ret ; 95e0 +Palette95e0: ; 95e0 + RGB 31, 31, 31 + RGB 16, 31, 14 + RGB 05, 14, 21 + RGB 05, 13, 10 + + RGB 31, 31, 31 + RGB 11, 21, 25 + RGB 05, 14, 21 + RGB 00, 03, 19 +; 95f0 +