Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 15:49:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename GenericPointerData -> G3DPipelineState

Browse Source
This commit is contained in:
Fexty12573 2025-07-13 21:43:59 +02:00
parent 1bfbace5a1
commit b890bf2f93
48 changed files with 158 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functypes/funcptr_02024220.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_FUNCPTR_02024220_H
#define POKEPLATINUM_FUNCPTR_02024220_H
typedef void (*UnkFuncPtr_02024220)(void);
#endif // POKEPLATINUM_FUNCPTR_02024220_H

6
include/overlay017/ov17_0223F118.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_OV17_0223F118_H
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/struct_ov17_0223F2E4.h"
@ -15,8 +15,8 @@
#include "strbuf.h"
#include "text.h"
GenericPointerData *ov17_0223F140(int heapID);
void ov17_0223F1E0(GenericPointerData *param0);
G3DPipelineState *ov17_0223F140(int heapID);
void ov17_0223F1E0(G3DPipelineState *param0);
void ov17_0223F1E8(int heapID, BgConfig *param1, SpriteManager *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0);
void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3);

4
include/overlay017/struct_ov17_02246F24.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_OV17_02246F24_H
#define POKEPLATINUM_STRUCT_OV17_02246F24_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/struct_ov17_0223BCE8.h"
@ -16,7 +16,7 @@
typedef struct {
UnkStruct_02095C48 *unk_00;
SysTask *unk_04;
GenericPointerData *unk_08;
G3DPipelineState *unk_08;
UnkStruct_ov17_0223F88C unk_0C;
UnkStruct_ov17_022472F8 unk_220;
UnkStruct_ov17_02246F24_sub1 unk_304;

4
include/overlay017/struct_ov17_02247A48.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_OV17_02247A48_H
#define POKEPLATINUM_STRUCT_OV17_02247A48_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/struct_ov17_0223D60C.h"
@ -17,7 +17,7 @@
typedef struct {
UnkStruct_02095C48 *unk_00;
SysTask *unk_04;
GenericPointerData *unk_08;
G3DPipelineState *unk_08;
UnkStruct_ov17_022476F8 unk_0C;
UnkStruct_ov17_02247A48_sub1 unk_D2;
UnkStruct_ov17_02249260 unk_E0;

4
include/overlay017/struct_ov17_0224DF54.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_OV17_0224DF54_H
#define POKEPLATINUM_STRUCT_OV17_0224DF54_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/struct_ov17_0223E838.h"
@ -24,7 +24,7 @@ typedef struct UnkStruct_ov17_0224DF54_t {
SysTask *unk_04;
SysTask *unk_08;
ParticleSystem *unk_0C;
GenericPointerData *unk_10;
G3DPipelineState *unk_10;
UnkStruct_ov17_0224A1EC unk_14;
UnkStruct_ov17_0224DF54_sub1 unk_A3C;
UnkStruct_ov17_0224DF54_sub2 unk_A6C;

4
include/overlay017/struct_ov17_0224FCA0.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_OV17_0224FCA0_H
#define POKEPLATINUM_STRUCT_OV17_0224FCA0_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/struct_ov17_0224F30C.h"
@ -17,7 +17,7 @@ typedef struct {
UnkStruct_02095C48 *unk_00;
SysTask *unk_04;
SysTask *unk_08;
GenericPointerData *unk_0C;
G3DPipelineState *unk_0C;
UnkStruct_ov17_022507C4 unk_10;
UnkStruct_ov17_0224FCA0_sub1 unk_39A;
UnkStruct_ov17_0224FCA0_sub2 unk_434;

4
include/overlay062/struct_ov62_0223118C.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV62_0223118C_H
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay062/struct_ov62_0223118C_sub1.h"
#include "overlay062/struct_ov62_02233310.h"
@ -35,7 +35,7 @@ typedef struct {
int unk_44;
u8 unk_48;
u8 padding_49[3];
GenericPointerData *unk_4C;
G3DPipelineState *unk_4C;
PokemonSpriteManager *unk_50;
UnkStruct_ov62_022349A8 unk_54;
UnkStruct_ov62_0223359C unk_46C;

4
include/overlay076/ov76_0223B870.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_OV76_0223B870_H
#define POKEPLATINUM_OV76_0223B870_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay076/struct_ov76_0223C398.h"
#include "overlay076/struct_ov76_0223DE00.h"
@ -22,7 +22,7 @@ void ov76_0223BB04(UnkStruct_ov76_0223DE00 *param0);
void ov76_0223BBAC(UnkStruct_ov76_0223DE00 *param0);
void ov76_0223BC70(UnkStruct_ov76_0223DE00 *param0);
void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2);
GenericPointerData *ov76_0223BE6C(void);
G3DPipelineState *ov76_0223BE6C(void);
void ov76_0223BE8C(void);
void ov76_0223BF10(void);
void ov76_0223BF50(void);

4
include/overlay076/struct_ov76_0223C398.h
View File

@ -5,7 +5,7 @@
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay012/struct_ball_rotation_decl.h"
#include "overlay012/struct_ov12_02235FE0_decl.h"
@ -40,7 +40,7 @@ typedef struct {
UnkStruct_02015920 *unk_150;
UnkStruct_ov12_02235FE0 *unk_154;
BallRotation *unk_158;
GenericPointerData *unk_15C;
G3DPipelineState *unk_15C;
UnkStruct_02012744 *unk_160;
FontOAM *unk_164[2];
CharTransferAllocation unk_16C[2];

4
include/overlay099/struct_ov99_021D2CB0.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV99_021D2CB0_H
#include "struct_defs/struct_0203E274.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay099/struct_ov99_021D2CB0_sub1.h"
#include "overlay099/struct_ov99_021D2CB0_sub2.h"
@ -23,7 +23,7 @@ typedef struct {
BOOL unk_04;
BgConfig *unk_08;
PaletteData *unk_0C;
GenericPointerData *unk_10;
G3DPipelineState *unk_10;
SysTask *unk_14;
SpriteSystem *unk_18;
SpriteManager *unk_1C;

4
include/overlay100/struct_ov100_021D46C8.h
View File

@ -4,7 +4,7 @@
#include <nitro/fx/fx.h>
#include <nnsys.h>
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay100/struct_ov100_021D36CC.h"
#include "overlay100/struct_ov100_021D46C8_sub1.h"
@ -24,7 +24,7 @@ typedef struct {
SpriteManager *unk_08;
BgConfig *unk_0C;
PaletteData *unk_10;
GenericPointerData *unk_14;
G3DPipelineState *unk_14;
Camera *camera;
NNSFndAllocator unk_1C;
MessageLoader *unk_2C;

4
include/overlay104/struct_ov104_0223C4CC.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV104_0223C4CC_H
#include "struct_decls/struct_0209B75C_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay063/struct_ov63_0222BCE8_decl.h"
#include "overlay063/struct_ov63_0222BE18_decl.h"
@ -25,7 +25,7 @@ typedef struct UnkStruct_ov104_0223C4CC_t {
BgConfig *unk_00;
PaletteData *unk_04;
UnkStruct_0209B75C *unk_08;
GenericPointerData *unk_0C;
G3DPipelineState *unk_0C;
UnkStruct_ov104_0223D5F0 *unk_10;
UnkStruct_ov63_0222BE18 *unk_14;
UnkStruct_ov63_0222BCE8 *unk_18;

4
include/overlay116/struct_ov116_022649E4.h
View File

@ -3,7 +3,7 @@
#include <nnsys.h>
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay116/struct_ov116_022649E4_sub1.h"
@ -20,7 +20,7 @@ typedef struct {
SpriteManager *unk_0C;
BgConfig *unk_10;
PaletteData *unk_14;
GenericPointerData *unk_18;
G3DPipelineState *unk_18;
Camera *camera;
u8 padding_20[4];
NNSFndAllocator unk_24;

4
include/overlay117/struct_ov117_02261280.h
View File

@ -4,7 +4,7 @@
#include <nnsys.h>
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay114/struct_ov114_0225CAD4_decl.h"
#include "overlay117/struct_ov117_022605C0.h"
@ -52,7 +52,7 @@ typedef struct UnkStruct_ov117_02261280_t {
PaletteData *unk_8C;
UnkStruct_02012744 *unk_90;
SysTask *unk_94;
GenericPointerData *unk_98;
G3DPipelineState *unk_98;
Camera *camera1;
Camera *camera2;
ParticleSystem *unk_A4;

4
include/overlay119/ov119_021D0D80.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_OV119_021D0D80_H
#define POKEPLATINUM_OV119_021D0D80_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay119/struct_ov119_021D0FD0.h"
#include "overlay119/struct_ov119_021D14DC.h"
@ -15,7 +15,7 @@
void ov119_021D0D80(void);
void ov119_021D0DA8(void);
GenericPointerData *ov119_021D0DD4(void);
G3DPipelineState *ov119_021D0DD4(void);
void ov119_021D0DF4(void);
void ov119_021D0E78(void);
void ov119_021D0EB8(BgConfig *param0);

4
include/overlay119/struct_ov119_021D17B8.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV119_021D17B8_H
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay119/struct_ov119_021D14DC.h"
@ -21,7 +21,7 @@ typedef struct {
int unk_0C;
int unk_10;
Window unk_14[2];
GenericPointerData *unk_34;
G3DPipelineState *unk_34;
PokemonSpriteManager *unk_38;
NARC *unk_3C;
UnkStruct_ov119_021D14DC *unk_40;

4
include/struct_defs/battle_system.h
View File

@ -12,7 +12,7 @@
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_decls/struct_0206D140_decl.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/trainer.h"
#include "battle/battle_context.h"
@ -42,7 +42,7 @@
#include "unk_0201567C.h"
struct BattleSystem {
GenericPointerData *unk_00;
G3DPipelineState *unk_00;
BgConfig *unk_04;
Window *windows;
MessageLoader *unk_0C;

4
include/struct_defs/struct_0207AE68_t.h
View File

@ -3,7 +3,7 @@
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_0207C8C4.h"
#include "applications/pokemon_summary_screen/main.h"
@ -37,7 +37,7 @@ struct UnkStruct_0207AE68_t {
Pokemon *unk_28;
Options *options;
UnkStruct_0207C8C4 *unk_30;
GenericPointerData *unk_34;
G3DPipelineState *unk_34;
ApplicationManager *appMan;
PokemonSummary *unk_3C;
void *unk_40;

10
include/struct_defs/struct_0207C690.h
View File

@ -1,10 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_0207C690_H
#define POKEPLATINUM_STRUCT_0207C690_H
typedef struct {
int heapID;
void *unk_04;
void *unk_08;
} GenericPointerData;
#endif // POKEPLATINUM_STRUCT_0207C690_H

4
include/struct_defs/struct_0207F248.h
View File

@ -4,7 +4,7 @@
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_decls/struct_02098700_decl.h"
#include "struct_defs/funcptr_0207F248_sub1.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_020831B4.h"
#include "struct_defs/struct_02083D1C.h"
#include "struct_defs/struct_02098C44.h"
@ -61,7 +61,7 @@ typedef struct {
u16 monStats[6];
HeightWeightData *unk_B20;
OverlayMetadata *unk_B24;
GenericPointerData *unk_B28;
G3DPipelineState *unk_B28;
} GameWindowLayout;
#endif // POKEPLATINUM_STRUCT_0207F248_H

12
include/unk_02024220.h
View File

@ -1,11 +1,15 @@
#ifndef POKEPLATINUM_UNK_02024220_H
#define POKEPLATINUM_UNK_02024220_H
#include "struct_defs/struct_0207C690.h"
typedef struct G3DPipelineState {
int heapID;
void *unk_04;
void *unk_08;
} G3DPipelineState;
#include "functypes/funcptr_02024220.h"
typedef void (*G3DPipelineSetupCallback)(void);
GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5);
void sub_020242C4(GenericPointerData *param0);
G3DPipelineState *G3DPipelineState_New(u32 heapID, int param1, int param2, int param3, int param4, G3DPipelineSetupCallback cb);
void G3DPipelineState_Free(G3DPipelineState *state);
#endif // POKEPLATINUM_UNK_02024220_H

4
include/unk_0207C63C.h
View File

@ -1,13 +1,13 @@
#ifndef POKEPLATINUM_UNK_0207C63C_H
#define POKEPLATINUM_UNK_0207C63C_H
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_0207C894.h"
#include "struct_defs/struct_0207C8C4.h"
void sub_0207C63C(void);
void sub_0207C664(void);
GenericPointerData *sub_0207C690(int heapID);
G3DPipelineState *sub_0207C690(int heapID);
void sub_0207C6AC(void);
void sub_0207C730(void);
void sub_0207C770(void);

8
src/applications/title_screen.c
View File

@ -7,7 +7,6 @@
#include "constants/heap.h"
#include "constants/species.h"
#include "struct_defs/struct_0207C690.h"
#include "struct_defs/struct_02099F80.h"
#include "game_opening/const_ov77_021D742C.h"
@ -19,6 +18,7 @@
#include "easy3d_object.h"
#include "font.h"
#include "fx_util.h"
#include "unk_02024220.h"
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
@ -202,7 +202,7 @@ typedef struct TitleScreen {
typedef struct TitleScreenAppData {
int heapID;
BgConfig *bgConfig;
GenericPointerData *unk_08;
G3DPipelineState *unk_08;
TitleScreenUnusedStruct unused0;
TitleScreen titleScreen;
u16 nextApp;
@ -515,13 +515,13 @@ static BOOL TitleScreen_ShouldSkipIntro(void)
static void ov77_021D11CC(TitleScreenAppData *appData)
{
appData->unk_08 = sub_02024220(appData->heapID, 0, 1, 0, 4, NULL);
appData->unk_08 = G3DPipelineState_New(appData->heapID, 0, 1, 0, 4, NULL);
G2_SetBG0Priority(1);
}
static void ov77_021D11FC(TitleScreenAppData *appData)
{
sub_020242C4(appData->unk_08);
G3DPipelineState_Free(appData->unk_08);
}
static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, int giratinaTexAnim, enum HeapId heapID)

14
src/battle/ov16_0223B140.c
View File

@ -13,7 +13,7 @@
#include "struct_decls/struct_0207AE68_decl.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/struct_0207A778.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "battle/battle_context.h"
@ -125,8 +125,8 @@ static void ov16_0223CE68(void *param0);
static void ov16_0223CF1C(void *param0);
static void ov16_0223CF48(SysTask *param0, void *param1);
static void ov16_0223CF8C(SysTask *param0, void *param1);
static GenericPointerData *ov16_0223CD7C(void);
static void ov16_0223CE20(GenericPointerData *param0);
static G3DPipelineState *ov16_0223CD7C(void);
static void ov16_0223CE20(G3DPipelineState *param0);
static void ov16_0223CD9C(void);
static void ov16_0223DD4C(BattleSystem *battleSys);
static void ov16_0223D0C4(SysTask *param0, void *param1);
@ -1422,9 +1422,9 @@ static BOOL ov16_0223CD3C(u16 param0)
return 0;
}
static GenericPointerData *ov16_0223CD7C(void)
static G3DPipelineState *ov16_0223CD7C(void)
{
return sub_02024220(HEAP_ID_BATTLE, 0, 2, 0, 2, ov16_0223CD9C);
return G3DPipelineState_New(HEAP_ID_BATTLE, 0, 2, 0, 2, ov16_0223CD9C);
}
static void ov16_0223CD9C(void)
@ -1442,9 +1442,9 @@ static void ov16_0223CD9C(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov16_0223CE20(GenericPointerData *param0)
static void ov16_0223CE20(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void ov16_0223CE28(void)

16
src/dw_warp/dw_warp.c
View File

@ -5,7 +5,7 @@
#include "constants/graphics.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "camera.h"
@ -28,7 +28,7 @@
#define DWARP_ANM_DURATION 85
typedef struct DistortionWorldWarp {
GenericPointerData *p3DCallback;
G3DPipelineState *p3DCallback;
Camera *camera;
SysTask *task;
int frameCnt;
@ -53,9 +53,9 @@ static void DWWarp_DeleteCamera(DistortionWorldWarp *warp);
static void DWWarp_InitModel(DistortionWorldWarp *warp);
static void DWWarp_DeleteModel(DistortionWorldWarp *warp);
static void Model3D_Update(DistortionWorldWarp *warp);
static GenericPointerData *DWWarp_Init3D(int heapID);
static G3DPipelineState *DWWarp_Init3D(int heapID);
static void DWWarp_Setup3D(void);
static void DWWarp_Exit3D(GenericPointerData *param0);
static void DWWarp_Exit3D(G3DPipelineState *param0);
static void DWWarp_CameraMove(DistortionWorldWarp *warp);
BOOL DWWarp_Init(ApplicationManager *appMan, int *state)
@ -314,9 +314,9 @@ static void Model3D_Update(DistortionWorldWarp *warp)
NNS_G3dGePopMtx(1);
}
static GenericPointerData *DWWarp_Init3D(int heapID)
static G3DPipelineState *DWWarp_Init3D(int heapID)
{
return sub_02024220(heapID, 0, 2, 0, 2, DWWarp_Setup3D);
return G3DPipelineState_New(heapID, 0, 2, 0, 2, DWWarp_Setup3D);
}
static void DWWarp_Setup3D(void)
@ -335,9 +335,9 @@ static void DWWarp_Setup3D(void)
G3_ViewPort(0, 0, 255, 191);
}
static void DWWarp_Exit3D(GenericPointerData *param0)
static void DWWarp_Exit3D(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void DWWarp_CameraMove(DistortionWorldWarp *warp)

8
src/easy3d.c
View File

@ -4,7 +4,7 @@
#include <nnsys.h>
#include <string.h>
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "gx_layers.h"
#include "system.h"
@ -78,11 +78,11 @@ void Easy3D_DrawRenderObjSimple(NNSG3dRenderObj *renderObj, const VecFx32 *pos,
NNS_G3dGeFlushBuffer();
}
static GenericPointerData *Unk_021BFB0C = NULL;
static G3DPipelineState *Unk_021BFB0C = NULL;
void Easy3D_Init(const u8 heapID)
{
Unk_021BFB0C = sub_02024220(heapID, 0, 2, 0, 4, Easy3D_SetupEngine);
Unk_021BFB0C = G3DPipelineState_New(heapID, 0, 2, 0, 4, Easy3D_SetupEngine);
}
static void Easy3D_SetupEngine(void)
@ -102,7 +102,7 @@ static void Easy3D_SetupEngine(void)
void Easy3D_Shutdown(void)
{
sub_020242C4(Unk_021BFB0C);
G3DPipelineState_Free(Unk_021BFB0C);
}
BOOL Easy3D_BindTextureToResource(void *resource, NNSG3dResTex *texture)

8
src/game_opening/ov77_021D25B0.c
View File

@ -3,7 +3,7 @@
#include "constants/graphics.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "game_opening/ov77_021D54B0.h"
@ -128,7 +128,7 @@ typedef struct {
int unk_04;
BOOL unk_08;
BgConfig *unk_0C;
GenericPointerData *unk_10;
G3DPipelineState *unk_10;
u32 unk_14;
UnkStruct_ov77_021D2F38 unk_18;
UnkStruct_ov77_021D37C0 unk_34;
@ -822,7 +822,7 @@ static void ov77_021D2A58(UnkStruct_ov77_021D2E9C *param0)
NNSGfdPlttKey v1;
u32 v2, v3;
param0->unk_10 = sub_02024220(param0->unk_00, 0, 1, 0, 4, ov77_021D2AA0);
param0->unk_10 = G3DPipelineState_New(param0->unk_00, 0, 1, 0, 4, ov77_021D2AA0);
v0 = NNS_GfdAllocTexVram(0x2000 * 4, 0, 0);
v1 = NNS_GfdAllocPlttVram(0x20 * 4, 0, NNS_GFD_ALLOC_FROM_LOW);
@ -1454,7 +1454,7 @@ static void ov77_021D36F8(UnkStruct_ov77_021D2E9C *param0)
param0->unk_34.unk_240 = NULL;
}
sub_020242C4(param0->unk_10);
G3DPipelineState_Free(param0->unk_10);
param0->unk_34.unk_02 = 0;
}

8
src/overlay010/ov10_0221F800.c
View File

@ -7,7 +7,7 @@
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "applications/pokemon_summary_screen/main.h"
@ -96,7 +96,7 @@ typedef struct UnkStruct_ov10_0221FB28_t {
u16 unk_538[2][384];
UnkStruct_02012744 *unk_B38;
FontOAM *unk_B3C[4];
GenericPointerData *unk_B4C;
G3DPipelineState *unk_B4C;
ParticleSystem *unk_B50;
void *unk_B54;
u8 unk_B58[4];
@ -1727,7 +1727,7 @@ static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0)
Camera *camera;
void *v1;
param0->unk_B4C = sub_02024220(param0->unk_00->heapID, 0, 4, 0, 2, NULL);
param0->unk_B4C = G3DPipelineState_New(param0->unk_00->heapID, 0, 4, 0, 2, NULL);
G3X_AlphaBlend(1);
ParticleSystem_ZeroAll();
@ -1777,7 +1777,7 @@ static void ov10_022218F4(UnkStruct_ov10_0221FB28 *param0)
ParticleSystem_Free(param0->unk_B50);
Heap_Free(param0->unk_B54);
sub_020242C4(param0->unk_B4C);
G3DPipelineState_Free(param0->unk_B4C);
}
static u32 ov10_02221928(u32 param0, BOOL param1)

10
src/overlay017/ov17_0223F118.c
View File

@ -9,7 +9,7 @@
#include "struct_decls/font_oam.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02095C48.h"
#include "overlay017/ov17_02252A70.h"
@ -78,9 +78,9 @@ static void NitroStaticInit(void)
Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2);
}
GenericPointerData *ov17_0223F140(int heapID)
G3DPipelineState *ov17_0223F140(int heapID)
{
return sub_02024220(heapID, 0, 2, 0, 2, ov17_0223F15C);
return G3DPipelineState_New(heapID, 0, 2, 0, 2, ov17_0223F15C);
}
static void ov17_0223F15C(void)
@ -98,9 +98,9 @@ static void ov17_0223F15C(void)
G3_ViewPort(0, 0, 255, 191);
}
void ov17_0223F1E0(GenericPointerData *param0)
void ov17_0223F1E0(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
void ov17_0223F1E8(int heapID, BgConfig *param1, SpriteManager *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)

4
src/overlay062/ov62_0222F2C0.c
View File

@ -55,7 +55,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0)
param0->unk_14.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, HEAP_ID_102);
param0->unk_14.unk_10 = BgConfig_New(HEAP_ID_102);
param0->unk_14.unk_14 = PaletteData_New(HEAP_ID_102);
param0->unk_14.unk_4C = sub_02024220(HEAP_ID_102, 0, 1, 0, 4, NULL);
param0->unk_14.unk_4C = G3DPipelineState_New(HEAP_ID_102, 0, 1, 0, 4, NULL);
param0->unk_14.unk_50 = PokemonSpriteManager_New(HEAP_ID_102);
NNS_G2dSetupSoftwareSpriteCamera();
@ -199,7 +199,7 @@ void ov62_0222F514(UnkStruct_0208C06C *param0)
MessageLoader_Free(param0->unk_14.unk_38);
}
sub_020242C4(param0->unk_14.unk_4C);
G3DPipelineState_Free(param0->unk_14.unk_4C);
PokemonSpriteManager_Free(param0->unk_14.unk_50);
ov62_022411EC(param0);

8
src/overlay069/ov69_0225C700.c
View File

@ -7,7 +7,7 @@
#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/struct_02015958.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "struct_defs/wi_fi_history.h"
@ -108,7 +108,7 @@ typedef struct {
SpriteList *unk_04;
G2dRenderer unk_08;
SpriteResourceCollection *unk_194[4];
GenericPointerData *unk_1A4;
G3DPipelineState *unk_1A4;
NARC *unk_1A8;
} UnkStruct_ov69_0225D35C;
@ -1486,13 +1486,13 @@ static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0)
static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID)
{
param0->unk_1A4 = sub_02024220(heapID, 0, 2, 0, 4, ov69_0225D64C);
param0->unk_1A4 = G3DPipelineState_New(heapID, 0, 2, 0, 4, ov69_0225D64C);
NNS_G3dGlbLightVector(0, 0, 0, (-(FX32_ONE - 1)));
}
static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0)
{
sub_020242C4(param0->unk_1A4);
G3DPipelineState_Free(param0->unk_1A4);
}
static void ov69_0225D64C(void)

8
src/overlay070/ov70_0225D9A4.c
View File

@ -6,7 +6,7 @@
#include "constants/graphics.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay005/struct_ov5_021DE5D0.h"
@ -100,7 +100,7 @@ typedef struct {
G2dRenderer unk_08;
SpriteResourceCollection *unk_194[4];
NNSG2dCellTransferState *unk_1A4;
GenericPointerData *unk_1A8;
G3DPipelineState *unk_1A8;
} UnkStruct_ov70_0225E4EC;
typedef struct {
@ -1317,7 +1317,7 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *saveData, u
}
{
param0->unk_1A8 = sub_02024220(heapID, 0, 2, 0, 4, ov70_0225E754);
param0->unk_1A8 = G3DPipelineState_New(heapID, 0, 2, 0, 4, ov70_0225E754);
}
}
@ -1358,7 +1358,7 @@ static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0)
}
{
sub_020242C4(param0->unk_1A8);
G3DPipelineState_Free(param0->unk_1A8);
}
}

6
src/overlay076/ov76_0223B870.c
View File

@ -7,7 +7,7 @@
#include "struct_defs/seal_case.h"
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "overlay012/ov12_02225864.h"
#include "overlay012/struct_ov12_02225F6C.h"
@ -367,9 +367,9 @@ void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2)
SysTask_Start(ov76_0223BCA0, v0, 0x1000);
}
GenericPointerData *ov76_0223BE6C(void)
G3DPipelineState *ov76_0223BE6C(void)
{
return sub_02024220(HEAP_ID_53, 0, 2, 0, 2, ov76_0223BE8C);
return G3DPipelineState_New(HEAP_ID_53, 0, 2, 0, 2, ov76_0223BE8C);
}
void ov76_0223BE8C(void)

14
src/overlay099/ov99_021D0D80.c
View File

@ -5,7 +5,7 @@
#include "constants/graphics.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay099/ov99_021D1A54.h"
@ -76,9 +76,9 @@ static void ov99_021D1380(BgConfig *param0);
static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0);
static GenericPointerData *ov99_021D19AC(int heapID);
static G3DPipelineState *ov99_021D19AC(int heapID);
static void ov99_021D19C8(void);
static void ov99_021D1A4C(GenericPointerData *param0);
static void ov99_021D1A4C(G3DPipelineState *param0);
static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D1314(UnkStruct_ov99_021D2CB0 *param0);
@ -767,9 +767,9 @@ static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0)
Camera_Delete(param0->camera);
}
static GenericPointerData *ov99_021D19AC(int heapID)
static G3DPipelineState *ov99_021D19AC(int heapID)
{
return sub_02024220(heapID, 0, 1, 0, 1, ov99_021D19C8);
return G3DPipelineState_New(heapID, 0, 1, 0, 1, ov99_021D19C8);
}
static void ov99_021D19C8(void)
@ -787,7 +787,7 @@ static void ov99_021D19C8(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov99_021D1A4C(GenericPointerData *param0)
static void ov99_021D1A4C(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}

4
src/overlay100/ov100_021D0D80.c
View File

@ -215,7 +215,7 @@ static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0)
param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, HEAP_ID_111);
param0->unk_0C = BgConfig_New(HEAP_ID_111);
param0->unk_10 = PaletteData_New(HEAP_ID_111);
param0->unk_14 = sub_02024220(HEAP_ID_111, 0, 1, 0, 4, NULL);
param0->unk_14 = G3DPipelineState_New(HEAP_ID_111, 0, 1, 0, 4, NULL);
param0->camera = Camera_Alloc(HEAP_ID_111);
param0->unk_2C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPEAR_PILLAR, HEAP_ID_111);
@ -259,7 +259,7 @@ static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0)
PaletteData_Free(param0->unk_10);
NARC_dtor(param0->unk_00);
sub_020242C4(param0->unk_14);
G3DPipelineState_Free(param0->unk_14);
Camera_Delete(param0->camera);
SpriteSystem_FreeResourcesAndManager(param0->unk_04, param0->unk_08);
SpriteSystem_Free(param0->unk_04);

14
src/overlay104/ov104_0223C2D4.c
View File

@ -4,7 +4,7 @@
#include <string.h>
#include "struct_decls/struct_0209B75C_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay063/ov63_0222BCE8.h"
@ -72,9 +72,9 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0);
void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0);
static GenericPointerData *ov104_0223CF4C(int heapID);
static G3DPipelineState *ov104_0223CF4C(int heapID);
static void ov104_0223CF68(void);
static void ov104_0223CFEC(GenericPointerData *param0);
static void ov104_0223CFEC(G3DPipelineState *param0);
static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223D498(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223D570(UnkStruct_ov104_0223C634 *param0, UnkStruct_ov104_0223D570 *param1);
@ -770,9 +770,9 @@ static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0)
ov63_0222D7B4(param0->unk_30);
}
static GenericPointerData *ov104_0223CF4C(int heapID)
static G3DPipelineState *ov104_0223CF4C(int heapID)
{
return sub_02024220(heapID, 0, 1, 0, 1, ov104_0223CF68);
return G3DPipelineState_New(heapID, 0, 1, 0, 1, ov104_0223CF68);
}
static void ov104_0223CF68(void)
@ -790,9 +790,9 @@ static void ov104_0223CF68(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov104_0223CFEC(GenericPointerData *param0)
static void ov104_0223CFEC(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void ov104_0223CFF4(UnkStruct_ov104_0223C4CC *param0)

10
src/overlay105/ov105_02241AE0.c
View File

@ -3,7 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "applications/pokemon_summary_screen/main.h"
@ -100,7 +100,7 @@ struct UnkStruct_ov105_02241FF4_t {
Menu *unk_FC;
StringList unk_100[4];
PaletteData *unk_120;
GenericPointerData *unk_124;
G3DPipelineState *unk_124;
PokemonSpriteManager *unk_128;
PokemonSprite *unk_12C[3];
Options *options;
@ -357,7 +357,7 @@ int ov105_02241AE0(ApplicationManager *appMan, int *param1)
v1 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_ov105_02241FF4), HEAP_ID_93);
memset(v1, 0, sizeof(UnkStruct_ov105_02241FF4));
v1->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
v1->unk_124 = G3DPipelineState_New(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
v1->unk_4C = BgConfig_New(HEAP_ID_93);
v1->unk_00 = appMan;
@ -2782,7 +2782,7 @@ static void ov105_022451B4(UnkStruct_ov105_02241FF4 *param0)
ov105_0224473C(param0->unk_4C);
NARC_dtor(param0->unk_338);
sub_020242C4(param0->unk_124);
G3DPipelineState_Free(param0->unk_124);
return;
}
@ -2793,7 +2793,7 @@ static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0)
ov105_022452E4();
param0->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
param0->unk_124 = G3DPipelineState_New(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
param0->unk_4C = BgConfig_New(HEAP_ID_93);
ov105_0224531C(param0);

16
src/overlay113/ov113_0225C700.c
View File

@ -12,7 +12,7 @@
#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_02015958.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay066/ov66_0222DDF0.h"
@ -85,7 +85,7 @@ typedef struct UnkStruct_ov113_0225DBCC_t {
BgConfig *unk_08;
PaletteData *unk_0C;
UnkStruct_02012744 *unk_10;
GenericPointerData *unk_14;
G3DPipelineState *unk_14;
SysTask *unk_18;
SpriteSystem *unk_1C;
SpriteManager *unk_20;
@ -135,9 +135,9 @@ static void ov113_0225D12C(BgConfig *param0);
static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1);
static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0);
static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0);
static GenericPointerData *ov113_0225DC6C(int heapID);
static G3DPipelineState *ov113_0225DC6C(int heapID);
static void ov113_0225DC88(void);
static void ov113_0225DD0C(GenericPointerData *param0);
static void ov113_0225DD0C(G3DPipelineState *param0);
static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0);
static void ov113_0225DA9C(UnkStruct_ov113_0225DBCC *param0);
static void ov113_0225DAA8(UnkStruct_ov113_0225DBCC *param0, NARC *param1);
@ -1260,9 +1260,9 @@ static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0)
}
}
static GenericPointerData *ov113_0225DC6C(int heapID)
static G3DPipelineState *ov113_0225DC6C(int heapID)
{
return sub_02024220(heapID, 0, 2, 0, 2, ov113_0225DC88);
return G3DPipelineState_New(heapID, 0, 2, 0, 2, ov113_0225DC88);
}
static void ov113_0225DC88(void)
@ -1280,9 +1280,9 @@ static void ov113_0225DC88(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov113_0225DD0C(GenericPointerData *param0)
static void ov113_0225DD0C(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void ov113_0225DD14(UnkStruct_ov113_0225DBCC *param0)

8
src/overlay115/ov115_02260CEC.c
View File

@ -8,7 +8,7 @@
#include "struct_decls/struct_02012744_decl.h"
#include "struct_decls/struct_02012B20_decl.h"
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay092/struct_ov92_021D28C0.h"
@ -274,7 +274,7 @@ typedef struct {
Strbuf *unk_10;
u16 unk_14;
u16 unk_16;
GenericPointerData *unk_18;
G3DPipelineState *unk_18;
SpriteList *unk_1C;
G2dRenderer unk_20;
SpriteResourceCollection *unk_1AC[4];
@ -2860,14 +2860,14 @@ static void ov115_02263328(void)
static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID)
{
param0->unk_18 = sub_02024220(heapID, 0, 1, 0, 4, ov115_02263328);
param0->unk_18 = G3DPipelineState_New(heapID, 0, 1, 0, 4, ov115_02263328);
ov115_02263C24(param0, param1, param2, heapID);
}
static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0)
{
ov115_02263CC0(param0);
sub_020242C4(param0->unk_18);
G3DPipelineState_Free(param0->unk_18);
}
static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID)

4
src/overlay116/ov116_022604C4.c
View File

@ -760,7 +760,7 @@ static void ov116_022612CC(UnkStruct_ov116_0226139C *param0)
param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, HEAP_ID_106);
param0->unk_48.unk_10 = BgConfig_New(HEAP_ID_106);
param0->unk_48.unk_14 = PaletteData_New(HEAP_ID_106);
param0->unk_48.unk_18 = sub_02024220(HEAP_ID_106, 0, 1, 0, 4, NULL);
param0->unk_48.unk_18 = G3DPipelineState_New(HEAP_ID_106, 0, 1, 0, 4, NULL);
param0->unk_48.camera = Camera_Alloc(HEAP_ID_106);
ov116_02261C88(param0);
@ -821,7 +821,7 @@ void ov116_0226139C(UnkStruct_ov116_0226139C *param0)
PaletteData_Free(param0->unk_48.unk_14);
NARC_dtor(param0->unk_48.unk_00);
NARC_dtor(param0->unk_48.unk_04);
sub_020242C4(param0->unk_48.unk_18);
G3DPipelineState_Free(param0->unk_48.unk_18);
Camera_Delete(param0->unk_48.camera);
SpriteSystem_FreeResourcesAndManager(param0->unk_48.unk_08, param0->unk_48.unk_0C);
SpriteSystem_Free(param0->unk_48.unk_08);

14
src/overlay117/ov117_02260668.c
View File

@ -6,7 +6,7 @@
#include "constants/graphics.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay004/ov4_021D0D80.h"
@ -58,9 +58,9 @@
#include "vram_transfer.h"
static void ov117_02260DA0(void *param0);
static GenericPointerData *ov117_02260E14(int heapID);
static G3DPipelineState *ov117_02260E14(int heapID);
static void ov117_02260E34(void);
static void ov117_02260EB8(GenericPointerData *param0);
static void ov117_02260EB8(G3DPipelineState *param0);
static void ov117_02260F7C(SysTask *param0, void *param1);
static void ov117_022610D8(BgConfig *param0);
static void ov117_02261280(UnkStruct_ov117_02261280 *param0);
@ -508,9 +508,9 @@ static void ov117_02260DA0(void *param0)
OS_SetIrqCheckFlag(OS_IE_V_BLANK);
}
static GenericPointerData *ov117_02260E14(int heapID)
static G3DPipelineState *ov117_02260E14(int heapID)
{
return sub_02024220(heapID, 0, 1, 0, 2, ov117_02260E34);
return G3DPipelineState_New(heapID, 0, 1, 0, 2, ov117_02260E34);
}
static void ov117_02260E34(void)
@ -528,9 +528,9 @@ static void ov117_02260E34(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov117_02260EB8(GenericPointerData *param0)
static void ov117_02260EB8(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void ov117_02260EC0(UnkStruct_ov117_02261280 *param0)

8
src/overlay119/ov119_021D0D80.c
View File

@ -7,7 +7,7 @@
#include "constants/narc.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay119/struct_ov119_021D0FD0.h"
@ -43,7 +43,7 @@
void ov119_021D0D80(void);
void ov119_021D0DA8(void);
GenericPointerData *ov119_021D0DD4(void);
G3DPipelineState *ov119_021D0DD4(void);
void ov119_021D0DF4(void);
void ov119_021D0E78(void);
static u32 ov119_021D13B4(u32 param0, BOOL param1);
@ -67,9 +67,9 @@ void ov119_021D0DA8(void)
G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8);
}
GenericPointerData *ov119_021D0DD4(void)
G3DPipelineState *ov119_021D0DD4(void)
{
return sub_02024220(HEAP_ID_71, 0, 2, 0, 2, ov119_021D0DF4);
return G3DPipelineState_New(HEAP_ID_71, 0, 2, 0, 2, ov119_021D0DF4);
}
void ov119_021D0DF4(void)

10
src/unk_02024220.c
View File

@ -3,19 +3,15 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_0207C690.h"
#include "functypes/funcptr_02024220.h"
#include "gx_layers.h"
#include "heap.h"
static void sub_020242DC(void);
GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5)
G3DPipelineState *G3DPipelineState_New(u32 heapID, int param1, int param2, int param3, int param4, G3DPipelineSetupCallback param5)
{
int v0, v1;
GenericPointerData *v2 = Heap_AllocFromHeap(heapID, sizeof(GenericPointerData));
G3DPipelineState *v2 = Heap_AllocFromHeap(heapID, sizeof(G3DPipelineState));
v2->heapID = heapID;
@ -49,7 +45,7 @@ GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3,
return v2;
}
void sub_020242C4(GenericPointerData *param0)
void G3DPipelineState_Free(G3DPipelineState *param0)
{
Heap_Free(param0->unk_04);
Heap_Free(param0->unk_08);

2
src/unk_0207AE68.c
View File

@ -198,7 +198,7 @@ void sub_0207B0E0(UnkStruct_0207AE68 *param0)
PaletteData_Free(param0->unk_14);
PokemonSpriteManager_Free(param0->unk_18);
sub_02015FB8(param0->unk_44);
sub_020242C4(param0->unk_34);
G3DPipelineState_Free(param0->unk_34);
sub_0207C460(param0->unk_00);
MessageLoader_Free(param0->unk_08);
StringTemplate_Free(param0->unk_0C);

6
src/unk_0207C63C.c
View File

@ -2,7 +2,7 @@
#include <nnsys.h>
#include <string.h>
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_0207C894.h"
#include "struct_defs/struct_0207C8C4.h"
@ -44,9 +44,9 @@ void sub_0207C664(void)
G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8);
}
GenericPointerData *sub_0207C690(int heapID)
G3DPipelineState *sub_0207C690(int heapID)
{
return sub_02024220(heapID, 0, 2, 0, 2, sub_0207C6AC);
return G3DPipelineState_New(heapID, 0, 2, 0, 2, sub_0207C6AC);
}
void sub_0207C6AC(void)

14
src/unk_0207E0B8.c
View File

@ -5,7 +5,7 @@
#include "constants/items.h"
#include "struct_defs/struct_0207C690.h"
#include "unk_02024220.h"
#include "struct_defs/struct_0207F248.h"
#include "struct_defs/struct_02099F80.h"
@ -123,9 +123,9 @@ static u8 CheckDuplicateValues(GameWindowLayout *param0);
static u8 CheckUniqueValues(GameWindowLayout *param0);
static u8 CheckEqualityInArray(GameWindowLayout *param0);
static BOOL ValidateGameWindowState(GameWindowLayout *param0);
static GenericPointerData *sub_0207EAD4(int heapID);
static G3DPipelineState *sub_0207EAD4(int heapID);
static void sub_0207EAF4(void);
static void sub_0207EB64(GenericPointerData *param0);
static void sub_0207EB64(G3DPipelineState *param0);
static int ProcessMessageResult(GameWindowLayout *param0);
static int HandleOverlayCompletion(GameWindowLayout *param0);
static void sub_0207F388(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1);
@ -881,9 +881,9 @@ void sub_0207EA74(GameWindowLayout *windowLayout, int param1)
}
}
static GenericPointerData *sub_0207EAD4(int heapID)
static G3DPipelineState *sub_0207EAD4(int heapID)
{
return sub_02024220(heapID, 0, 1, 0, 2, sub_0207EAF4);
return G3DPipelineState_New(heapID, 0, 1, 0, 2, sub_0207EAF4);
}
static void sub_0207EAF4(void)
@ -898,9 +898,9 @@ static void sub_0207EAF4(void)
G3_ViewPort(0, 0, 255, 191);
}
static void sub_0207EB64(GenericPointerData *param0)
static void sub_0207EB64(G3DPipelineState *param0)
{
sub_020242C4(param0);
G3DPipelineState_Free(param0);
}
static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1)

2
src/unk_02097B18.c
View File

@ -245,7 +245,7 @@ static int sub_02097D88(ApplicationManager *appMan, int *param1)
ov76_0223B8C4(v0);
ov76_0223C424(&v0->unk_D4);
VramTransfer_Free();
sub_020242C4(v0->unk_D4.unk_15C);
G3DPipelineState_Free(v0->unk_D4.unk_15C);
ov76_0223EB54(53);
NARC_dtor(v0->unk_42C);
ApplicationManager_FreeData(appMan);

2
src/unk_02098218.c
View File

@ -155,7 +155,7 @@ static int sub_02098388(ApplicationManager *appMan, int *param1)
{
UnkStruct_ov119_021D0FD0 *v0 = ApplicationManager_Data(appMan);
sub_020242C4(v0->unk_04.unk_34);
G3DPipelineState_Free(v0->unk_04.unk_34);
GXLayers_EngineAToggleLayers(1, 0);
GXLayers_EngineAToggleLayers(2, 0);