From 35575b57a01bbd5447fbcee3b30050d8d8c3d02e Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 16 Feb 2019 23:51:06 -0500 Subject: use BG_CHAR_ADDR define --- src/intro_credits_graphics.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/intro_credits_graphics.c') diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index ba1f56158..4489b64c3 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -331,7 +331,7 @@ static void sub_817B458(u8); void load_intro_part2_graphics(u8 a) { - LZ77UnCompVram(gUnknown_085F0740, (void *)(VRAM + 0x4000)); + LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); LoadPalette(&gUnknown_085F06E0, 240, 32); switch (a) @@ -438,7 +438,7 @@ void sub_817B150(u8 a) void sub_817B1C8(u8 a) { - LZ77UnCompVram(gUnknown_085F0740, (void *)(VRAM + 0x4000)); + LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); switch (a) { @@ -449,7 +449,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); LoadPalette(&gUnknown_085F1668, 256, 32); sub_817B76C(); break; @@ -459,7 +459,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); LoadPalette(&gUnknown_085F0D5C, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); LoadPalette(&gUnknown_085F1688, 256, 32); sub_817B76C(); break; -- cgit v1.2.3 From 22657c708753df14e84d4bdae4afac0072803447 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 17 Feb 2019 00:25:48 -0500 Subject: use BG_SCREEN_ADDR macro for tilemap addresses --- src/intro_credits_graphics.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/intro_credits_graphics.c') diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 4489b64c3..b98708324 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -332,14 +332,14 @@ static void sub_817B458(u8); void load_intro_part2_graphics(u8 a) { LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); - LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); + LZ77UnCompVram(gUnknown_085F0BC0, (void *)(BG_SCREEN_ADDR(15))); LoadPalette(&gUnknown_085F06E0, 240, 32); switch (a) { case 0: default: LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); LoadPalette(&gUnknown_085F1668, 256, 32); @@ -347,7 +347,7 @@ void load_intro_part2_graphics(u8 a) break; case 1: LZ77UnCompVram(gUnknown_085F1824, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1EAC, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1EAC, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F17E4, 0, 32); LoadCompressedSpriteSheet(gUnknown_085F50EC); LoadPalette(&gUnknown_085F21B0, 256, 32); @@ -439,27 +439,27 @@ void sub_817B150(u8 a) void sub_817B1C8(u8 a) { LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); - LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); + LZ77UnCompVram(gUnknown_085F0BC0, (void *)(BG_SCREEN_ADDR(15))); switch (a) { case 0: default: LoadPalette(&gUnknown_085F06E0, 240, 32); LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); LoadPalette(&gUnknown_085F1668, 256, 32); sub_817B76C(); break; case 1: LoadPalette(&gUnknown_085F0700, 240, 32); LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0D5C, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); LoadPalette(&gUnknown_085F1688, 256, 32); sub_817B76C(); break; @@ -467,7 +467,7 @@ void sub_817B1C8(u8 a) case 3: LoadPalette(&gUnknown_085F0700, 240, 32); LZ77UnCompVram(gUnknown_085F1824, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1EAC, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1EAC, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F1804, 0, 32); LoadCompressedSpriteSheet(gUnknown_085F50EC); LoadPalette(&gUnknown_085F1804, 256, 32); @@ -476,7 +476,7 @@ void sub_817B1C8(u8 a) case 4: LoadPalette(&gUnknown_085F0720, 240, 32); LZ77UnCompVram(gUnknown_085F235C, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F2568, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F2568, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F231C, 0, 64); LoadCompressedSpriteSheet(gUnknown_085F5180); LoadPalette(&gUnknown_085F2548, 256, 32); -- cgit v1.2.3