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

more intro graphics

Browse Source
This commit is contained in:
red031000
2023-05-05 23:14:23 +01:00
parent d620d057c2
commit 683d73d19e
30 changed files with 146 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ const struct MOD59_CharStruct021D9DEC MOD59_021D9DEC =
const struct MOD59_CharStruct021D9DEC MOD59_021D9DFC =
{
.narcId = { NARC_intro_narc_0013_NCGR, NARC_intro_narc_0014_NCGR, NARC_intro_narc_0015_NCGR, NARC_intro_narc_0016_NCGR }
.narcId = { NARC_intro_dawn_walk_1_NCGR, NARC_intro_dawn_walk_2_NCGR, NARC_intro_dawn_walk_3_NCGR, NARC_intro_dawn_walk_4_NCGR }
};
const struct MOD59_ListStruct021D9E0C MOD59_021D9E0C[2] =
@@ -137,7 +137,7 @@ const struct MOD59_ListStruct021D9E0C MOD59_021D9E0C[2] =
const struct MOD59_UnkStruct021D9E30 MOD59_021D9E1C =
{
.scrnIds = { NARC_intro_intro_background_NSCR, NARC_intro_control_info_padab_NSCR, NARC_intro_control_info_xy_NSCR, NARC_intro_control_info_touchscreen_NSCR, NARC_intro_adventure_info_NSCR }
.scrnIds = { NARC_intro_main_background_NSCR, NARC_intro_control_info_padab_NSCR, NARC_intro_control_info_xy_NSCR, NARC_intro_control_info_touchscreen_NSCR, NARC_intro_adventure_info_NSCR }
};
const struct MOD59_UnkStruct021D9E30 MOD59_021D9E30 =
@@ -165,7 +165,7 @@ const struct MOD59_ListStruct021D9E0C MOD59_021D9E58[3] =
const struct MOD59_CharStruct021D9E70 MOD59_021D9E70 =
{
.charData = { NARC_intro_narc_0013_NCGR, NARC_intro_narc_0044_NCGR, NARC_intro_narc_0045_NCGR, NARC_intro_narc_0046_NCGR, NARC_intro_narc_0047_NCGR, 0xFF }
.charData = { NARC_intro_dawn_walk_1_NCGR, NARC_intro_narc_0044_NCGR, NARC_intro_narc_0045_NCGR, NARC_intro_narc_0046_NCGR, NARC_intro_narc_0047_NCGR, 0xFF }
};
const struct MOD59_CharStruct021D9E70 MOD59_021D9E88 =
@@ -306,8 +306,8 @@ const struct MOD59_GraphicsPaletteMap021D9F90 MOD59_021D9F90 =
},
//rowan sprite
{
.charNum = NARC_intro_narc_0018_NCGR,
.palNum = NARC_intro_narc_0019_NCLR
.charNum = NARC_intro_rowan_front_NCGR,
.palNum = NARC_intro_rowan_front_NCLR
},
//boy sprites
{
@@ -328,25 +328,25 @@ const struct MOD59_GraphicsPaletteMap021D9F90 MOD59_021D9F90 =
},
//girl sprites
{
.charNum = NARC_intro_narc_0013_NCGR,
.palNum = NARC_intro_narc_0017_NCLR
.charNum = NARC_intro_dawn_walk_1_NCGR,
.palNum = NARC_intro_dawn_walk_NCLR
},
{
.charNum = NARC_intro_narc_0014_NCGR,
.palNum = NARC_intro_narc_0017_NCLR
.charNum = NARC_intro_dawn_walk_2_NCGR,
.palNum = NARC_intro_dawn_walk_NCLR
},
{
.charNum = NARC_intro_narc_0015_NCGR,
.palNum = NARC_intro_narc_0017_NCLR
.charNum = NARC_intro_dawn_walk_3_NCGR,
.palNum = NARC_intro_dawn_walk_NCLR
},
{
.charNum = NARC_intro_narc_0016_NCGR,
.palNum = NARC_intro_narc_0017_NCLR
.charNum = NARC_intro_dawn_walk_4_NCGR,
.palNum = NARC_intro_dawn_walk_NCLR
},
//barry sprite
{
.charNum = NARC_intro_narc_0020_NCGR,
.palNum = NARC_intro_narc_0021_NCLR
.charNum = NARC_intro_barry_front_NCGR,
.palNum = NARC_intro_barry_front_NCLR
}
}
};
@@ -1005,20 +1005,20 @@ THUMB_FUNC BOOL MOD59_DisplayControlAdventureMessage(MOD59_IntroOverlayData *dat
THUMB_FUNC void MOD59_LoadInitialTilemap(MOD59_IntroOverlayData *data)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_buttons_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id);
BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heap_id);
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0023_NCGR, data->bgConfig, GF_BG_LYR_SUB_3, 0, 0, FALSE, 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;
if ((u8)gGameVersion == VERSION_DIAMOND)
{
pal1 = NARC_intro_buttons_diamond_NCLR;
pal1 = NARC_intro_background_diamond_NCLR;
pal2 = NARC_intro_narc_0024_NCLR;
}
else
{
pal1 = NARC_intro_buttons_pearl_NCLR;
pal1 = NARC_intro_background_pearl_NCLR;
pal2 = NARC_intro_narc_0025_NCLR;
}
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, pal1, GF_BG_LYR_MAIN_0, 0, 0x60, data->heap_id);
@@ -1047,14 +1047,14 @@ THUMB_FUNC void MOD59_LoadCharDataFromIndex(MOD59_IntroOverlayData *data)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].charNum, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex0].palNum, GF_BG_LYR_MAIN_0, 0xE0, 0x20, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0022_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, FALSE, data->heap_id);
MOD59_TilemapChangePalette(data, GF_BG_LYR_MAIN_1, 7);
}
if (data->spriteDataIndex1 != 0 && data->spriteDataIndex1 < 12)
{
GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].charNum, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_GXLoadPal(NARC_DEMO_INTRO_INTRO, graphicsPaletteMap.map[data->spriteDataIndex1].palNum, GF_BG_LYR_MAIN_0, 0x100, 0x20, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0022_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_character_screen_NSCR, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, FALSE, data->heap_id);
MOD59_TilemapChangePalette(data, GF_BG_LYR_MAIN_2, 8);
}
}

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

@@ -1,8 +1,18 @@
buttons.NCGR
buttons_diamond.NCLR
buttons_pearl.NCLR
main_background_tileset.NCGR
background_diamond.NCLR
background_pearl.NCLR
lucas_walk_1.NCGR
lucas_walk_2.NCGR
lucas_walk_3.NCGR
lucas_walk_4.NCGR
lucas_walk.NCLR
dawn_walk_1.NCGR
dawn_walk_2.NCGR
dawn_walk_3.NCGR
dawn_walk_4.NCGR
dawn_walk.NCLR
rowan_front.NCGR
rowan_front.NCLR
barry_front.NCGR
barry_front.NCLR
sub_background_tileset.NCGR

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

@@ -1,7 +1,7 @@
buttons.NCGR
buttons_diamond.NCLR
buttons_pearl.NCLR
intro_background.NSCR
main_background_tileset.NCGR
background_diamond.NCLR
background_pearl.NCLR
main_background.NSCR
control_info_padab.NSCR
control_info_xy.NSCR
control_info_touchscreen.NSCR
@@ -11,3 +11,14 @@ lucas_walk_2.NCGR
lucas_walk_3.NCGR
lucas_walk_4.NCGR
lucas_walk.NCLR
dawn_walk_1.NCGR
dawn_walk_2.NCGR
dawn_walk_3.NCGR
dawn_walk_4.NCGR
dawn_walk.NCLR
rowan_front.NCGR
rowan_front.NCLR
barry_front.NCGR
barry_front.NCLR
character_screen.NSCR
sub_background_tileset.NCGR

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

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

19
files/demo/intro/intro/barry_front.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
131 189 156
115 106 82
180 90 57
246 131 74
41 49 49
57 74 90
238 213 115
115 164 74
197 189 213
189 164 90
123 65 65
213 156 115
255 213 189
0 0 0
90 115 115
238 238 255

BIN
files/demo/intro/intro/barry_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

0
files/demo/intro/intro/narc_0022.NSCR → files/demo/intro/intro/character_screen.NSCR
View File

19
files/demo/intro/intro/dawn_walk.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
123 106 98
189 106 156
197 65 65
255 115 74
57 65 82
65 106 148
255 222 90
238 148 197
197 189 213
205 156 57
123 65 65
213 156 115
255 213 189
0 0 0
156 148 189
238 238 255

BIN
files/demo/intro/intro/dawn_walk_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
files/demo/intro/intro/dawn_walk_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
files/demo/intro/intro/dawn_walk_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
files/demo/intro/intro/dawn_walk_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

0
files/demo/intro/intro/intro_background.NSCR → files/demo/intro/intro/main_background.NSCR
View File

0
files/demo/intro/intro/buttons.png → files/demo/intro/intro/main_background_tileset.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 960 B

After

Width:  |  Height:  |  Size: 960 B

BIN
files/demo/intro/intro/narc_0013.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0014.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0015.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0016.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0017.NCLR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0018.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0019.NCLR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0020.NCGR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0021.NCLR
View File

Binary file not shown.

BIN
files/demo/intro/intro/narc_0023.NCGR
View File

Binary file not shown.

19
files/demo/intro/intro/rowan_front.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
197 189 156
74 115 164
82 74 74
115 106 106
57 74 90
74 90 131
255 222 90
98 139 213
205 205 222
180 123 57
123 65 65
222 164 139
255 222 205
0 0 0
172 164 205
238 238 255

BIN
files/demo/intro/intro/rowan_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
files/demo/intro/intro/sub_background_tileset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

18
filesystem.mk
View File

@@ -3345,14 +3345,24 @@ files/resource/eng/trial/trial.narc: \
files/resource/eng/trial/trial/narc_0007.NCGR
files/demo/intro/intro.narc: \
files/demo/intro/intro/buttons.NCGR \
files/demo/intro/intro/buttons_diamond.NCLR \
files/demo/intro/intro/buttons_pearl.NCLR \
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/lucas_walk_1.NCGR \
files/demo/intro/intro/lucas_walk_2.NCGR \
files/demo/intro/intro/lucas_walk_3.NCGR \
files/demo/intro/intro/lucas_walk_4.NCGR \
files/demo/intro/intro/lucas_walk.NCLR
files/demo/intro/intro/lucas_walk.NCLR \
files/demo/intro/intro/dawn_walk_1.NCGR \
files/demo/intro/intro/dawn_walk_2.NCGR \
files/demo/intro/intro/dawn_walk_3.NCGR \
files/demo/intro/intro/dawn_walk_4.NCGR \
files/demo/intro/intro/dawn_walk.NCLR \
files/demo/intro/intro/rowan_front.NCGR \
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/graphic/field_board.narc: \
files/graphic/field_board/narc_0000.NCGR \

32
graphics_rules.mk
View File

@@ -151,9 +151,12 @@ 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/buttons_diamond.NCLR \
files/demo/intro/intro/buttons_pearl.NCLR \
files/demo/intro/intro/background_diamond.NCLR \
files/demo/intro/intro/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/title/titledemo/narc_0016.NCLR \
files/graphic/field_board/narc_0001.NCLR \
files/poketool/icongra/poke_icon/narc_0000.NCLR \
@@ -199,11 +202,18 @@ VERSION101_SOPC_8BPP_NCGR_FILES := files/demo/title/titledemo/narc_0001.NCGR \
files/demo/title/titledemo/narc_0003.NCGR
VERSION101_SOPC_NCGR_FILES := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \
files/demo/intro/intro/buttons.NCGR \
files/demo/intro/intro/main_background_tileset.NCGR \
files/demo/intro/intro/lucas_walk_1.NCGR \
files/demo/intro/intro/lucas_walk_2.NCGR \
files/demo/intro/intro/lucas_walk_3.NCGR \
files/demo/intro/intro/lucas_walk_4.NCGR \
files/demo/intro/intro/dawn_walk_1.NCGR \
files/demo/intro/intro/dawn_walk_2.NCGR \
files/demo/intro/intro/dawn_walk_3.NCGR \
files/demo/intro/intro/dawn_walk_4.NCGR \
files/demo/intro/intro/rowan_front.NCGR \
files/demo/intro/intro/barry_front.NCGR \
files/demo/intro/intro/sub_background_tileset.NCGR \
files/demo/title/titledemo/narc_0007.NCGR \
files/demo/title/titledemo/narc_0011.NCGR \
files/demo/title/titledemo/narc_0015.NCGR \
@@ -539,11 +549,18 @@ SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \
NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \
files/data/cell0.NCGR \
files/demo/intro/intro/buttons.NCGR \
files/demo/intro/intro/main_background_tileset.NCGR \
files/demo/intro/intro/lucas_walk_1.NCGR \
files/demo/intro/intro/lucas_walk_2.NCGR \
files/demo/intro/intro/lucas_walk_3.NCGR \
files/demo/intro/intro/lucas_walk_4.NCGR \
files/demo/intro/intro/dawn_walk_1.NCGR \
files/demo/intro/intro/dawn_walk_2.NCGR \
files/demo/intro/intro/dawn_walk_3.NCGR \
files/demo/intro/intro/dawn_walk_4.NCGR \
files/demo/intro/intro/rowan_front.NCGR \
files/demo/intro/intro/barry_front.NCGR \
files/demo/intro/intro/sub_background_tileset.NCGR \
files/demo/title/titledemo/narc_0001.NCGR \
files/demo/title/titledemo/narc_0003.NCGR \
files/demo/title/titledemo/narc_0007.NCGR \
@@ -898,9 +915,12 @@ 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/buttons_diamond.NCLR \
files/demo/intro/intro/buttons_pearl.NCLR \
files/demo/intro/intro/background_diamond.NCLR \
files/demo/intro/intro/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/title/titledemo/narc_0001.NCLR \
files/demo/title/titledemo/narc_0003.NCLR \
files/demo/title/titledemo/narc_0009.NCLR \