diff --git a/arm9/modules/59/src/mod59_Intro.c b/arm9/modules/59/src/mod59_Intro.c index c838f37a0..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_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_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 }; @@ -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..55f4aefc2 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,9 @@ barry_front.NCGR barry_front.NCLR 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 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 6d034e289..db68b1675 100644 Binary files a/files/demo/intro/intro/narc_0025.NCLR and b/files/demo/intro/intro/main_background_diamond.NCLR differ diff --git a/files/demo/intro/intro/background_diamond.pal b/files/demo/intro/intro/main_background_diamond.pal similarity index 100% rename from files/demo/intro/intro/background_diamond.pal rename to files/demo/intro/intro/main_background_diamond.pal diff --git a/files/demo/intro/intro/main_background_pearl.NCLR b/files/demo/intro/intro/main_background_pearl.NCLR new file mode 100644 index 000000000..4a9eafe03 Binary files /dev/null and b/files/demo/intro/intro/main_background_pearl.NCLR differ diff --git a/files/demo/intro/intro/background_pearl.pal b/files/demo/intro/intro/main_background_pearl.pal similarity index 100% rename from files/demo/intro/intro/background_pearl.pal rename to files/demo/intro/intro/main_background_pearl.pal diff --git a/files/demo/intro/intro/narc_0026.NSCR b/files/demo/intro/intro/sub_background_1.NSCR similarity index 100% rename from files/demo/intro/intro/narc_0026.NSCR rename to files/demo/intro/intro/sub_background_1.NSCR diff --git a/files/demo/intro/intro/narc_0027.NSCR b/files/demo/intro/intro/sub_background_2.NSCR similarity index 100% rename from files/demo/intro/intro/narc_0027.NSCR rename to files/demo/intro/intro/sub_background_2.NSCR diff --git a/files/demo/intro/intro/narc_0028.NSCR b/files/demo/intro/intro/sub_background_3.NSCR similarity index 100% rename from files/demo/intro/intro/narc_0028.NSCR rename to files/demo/intro/intro/sub_background_3.NSCR diff --git a/files/demo/intro/intro/narc_0029.NSCR b/files/demo/intro/intro/sub_background_4.NSCR similarity index 100% rename from files/demo/intro/intro/narc_0029.NSCR rename to files/demo/intro/intro/sub_background_4.NSCR diff --git a/files/demo/intro/intro/narc_0024.NCLR b/files/demo/intro/intro/sub_background_diamond.NCLR similarity index 100% rename from files/demo/intro/intro/narc_0024.NCLR rename to files/demo/intro/intro/sub_background_diamond.NCLR diff --git a/files/demo/intro/intro/sub_background_diamond.pal b/files/demo/intro/intro/sub_background_diamond.pal new file mode 100644 index 000000000..3034ada4f --- /dev/null +++ b/files/demo/intro/intro/sub_background_diamond.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 246 49 +106 131 172 +90 123 164 +82 115 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +189 205 230 +180 197 222 +164 189 213 +156 172 205 +139 164 197 +131 156 189 +115 139 180 +106 131 172 +222 98 98 +164 98 98 +106 98 90 +180 180 172 +255 255 255 +0 0 0 +49 255 65 +255 246 49 +98 189 131 +98 189 123 +90 180 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +57 65 222 +57 74 205 +57 74 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +57 65 222 +74 82 230 +90 98 238 +106 115 246 +123 131 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/demo/intro/intro/sub_background_pearl.pal b/files/demo/intro/intro/sub_background_pearl.pal new file mode 100644 index 000000000..e249b691c --- /dev/null +++ b/files/demo/intro/intro/sub_background_pearl.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 246 49 +180 123 164 +172 106 148 +164 98 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +230 197 222 +230 189 213 +222 180 205 +213 164 197 +205 156 189 +197 139 180 +189 131 172 +180 123 164 +222 98 98 +164 98 98 +106 98 90 +180 180 172 +255 255 255 +0 0 0 +49 255 65 +255 246 49 +98 189 131 +98 189 123 +90 180 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +57 65 222 +57 74 205 +57 74 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 246 49 +57 65 222 +74 82 230 +90 98 238 +106 115 246 +123 131 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/filesystem.mk b/filesystem.mk index deebabbd8..b96eccf07 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -3346,8 +3346,8 @@ files/resource/eng/trial/trial.narc: \ files/demo/intro/intro.narc: \ files/demo/intro/intro/main_background_tileset.NCGR \ - files/demo/intro/intro/background_diamond.NCLR \ - files/demo/intro/intro/background_pearl.NCLR \ + files/demo/intro/intro/main_background_diamond.NCLR \ + files/demo/intro/intro/main_background_pearl.NCLR \ files/demo/intro/intro/lucas_walk_1.NCGR \ files/demo/intro/intro/lucas_walk_2.NCGR \ files/demo/intro/intro/lucas_walk_3.NCGR \ @@ -3362,7 +3362,9 @@ files/demo/intro/intro.narc: \ files/demo/intro/intro/rowan_front.NCLR \ files/demo/intro/intro/barry_front.NCGR \ files/demo/intro/intro/barry_front.NCLR \ - files/demo/intro/intro/sub_background_tileset.NCGR + files/demo/intro/intro/sub_background_tileset.NCGR \ + files/demo/intro/intro/sub_background_diamond.NCLR \ + files/demo/intro/intro/sub_background_pearl.NCLR files/graphic/field_board.narc: \ files/graphic/field_board/narc_0000.NCGR \ diff --git a/graphics_rules.mk b/graphics_rules.mk index 425893567..f7da9deac 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -151,12 +151,14 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ files/resource/eng/trial/trial/narc_0007.NCGR 4BPP_NCLR_FILES := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ - files/demo/intro/intro/background_diamond.NCLR \ - files/demo/intro/intro/background_pearl.NCLR \ + files/demo/intro/intro/main_background_diamond.NCLR \ + files/demo/intro/intro/main_background_pearl.NCLR \ files/demo/intro/intro/lucas_walk.NCLR \ files/demo/intro/intro/dawn_walk.NCLR \ files/demo/intro/intro/rowan_front.NCLR \ files/demo/intro/intro/barry_front.NCLR \ + files/demo/intro/intro/sub_background_diamond.NCLR \ + files/demo/intro/intro/sub_background_pearl.NCLR \ files/demo/title/titledemo/narc_0016.NCLR \ files/graphic/field_board/narc_0001.NCLR \ files/poketool/icongra/poke_icon/narc_0000.NCLR \ @@ -915,12 +917,14 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \ files/data/cell0.NCLR \ - files/demo/intro/intro/background_diamond.NCLR \ - files/demo/intro/intro/background_pearl.NCLR \ + files/demo/intro/intro/main_background_diamond.NCLR \ + files/demo/intro/intro/main_background_pearl.NCLR \ files/demo/intro/intro/lucas_walk.NCLR \ files/demo/intro/intro/dawn_walk.NCLR \ files/demo/intro/intro/rowan_front.NCLR \ files/demo/intro/intro/barry_front.NCLR \ + files/demo/intro/intro/sub_background_diamond.NCLR \ + files/demo/intro/intro/sub_background_pearl.NCLR \ files/demo/title/titledemo/narc_0001.NCLR \ files/demo/title/titledemo/narc_0003.NCLR \ files/demo/title/titledemo/narc_0009.NCLR \