From 5c04ebe6e097a0de1e28848e18a2bd7503b0a967 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Thu, 10 Apr 2014 19:49:44 -0400 Subject: initial palette --- home.asm | 17 ++++++++++------- macros.asm | 3 +++ main.asm | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100755 macros.asm diff --git a/home.asm b/home.asm index f343ea7..bb79b3f 100755 --- a/home.asm +++ b/home.asm @@ -295,7 +295,7 @@ Func_036a: ; 036a (0:036a) ld de, $caf0 ld c, $10 .asm_387 - ld hl, Unknown_0399 + ld hl, InitialPalette ld b, $8 .asm_38c ld a, [hli] @@ -308,8 +308,11 @@ Func_036a: ; 036a (0:036a) call Func_0458 ret -Unknown_0399: ; 0399 (0:0399) -INCBIN "baserom.gbc",$0399,$03a1 - $0399 +InitialPalette: ; 0399 (0:0399) + RGB 28,28,24 + RGB 21,21,16 + RGB 10,10,08 + RGB 00,00,00 Func_03a1: ; 03a1 (0:03a1) call Func_03c0 @@ -403,19 +406,19 @@ asm_44a bit 6, a jr nz, Func_0458 ld b, $8 - call Func_0467 + call InitializePalettes jr asm_445 Func_0458: ; 0458 (0:0458) xor a ld b, $40 - call Func_0467 + call InitializePalettes ld a, $8 ld b, $40 - call Func_0467 + call InitializePalettes jr asm_445 -Func_0467: ; 0467 (0:0467) +InitializePalettes: ; 0467 (0:0467) add a add a add a diff --git a/macros.asm b/macros.asm new file mode 100755 index 0000000..3dd7d89 --- /dev/null +++ b/macros.asm @@ -0,0 +1,3 @@ +RGB: MACRO + dw (\3 << 10 | \2 << 5 | \1) +ENDM \ No newline at end of file diff --git a/main.asm b/main.asm index f101a58..47db922 100755 --- a/main.asm +++ b/main.asm @@ -1,3 +1,5 @@ +INCLUDE "macros.asm" + INCLUDE "home.asm" SECTION "bank1",ROMX,BANK[$1] -- cgit v1.2.3