ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

More data moved into C code

Browse Source
This commit is contained in:
Phlosioneer 2019-02-15 00:00:01 -05:00
parent a4aaf279ac
commit be08a662a8
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/pokenav.s
View File

@ -3,13 +3,6 @@
.section .rodata .section .rodata
gUnknown_0861FA54:: @ 861FA54
obj_pal gUnknown_0861F590, 0
null_obj_pal
gUnknown_0861FA64:: @ 861FA64
obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2
gUnknown_0861FA6C:: @ 861FA6C gUnknown_0861FA6C:: @ 861FA6C
obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3 obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3
obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1 obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1

5
include/graphics.h
View File

@ -4013,6 +4013,11 @@ extern const u16 gPokenavConditionMarker_Pal[];
extern const u16 gPokenavHeader_Pal[]; extern const u16 gPokenavHeader_Pal[];
extern const u32 gPokenavHeader_Gfx[]; extern const u32 gPokenavHeader_Gfx[];
extern const u32 gPokenavHeader_Tilemap[]; extern const u32 gPokenavHeader_Tilemap[];
extern const u32 gPokenavLeftHeaderHoennMap_Gfx[];
extern const u32 gPokenavLeftHeaderMainMenu_Gfx[];
extern const u32 gPokenavLeftHeaderCondition_Gfx[];
extern const u32 gPokenavLeftHeaderRibbons_Gfx[];
extern const u32 gPokenavLeftHeaderMatchCall_Gfx[];
extern const u32 gUnknown_08D9862C[]; extern const u32 gUnknown_08D9862C[];
extern const u32 gUnknown_08D98CC8[]; extern const u32 gUnknown_08D98CC8[];

41
src/pokenav_main.c
View File

@ -19,12 +19,6 @@
#define UNKNOWN_OFFSET 100000 #define UNKNOWN_OFFSET 100000
struct PaletteDescriptor {
void *palette;
u16 tag;
};
struct UnknownStruct_0203CF40 { struct UnknownStruct_0203CF40 {
u32 (*field0)(void); u32 (*field0)(void);
u32 field4; u32 field4;
@ -123,7 +117,7 @@ u32 sub_81C786C(void);
u32 sub_81C7764(s32 a0); u32 sub_81C7764(s32 a0);
u32 atk47_cmd47(s32 a0); u32 atk47_cmd47(s32 a0);
bool32 sub_81C7738(void); bool32 sub_81C7738(void);
void CopyPaletteIntoBufferUnfaded(void *palette, u32 a1, u32 a2); void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2);
void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); void sub_81C7834(u32 (*a0)(void), u32(*a1)(void));
void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7360(struct UnknownStruct_0203CF40 *a0);
void sub_81C7650(u32 index); void sub_81C7650(u32 index);
@ -344,10 +338,25 @@ const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = {
} }
}; };
const struct SpritePalette gUnknown_0861FA54[2] = {
{
.data = gUnknown_0861F590,
.tag = 0,
},
{
.data = NULL,
.tag = 0,
}
};
const struct CompressedSpriteSheet gUnknown_0861FA64 = {
.data = gPokenavLeftHeaderHoennMap_Gfx,
.size = 0xC00,
.tag = 2
};
extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40;
extern u8 gUnknown_0203CF3C; extern u8 gUnknown_0203CF3C;
extern const struct CompressedSpriteSheet gUnknown_0861FA4C[];
extern const struct PaletteDescriptor gUnknown_0861FA54;
extern const struct SpriteTemplate gUnknown_0861FB04; extern const struct SpriteTemplate gUnknown_0861FB04;
u32 sub_81C7078(u32 (*a0)(s32), u32 a1) u32 sub_81C7078(u32 (*a0)(s32), u32 a1)
@ -763,7 +772,7 @@ u32 sub_81C7764(s32 a0) {
decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0);
SetBgTilemapBuffer(0, &v1->data[11]); SetBgTilemapBuffer(0, &v1->data[11]);
CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0);
CopyPaletteIntoBufferUnfaded(&gPokenavHeader_Pal, 0, 0x20); CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
return 0; return 0;
case 2: case 2:
@ -865,15 +874,15 @@ u32 sub_81C791C(s32 a0) {
} }
} }
void CopyPaletteIntoBufferUnfaded(void *palette, u32 bufferOffset, u32 size) { void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) {
CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size);
} }
void sub_81C795C(const struct PaletteDescriptor *palettes) { void sub_81C795C(const struct SpritePalette *palettes) {
const struct PaletteDescriptor *current; const struct SpritePalette *current;
u32 index; u32 index;
for (current = palettes; current->palette != NULL; current++) for (current = palettes; current->data != NULL; current++)
{ {
index = AllocSpritePalette(current->tag); index = AllocSpritePalette(current->tag);
if (index == 0xFF) if (index == 0xFF)
@ -883,7 +892,7 @@ void sub_81C795C(const struct PaletteDescriptor *palettes) {
else else
{ {
index = (index * 16) + 0x100; index = (index * 16) + 0x100;
CopyPaletteIntoBufferUnfaded(current->palette, index, 0x20); CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
} }
} }
} }
@ -1105,7 +1114,7 @@ void sub_81C7C28(void) {
LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]);
} }
sub_81C795C(&gUnknown_0861FA54); sub_81C795C(gUnknown_0861FA54);
v2 = IndexOfSpritePaletteTag(0); v2 = IndexOfSpritePaletteTag(0);
v3 = 0x80 << 9 << v2; v3 = 0x80 << 9 << v2;
v1[5] = -2 & ~v3; v1[5] = -2 & ~v3;