Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-09 01:26:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #483 from red031000/master

Browse Source 
more intro graphics
This commit is contained in:
Thomas
2023-05-06 08:08:48 -05:00
committed by GitHub
parent 14840a6781 b0ef65d561
commit ba1d834ab7
16 changed files with 552 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arm9/modules/59/src/mod59_Intro.c
View File

@@ -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);

6
files/demo/intro/intro/.gitignore vendored
View File

@@ -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

10
files/demo/intro/intro/.knarcorder
View File

@@ -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

BIN
files/demo/intro/intro/narc_0025.NCLR → files/demo/intro/intro/main_background_diamond.NCLR
View File

Binary file not shown.

0
files/demo/intro/intro/background_diamond.pal → files/demo/intro/intro/main_background_diamond.pal
View File

BIN
files/demo/intro/intro/main_background_pearl.NCLR Normal file
View File

Binary file not shown.

0
files/demo/intro/intro/background_pearl.pal → files/demo/intro/intro/main_background_pearl.pal
View File

0
files/demo/intro/intro/narc_0026.NSCR → files/demo/intro/intro/sub_background_1.NSCR
View File

0
files/demo/intro/intro/narc_0027.NSCR → files/demo/intro/intro/sub_background_2.NSCR
View File

0
files/demo/intro/intro/narc_0028.NSCR → files/demo/intro/intro/sub_background_3.NSCR
View File

0
files/demo/intro/intro/narc_0029.NSCR → files/demo/intro/intro/sub_background_4.NSCR
View File

0
files/demo/intro/intro/narc_0024.NCLR → files/demo/intro/intro/sub_background_diamond.NCLR
View File

259
files/demo/intro/intro/sub_background_diamond.pal Normal file
View File

@@ -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

259
files/demo/intro/intro/sub_background_pearl.pal Normal file
View File

@@ -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

8
filesystem.mk
View File

@@ -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 \

12
graphics_rules.mk
View File

@@ -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 \