Game-Decompilation/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2024-11-26 23:50:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update terminology (cell -> sprite, char -> tiles

Browse Source
This commit is contained in:
Fexty12573 2024-07-06 19:04:24 +02:00
parent 97932c582a
commit 862e363271
70 changed files with 271 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/sprite_resource.h
View File

@ -9,12 +9,12 @@
#include <nnsys.h>
enum SpriteResourceType {
SPRITE_RESOURCE_CHAR = 0,
SPRITE_RESOURCE_TILES = 0,
SPRITE_RESOURCE_PALETTE,
SPRITE_RESOURCE_CELL,
SPRITE_RESOURCE_CELL_ANIM,
SPRITE_RESOURCE_MULTI_CELL,
SPRITE_RESOURCE_MULTI_CELL_ANIM,
SPRITE_RESOURCE_SPRITE,
SPRITE_RESOURCE_SPRITE_ANIM,
SPRITE_RESOURCE_MULTI_SPRITE,
SPRITE_RESOURCE_MULTI_SPRITE_ANIM,
};
typedef struct SpriteResource {
@ -24,8 +24,8 @@ typedef struct SpriteResource {
} SpriteResource;
typedef struct SpriteResourceCollection {
ResourceCollection * collection;
SpriteResource * resources;
ResourceCollection *collection;
SpriteResource *resources;
int capacity;
int count;
enum SpriteResourceType type;
@ -64,17 +64,17 @@ typedef struct SpriteResourceList {
SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapId heapID);
void SpriteResourceCollection_Delete(SpriteResourceCollection *spriteResources);
SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddChar(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
void SpriteResourceCollection_ModifyChar(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID);
void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID);
void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddCharFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddCharFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, int param7);
SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, int param7);
SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID, int param8);
SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
void SpriteResourceCollection_ModifyCharFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID);
void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID);
int SpriteResourceCollection_AddTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapId heapID);
void SpriteResoureCollection_AddTableEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapId heapID);
SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapId heapID);
@ -85,12 +85,12 @@ void SpriteResourceCollection_Remove(SpriteResourceCollection *spriteResources,
void SpriteResourceCollection_Clear(SpriteResourceCollection *spriteResources);
SpriteResource *SpriteResourceCollection_Find(const SpriteResourceCollection *spriteResources, int id);
int SpriteResource_GetID(const SpriteResource *spriteRes);
NNSG2dCharacterData *SpriteResource_GetCharData(const SpriteResource *spriteRes);
NNSG2dCharacterData *SpriteResource_GetTileData(const SpriteResource *spriteRes);
NNSG2dPaletteData *SpriteResource_GetPaletteData(const SpriteResource *spriteRes);
NNSG2dCellDataBank *SpriteResource_GetCellData(const SpriteResource *spriteRes);
NNSG2dCellAnimBankData *SpriteResource_GetCellAnimData(const SpriteResource *spriteRes);
NNSG2dMultiCellDataBank *SpriteResource_GetMultiCellData(const SpriteResource *spriteRes);
NNSG2dMultiCellAnimBankData *SpriteResource_GetMultiCellAnimData(const SpriteResource *spriteRes);
NNSG2dCellDataBank *SpriteResource_GetSpriteData(const SpriteResource *spriteRes);
NNSG2dCellAnimBankData *SpriteResource_GetSpriteAnimData(const SpriteResource *spriteRes);
NNSG2dMultiCellDataBank *SpriteResource_GetMultiSpriteData(const SpriteResource *spriteRes);
NNSG2dMultiCellAnimBankData *SpriteResource_GetMultiSpriteAnimData(const SpriteResource *spriteRes);
enum SpriteResourceType SpriteResource_GetType(const SpriteResource *spriteRes);
NNS_G2D_VRAM_TYPE SpriteResource_GetVRAMType(const SpriteResource *spriteRes);
int SpriteResource_GetPaletteIndex(const SpriteResource *spriteRes);

2
src/choose_starter/choose_starter_app.c
View File

@ -1431,7 +1431,7 @@ static BOOL ov78_021D2200(ChooseStarterCameraMovement *param0)
static void MakeCursorOAM(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2)
{
param1->unk_04[0] = SpriteResourceCollection_AddChar(param0->unk_24C[0], 82, 10, 0, 10, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param1->unk_04[0] = SpriteResourceCollection_AddTiles(param0->unk_24C[0], 82, 10, 0, 10, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param1->unk_04[0]);
SpriteResource_ReleaseData(param1->unk_04[0]);

2
src/overlay005/encounter_effect.c
View File

@ -754,7 +754,7 @@ void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0)
void ov5_021DE4CC(NARC *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
{
param2->unk_00[0] = SpriteResourceCollection_AddCharFromEx(param1->unk_190[0], param0, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 1);
param2->unk_00[0] = SpriteResourceCollection_AddTilesFromEx(param1->unk_190[0], param0, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 1);
param2->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_190[1], param0, param3, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param4, 4);
param2->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_190[2], param0, param6, 0, param8, 2, 4);
param2->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_190[3], param0, param7, 0, param8, 3, 4);

4
src/overlay005/ov5_021D2F14.c
View File

@ -236,7 +236,7 @@ void ov5_021D33B0(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, BOOL p
return;
}
v0 = SpriteResourceCollection_AddChar(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddTiles(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
if (v0 != NULL) {
sub_0200A3DC(v0);
@ -256,7 +256,7 @@ void ov5_021D3414(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, BOOL
return;
}
v0 = SpriteResourceCollection_AddCharFrom(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
if (v0 != NULL) {
sub_0200A3DC(v0);

2
src/overlay005/ov5_021D5EB8.c
View File

@ -1049,7 +1049,7 @@ static SpriteResource *ov5_021D65C0(SpriteResourceTable *param0, int param1, int
switch (param1) {
case 0:
v1 = SpriteResourceCollection_AddCharFromEx(param3, param4, v2, v3, v6, v4, 4, param5);
v1 = SpriteResourceCollection_AddTilesFromEx(param3, param4, v2, v3, v6, v4, 4, param5);
break;
case 1:
v1 = SpriteResourceCollection_AddPaletteFromEx(param3, param4, v2, v3, v6, v4, v5, 4, param5);

2
src/overlay006/ov6_022426AC.c
View File

@ -98,7 +98,7 @@ void ov6_022426C0(UnkStruct_ov6_022426B8 *param0, const int param1)
}
{
param0->unk_10[0] = SpriteResourceCollection_AddCharFrom(param0->unk_00[0], v1, 5, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_00[0], v1, 5, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_10[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_00[1], v1, 3, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 4);
param0->unk_10[2] = SpriteResourceCollection_AddFrom(param0->unk_00[2], v1, 6, 0, 2, 2, 4);
param0->unk_10[3] = SpriteResourceCollection_AddFrom(param0->unk_00[3], v1, 12, 0, 3, 3, 4);

12
src/overlay006/ov6_02243258.c
View File

@ -417,7 +417,7 @@ static void ov6_022434B0(UnkStruct_ov6_02243258 *param0, NARC *param1, int param
if (param0->unk_1A8[v0].unk_00 == param0->unk_04) {
param0->unk_1A8[v0].unk_00 = param3;
param0->unk_1A8[v0].unk_02 = 0;
param0->unk_1A8[v0].unk_04 = SpriteResourceCollection_AddCharFrom(param0->unk_198, param1, param2, 0, param3, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_1A8[v0].unk_04 = SpriteResourceCollection_AddTilesFrom(param0->unk_198, param1, param2, 0, param3, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
return;
}
}
@ -1741,13 +1741,13 @@ static void ov6_02244928(UnkStruct_ov6_02243FFC *param0, NARC *param1)
param0->unk_20C = SpriteResourceCollection_New(2, 3, 4);
for (v0 = 0; v0 < 1; v0++) {
param0->unk_210[v0] = SpriteResourceCollection_AddCharFrom(param0->unk_200, param1, Unk_ov6_02249108[v0].unk_04, 0, Unk_ov6_02249108[v0].unk_00, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_210[v0] = SpriteResourceCollection_AddTilesFrom(param0->unk_200, param1, Unk_ov6_02249108[v0].unk_04, 0, Unk_ov6_02249108[v0].unk_00, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
}
if (param0->unk_0C == 0) {
param0->unk_210[v0] = SpriteResourceCollection_AddCharFrom(param0->unk_200, param1, 13, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_210[v0] = SpriteResourceCollection_AddTilesFrom(param0->unk_200, param1, 13, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
} else {
param0->unk_210[v0] = SpriteResourceCollection_AddCharFrom(param0->unk_200, param1, 16, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_210[v0] = SpriteResourceCollection_AddTilesFrom(param0->unk_200, param1, 16, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
}
v0++;
@ -1920,7 +1920,7 @@ static void ov6_02244DB4(UnkStruct_ov6_02243FFC *param0)
for (v0 = 0; v0 < 4; v0++) {
if (param0->unk_210[v0] == NULL) {
param0->unk_210[v0] = SpriteResourceCollection_AddCharFrom(param0->unk_200, v1, 7, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_210[v0] = SpriteResourceCollection_AddTilesFrom(param0->unk_200, v1, 7, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
break;
}
}
@ -2083,7 +2083,7 @@ static SpriteResource *ov6_022450F4(UnkStruct_ov6_02243FFC *param0, NARC *param1
{
SpriteResource *v0;
v0 = SpriteResourceCollection_AddCharFrom(param0->unk_200, param1, 5, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_200, param1, 5, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
return v0;
}

2
src/overlay007/ov7_0224BE9C.c
View File

@ -724,7 +724,7 @@ static void ov7_0224CA54(CellActorResourceData *param0, UnkStruct_ov7_0224C768 *
{
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
param1->unk_148[0] = SpriteResourceCollection_AddCharFrom(param1->unk_138[0], v0, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param1->unk_148[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_138[0], v0, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param1->unk_148[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_138[1], v0, 10, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2);
param1->unk_148[2] = SpriteResourceCollection_AddFrom(param1->unk_138[2], v0, 5, 0, 5000, 2, param2);
param1->unk_148[3] = SpriteResourceCollection_AddFrom(param1->unk_138[3], v0, 6, 0, 5000, 3, param2);

2
src/overlay007/ov7_0224CD28.c
View File

@ -1508,7 +1508,7 @@ static void ov7_0224EB7C(UnkStruct_ov7_0224D008 *param0, u16 param1)
v0 = SpriteResourceCollection_Find(param0->unk_94.unk_194[0], 2);
SpriteResourceCollection_ModifyChar(param0->unk_94.unk_194[0], v0, 16, Item_FileID(param1, 1), 0, 11);
SpriteResourceCollection_ModifyTiles(param0->unk_94.unk_194[0], v0, 16, Item_FileID(param1, 1), 0, 11);
sub_0200A4C0(v0);
v0 = SpriteResourceCollection_Find(param0->unk_94.unk_194[1], 1);

2
src/overlay009/ov9_02249960.c
View File

@ -2652,7 +2652,7 @@ static void ov9_0224AEE4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B064
int v0;
for (v0 = 0; v0 < 7; v0++) {
param1->unk_1A0[v0] = SpriteResourceCollection_AddCharFrom(param1->unk_190, param2, Unk_ov9_02251E58[v0], 0, ((v0) + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param1->unk_1A0[v0] = SpriteResourceCollection_AddTilesFrom(param1->unk_190, param2, Unk_ov9_02251E58[v0], 0, ((v0) + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, 4);
sub_0200A3DC(param1->unk_1A0[v0]);
}

6
src/overlay021/ov21_021D1FA4.c
View File

@ -798,7 +798,7 @@ static void ov21_021D2AE8(UnkStruct_ov21_021D13FC *param0, int param1)
UnkStruct_ov21_021D22F8 *v0 = &param0->unk_1B0;
NARC *v1 = ov21_021D26E0(param0);
v0->unk_0C[0] = SpriteResourceCollection_AddCharFrom(param0->unk_13C[0], v1, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
v0->unk_0C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_13C[0], v1, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
sub_0200A3DC(v0->unk_0C[0]);
SpriteResource_ReleaseData(v0->unk_0C[0]);
@ -814,7 +814,7 @@ static void ov21_021D2AE8(UnkStruct_ov21_021D13FC *param0, int param1)
void ov21_021D2B88(UnkStruct_ov21_021D22F8 *param0, SpriteResourceCollection **param1, int param2, NARC *param3)
{
param0->unk_0C[0] = SpriteResourceCollection_AddCharFrom(param1[0], param3, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_0C[0] = SpriteResourceCollection_AddTilesFrom(param1[0], param3, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_0C[0]);
SpriteResource_ReleaseData(param0->unk_0C[0]);
@ -966,7 +966,7 @@ static void ov21_021D2E70(UnkStruct_ov21_021D13FC *param0, int param1)
UnkStruct_ov21_021D2584 *v0 = &param0->unk_1E0;
NARC *v1 = ov21_021D26E0(param0);
v0->unk_10[0] = SpriteResourceCollection_AddCharFrom(param0->unk_13C[0], v1, 119, 1, 12000, NNS_G2D_VRAM_TYPE_2DSUB, param1);
v0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_13C[0], v1, 119, 1, 12000, NNS_G2D_VRAM_TYPE_2DSUB, param1);
sub_0200A3DC(v0->unk_10[0]);
SpriteResource_ReleaseData(v0->unk_10[0]);

4
src/overlay021/ov21_021D5AEC.c
View File

@ -801,7 +801,7 @@ static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
SpriteResource *v0;
NARC *v1 = ov21_021D26E0(param1);
v0 = SpriteResourceCollection_AddCharFrom(param0->unk_80[0], v1, 81, 1, 81, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, 81, 1, 81, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(v0);
SpriteResource_ReleaseData(v0);
@ -814,7 +814,7 @@ static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
SpriteResourceCollection_AddFrom(param0->unk_80[3], v1, 80, 1, 80, 3, param2);
sub_020093B4(&param0->unk_90, 81, 3, 79, 80, 0xffffffff, 0xffffffff, 0, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL);
v0 = SpriteResourceCollection_AddCharFrom(param0->unk_80[0], v1, 111, 1, 111, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, 111, 1, 111, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(v0);
SpriteResource_ReleaseData(v0);

2
src/overlay021/ov21_021D76B0.c
View File

@ -562,7 +562,7 @@ static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_2C[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 84, 1, 84 + 1000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_2C[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 84, 1, 84 + 1000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_2C[0]);
SpriteResource_ReleaseData(param0->unk_2C[0]);

2
src/overlay021/ov21_021D85B0.c
View File

@ -611,7 +611,7 @@ static void ov21_021D8C1C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(v0);
param0->unk_24[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_24[0]);
SpriteResource_ReleaseData(param0->unk_24[0]);

4
src/overlay021/ov21_021D94BC.c
View File

@ -2291,7 +2291,7 @@ static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_E4[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 125, 1, 125 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_E4[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 125, 1, 125 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_E4[0]);
SpriteResource_ReleaseData(param0->unk_E4[0]);
@ -2323,7 +2323,7 @@ static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_F4[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 128, 1, 128 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_F4[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 128, 1, 128 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_F4[0]);
SpriteResource_ReleaseData(param0->unk_F4[0]);

4
src/overlay021/ov21_021DC9BC.c
View File

@ -532,14 +532,14 @@ static void ov21_021DCFC8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCA
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_B4[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 108, 1, 108 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_B4[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 108, 1, 108 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_B4[0]);
SpriteResource_ReleaseData(param0->unk_B4[0]);
param0->unk_B4[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v1, 106, 1, 106 + 6000, 2, param2);
param0->unk_B4[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v1, 107, 1, 107 + 6000, 3, param2);
param0->unk_D0[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 93, 1, 93 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_D0[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 93, 1, 93 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_D0[0]);
SpriteResource_ReleaseData(param0->unk_D0[0]);

2
src/overlay021/ov21_021DDD2C.c
View File

@ -406,7 +406,7 @@ static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDD
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_04[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 105, 1, 105 + 6000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_04[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 105, 1, 105 + 6000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_04[0]);
SpriteResource_ReleaseData(param0->unk_04[0]);

4
src/overlay021/ov21_021DE668.c
View File

@ -510,7 +510,7 @@ static void ov21_021DED7C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
int v4 = ov21_021D1F9C();
int v5 = ov21_021D1FA0();
param0->unk_24[0] = SpriteResourceCollection_AddChar(v0->unk_13C[0], v1, v2, 1, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_24[0] = SpriteResourceCollection_AddTiles(v0->unk_13C[0], v1, v2, 1, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_24[0]);
SpriteResource_ReleaseData(param0->unk_24[0]);
@ -600,7 +600,7 @@ static void ov21_021DEFA8(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_14[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_14[0]);
SpriteResource_ReleaseData(param0->unk_14[0]);

2
src/overlay021/ov21_021DF734.c
View File

@ -523,7 +523,7 @@ static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_10[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 122, 1, 122 + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 122, 1, 122 + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_10[0]);
SpriteResource_ReleaseData(param0->unk_10[0]);

2
src/overlay021/ov21_021E0C68.c
View File

@ -488,7 +488,7 @@ static void ov21_021E127C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_08[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_08[0]);
SpriteResource_ReleaseData(param0->unk_08[0]);

4
src/overlay021/ov21_021E1924.c
View File

@ -668,14 +668,14 @@ static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(v0);
param0->unk_40[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 102, 1, 102 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_40[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 102, 1, 102 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_40[0]);
SpriteResource_ReleaseData(param0->unk_40[0]);
param0->unk_40[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v1, 100, 1, 100 + 5000, 2, param2);
param0->unk_40[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v1, 101, 1, 101 + 5000, 3, param2);
param0->unk_70[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 99, 1, 99 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_70[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 99, 1, 99 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_70[0]);
SpriteResource_ReleaseData(param0->unk_70[0]);

4
src/overlay021/ov21_021E29DC.c
View File

@ -672,7 +672,7 @@ static void ov21_021E3178(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32
UnkStruct_ov21_021D13FC *v0 = param0->unk_00;
NARC *v1 = ov21_021D26E0(param0->unk_00);
param1->unk_18[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 87, 1, 87 + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param1->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 87, 1, 87 + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param1->unk_18[0]);
SpriteResource_ReleaseData(param1->unk_18[0]);
@ -1244,7 +1244,7 @@ static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E34
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_18[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 96, 1, 96 + 2100, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 96, 1, 96 + 2100, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_18[0]);
SpriteResource_ReleaseData(param0->unk_18[0]);

2
src/overlay021/ov21_021E3FFC.c
View File

@ -540,7 +540,7 @@ static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_314[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 116, 1, 116 + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_314[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 116, 1, 116 + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_314[0]);
SpriteResource_ReleaseData(param0->unk_314[0]);

2
src/overlay021/ov21_021E4CA4.c
View File

@ -810,7 +810,7 @@ static void ov21_021E5644(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_58[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 113, 1, 113 + 10000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_58[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 113, 1, 113 + 10000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_58[0]);
SpriteResource_ReleaseData(param0->unk_58[0]);

2
src/overlay021/ov21_021E6014.c
View File

@ -374,7 +374,7 @@ static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E61
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(v0);
param0->unk_00[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0->unk_00[0]);
SpriteResource_ReleaseData(param0->unk_00[0]);

2
src/overlay021/ov21_021E68F4.c
View File

@ -539,7 +539,7 @@ static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(param1->unk_00);
param0->unk_10[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 102, 1, 102 + 9000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 102, 1, 102 + 9000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_10[0]);
SpriteResource_ReleaseData(param0->unk_10[0]);

4
src/overlay021/ov21_021E737C.c
View File

@ -561,7 +561,7 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
v3 = PokeIconCellsFileIndex();
v4 = PokeIconAnimationFileIndex();
param0->unk_14[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v9, v1, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v9, v1, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
sub_0200A450(param0->unk_14[0]);
SpriteResource_ReleaseData(param0->unk_14[0]);
@ -577,7 +577,7 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v9, v3, 0, 8000, 2, param3);
param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v9, v4, 0, 8000, 3, param3);
param0->unk_24[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v7, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v7, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
sub_0200A3DC(param0->unk_24[0]);
SpriteResource_ReleaseData(param0->unk_24[0]);

2
src/overlay021/ov21_021E8484.c
View File

@ -511,7 +511,7 @@ static void ov21_021E89F4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85
UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
NARC *v1 = ov21_021D26E0(v0);
param0->unk_08[0] = SpriteResourceCollection_AddCharFrom(v0->unk_13C[0], v1, 102, 1, 102 + 13000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 102, 1, 102 + 13000, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0->unk_08[0]);
SpriteResource_ReleaseData(param0->unk_08[0]);

4
src/overlay021/ov21_021E8D48.c
View File

@ -439,7 +439,7 @@ static void ov21_021E92B0(UnkStruct_ov21_021D22F8 *param0)
static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9)
{
param0[0] = SpriteResourceCollection_AddChar(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0[0] = SpriteResourceCollection_AddTiles(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0[0]);
SpriteResource_ReleaseData(param0[0]);
@ -455,7 +455,7 @@ static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **pa
static void ov21_021E9344(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9)
{
param0[0] = SpriteResourceCollection_AddCharFrom(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0[0] = SpriteResourceCollection_AddTilesFrom(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
sub_0200A3DC(param0[0]);
SpriteResource_ReleaseData(param0[0]);

2
src/overlay022/ov22_02255094.c
View File

@ -175,7 +175,7 @@ void ov22_02255248(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BO
{
SpriteResource *v0;
v0 = SpriteResourceCollection_AddCharFrom(param0->unk_48[0], param1, param2, param3, param5, param4, 14);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_48[0], param1, param2, param3, param5, param4, 14);
sub_0200A3DC(v0);
}

2
src/overlay022/ov22_0225A428.c
View File

@ -349,7 +349,7 @@ static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, SpriteResourceCollect
static void ov22_0225AA34(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9)
{
param0[0] = SpriteResourceCollection_AddCharFrom(param1[0], param3, param4, 0, param9 + param4, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0[0] = SpriteResourceCollection_AddTilesFrom(param1[0], param3, param4, 0, param9 + param4, NNS_G2D_VRAM_TYPE_2DSUB, param2);
sub_0200A3DC(param0[0]);
SpriteResource_ReleaseData(param0[0]);

4
src/overlay023/ov23_0223E140.c
View File

@ -2788,7 +2788,7 @@ static void ov23_02240E88(void)
v1 = NARC_ctor(NARC_INDEX_DATA__UG_ANIM, 29);
ov23_02240E60(SpriteResourceCollection_AddCharFrom(Unk_ov23_02257740->unk_1B0[0], v1, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 29));
ov23_02240E60(SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257740->unk_1B0[0], v1, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 29));
sub_0200A328(Unk_ov23_02257740->unk_1C0[Unk_ov23_02257740->unk_A2F - 1]);
ov23_02240E60(SpriteResourceCollection_AddPaletteFrom(Unk_ov23_02257740->unk_1B0[1], v1, 7, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 29));
@ -2796,7 +2796,7 @@ static void ov23_02240E88(void)
ov23_02240E60(SpriteResourceCollection_AddFrom(Unk_ov23_02257740->unk_1B0[2], v1, 5, 0, 0, 2, 29));
ov23_02240E60(SpriteResourceCollection_AddFrom(Unk_ov23_02257740->unk_1B0[3], v1, 4, 0, 0, 3, 29));
ov23_02240E60(SpriteResourceCollection_AddCharFrom(Unk_ov23_02257740->unk_1B0[0], v1, 3, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 29));
ov23_02240E60(SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257740->unk_1B0[0], v1, 3, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 29));
sub_0200A328(Unk_ov23_02257740->unk_1C0[Unk_ov23_02257740->unk_A2F - 1]);
ov23_02240E60(SpriteResourceCollection_AddPalette(Unk_ov23_02257740->unk_1B0[1], 52, 1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 29));

12
src/overlay023/ov23_0224340C.c
View File

@ -789,7 +789,7 @@ static void ov23_02243754(void)
v1 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, 4);
Unk_ov23_02257764->unk_1F4[1][0] = SpriteResourceCollection_AddCharFrom(Unk_ov23_02257764->unk_1D4[1][0], v1, 17, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[1][0] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[1][0], v1, 17, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[1][1] = SpriteResourceCollection_AddPaletteFrom(Unk_ov23_02257764->unk_1D4[1][1], v1, 18, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, 4);
Unk_ov23_02257764->unk_1F4[1][2] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][2], v1, 16, 0, 0, 2, 4);
Unk_ov23_02257764->unk_1F4[1][3] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][3], v1, 15, 0, 0, 3, 4);
@ -3106,7 +3106,7 @@ static void ov23_02245F94(SysTask *param0, void *param1)
v2 = 28;
}
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddChar(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
v0->unk_00++;
break;
case 2:
@ -3553,7 +3553,7 @@ static void ov23_02246A80(SysTask *param0, void *param1)
v0->unk_00++;
break;
case 1:
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddChar(Unk_ov23_02257764->unk_1D4[0][0], 50, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
sub_0200AAE0(1, 10, 0, GX_BLEND_PLANEMASK_BG0, 1);
v0->unk_00++;
break;
@ -4127,7 +4127,7 @@ static void ov23_022479F4(UnkStruct_ov23_022471D8 *param0)
v2 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, 4);
if (v1 < (7 - 1)) {
param0->unk_F8[v1 + 1] = SpriteResourceCollection_AddCharFrom(Unk_ov23_02257764->unk_1D4[0][0], v2, v0[v1], 0, v1 + 1, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
param0->unk_F8[v1 + 1] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[0][0], v2, v0[v1], 0, v1 + 1, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
}
NARC_dtor(v2);
@ -4169,7 +4169,7 @@ static void ov23_02247A8C(SysTask *param0, void *param1)
break;
case 1:
sub_0200AAE0(1, 10, 0, GX_BLEND_PLANEMASK_BG0, 1);
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddChar(Unk_ov23_02257764->unk_1D4[0][0], 50, 32, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 32, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
v0->unk_F8[0] = Unk_ov23_02257764->unk_1F4[0][0];
v0->unk_00++;
break;
@ -4455,7 +4455,7 @@ static void ov23_022480C4(SysTask *param0, void *param1)
v2 = 25;
}
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddChar(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4);
v0->unk_00++;
break;
case 2:

2
src/overlay023/ov23_02248F1C.c
View File

@ -448,7 +448,7 @@ static void ov23_02249584(UnkStruct_ov23_0224942C *param0)
v1 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, 4);
param0->unk_35C[0] = SpriteResourceCollection_AddCharFrom(param0->unk_34C[0], v1, 4, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, 4);
param0->unk_35C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_34C[0], v1, 4, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, 4);
param0->unk_35C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_34C[1], v1, 3, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, 2, 4);
param0->unk_35C[2] = SpriteResourceCollection_AddFrom(param0->unk_34C[2], v1, 5, 0, 1000, 2, 4);
param0->unk_35C[3] = SpriteResourceCollection_AddFrom(param0->unk_34C[3], v1, 6, 0, 1000, 3, 4);

2
src/overlay056/ov56_022561C0.c
View File

@ -387,7 +387,7 @@ static void ov56_02256634(UnkStruct_ov56_02256468 *param0)
param0->unk_1B8[v0] = SpriteResourceCollection_New(1, v0, 4);
}
param0->unk_1C8[0] = SpriteResourceCollection_AddChar(param0->unk_1B8[0], 74, 5, 1, 999, NNS_G2D_VRAM_TYPE_2DSUB, 4);
param0->unk_1C8[0] = SpriteResourceCollection_AddTiles(param0->unk_1B8[0], 74, 5, 1, 999, NNS_G2D_VRAM_TYPE_2DSUB, 4);
param0->unk_1C8[1] = SpriteResourceCollection_AddPalette(param0->unk_1B8[1], 74, 1, 0, 999, NNS_G2D_VRAM_TYPE_2DSUB, 1, 4);
param0->unk_1C8[2] = SpriteResourceCollection_Add(param0->unk_1B8[2], 74, 6, 1, 999, 2, 4);
param0->unk_1C8[3] = SpriteResourceCollection_Add(param0->unk_1B8[3], 74, 7, 1, 999, 3, 4);

4
src/overlay058/ov58_021D0D80.c
View File

@ -632,11 +632,11 @@ static void ov58_021D1554(UnkStruct_02095EAC *param0, NARC *param1)
param0->unk_1C4[v0] = SpriteResourceCollection_New(2, v0, 39);
}
param0->unk_1D4[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1C4[0], param1, 6, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 39);
param0->unk_1D4[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1C4[0], param1, 6, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 39);
param0->unk_1D4[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1C4[1], param1, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, 39);
param0->unk_1D4[0][2] = SpriteResourceCollection_AddFrom(param0->unk_1C4[2], param1, 7, 1, 0, 2, 39);
param0->unk_1D4[0][3] = SpriteResourceCollection_AddFrom(param0->unk_1C4[3], param1, 8, 1, 0, 3, 39);
param0->unk_1D4[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1C4[0], param1, 6, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 39);
param0->unk_1D4[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1C4[0], param1, 6, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 39);
param0->unk_1D4[1][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1C4[1], param1, 0, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 3, 39);
param0->unk_1D4[1][2] = SpriteResourceCollection_AddFrom(param0->unk_1C4[2], param1, 7, 1, 1, 2, 39);
param0->unk_1D4[1][3] = SpriteResourceCollection_AddFrom(param0->unk_1C4[3], param1, 8, 1, 1, 3, 39);

2
src/overlay059/ov59_021D0D80.c
View File

@ -618,7 +618,7 @@ static void ov59_021D14A4(UnkStruct_020961E8 *param0, NARC *param1)
param0->unk_1E0[v0] = SpriteResourceCollection_New(3, v0, 51);
}
param0->unk_1F0[2][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1E0[0], param1, 12, 1, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 51);
param0->unk_1F0[2][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1E0[0], param1, 12, 1, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 51);
param0->unk_1F0[2][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1E0[1], param1, 1, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 15, 51);
param0->unk_1F0[2][2] = SpriteResourceCollection_AddFrom(param0->unk_1E0[2], param1, 13, 1, 2, 2, 51);
param0->unk_1F0[2][3] = SpriteResourceCollection_AddFrom(param0->unk_1E0[3], param1, 14, 1, 2, 3, 51);

12
src/overlay063/ov63_0222AE60.c
View File

@ -744,10 +744,10 @@ static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param
BOOL v2;
u32 v3, v4;
param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddCharFrom(param0->unk_2280[0], param0->unk_2294[0], ((((param1) * 2) + 13) + 1), 0, 0x200 + param1, param2, param4);
param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], ((((param1) * 2) + 13) + 1), 0, 0x200 + param1, param2, param4);
param0->unk_10[param1].unk_04[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_2280[1], param0->unk_2294[0], (((param1) * 2) + 13), 0, 0x200 + param1, param2, 1, param4);
v0 = SpriteResource_GetCharData(param0->unk_10[param1].unk_04[0]);
v0 = SpriteResource_GetTileData(param0->unk_10[param1].unk_04[0]);
if (v0->szByte == 0x1800) {
v2 = 0;
@ -800,13 +800,13 @@ static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param
v2 = param1 - 2;
param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddCharFrom(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1)-2)), 0, 0x200 + param1, param2, param4);
param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1)-2)), 0, 0x200 + param1, param2, param4);
if (param3 == 2) {
v0 = SpriteResource_GetCharData(param0->unk_10[param1].unk_04[0]);
v0 = SpriteResource_GetTileData(param0->unk_10[param1].unk_04[0]);
v0->szByte = 0x800;
} else if (param3 == 1) {
v0 = SpriteResource_GetCharData(param0->unk_10[param1].unk_04[0]);
v0 = SpriteResource_GetTileData(param0->unk_10[param1].unk_04[0]);
v0->szByte = 0x1400;
}
@ -893,7 +893,7 @@ static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param
param0->unk_2248.unk_00[v0 + 2] = SpriteResourceCollection_AddFrom(param0->unk_2280[v0 + 2], param0->unk_2294[0], 0 + v0, 0, 0x120, 2 + v0, param2);
}
param0->unk_2248.unk_00[0] = SpriteResourceCollection_AddCharFrom(param0->unk_2280[0], param0->unk_2294[0], 2, 0, 0x120, param1, param2);
param0->unk_2248.unk_00[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], 2, 0, 0x120, param1, param2);
v1 = sub_0200A450(param0->unk_2248.unk_00[0]);
GF_ASSERT(v1);

2
src/overlay064/ov64_0222DCE0.c
View File

@ -1015,7 +1015,7 @@ static void ov64_0222E3D8 (UnkStruct_ov64_0222E21C * param0, u32 param1)
param0->unk_204[v0] = SpriteResourceCollection_New(64, v0, param1);
}
param0->unk_260[0] = SpriteResourceCollection_AddCharFrom(param0->unk_204[0], param0->unk_21C, 15, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
param0->unk_260[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_204[0], param0->unk_21C, 15, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
param0->unk_260[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_204[1], param0->unk_21C, 0, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param1);
param0->unk_260[2] = SpriteResourceCollection_AddFrom(param0->unk_204[2], param0->unk_21C, 16, 0, 100, 2, param1);
param0->unk_260[3] = SpriteResourceCollection_AddFrom(param0->unk_204[3], param0->unk_21C, 17, 0, 100, 3, param1);

2
src/overlay065/ov65_0222DCE0.c
View File

@ -6684,7 +6684,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0);
param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddCharFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_BE0.unk_20C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_31C[1], param1, 43, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, 8, param2);
param0->unk_BE0.unk_20C[2] = SpriteResourceCollection_AddFrom(param0->unk_31C[2], param1, 40, 0, 30, 2, param2);
param0->unk_BE0.unk_20C[3] = SpriteResourceCollection_AddFrom(param0->unk_31C[3], param1, 41, 0, 30, 3, param2);

2
src/overlay065/ov65_02235060.c
View File

@ -648,7 +648,7 @@ static void ov65_02235960(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *par
{
BOOL v0;
param0->unk_1A0.unk_00[0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], param2, 37, 0, 50, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
param0->unk_1A0.unk_00[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], param2, 37, 0, 50, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
param0->unk_1A0.unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_190[1], param2, 36, 0, 50, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param1);
param0->unk_1A0.unk_00[2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], param2, 38, 0, 50, 2, param1);
param0->unk_1A0.unk_00[3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], param2, 39, 0, 50, 3, param1);

2
src/overlay068/ov68_0225C700.c
View File

@ -677,7 +677,7 @@ static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB
{
BOOL v0;
param0->unk_18[0] = SpriteResourceCollection_AddCharFrom(param2->unk_194[0], param2->unk_1A4, 205, 0, 20, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_18[0] = SpriteResourceCollection_AddTilesFrom(param2->unk_194[0], param2->unk_1A4, 205, 0, 20, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_18[1] = SpriteResourceCollection_AddPaletteFrom(param2->unk_194[1], param2->unk_1A4, 204, 0, 20, NNS_G2D_VRAM_TYPE_2DMAIN, 3, param3);
v0 = sub_0200A3DC(param0->unk_18[0]);

2
src/overlay069/ov69_0225C700.c
View File

@ -2647,7 +2647,7 @@ static void ov69_0225E960(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D3
SpriteResource_ReleaseData(param0->unk_6C[0][1]);
for (v0 = 0; v0 < 12; v0++) {
param0->unk_6C[v0][0] = SpriteResourceCollection_AddCharFrom(param1->unk_194[0], param1->unk_1A8, (21 + ((v0) * 3)), 0, v0, NNS_G2D_VRAM_TYPE_2DSUB, param3);
param0->unk_6C[v0][0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], param1->unk_1A8, (21 + ((v0) * 3)), 0, v0, NNS_G2D_VRAM_TYPE_2DSUB, param3);
param0->unk_6C[v0][2] = SpriteResourceCollection_AddFrom(param1->unk_194[2], param1->unk_1A8, (22 + ((v0) * 3)), 0, v0, 2, param3);
param0->unk_6C[v0][3] = SpriteResourceCollection_AddFrom(param1->unk_194[3], param1->unk_1A8, (23 + ((v0) * 3)), 0, v0, 3, param3);

8
src/overlay070/ov70_0225D9A4.c
View File

@ -1660,7 +1660,7 @@ static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4
int v2;
NARC *v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
param0->unk_40[0] = SpriteResourceCollection_AddCharFrom(param1->unk_194[0], v3, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_40[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], v3, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_40[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_194[1], v3, 10, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2);
param0->unk_40[2] = SpriteResourceCollection_AddFrom(param1->unk_194[2], v3, 5, 0, 5000, 2, param2);
param0->unk_40[3] = SpriteResourceCollection_AddFrom(param1->unk_194[3], v3, 6, 0, 5000, 3, param2);
@ -2698,7 +2698,7 @@ static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
{
BOOL v2;
param0->unk_58[0] = SpriteResourceCollection_AddCharFrom(param1->unk_194[0], param2, 61 + (v0 * 3), 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, param3);
param0->unk_58[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], param2, 61 + (v0 * 3), 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, param3);
v2 = sub_0200A3DC(param0->unk_58[0]);
GF_ASSERT(v2);
@ -2773,7 +2773,7 @@ static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
{
BOOL v5;
param0->unk_6C[0] = SpriteResourceCollection_AddChar(param1->unk_194[0], v4.unk_00, v4.unk_04, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, param3);
param0->unk_6C[0] = SpriteResourceCollection_AddTiles(param1->unk_194[0], v4.unk_00, v4.unk_04, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, param3);
v5 = sub_0200A3DC(param0->unk_6C[0]);
GF_ASSERT(v5);
@ -3002,7 +3002,7 @@ static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
v2 = v1;
}
param0->unk_BC[v0] = SpriteResourceCollection_AddCharFrom(param1->unk_194[0], v2, v10->unk_02, 0, 150 + v0, NNS_G2D_VRAM_TYPE_2DSUB, param3);
param0->unk_BC[v0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], v2, v10->unk_02, 0, 150 + v0, NNS_G2D_VRAM_TYPE_2DSUB, param3);
v3 = sub_0200A3DC(param0->unk_BC[v0]);
GF_ASSERT(v3);

2
src/overlay071/ov71_0223CF0C.c
View File

@ -69,7 +69,7 @@ void ov71_0223CF0C(UnkStruct_ov71_0223D238 *param0, NARC *param1)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov71_0223D6C8[v0], v0, 25);
}
param0->unk_1A0[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], param1, 33, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 25);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], param1, 33, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 25);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_190[1], param1, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 9, 25);
param0->unk_1A0[0][2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], param1, 44, 0, 1, 2, 25);
param0->unk_1A0[0][3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], param1, 46, 0, 1, 3, 25);

4
src/overlay072/ov72_0223D7A0.c
View File

@ -490,11 +490,11 @@ static void ov72_0223DDD8(UnkStruct_ov72_0223DB98 *param0, NARC *param1)
param0->unk_1CC[v0] = SpriteResourceCollection_New(2, v0, 39);
}
param0->unk_1DC[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1CC[0], param1, 7, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 39);
param0->unk_1DC[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1CC[0], param1, 7, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 39);
param0->unk_1DC[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1CC[1], param1, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 39);
param0->unk_1DC[0][2] = SpriteResourceCollection_AddFrom(param0->unk_1CC[2], param1, 8, 1, 0, 2, 39);
param0->unk_1DC[0][3] = SpriteResourceCollection_AddFrom(param0->unk_1CC[3], param1, 9, 1, 0, 3, 39);
param0->unk_1DC[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1CC[0], param1, 7, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 39);
param0->unk_1DC[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1CC[0], param1, 7, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 39);
param0->unk_1DC[1][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1CC[1], param1, 1, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 3, 39);
param0->unk_1DC[1][2] = SpriteResourceCollection_AddFrom(param0->unk_1CC[2], param1, 8, 1, 1, 2, 39);
param0->unk_1DC[1][3] = SpriteResourceCollection_AddFrom(param0->unk_1CC[3], param1, 9, 1, 1, 3, 39);

22
src/overlay077/ov77_021D54B0.c
View File

@ -151,17 +151,17 @@ void ov77_021D5564(UnkStruct_ov77_021D5564 *param0)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov77_021D7914[v0], v0, v1);
}
param0->unk_1A0[0][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 46, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 46, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 50, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[3][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 87, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[4][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 22, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[5][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 23, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[6][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 91, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[7][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 83, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[8][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 83, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[9][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 54, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[10][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 54, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 50, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[3][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 87, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[4][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 22, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[5][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 23, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[6][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 91, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[7][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[8][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[9][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
param0->unk_1A0[10][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, v1);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 1, v1);
param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 53, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);

2
src/overlay077/ov77_021D6670.c
View File

@ -204,7 +204,7 @@ static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov77_021D7930[v0], v0, v1);
}
param0->unk_1A0[0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_MAX, v1);
param0->unk_1A0[0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_MAX, v1);
param0->unk_1A0[1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 3, 0, 0, NNS_G2D_VRAM_TYPE_MAX, 1, v1);
param0->unk_1A0[2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 5, 0, 0, 2, v1);
param0->unk_1A0[3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 6, 0, 0, 3, v1);

4
src/overlay083/ov83_0223D6A8.c
View File

@ -210,7 +210,7 @@ void ov83_0223D7A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *par
{
BOOL v0;
param1->unk_00[0] = SpriteResourceCollection_AddCharFromEx(param0->unk_190[0], param2, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param9, 1);
param1->unk_00[0] = SpriteResourceCollection_AddTilesFromEx(param0->unk_190[0], param2, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param9, 1);
param1->unk_00[1] = SpriteResourceCollection_AddPaletteFromEx(param0->unk_190[1], param2, param3, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param4, param9, 1);
param1->unk_10 = 0;
param1->unk_00[2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], param2, param6, 0, param8, 2, param9);
@ -232,7 +232,7 @@ void ov83_0223D894(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *par
BOOL v0;
u32 v1;
param1->unk_00[0] = SpriteResourceCollection_AddCharFromEx(param0->unk_190[0], param2, param4, 0, param7, NNS_G2D_VRAM_TYPE_2DMAIN, param8, 1);
param1->unk_00[0] = SpriteResourceCollection_AddTilesFromEx(param0->unk_190[0], param2, param4, 0, param7, NNS_G2D_VRAM_TYPE_2DMAIN, param8, 1);
param1->unk_00[1] = param3;
param1->unk_10 = 1;

4
src/overlay088/ov88_0223B140.c
View File

@ -1255,11 +1255,11 @@ static void ov88_0223C66C(UnkStruct_02095E80 *param0, NARC *param1)
param0->unk_324[v0] = SpriteResourceCollection_New(2, v0, 26);
}
param0->unk_334[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_324[0], param1, 7, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 26);
param0->unk_334[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_324[0], param1, 7, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 26);
param0->unk_334[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_324[1], param1, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 9, 26);
param0->unk_334[0][2] = SpriteResourceCollection_AddFrom(param0->unk_324[2], param1, 8, 1, 0, 2, 26);
param0->unk_334[0][3] = SpriteResourceCollection_AddFrom(param0->unk_324[3], param1, 9, 1, 0, 3, 26);
param0->unk_334[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_324[0], param1, 10, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 26);
param0->unk_334[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_324[0], param1, 10, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 26);
param0->unk_334[1][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_324[1], param1, 0, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 10, 26);
param0->unk_334[1][2] = SpriteResourceCollection_AddFrom(param0->unk_324[2], param1, 11, 1, 1, 2, 26);
param0->unk_334[1][3] = SpriteResourceCollection_AddFrom(param0->unk_324[3], param1, 12, 1, 1, 3, 26);

4
src/overlay094/ov94_0223BCB0.c
View File

@ -359,11 +359,11 @@ static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C *param0)
param0->unk_D74[v0] = SpriteResourceCollection_New(3, v0, 62);
}
param0->unk_D84[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_D74[0], v1, 18, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 62);
param0->unk_D84[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_D74[0], v1, 18, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 62);
param0->unk_D84[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_D74[1], v1, 9, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 62);
param0->unk_D84[0][2] = SpriteResourceCollection_AddFrom(param0->unk_D74[2], v1, 19, 1, 0, 2, 62);
param0->unk_D84[0][3] = SpriteResourceCollection_AddFrom(param0->unk_D74[3], v1, 20, 1, 0, 3, 62);
param0->unk_D84[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_D74[0], v1, 32, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 62);
param0->unk_D84[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_D74[0], v1, 32, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 62);
param0->unk_D84[1][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_D74[1], v1, 8, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 9, 62);
param0->unk_D84[1][2] = SpriteResourceCollection_AddFrom(param0->unk_D74[2], v1, 33, 1, 1, 2, 62);
param0->unk_D84[1][3] = SpriteResourceCollection_AddFrom(param0->unk_D74[3], v1, 34, 1, 1, 3, 62);

2
src/overlay096/ov96_0223B6A0.c
View File

@ -271,7 +271,7 @@ static void ov96_0223B9D0(UnkStruct_ov96_0223BF40 *param0)
param0->unk_D84[v0] = SpriteResourceCollection_New(2, v0, 68);
}
param0->unk_D94[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_D84[0], v1, 35, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 68);
param0->unk_D94[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_D84[0], v1, 35, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 68);
param0->unk_D94[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_D84[1], v1, 9, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 68);
param0->unk_D94[0][2] = SpriteResourceCollection_AddFrom(param0->unk_D84[2], v1, 36, 1, 0, 2, 68);
param0->unk_D94[0][3] = SpriteResourceCollection_AddFrom(param0->unk_D84[3], v1, 37, 1, 0, 3, 68);

4
src/overlay097/ov97_0222D30C.c
View File

@ -1133,7 +1133,7 @@ static void ov97_0222E398(UnkStruct_ov97_0222E398 *param0)
v6 = NNS_G2D_VRAM_TYPE_2DMAIN;
v7 = 20000 + v6;
param0->unk_58[v9 + 0][0] = SpriteResourceCollection_AddChar(param0->unk_0C->unk_190[0], v0, v1, v5, v7, v6, v8);
param0->unk_58[v9 + 0][0] = SpriteResourceCollection_AddTiles(param0->unk_0C->unk_190[0], v0, v1, v5, v7, v6, v8);
param0->unk_58[v9 + 0][1] = SpriteResourceCollection_AddPalette(param0->unk_0C->unk_190[1], v0, v2, 0, v7, v6, 1, v8);
param0->unk_58[v9 + 0][2] = SpriteResourceCollection_Add(param0->unk_0C->unk_190[2], v0, v3, v5, v7, 2, v8);
param0->unk_58[v9 + 0][3] = SpriteResourceCollection_Add(param0->unk_0C->unk_190[3], v0, v4, v5, v7, 3, v8);
@ -1143,7 +1143,7 @@ static void ov97_0222E398(UnkStruct_ov97_0222E398 *param0)
v6 = NNS_G2D_VRAM_TYPE_2DSUB;
v7 = 20000 + v6;
param0->unk_58[v9 + 1][0] = SpriteResourceCollection_AddChar(param0->unk_0C->unk_190[0], v0, v1, v5, v7, v6, v8);
param0->unk_58[v9 + 1][0] = SpriteResourceCollection_AddTiles(param0->unk_0C->unk_190[0], v0, v1, v5, v7, v6, v8);
param0->unk_58[v9 + 1][1] = SpriteResourceCollection_AddPalette(param0->unk_0C->unk_190[1], v0, v2, 0, v7, v6, 1, v8);
param0->unk_58[v9 + 1][2] = SpriteResourceCollection_Add(param0->unk_0C->unk_190[2], v0, v3, v5, v7, 2, v8);
param0->unk_58[v9 + 1][3] = SpriteResourceCollection_Add(param0->unk_0C->unk_190[3], v0, v4, v5, v7, 3, v8);

2
src/overlay097/ov97_02233B18.c
View File

@ -526,7 +526,7 @@ static void ov97_02233FA4(UnkStruct_ov97_02234A2C *param0)
param0->unk_1B8[v0] = SpriteResourceCollection_New(3, v0, 78);
}
param0->unk_1D0[0] = SpriteResourceCollection_AddChar(param0->unk_1B8[0], 116, 26, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 78);
param0->unk_1D0[0] = SpriteResourceCollection_AddTiles(param0->unk_1B8[0], 116, 26, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 78);
param0->unk_1D0[1] = SpriteResourceCollection_AddPalette(param0->unk_1B8[1], 116, 23, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 78);
param0->unk_1D0[2] = SpriteResourceCollection_Add(param0->unk_1B8[2], 116, 25, 1, 0, 2, 78);
param0->unk_1D0[3] = SpriteResourceCollection_Add(param0->unk_1B8[3], 116, 24, 1, 0, 3, 78);

2
src/overlay097/ov97_02237694.c
View File

@ -368,7 +368,7 @@ void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, i
}
if (param1 != -1) {
v0->unk_34.unk_1A8[param5][0] = SpriteResourceCollection_AddChar(v0->unk_34.unk_190[0], param0, param1, v2, param5, v1, v0->unk_08);
v0->unk_34.unk_1A8[param5][0] = SpriteResourceCollection_AddTiles(v0->unk_34.unk_190[0], param0, param1, v2, param5, v1, v0->unk_08);
}
if (param2 != -1) {

2
src/overlay101/ov101_021D7E48.c
View File

@ -153,7 +153,7 @@ void ov101_021D80E4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2,
if (param0->unk_1B0[v0].unk_00 == param0->unk_08) {
param0->unk_1B0[v0].unk_00 = param4;
param0->unk_1B0[v0].unk_02 = 0;
param0->unk_1B0[v0].unk_04 = SpriteResourceCollection_AddCharFrom(
param0->unk_1B0[v0].unk_04 = SpriteResourceCollection_AddTilesFrom(
param0->unk_1A0, param2, param3, 0, param4, param1, param0->unk_00);
return;
}

2
src/overlay105/ov105_02245AAC.c
View File

@ -41,7 +41,7 @@ void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov105_02246444[v0], v0, 93);
}
param0->unk_1A0[0][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 151, 0, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 93);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 151, 0, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 93);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 151, 36, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 8, 93);
param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 151, 2, 1, 0, 2, 93);
param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 151, 1, 1, 0, 3, 93);

4
src/overlay106/ov106_02243310.c
View File

@ -47,14 +47,14 @@ void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov106_0224384C[v0], v0, 98);
}
param0->unk_1A0[0][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 151, 12, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 98);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 151, 12, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 98);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 151, 38, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 98);
param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 151, 14, 1, 0, 2, 98);
param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 151, 13, 1, 0, 3, 98);
v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 98);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v1, Pokemon_IconSpriteIndex(param1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 98);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v1, Pokemon_IconSpriteIndex(param1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 98);
param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 19, PokeIconPalettesFileIndex(), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 98);
param0->unk_1A0[1][2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], v1, PokeIcon32KCellsFileIndex(), 0, 1, 2, 98);
param0->unk_1A0[1][3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], v1, PokeIcon32KAnimationFileIndex(), 0, 1, 3, 98);

10
src/overlay107/ov107_02249604.c
View File

@ -58,14 +58,14 @@ void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2)
param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov107_0224A204[v0], v0, 100);
}
param0->unk_1A0[0][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 151, 15, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 151, 15, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 151, 39, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 100);
param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 151, 17, 1, 0, 2, 100);
param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 151, 16, 1, 0, 3, 100);
v1 = NARC_ctor(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, 100);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v1, Item_FileID(0, 1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v1, Item_FileID(0, 1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 16, Item_FileID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 100);
param0->unk_1A0[1][2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], v1, Item_IconNCERFile(), 0, 1, 2, 100);
param0->unk_1A0[1][3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], v1, Item_IconNANRFile(), 0, 1, 3, 100);
@ -90,7 +90,7 @@ void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2)
v2 = Party_GetPokemonBySlotIndex(param1, v0);
}
param0->unk_1A0[3 + v0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v1, Pokemon_IconSpriteIndex(v2), 0, 3 + v0, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[3 + v0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v1, Pokemon_IconSpriteIndex(v2), 0, 3 + v0, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
}
NARC_dtor(v1);
@ -183,7 +183,7 @@ void ov107_022499BC(UnkStruct_ov107_02249954 *param0, u16 param1)
v0 = SpriteResourceCollection_Find(param0->unk_190[0], 1);
SpriteResourceCollection_ModifyChar(param0->unk_190[0], v0, 16, Item_FileID(param1, 1), 0, 100);
SpriteResourceCollection_ModifyTiles(param0->unk_190[0], v0, 16, Item_FileID(param1, 1), 0, 100);
sub_0200A4C0(v0);
return;
@ -225,7 +225,7 @@ static void ov107_02249A70(UnkStruct_ov107_02249954 *param0)
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 100);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v0, sub_02081930(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v0, sub_02081930(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 20, sub_02081934(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 100);
param0->unk_1A0[2][2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], v0, sub_02081938(), 0, 2, 2, 100);
param0->unk_1A0[2][3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], v0, sub_0208193C(), 0, 2, 3, 100);

10
src/overlay108/ov108_02243030.c
View File

@ -158,7 +158,7 @@ static void ov108_022431FC(void)
static void ov108_02243230(UnkStruct_ov108_02243030 *param0)
{
param0->unk_1A0[1][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 151, 18, 1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[1][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 151, 18, 1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 151, 40, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 8, 103);
param0->unk_1A0[1][2] = SpriteResourceCollection_Add(param0->unk_190[2], 151, 20, 1, 1, 2, 103);
param0->unk_1A0[1][3] = SpriteResourceCollection_Add(param0->unk_190[3], 151, 19, 1, 1, 3, 103);
@ -173,7 +173,7 @@ static void ov108_022432B4(UnkStruct_ov108_02243030 *param0)
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 103);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v0, sub_02081930(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v0, sub_02081930(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 20, sub_02081934(), 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 103);
param0->unk_1A0[2][2] = SpriteResourceCollection_AddFrom(param0->unk_190[2], v0, sub_02081938(), 0, 2, 2, 103);
param0->unk_1A0[2][3] = SpriteResourceCollection_AddFrom(param0->unk_190[3], v0, sub_0208193C(), 0, 2, 3, 103);
@ -209,8 +209,8 @@ static void ov108_02243360(UnkStruct_ov108_02243030 *param0, Party *param1, Part
v1 = Party_GetPokemonBySlotIndex(param2, v3);
}
param0->unk_1A0[3 + v3][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v2, Pokemon_IconSpriteIndex(v0), 0, 3 + v3, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[7 + v3][0] = SpriteResourceCollection_AddCharFrom(param0->unk_190[0], v2, Pokemon_IconSpriteIndex(v1), 0, 7 + v3, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[3 + v3][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v2, Pokemon_IconSpriteIndex(v0), 0, 3 + v3, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
param0->unk_1A0[7 + v3][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_190[0], v2, Pokemon_IconSpriteIndex(v1), 0, 7 + v3, NNS_G2D_VRAM_TYPE_2DMAIN, 103);
}
NARC_dtor(v2);
@ -219,7 +219,7 @@ static void ov108_02243360(UnkStruct_ov108_02243030 *param0, Party *param1, Part
static void ov108_02243490(UnkStruct_ov108_02243030 *param0)
{
param0->unk_1A0[0][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 151, 21, 1, 0, NNS_G2D_VRAM_TYPE_2DSUB, 103);
param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 151, 21, 1, 0, NNS_G2D_VRAM_TYPE_2DSUB, 103);
param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 151, 41, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 2, 103);
param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 151, 23, 1, 0, 2, 103);
param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 151, 22, 1, 0, 3, 103);

2
src/overlay109/ov109_021D3D50.c
View File

@ -615,7 +615,7 @@ static void ov109_021D441C(UnkStruct_ov109_021D5140 *param0, NARC *param1)
param0->unk_1F0[v0] = SpriteResourceCollection_New(3, v0, 95);
}
param0->unk_200[2][0] = SpriteResourceCollection_AddCharFrom(param0->unk_1F0[0], param1, 12, 1, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 95);
param0->unk_200[2][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1F0[0], param1, 12, 1, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 95);
param0->unk_200[2][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1F0[1], param1, 1, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 15, 95);
param0->unk_200[2][2] = SpriteResourceCollection_AddFrom(param0->unk_1F0[2], param1, 13, 1, 2, 2, 95);
param0->unk_200[2][3] = SpriteResourceCollection_AddFrom(param0->unk_1F0[3], param1, 14, 1, 2, 3, 95);

8
src/overlay111/ov111_021D2F80.c
View File

@ -72,7 +72,7 @@ void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0)
static void ov111_021D304C(UnkStruct_ov111_021D2F80 *param0, int param1)
{
param0->unk_1A0[2][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 184, 12, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[2][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 184, 12, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 184, 13, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 115);
param0->unk_1A0[2][2] = SpriteResourceCollection_Add(param0->unk_190[2], 184, 11, 0, 2, 2, 115);
param0->unk_1A0[2][3] = SpriteResourceCollection_Add(param0->unk_190[3], 184, 10, 0, 2, 3, 115);
@ -82,7 +82,7 @@ static void ov111_021D304C(UnkStruct_ov111_021D2F80 *param0, int param1)
static void ov111_021D30D8(UnkStruct_ov111_021D2F80 *param0, int param1, int param2, int param3)
{
param0->unk_1A0[param1][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 184, 32, 0, param2, param3, 115);
param0->unk_1A0[param1][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 184, 32, 0, param2, param3, 115);
param0->unk_1A0[param1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 184, 33, 0, param2, param3, 5, 115);
param0->unk_1A0[param1][2] = SpriteResourceCollection_Add(param0->unk_190[2], 184, 31, 0, param2, 2, 115);
param0->unk_1A0[param1][3] = SpriteResourceCollection_Add(param0->unk_190[3], 184, 30, 0, param2, 3, 115);
@ -92,7 +92,7 @@ static void ov111_021D30D8(UnkStruct_ov111_021D2F80 *param0, int param1, int par
static void ov111_021D3168(UnkStruct_ov111_021D2F80 *param0, int param1)
{
param0->unk_1A0[3][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 184, 16, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[3][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 184, 16, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[3][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 184, 17, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 115);
param0->unk_1A0[3][2] = SpriteResourceCollection_Add(param0->unk_190[2], 184, 15, 0, 3, 2, 115);
param0->unk_1A0[3][3] = SpriteResourceCollection_Add(param0->unk_190[3], 184, 14, 0, 3, 3, 115);
@ -102,7 +102,7 @@ static void ov111_021D3168(UnkStruct_ov111_021D2F80 *param0, int param1)
static void ov111_021D31F4(UnkStruct_ov111_021D2F80 *param0, int param1)
{
param0->unk_1A0[4][0] = SpriteResourceCollection_AddChar(param0->unk_190[0], 184, 20, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[4][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 184, 20, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 115);
param0->unk_1A0[4][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 184, 21, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 115);
param0->unk_1A0[4][2] = SpriteResourceCollection_Add(param0->unk_190[2], 184, 19, 0, 4, 2, 115);
param0->unk_1A0[4][3] = SpriteResourceCollection_Add(param0->unk_190[3], 184, 18, 0, 4, 3, 115);

2
src/overlay114/ov114_0225C700.c
View File

@ -1296,7 +1296,7 @@ static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_022
GF_ASSERT(param1->unk_00 == 0);
param1->unk_00 = 1;
param1->unk_04[0] = SpriteResourceCollection_AddCharFrom(param0->unk_00[0], param2, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param9);
param1->unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_00[0], param2, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param9);
param1->unk_04[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_00[1], param2, param3, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param4, param9);
param1->unk_04[2] = SpriteResourceCollection_AddFrom(param0->unk_00[2], param2, param6, 0, param8, 2, param9);
param1->unk_04[3] = SpriteResourceCollection_AddFrom(param0->unk_00[3], param2, param7, 0, param8, 3, param9);

8
src/overlay115/ov115_02260CEC.c
View File

@ -2659,7 +2659,7 @@ static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param2);
{
param0->unk_00[0] = SpriteResourceCollection_AddCharFrom(param1->unk_1AC[0], v0, 21, 0, 120, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], v0, 21, 0, 120, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], v0, 20, 0, 120, NNS_G2D_VRAM_TYPE_2DSUB, 2, param2);
param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], v0, 22, 0, 120, 2, param2);
param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], v0, 23, 0, 120, 3, param2);
@ -3217,7 +3217,7 @@ static void ov115_02263A74(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 p
BOOL v0;
{
param0->unk_1E0[0] = SpriteResourceCollection_AddCharFrom(param0->unk_1AC[0], param1, 2, 0, 200, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_1E0[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1AC[0], param1, 2, 0, 200, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_1E0[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1AC[1], param1, 3, 0, 200, NNS_G2D_VRAM_TYPE_2DMAIN, 8, param2);
param0->unk_1E0[2] = SpriteResourceCollection_AddFrom(param0->unk_1AC[2], param1, 1, 0, 200, 2, param2);
param0->unk_1E0[3] = SpriteResourceCollection_AddFrom(param0->unk_1AC[3], param1, 0, 0, 200, 3, param2);
@ -3620,7 +3620,7 @@ static void ov115_022643EC(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 p
NNS_G3dMdlUseGlbAlpha(param0->unk_760.unk_50.model);
{
param0->unk_760.unk_60[0] = SpriteResourceCollection_AddCharFrom(param0->unk_1AC[0], param1, 7, 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_760.unk_60[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1AC[0], param1, 7, 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_760.unk_60[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_1AC[1], param1, 4, 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, 4, param2);
param0->unk_760.unk_60[2] = SpriteResourceCollection_AddFrom(param0->unk_1AC[2], param1, 6, 0, 100, 2, param2);
param0->unk_760.unk_60[3] = SpriteResourceCollection_AddFrom(param0->unk_1AC[3], param1, 5, 0, 100, 3, param2);
@ -4396,7 +4396,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
{
BOOL v0;
param0->unk_00[0] = SpriteResourceCollection_AddCharFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], param2, 11, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3);
param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], param2, 9, 0, 140, 2, param3);
param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], param2, 8, 0, 140, 3, param3);

216
src/sprite_resource.c
View File

@ -15,32 +15,32 @@
#define SPRITE_VRAM_TYPE_DEFAULT NNS_G2D_VRAM_TYPE_3DMAIN
#define NARC_INDEX_NONE 0xFFFFFFFE
typedef struct CharResourceData {
NNSG2dCharacterData * charData;
typedef struct TileResourceData {
NNSG2dCharacterData *tileData;
NNS_G2D_VRAM_TYPE vramType;
} CharResourceData;
} TileResourceData;
typedef struct PaletteResourceData {
NNSG2dPaletteData * paletteData;
NNSG2dPaletteData *paletteData;
NNS_G2D_VRAM_TYPE vramType;
int paletteIndex;
} PaletteResourceData;
typedef struct CellResourceData {
NNSG2dCellDataBank * cellBank;
} CellResourceData;
typedef struct SpriteResourceData {
NNSG2dCellDataBank *spriteBank;
} SpriteResourceData;
typedef struct CellAnimResourceData {
NNSG2dAnimBankData * animBank;
} CellAnimResourceData;
typedef struct SpriteAnimResourceData {
NNSG2dAnimBankData *animBank;
} SpriteAnimResourceData;
typedef struct MultiCellResourceData {
NNSG2dMultiCellDataBank * multiCellBank;
} MultiCellResourceData;
typedef struct MultiSpriteResourceData {
NNSG2dMultiCellDataBank *multiSpriteBank;
} MultiSpriteResourceData;
typedef struct MultiCellAnimResourceData {
NNSG2dAnimBankData * multiCellAnimBank;
} MultiCellAnimResourceData;
typedef struct MultiSpriteAnimResourceData {
NNSG2dAnimBankData *multiSpriteAnimBank;
} MultiSpriteAnimResourceData;
typedef struct SpriteResourceTableBinary {
enum SpriteResourceType type;
@ -56,12 +56,12 @@ static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteRes
static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID, u32 param10);
static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, u32 heapID, u32 param4);
static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
static CharResourceData *SpriteUtil_UnpackCharacterResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
static TileResourceData *SpriteUtil_UnpacktileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
static CellResourceData *SpriteUtil_UnpackCellResource(void *rawData, enum HeapId heapID);
static CellAnimResourceData *SpriteUtil_UnpackCellAnimResource(void *rawData, enum HeapId heapID);
static MultiCellResourceData *SpriteUtil_UnpackMultiCellResource(void *rawData, enum HeapId heapID);
static MultiCellAnimResourceData *SpriteUtil_UnpackMultiCellAnimResource(void *rawData, enum HeapId heapID);
static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapId heapID);
static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapId heapID);
static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapId heapID);
static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapId heapID);
static void *SpriteResource_GetData(const SpriteResource *spriteRes);
static void SpriteResource_FreeData(SpriteResource *spriteRes);
static int SpriteResourceTableEntryNARC_GetEntryCount(const SpriteResourceTableEntryNARC *entries);
@ -145,11 +145,11 @@ SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *
return spriteRes;
}
SpriteResource *SpriteResourceCollection_AddChar(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx,
SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx,
BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
{
GF_ASSERT(spriteResources);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
GF_ASSERT(spriteRes);
@ -163,7 +163,7 @@ SpriteResource *SpriteResourceCollection_AddChar(SpriteResourceCollection *sprit
id,
vramType,
0,
SPRITE_RESOURCE_CHAR,
SPRITE_RESOURCE_TILES,
heapID,
0
);
@ -213,19 +213,19 @@ SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteRes
return spriteRes;
}
void SpriteResourceCollection_ModifyChar(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes,
void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes,
int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID)
{
GF_ASSERT(spriteResources);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
GF_ASSERT(spriteRes);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
int id = SpriteResource_GetID(spriteRes);
NNS_G2D_VRAM_TYPE vramType = SpriteResource_GetVRAMType(spriteRes);
SpriteResourceCollection_Remove(spriteResources, spriteRes);
SpriteResourceCollection_InitRes(spriteResources, spriteRes, narcIdx, memberIdx, compressed, id, vramType, 0, SPRITE_RESOURCE_CHAR, heapID, 0);
SpriteResourceCollection_InitRes(spriteResources, spriteRes, narcIdx, memberIdx, compressed, id, vramType, 0, SPRITE_RESOURCE_TILES, heapID, 0);
}
void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes,
@ -257,11 +257,11 @@ void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteReso
);
}
SpriteResource *SpriteResourceCollection_AddCharFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx,
SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx,
BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
{
GF_ASSERT(spriteResources);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
GF_ASSERT(spriteRes);
@ -275,7 +275,7 @@ SpriteResource *SpriteResourceCollection_AddCharFrom(SpriteResourceCollection *s
id,
vramType,
0,
SPRITE_RESOURCE_CHAR,
SPRITE_RESOURCE_TILES,
heapID,
0
);
@ -284,11 +284,11 @@ SpriteResource *SpriteResourceCollection_AddCharFrom(SpriteResourceCollection *s
return spriteRes;
}
SpriteResource *SpriteResourceCollection_AddCharFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx,
SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx,
BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, int param7)
{
GF_ASSERT(spriteResources);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
GF_ASSERT(spriteRes);
@ -302,7 +302,7 @@ SpriteResource *SpriteResourceCollection_AddCharFromEx(SpriteResourceCollection
id,
vramType,
0,
SPRITE_RESOURCE_CHAR,
SPRITE_RESOURCE_TILES,
heapID,
param7
);
@ -391,13 +391,13 @@ SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *sprit
return spriteRes;
}
void SpriteResourceCollection_ModifyCharFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes,
void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes,
NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID)
{
GF_ASSERT(spriteResources);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
GF_ASSERT(spriteRes);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
int id = SpriteResource_GetID(spriteRes);
NNS_G2D_VRAM_TYPE vramType = SpriteResource_GetVRAMType(spriteRes);
@ -412,7 +412,7 @@ void SpriteResourceCollection_ModifyCharFrom(SpriteResourceCollection *spriteRes
id,
vramType,
0,
SPRITE_RESOURCE_CHAR,
SPRITE_RESOURCE_TILES,
heapID,
0
);
@ -517,52 +517,52 @@ int SpriteResource_GetID(const SpriteResource *spriteRes)
return Resource_GetID(spriteRes->rawResource);
}
NNSG2dCharacterData *SpriteResource_GetCharData(const SpriteResource *spriteRes)
NNSG2dCharacterData *SpriteResource_GetTileData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
CharResourceData *charRes = SpriteResource_GetData(spriteRes);
return charRes->charData;
TileResourceData *tileData = SpriteResource_GetData(spriteRes);
return tileData->tileData;
}
NNSG2dPaletteData *SpriteResource_GetPaletteData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_PALETTE);
PaletteResourceData *paletteRes = SpriteResource_GetData(spriteRes);
return paletteRes->paletteData;
PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
return paletteData->paletteData;
}
NNSG2dCellDataBank *SpriteResource_GetCellData(const SpriteResource *spriteRes)
NNSG2dCellDataBank *SpriteResource_GetSpriteData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CELL);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_SPRITE);
CellResourceData *cellRes = SpriteResource_GetData(spriteRes);
return cellRes->cellBank;
SpriteResourceData *spriteData = SpriteResource_GetData(spriteRes);
return spriteData->spriteBank;
}
NNSG2dCellAnimBankData *SpriteResource_GetCellAnimData(const SpriteResource *spriteRes)
NNSG2dCellAnimBankData *SpriteResource_GetSpriteAnimData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CELL_ANIM);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_SPRITE_ANIM);
CellAnimResourceData *cellAnimRes = SpriteResource_GetData(spriteRes);
return cellAnimRes->animBank;
SpriteAnimResourceData *spriteAnimData = SpriteResource_GetData(spriteRes);
return spriteAnimData->animBank;
}
NNSG2dMultiCellDataBank *SpriteResource_GetMultiCellData(const SpriteResource *spriteRes)
NNSG2dMultiCellDataBank *SpriteResource_GetMultiSpriteData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_CELL);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_SPRITE);
MultiCellResourceData *multiCellRes = SpriteResource_GetData(spriteRes);
return multiCellRes->multiCellBank;
MultiSpriteResourceData *multiSpriteData = SpriteResource_GetData(spriteRes);
return multiSpriteData->multiSpriteBank;
}
NNSG2dMultiCellAnimBankData *SpriteResource_GetMultiCellAnimData(const SpriteResource *spriteRes)
NNSG2dMultiCellAnimBankData *SpriteResource_GetMultiSpriteAnimData(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_CELL_ANIM);
GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_SPRITE_ANIM);
MultiCellAnimResourceData *multiCellAnimRes = SpriteResource_GetData(spriteRes);
return multiCellAnimRes->multiCellAnimBank;
MultiSpriteAnimResourceData *multiSpriteAnimData = SpriteResource_GetData(spriteRes);
return multiSpriteAnimData->multiSpriteAnimBank;
}
enum SpriteResourceType SpriteResource_GetType(const SpriteResource *spriteRes)
@ -575,14 +575,14 @@ NNS_G2D_VRAM_TYPE SpriteResource_GetVRAMType(const SpriteResource *spriteRes)
{
GF_ASSERT(spriteRes);
if (spriteRes->type == SPRITE_RESOURCE_CHAR) {
CharResourceData *charRes = SpriteResource_GetData(spriteRes);
return charRes->vramType;
if (spriteRes->type == SPRITE_RESOURCE_TILES) {
TileResourceData *tileData = SpriteResource_GetData(spriteRes);
return tileData->vramType;
}
if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
PaletteResourceData *paletteRes = SpriteResource_GetData(spriteRes);
return paletteRes->vramType;
PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
return paletteData->vramType;
}
return SPRITE_VRAM_TYPE_DEFAULT;
@ -593,8 +593,8 @@ int SpriteResource_GetPaletteIndex(const SpriteResource *spriteRes)
GF_ASSERT(spriteRes);
if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
PaletteResourceData *paletteRes = SpriteResource_GetData(spriteRes);
return paletteRes->paletteIndex;
PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
return paletteData->paletteIndex;
}
return 0;
@ -604,14 +604,14 @@ void SpriteResource_SetVRAMType(SpriteResource *spriteRes, NNS_G2D_VRAM_TYPE vra
{
GF_ASSERT(spriteRes);
if (spriteRes->type == SPRITE_RESOURCE_CHAR) {
CharResourceData *charRes = SpriteResource_GetData(spriteRes);
charRes->vramType = vramType;
if (spriteRes->type == SPRITE_RESOURCE_TILES) {
TileResourceData *tileData = SpriteResource_GetData(spriteRes);
tileData->vramType = vramType;
}
if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
PaletteResourceData *paletteRes = SpriteResource_GetData(spriteRes);
paletteRes->vramType = vramType;
PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
paletteData->vramType = vramType;
}
}
@ -750,77 +750,77 @@ static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteReso
void *rawData = Resource_GetData(spriteRes->rawResource);
switch (type) {
case SPRITE_RESOURCE_CHAR:
spriteRes->data = SpriteUtil_UnpackCharacterResource(rawData, vramType, heapID);
case SPRITE_RESOURCE_TILES:
spriteRes->data = SpriteUtil_UnpacktileResource(rawData, vramType, heapID);
break;
case SPRITE_RESOURCE_PALETTE:
spriteRes->data = SpriteUtil_UnpackPaletteResource(rawData, vramType, paletteIdx, heapID);
break;
case SPRITE_RESOURCE_CELL:
spriteRes->data = SpriteUtil_UnpackCellResource(rawData, heapID);
case SPRITE_RESOURCE_SPRITE:
spriteRes->data = SpriteUtil_UnpackSpriteResource(rawData, heapID);
break;
case SPRITE_RESOURCE_CELL_ANIM:
spriteRes->data = SpriteUtil_UnpackCellAnimResource(rawData, heapID);
case SPRITE_RESOURCE_SPRITE_ANIM:
spriteRes->data = SpriteUtil_UnpackSpriteAnimResource(rawData, heapID);
break;
case SPRITE_RESOURCE_MULTI_CELL:
spriteRes->data = SpriteUtil_UnpackMultiCellResource(rawData, heapID);
case SPRITE_RESOURCE_MULTI_SPRITE:
spriteRes->data = SpriteUtil_UnpackMultiSpriteResource(rawData, heapID);
break;
case SPRITE_RESOURCE_MULTI_CELL_ANIM:
spriteRes->data = SpriteUtil_UnpackMultiCellAnimResource(rawData, heapID);
case SPRITE_RESOURCE_MULTI_SPRITE_ANIM:
spriteRes->data = SpriteUtil_UnpackMultiSpriteAnimResource(rawData, heapID);
break;
}
}
static CharResourceData *SpriteUtil_UnpackCharacterResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
static TileResourceData *SpriteUtil_UnpacktileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
{
CharResourceData *charRes = Heap_AllocFromHeap(heapID, sizeof(CharResourceData));
NNS_G2dGetUnpackedCharacterData(rawData, &charRes->charData);
charRes->vramType = vramType;
TileResourceData *tileData = Heap_AllocFromHeap(heapID, sizeof(TileResourceData));
NNS_G2dGetUnpackedCharacterData(rawData, &tileData->tileData);
tileData->vramType = vramType;
return charRes;
return tileData;
}
static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
{
PaletteResourceData *paletteRes = Heap_AllocFromHeap(heapID, sizeof(PaletteResourceData));
NNS_G2dGetUnpackedPaletteData(rawData, &paletteRes->paletteData);
PaletteResourceData *paletteData = Heap_AllocFromHeap(heapID, sizeof(PaletteResourceData));
NNS_G2dGetUnpackedPaletteData(rawData, &paletteData->paletteData);
paletteRes->vramType = vramType;
paletteRes->paletteIndex = paletteIdx;
paletteData->vramType = vramType;
paletteData->paletteIndex = paletteIdx;
return paletteRes;
return paletteData;
}
static CellResourceData *SpriteUtil_UnpackCellResource(void *rawData, enum HeapId heapID)
static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapId heapID)
{
CellResourceData *cellRes = Heap_AllocFromHeap(heapID, sizeof(CellResourceData));
NNS_G2dGetUnpackedCellBank(rawData, &cellRes->cellBank);
SpriteResourceData *spriteResData = Heap_AllocFromHeap(heapID, sizeof(SpriteResourceData));
NNS_G2dGetUnpackedCellBank(rawData, &spriteResData->spriteBank);
return cellRes;
return spriteResData;
}
static CellAnimResourceData *SpriteUtil_UnpackCellAnimResource(void *rawData, enum HeapId heapID)
static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapId heapID)
{
CellAnimResourceData *cellAnimRes = Heap_AllocFromHeap(heapID, sizeof(CellAnimResourceData));
NNS_G2dGetUnpackedAnimBank(rawData, &cellAnimRes->animBank);
SpriteAnimResourceData *spriteAnimData = Heap_AllocFromHeap(heapID, sizeof(SpriteAnimResourceData));
NNS_G2dGetUnpackedAnimBank(rawData, &spriteAnimData->animBank);
return cellAnimRes;
return spriteAnimData;
}
static MultiCellResourceData *SpriteUtil_UnpackMultiCellResource(void *rawData, enum HeapId heapID)
static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapId heapID)
{
MultiCellResourceData *multiCellRes = Heap_AllocFromHeap(heapID, sizeof(MultiCellResourceData));
NNS_G2dGetUnpackedMultiCellBank(rawData, &multiCellRes->multiCellBank);
MultiSpriteResourceData *multiSpriteData = Heap_AllocFromHeap(heapID, sizeof(MultiSpriteResourceData));
NNS_G2dGetUnpackedMultiCellBank(rawData, &multiSpriteData->multiSpriteBank);
return multiCellRes;
return multiSpriteData;
}
static MultiCellAnimResourceData *SpriteUtil_UnpackMultiCellAnimResource(void *rawData, enum HeapId heapID)
static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapId heapID)
{
MultiCellAnimResourceData *multiCellAnimRes = Heap_AllocFromHeap(heapID, sizeof(MultiCellAnimResourceData));
NNS_G2dGetUnpackedMCAnimBank(rawData, &multiCellAnimRes->multiCellAnimBank);
MultiSpriteAnimResourceData *multiSpriteAnimData = Heap_AllocFromHeap(heapID, sizeof(MultiSpriteAnimResourceData));
NNS_G2dGetUnpackedMCAnimBank(rawData, &multiSpriteAnimData->multiSpriteAnimBank);
return multiCellAnimRes;
return multiSpriteAnimData;
}
static void SpriteResource_FreeData(SpriteResource *spriteRes)

10
src/unk_020093B4.c
View File

@ -62,7 +62,7 @@ void sub_020093B4(CellActorResourceData *param0, int param1, int param2, int par
v6 = sub_0200A558(v0, v2);
GF_ASSERT(v6);
param0->charData = SpriteResource_GetCharData(v0);
param0->charData = SpriteResource_GetTileData(v0);
} else {
v6 = sub_0200A534(v0);
GF_ASSERT(v6);
@ -71,17 +71,17 @@ void sub_020093B4(CellActorResourceData *param0, int param1, int param2, int par
param0->paletteProxy = sub_0200A72C(v1, v6);
param0->imageProxy = v6;
param0->cellBank = SpriteResource_GetCellData(v2);
param0->cellBank = SpriteResource_GetSpriteData(v2);
if (v3) {
param0->cellAnimBank = SpriteResource_GetCellAnimData(v3);
param0->cellAnimBank = SpriteResource_GetSpriteAnimData(v3);
} else {
param0->cellAnimBank = NULL;
}
if (v4) {
param0->multiCellBank = SpriteResource_GetMultiCellData(v4);
param0->multiCellAnimBank = SpriteResource_GetMultiCellAnimData(v5);
param0->multiCellBank = SpriteResource_GetMultiSpriteData(v4);
param0->multiCellAnimBank = SpriteResource_GetMultiSpriteAnimData(v5);
} else {
param0->multiCellBank = NULL;
param0->multiCellAnimBank = NULL;

14
src/unk_0200A328.c
View File

@ -17,7 +17,7 @@ BOOL sub_0200A328(const SpriteResource *param0)
GF_ASSERT(param0);
GF_ASSERT(SpriteResource_GetType(param0) == 0);
v0.unk_00 = SpriteResource_GetCharData(param0);
v0.unk_00 = SpriteResource_GetTileData(param0);
v0.unk_04 = SpriteResource_GetVRAMType(param0);
v0.unk_08 = SpriteResource_GetID(param0);
v0.unk_0C = 0;
@ -47,7 +47,7 @@ BOOL sub_0200A39C(const SpriteResource *param0)
GF_ASSERT(param0);
GF_ASSERT(SpriteResource_GetType(param0) == 0);
v0.unk_00 = SpriteResource_GetCharData(param0);
v0.unk_00 = SpriteResource_GetTileData(param0);
v0.unk_04 = SpriteResource_GetVRAMType(param0);
v0.unk_08 = SpriteResource_GetID(param0);
v0.unk_0C = 0;
@ -62,7 +62,7 @@ BOOL sub_0200A3DC(const SpriteResource *param0)
GF_ASSERT(param0);
GF_ASSERT(SpriteResource_GetType(param0) == 0);
v0.unk_00 = SpriteResource_GetCharData(param0);
v0.unk_00 = SpriteResource_GetTileData(param0);
v0.unk_04 = SpriteResource_GetVRAMType(param0);
v0.unk_08 = SpriteResource_GetID(param0);
v0.unk_0C = 1;
@ -92,7 +92,7 @@ BOOL sub_0200A450(const SpriteResource *param0)
GF_ASSERT(param0);
GF_ASSERT(SpriteResource_GetType(param0) == 0);
v0.unk_00 = SpriteResource_GetCharData(param0);
v0.unk_00 = SpriteResource_GetTileData(param0);
v0.unk_04 = SpriteResource_GetVRAMType(param0);
v0.unk_08 = SpriteResource_GetID(param0);
v0.unk_0C = 1;
@ -109,7 +109,7 @@ void sub_0200A490(const SpriteResource *param0, const SpriteResource *param1)
GF_ASSERT(param1);
v0 = SpriteResource_GetID(param0);
v1 = SpriteResource_GetCharData(param1);
v1 = SpriteResource_GetTileData(param1);
sub_0201EB08(v0, v1);
}
@ -122,7 +122,7 @@ void sub_0200A4C0(const SpriteResource *param0)
GF_ASSERT(param0);
v0 = SpriteResource_GetID(param0);
v1 = SpriteResource_GetCharData(param0);
v1 = SpriteResource_GetTileData(param0);
sub_0201EB08(v0, v1);
}
@ -174,7 +174,7 @@ NNSG2dImageProxy *sub_0200A558(const SpriteResource *param0, const SpriteResourc
GF_ASSERT(SpriteResource_GetType(param1) == 2);
v0 = SpriteResource_GetID(param0);
v1 = SpriteResource_GetCellData(param1);
v1 = SpriteResource_GetSpriteData(param1);
v2 = sub_0201EC00(v0, v1->pVramTransferData->szByteMax);
if (v2 == NULL) {

14
src/unk_0200C6E4.c
View File

@ -372,7 +372,7 @@ BOOL sub_0200CBDC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2,
return 0;
}
v0 = SpriteResourceCollection_AddChar(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
v0 = SpriteResourceCollection_AddTiles(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
if (v0 != NULL) {
sub_0200A3DC(v0);
@ -394,7 +394,7 @@ BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer *param0, SpriteGfx
return 0;
}
v0 = SpriteResourceCollection_AddCharFrom(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
v0 = SpriteResourceCollection_AddTilesFrom(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
if (v0 != NULL) {
sub_0200A3DC(v0);
@ -1245,7 +1245,7 @@ BOOL sub_0200D828(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2,
return 0;
}
v0 = SpriteResourceCollection_AddChar(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
v0 = SpriteResourceCollection_AddTiles(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
if (v0 != NULL) {
sub_0200A39C(v0);
@ -1267,7 +1267,7 @@ BOOL sub_0200D888(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2,
return 0;
}
v0 = SpriteResourceCollection_AddChar(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
v0 = SpriteResourceCollection_AddTiles(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
if (v0 != NULL) {
sub_0200A450(v0);
@ -1289,7 +1289,7 @@ BOOL sub_0200D8E8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2
return 0;
}
v0 = SpriteResourceCollection_AddCharFrom(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
v0 = SpriteResourceCollection_AddTilesFrom(param1->unk_0C[0], param2, param3, param4, param6, param5, param0->unk_00);
if (v0 != NULL) {
sub_0200A450(v0);
@ -1309,7 +1309,7 @@ void sub_0200D948(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2,
v0 = SpriteResourceCollection_Find(param1->unk_0C[0], param5);
SpriteResourceCollection_ModifyChar(param1->unk_0C[0], v0, param2, param3, param4, param0->unk_00);
SpriteResourceCollection_ModifyTiles(param1->unk_0C[0], v0, param2, param3, param4, param0->unk_00);
sub_0200A4C0(v0);
}
@ -1334,6 +1334,6 @@ void sub_0200D9B4(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2
v0 = SpriteResourceCollection_Find(param1->unk_0C[0], param5);
SpriteResourceCollection_ModifyCharFrom(param1->unk_0C[0], v0, param2, param3, param4, param0->unk_00);
SpriteResourceCollection_ModifyTilesFrom(param1->unk_0C[0], v0, param2, param3, param4, param0->unk_00);
sub_0200A4C0(v0);
}

4
src/unk_0208694C.c
View File

@ -1553,7 +1553,7 @@ static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1)
param0->unk_318[v0] = SpriteResourceCollection_New(2, v0, 18);
}
param0->unk_328[0][0] = SpriteResourceCollection_AddCharFrom(param0->unk_318[0], param1, 10, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 18);
param0->unk_328[0][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_318[0], param1, 10, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 18);
param0->unk_328[0][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_318[1], param1, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 9, 18);
param0->unk_328[0][2] = SpriteResourceCollection_AddFrom(param0->unk_318[2], param1, 12, 1, 0, 2, 18);
param0->unk_328[0][3] = SpriteResourceCollection_AddFrom(param0->unk_318[3], param1, 14, 1, 0, 3, 18);
@ -1566,7 +1566,7 @@ static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1)
DC_FlushRange(param0->unk_524, 0x20 * 4);
}
param0->unk_328[1][0] = SpriteResourceCollection_AddCharFrom(param0->unk_318[0], param1, 11, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 18);
param0->unk_328[1][0] = SpriteResourceCollection_AddTilesFrom(param0->unk_318[0], param1, 11, 1, 1, NNS_G2D_VRAM_TYPE_2DSUB, 18);
param0->unk_328[1][1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_318[1], param1, 1, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 3, 18);
param0->unk_328[1][2] = SpriteResourceCollection_AddFrom(param0->unk_318[2], param1, 13, 1, 1, 2, 18);
param0->unk_328[1][3] = SpriteResourceCollection_AddFrom(param0->unk_318[3], param1, 15, 1, 1, 3, 18);

2
src/unk_02098FFC.c
View File

@ -202,7 +202,7 @@ static void sub_020993A8(UnkStruct_0209903C *param0)
v4 = NARC_ctor(NARC_INDEX_GRAPHIC__PORUACT, param0->unk_00);
v2 = param0->unk_1B4[0];
v2->resources[0] = SpriteResourceCollection_AddCharFrom(param0->unk_1A4[0], v4, 0, 0, 0xe000, param0->unk_0E, param0->unk_00);
v2->resources[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_1A4[0], v4, 0, 0, 0xe000, param0->unk_0E, param0->unk_00);
GF_ASSERT(v2->resources[0] != NULL);