Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpack resdat and cldat files, create C headers for offsets into palette resdats #279

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Unpack resdat and cldat files, create C headers for offsets into palette resdats #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab41e0c
unpack all resdat/cldat, document format, add headers for palette off…
joshua-smith-12 Oct 22, 2024
027070f
make use of resdat headers in a couple locations
joshua-smith-12 Oct 22, 2024
5548ce1
remove irrelevant description field
joshua-smith-12 Oct 25, 2024
92af8e5
start doing some cleanup/renaming related to cldat/resdat code
joshua-smith-12 Oct 25, 2024
b539da1
roughly align resdat JSON format with how pokeheartgold handles
joshua-smith-12 Nov 2, 2024
1e9bd57
halfway through sprite_renderer, continuing to document
joshua-smith-12 Nov 4, 2024
217a90c
finish first pass over sprite_renderer files
joshua-smith-12 Nov 5, 2024
476319c
document struct for cldat files
joshua-smith-12 Nov 6, 2024
ba2359a
fix missed changes after rebasing
joshua-smith-12 Nov 6, 2024
d429b1c
document CellActorPropsTemplate struct
joshua-smith-12 Nov 6, 2024
a3b5172
formatting
joshua-smith-12 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 3 additions & 4 deletions include/overlay005/ov5_021D2F14.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
#include "struct_defs/sprite_template.h"

#include "overlay005/struct_ov5_021D30A8.h"
#include "overlay007/struct_ov7_0224F2EC.h"
#include "overlay007/struct_ov7_0224F358.h"
#include "overlay104/struct_ov104_02241308.h"

#include "cell_actor.h"
#include "narc.h"
#include "sprite_resource.h"

void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F2EC *param1, u32 param2, u32 param3);
void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPath *param1, u32 param2, u32 param3);
void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0);
CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F358 *param1);
CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const CellActorPropsTemplate *param1);
void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, UnkStruct_ov104_02241308 *param1, u32 param2, u32 param3);
void ov5_021D3270(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5, int param6);
void ov5_021D32E8(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5, int param6);
Expand Down
8 changes: 3 additions & 5 deletions include/overlay005/struct_ov5_021D30A8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D30A8_H
#define POKEPLATINUM_STRUCT_OV5_021D30A8_H

#include "struct_defs/struct_02009508.h"
#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
UnkStruct_02009508 *unk_190;
GF_G2dRenderer unk_04;
CellActorResourceDataList *unk_190;
SpriteResourceCollection *unk_194[6];
SpriteResourceList *unk_1AC[6];
u16 unk_1C4;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay005/struct_ov5_021DE47C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021DE47C_H
#define POKEPLATINUM_STRUCT_OV5_021DE47C_H

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
} UnkStruct_ov5_021DE47C;

Expand Down
17 changes: 0 additions & 17 deletions include/overlay007/struct_ov7_0224F2EC.h
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions include/overlay007/struct_ov7_0224F358.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions include/overlay021/struct_ov21_021D13FC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "struct_decls/sprite_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_defs/struct_0200C738.h"

#include "overlay021/struct_ov21_021D22F8.h"
#include "overlay021/struct_ov21_021D23F8.h"
Expand All @@ -15,13 +14,14 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "narc.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "sys_task_manager.h"

typedef struct {
BgConfig *unk_00;
Window unk_04;
UnkStruct_0200C738 unk_14;
GF_G2dRenderer unk_14;
CellActorCollection *unk_138;
SpriteResourceCollection *unk_13C[4];
UnkStruct_ov21_021D4C0C *unk_14C;
Expand Down
4 changes: 2 additions & 2 deletions include/overlay022/struct_ov22_0225A0E4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#include "struct_decls/struct_02015064_decl.h"
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"
#include "struct_defs/struct_0200C738.h"

#include "bg_window.h"
#include "cell_actor.h"
#include "narc.h"
#include "resource_collection.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
Expand All @@ -35,7 +35,7 @@ typedef struct {
BgConfig *unk_40;
CellActorCollection *unk_44;
SpriteResourceCollection *unk_48[4];
UnkStruct_0200C738 unk_58;
GF_G2dRenderer unk_58;
NARC *unk_5C;
} UnkStruct_ov22_0225A0E4;

Expand Down
5 changes: 2 additions & 3 deletions include/overlay063/ov63_0222D1C0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#ifndef POKEPLATINUM_OV63_0222D1C0_H
#define POKEPLATINUM_OV63_0222D1C0_H

#include "struct_defs/struct_0200C738.h"

#include "overlay063/struct_ov63_0222D160.h"
#include "overlay063/struct_ov63_0222D1C0_decl.h"
#include "overlay065/struct_ov65_0223582C.h"

#include "bg_window.h"
#include "sprite_renderer.h"

UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3);
UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(GF_G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3);
void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0);
void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1);

Expand Down
4 changes: 2 additions & 2 deletions include/overlay065/struct_ov65_0222EBE0_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "struct_decls/struct_02012744_decl.h"
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/struct_0200C738.h"
#include "struct_defs/struct_0207DFAC.h"

#include "overlay061/struct_ov61_0222C3B0.h"
Expand All @@ -19,6 +18,7 @@
#include "message.h"
#include "overlay_manager.h"
#include "savedata.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "strbuf.h"
#include "string_list.h"
Expand Down Expand Up @@ -49,7 +49,7 @@ struct UnkStruct_ov65_0222EBE0_t {
Menu *unk_184;
void *unk_188;
CellActorCollection *unk_18C;
UnkStruct_0200C738 unk_190;
GF_G2dRenderer unk_190;
SpriteResourceCollection *unk_31C[4];
UnkStruct_02012744 *unk_32C;
Window unk_330;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay065/struct_ov65_022358CC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#ifndef POKEPLATINUM_STRUCT_OV65_022358CC_H
#define POKEPLATINUM_STRUCT_OV65_022358CC_H

#include "struct_defs/struct_0200C738.h"

#include "overlay065/struct_ov65_022358CC_sub1.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
UnkStruct_ov65_022358CC_sub1 unk_1A0;
} UnkStruct_ov65_022358CC;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay071/struct_ov71_0223D238.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

#include <nnsys.h>

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
SpriteResource *unk_1A0[2][4];
CellActor *unk_1C0[25];
Expand Down
4 changes: 2 additions & 2 deletions include/overlay072/struct_ov72_0223DB98_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define POKEPLATINUM_STRUCT_OV72_0223DB98_T_H

#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/struct_0200C738.h"

#include "overlay072/struct_ov72_0223E7D8.h"
#include "overlay072/struct_ov72_0223E80C.h"
Expand All @@ -13,6 +12,7 @@
#include "game_options.h"
#include "game_records.h"
#include "message.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "strbuf.h"
#include "string_template.h"
Expand All @@ -30,7 +30,7 @@ struct UnkStruct_ov72_0223DB98_t {
Strbuf *unk_34;
int unk_38;
CellActorCollection *unk_3C;
UnkStruct_0200C738 unk_40;
GF_G2dRenderer unk_40;
SpriteResourceCollection *unk_1CC[4];
SpriteResource *unk_1DC[2][4];
CellActorResourceData unk_1FC;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay083/struct_ov83_0223D784.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_STRUCT_OV83_0223D784_H
#define POKEPLATINUM_STRUCT_OV83_0223D784_H

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
} UnkStruct_ov83_0223D784;

Expand Down
4 changes: 2 additions & 2 deletions include/overlay094/struct_ov94_0223FD4C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "struct_decls/struct_0202B370_decl.h"
#include "struct_decls/struct_0207AE68_decl.h"
#include "struct_defs/struct_0200C738.h"
#include "struct_defs/struct_0203E0FC.h"

#include "applications/pokemon_summary_screen/main.h"
Expand All @@ -29,6 +28,7 @@
#include "message.h"
#include "overlay_manager.h"
#include "pokemon.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "strbuf.h"
#include "string_list.h"
Expand Down Expand Up @@ -99,7 +99,7 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
Strbuf *unk_BDC;
int unk_BE0;
CellActorCollection *unk_BE4;
UnkStruct_0200C738 unk_BE8;
GF_G2dRenderer unk_BE8;
SpriteResourceCollection *unk_D74[4];
SpriteResource *unk_D84[3][4];
CellActorResourceData unk_DB4;
Expand Down
4 changes: 2 additions & 2 deletions include/overlay096/struct_ov96_0223BF40_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <dwc.h>
#include <nnsys.h>

#include "struct_defs/struct_0200C738.h"
#include "struct_defs/struct_0206BC70.h"

#include "overlay061/struct_ov61_0222C3B0.h"
Expand All @@ -18,6 +17,7 @@
#include "menu.h"
#include "message.h"
#include "pokemon.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "strbuf.h"
#include "string_template.h"
Expand Down Expand Up @@ -59,7 +59,7 @@ struct UnkStruct_ov96_0223BF40_t {
Strbuf *unk_BEC;
int unk_BF0;
CellActorCollection *unk_BF4;
UnkStruct_0200C738 unk_BF8;
GF_G2dRenderer unk_BF8;
SpriteResourceCollection *unk_D84[4];
SpriteResource *unk_D94[3][4];
CellActorResourceData unk_DC4;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay097/struct_ov97_0222D04C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#include <dwc.h>

#include "struct_defs/struct_0200C738.h"

#include "overlay097/struct_ov97_0223829C.h"
#include "overlay097/union_ov97_0222D2B0.h"

Expand All @@ -14,6 +12,7 @@
#include "list_menu.h"
#include "message.h"
#include "savedata.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"
#include "strbuf.h"
#include "string_list.h"
Expand Down Expand Up @@ -44,7 +43,7 @@ typedef struct {
int unk_43C;
int unk_440;
CellActorCollection *unk_444;
UnkStruct_0200C738 unk_448;
GF_G2dRenderer unk_448;
SpriteResourceCollection *unk_5D4[6];
SpriteResource *unk_5EC[6];
CellActorResourceData unk_604;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay097/struct_ov97_02237AEC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_STRUCT_OV97_02237AEC_H
#define POKEPLATINUM_STRUCT_OV97_02237AEC_H

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[6];
SpriteResource *unk_1A8[2][6];
CellActorResourceData unk_1D8[2];
Expand Down
5 changes: 2 additions & 3 deletions include/overlay105/struct_ov105_02245AAC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_STRUCT_OV105_02245AAC_H
#define POKEPLATINUM_STRUCT_OV105_02245AAC_H

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
SpriteResource *unk_1A0[1][4];
} UnkStruct_ov105_02245AAC;
Expand Down
5 changes: 2 additions & 3 deletions include/overlay106/struct_ov106_02243310.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_STRUCT_OV106_02243310_H
#define POKEPLATINUM_STRUCT_OV106_02243310_H

#include "struct_defs/struct_0200C738.h"

#include "cell_actor.h"
#include "sprite_renderer.h"
#include "sprite_resource.h"

typedef struct {
CellActorCollection *unk_00;
UnkStruct_0200C738 unk_04;
GF_G2dRenderer unk_04;
SpriteResourceCollection *unk_190[4];
SpriteResource *unk_1A0[2][4];
} UnkStruct_ov106_02243310;
Expand Down
Loading
Loading