From 916e37e67a591c47b4ad36dd8acd8208c756aeaa Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 6 May 2023 13:24:10 +0100 Subject: [PATCH 1/2] more intro graphics --- arm9/modules/59/src/mod59_Intro.c | 18 +- files/demo/intro/intro/.gitignore | 6 +- files/demo/intro/intro/.knarcorder | 6 +- ...0025.NCLR => main_background_diamond.NCLR} | Bin 552 -> 552 bytes ...iamond.pal => main_background_diamond.pal} | 0 .../intro/intro/main_background_pearl.NCLR | Bin 0 -> 552 bytes ...nd_pearl.pal => main_background_pearl.pal} | 0 .../{narc_0026.NSCR => sub_background_1.NSCR} | Bin .../{narc_0027.NSCR => sub_background_2.NSCR} | Bin .../{narc_0028.NSCR => sub_background_3.NSCR} | Bin .../{narc_0029.NSCR => sub_background_4.NSCR} | Bin ..._0024.NCLR => sub_background_diamond.NCLR} | Bin .../intro/intro/sub_background_diamond.pal | 259 ++++++++++++++++++ .../demo/intro/intro/sub_background_pearl.pal | 259 ++++++++++++++++++ filesystem.mk | 8 +- graphics_rules.mk | 12 +- 16 files changed, 548 insertions(+), 20 deletions(-) rename files/demo/intro/intro/{narc_0025.NCLR => main_background_diamond.NCLR} (57%) rename files/demo/intro/intro/{background_diamond.pal => main_background_diamond.pal} (100%) create mode 100644 files/demo/intro/intro/main_background_pearl.NCLR rename files/demo/intro/intro/{background_pearl.pal => main_background_pearl.pal} (100%) rename files/demo/intro/intro/{narc_0026.NSCR => sub_background_1.NSCR} (100%) rename files/demo/intro/intro/{narc_0027.NSCR => sub_background_2.NSCR} (100%) rename files/demo/intro/intro/{narc_0028.NSCR => sub_background_3.NSCR} (100%) rename files/demo/intro/intro/{narc_0029.NSCR => sub_background_4.NSCR} (100%) rename files/demo/intro/intro/{narc_0024.NCLR => sub_background_diamond.NCLR} (100%) create mode 100644 files/demo/intro/intro/sub_background_diamond.pal create mode 100644 files/demo/intro/intro/sub_background_pearl.pal diff --git a/arm9/modules/59/src/mod59_Intro.c b/arm9/modules/59/src/mod59_Intro.c index c838f37a0..e2be3a373 100644 --- a/arm9/modules/59/src/mod59_Intro.c +++ b/arm9/modules/59/src/mod59_Intro.c @@ -142,7 +142,7 @@ const struct MOD59_UnkStruct021D9E30 MOD59_021D9E1C = const struct MOD59_UnkStruct021D9E30 MOD59_021D9E30 = { - .scrnIds = { NARC_intro_narc_0026_NSCR, NARC_intro_narc_0027_NSCR, NARC_intro_narc_0027_NSCR, NARC_intro_narc_0028_NSCR, NARC_intro_narc_0029_NSCR } + .scrnIds = { NARC_intro_sub_background_1_NSCR, NARC_intro_sub_background_1_NSCR, NARC_intro_narc_0027_NSCR, NARC_intro_narc_0028_NSCR, NARC_intro_narc_0029_NSCR } }; const u32 MOD59_021D9E44[5] = { 0, 6, 1, 12, 2060 }; @@ -1009,20 +1009,20 @@ THUMB_FUNC void MOD59_LoadInitialTilemap(MOD59_IntroOverlayData *data) BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heap_id); GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_sub_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, data->heap_id); - u32 pal1; - u32 pal2; + u32 mainPal; + u32 subPal; if ((u8)gGameVersion == VERSION_DIAMOND) { - pal1 = NARC_intro_background_diamond_NCLR; - pal2 = NARC_intro_narc_0024_NCLR; + mainPal = NARC_intro_main_background_diamond_NCLR; + subPal = NARC_intro_sub_background_diamond_NCLR; } else { - pal1 = NARC_intro_background_pearl_NCLR; - pal2 = NARC_intro_narc_0025_NCLR; + mainPal = NARC_intro_main_background_pearl_NCLR; + subPal = NARC_intro_sub_background_pearl_NCLR; } - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, pal1, GF_BG_LYR_MAIN_0, 0, 0x60, data->heap_id); - GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, pal2, GF_BG_LYR_SUB_0, 0, 0xa0, data->heap_id); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, mainPal, GF_BG_LYR_MAIN_0, 0, 0x60, data->heap_id); + GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, subPal, GF_BG_LYR_SUB_0, 0, 0xa0, data->heap_id); MOD59_LoadMainScrnData(data); MOD59_LoadCharDataFromIndex(data); MOD59_LoadSubScrnData(data); diff --git a/files/demo/intro/intro/.gitignore b/files/demo/intro/intro/.gitignore index 7073ee087..abd5fa247 100644 --- a/files/demo/intro/intro/.gitignore +++ b/files/demo/intro/intro/.gitignore @@ -1,6 +1,6 @@ main_background_tileset.NCGR -background_diamond.NCLR -background_pearl.NCLR +main_background_diamond.NCLR +main_background_pearl.NCLR lucas_walk_1.NCGR lucas_walk_2.NCGR lucas_walk_3.NCGR @@ -16,3 +16,5 @@ rowan_front.NCLR barry_front.NCGR barry_front.NCLR sub_background_tileset.NCGR +sub_background_diamond.NCLR +sub_background_pearl.NCLR diff --git a/files/demo/intro/intro/.knarcorder b/files/demo/intro/intro/.knarcorder index 0e845ece7..cc1642425 100644 --- a/files/demo/intro/intro/.knarcorder +++ b/files/demo/intro/intro/.knarcorder @@ -1,6 +1,6 @@ main_background_tileset.NCGR -background_diamond.NCLR -background_pearl.NCLR +main_background_diamond.NCLR +main_background_pearl.NCLR main_background.NSCR control_info_padab.NSCR control_info_xy.NSCR @@ -22,3 +22,5 @@ barry_front.NCGR barry_front.NCLR character_screen.NSCR sub_background_tileset.NCGR +sub_background_diamond.NCLR +sub_background_pearl.NCLR diff --git a/files/demo/intro/intro/narc_0025.NCLR b/files/demo/intro/intro/main_background_diamond.NCLR similarity index 57% rename from files/demo/intro/intro/narc_0025.NCLR rename to files/demo/intro/intro/main_background_diamond.NCLR index 6d034e28911e9b33d69497d36e7f80798ce944ac..db68b1675dcc1c75c3805688842190576fb76b4f 100644 GIT binary patch delta 110 zcmZ3%vVvuTMgjwad9hgjm#occ6O#(!^rCpfUI(7?Wq^ZNFZNvZRQ1@&W&i8&g5=ayB!ae8BS+6pEHq1Ccp`R=NpS>IE%@nAaR#0!=HCZZvJ delta 91 zcmZ3%vVvuT2FHErZ-HAqr?^g>D4}s*S|cG^JRr7bVRz}-O8&Zy6H6EY^Qvr0#q{=vpDDkjwfm=PN zxWW`MFvNPX=c=cw$4)N$U%$6JDqA91JrE}Qzn(p}ton`98@tn1Ffj Date: Sat, 6 May 2023 13:42:52 +0100 Subject: [PATCH 2/2] ensure this actually builds --- arm9/modules/59/src/mod59_Intro.c | 2 +- files/demo/intro/intro/.knarcorder | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arm9/modules/59/src/mod59_Intro.c b/arm9/modules/59/src/mod59_Intro.c index e2be3a373..2c1d94f78 100644 --- a/arm9/modules/59/src/mod59_Intro.c +++ b/arm9/modules/59/src/mod59_Intro.c @@ -142,7 +142,7 @@ const struct MOD59_UnkStruct021D9E30 MOD59_021D9E1C = const struct MOD59_UnkStruct021D9E30 MOD59_021D9E30 = { - .scrnIds = { NARC_intro_sub_background_1_NSCR, NARC_intro_sub_background_1_NSCR, NARC_intro_narc_0027_NSCR, NARC_intro_narc_0028_NSCR, NARC_intro_narc_0029_NSCR } + .scrnIds = { NARC_intro_sub_background_1_NSCR, NARC_intro_sub_background_2_NSCR, NARC_intro_sub_background_2_NSCR, NARC_intro_sub_background_3_NSCR, NARC_intro_sub_background_4_NSCR } }; const u32 MOD59_021D9E44[5] = { 0, 6, 1, 12, 2060 }; diff --git a/files/demo/intro/intro/.knarcorder b/files/demo/intro/intro/.knarcorder index cc1642425..55f4aefc2 100644 --- a/files/demo/intro/intro/.knarcorder +++ b/files/demo/intro/intro/.knarcorder @@ -24,3 +24,7 @@ character_screen.NSCR sub_background_tileset.NCGR sub_background_diamond.NCLR sub_background_pearl.NCLR +sub_background_1.NSCR +sub_background_2.NSCR +sub_background_3.NSCR +sub_background_4.NSCR