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

Rebase + clean-up PR#115 with current project state #134

Merged
merged 12 commits into from
Jan 29, 2024
Merged

Rebase + clean-up PR#115 with current project state #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67d92f6
improving readability
ecopsychologer Nov 15, 2023
22d65fd
readability
ecopsychologer Nov 15, 2023
024df03
clean it up
ecopsychologer Nov 15, 2023
1c24449
Update pokemon.h
ecopsychologer Nov 15, 2023
03bdd93
add function names
ecopsychologer Nov 17, 2023
51b665d
add function names
ecopsychologer Nov 17, 2023
6cabe00
add struct names
ecopsychologer Nov 17, 2023
549e023
more functions with human names
ecopsychologer Nov 17, 2023
947fa0f
rename chatotcrydata
ecopsychologer Nov 17, 2023
00c6525
doxygen documentation
ecopsychologer Nov 17, 2023
98d93b3
update box mon function
ecopsychologer Nov 17, 2023
4ab62fb
fixing formatting
ecopsychologer Nov 17, 2023
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ fi
# Set up env variable to show % of completion during ninja build
export NINJA_STATUS="[%p %f/%t] "

# Build the project
ninja -C build "$target" "$@"
2 changes: 1 addition & 1 deletion include/constants/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ enum PokemonDataParam {
MON_DATA_SP_DEF,
MON_DATA_170,
MON_DATA_171,
MON_DATA_172,
MON_DATA_172, //!< possible data sanity check
MON_DATA_173,
MON_DATA_SPECIES_EGG,
MON_DATA_COMBINED_IVS,
Expand Down
2 changes: 1 addition & 1 deletion include/functypes/funcptr_0207E634.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

#include "struct_defs/struct_0207F248.h"

typedef void (* UnkFuncPtr_0207E634)(UnkStruct_0207F248 *, int *);
typedef void (* UnkFuncPtr_0207E634)(GameWindowLayout *, int *);

#endif // POKEPLATINUM_FUNCPTR_0207E634_H
2 changes: 1 addition & 1 deletion include/functypes/funcptr_0207F248.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_FUNCPTR_0207F248_H
#define POKEPLATINUM_FUNCPTR_0207F248_H

typedef int (* UnkFuncPtr_0207F248)(void *);
typedef int (* GenericFunctionPtr)(void *);

#endif // POKEPLATINUM_FUNCPTR_0207F248_H
2 changes: 1 addition & 1 deletion include/functypes/struct_0207F248_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_0207F248_1_H
#define POKEPLATINUM_STRUCT_0207F248_1_H

typedef int (* UnkStruct_0207F248_1)(void *);
typedef int (* GameWindowLayout_1)(void *);

#endif // POKEPLATINUM_STRUCT_0207F248_1_H
2 changes: 1 addition & 1 deletion include/overlay005/ov5_021D2F14.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

void ov5_021D2F14(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3);
void ov5_021D30A8(UnkStruct_ov5_021D30A8 * param0);
UnkStruct_02022550 * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
GraphicElementData * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * 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
4 changes: 2 additions & 2 deletions include/overlay005/ov5_021DDBE8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ void ov5_021DE47C(UnkStruct_ov5_021DE47C * param0, int param1, int param2);
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);
void ov5_021DE5A4(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1);
void ov5_021DE5D0(UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param3, u16 param4);
UnkStruct_02022550 * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
void ov5_021DE5D0(GraphicElementData * param0, u32 param1, u32 param2, u8 param3, u16 param4);
GraphicElementData * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
VecFx32 ov5_021DE660(fx32 param0, fx32 param1, fx32 param2);
UnkStruct_ov5_021DE6BC * ov5_021DE6A4(u32 param0);
void ov5_021DE6BC(UnkStruct_ov5_021DE6BC * param0);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay005/struct_ov5_021D30A8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "struct_decls/struct_020218BC_decl.h"

typedef struct {
UnkStruct_020218BC * unk_00;
GraphicElementManager * unk_00;
UnkStruct_0200C738 unk_04;
UnkStruct_02009508 * unk_190;
UnkStruct_02009714 * unk_194[6];
Expand Down
2 changes: 1 addition & 1 deletion include/overlay005/struct_ov5_021DE47C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "struct_decls/struct_020218BC_decl.h"

typedef struct {
UnkStruct_020218BC * unk_00;
GraphicElementManager * unk_00;
UnkStruct_0200C738 unk_04;
UnkStruct_02009714 * unk_190[4];
} UnkStruct_ov5_021DE47C;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay006/battle_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ typedef struct {
ChatotCry * unk_F0[4];
UnkStruct_02056B24 * unk_100;
UnkStruct_0202C878 * unk_104;
UnkStruct_020279FC * unk_108;
AnimationControlFlags * unk_108;
UnkStruct_0206D140 * unk_10C;
BattleParams_sub1 unk_110;
UnkStruct_0202CD88 * unk_11C;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay006/struct_ov6_02246254.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ typedef struct {
const TrainerInfo * unk_08;
int unk_0C;
int unk_10;
const UnkStruct_020279FC * unk_14;
const AnimationControlFlags * unk_14;
} UnkStruct_ov6_02246254;

#endif // POKEPLATINUM_STRUCT_OV6_02246254_H
10 changes: 5 additions & 5 deletions include/overlay007/struct_ov7_0224D008.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ typedef struct {
Window unk_08[6];
Window unk_68;
UnkStruct_0200112C * unk_78;
UnkStruct_02013A04 * unk_7C;
UnkStruct_02001AF4 * unk_80;
UnkStruct_02013A04 * unk_84;
ResourceMetadata * unk_7C;
UIControlData * unk_80;
ResourceMetadata * unk_84;
MessageLoader * unk_88;
UnkStruct_0200B358 * unk_8C;
UnkStruct_020203AC * unk_90;
UnkStruct_ov5_021D30A8 unk_94;
UnkStruct_02022550 * unk_25C[4];
GraphicElementData * unk_25C[4];
u16 unk_26C[2];
TrainerInfo * unk_270;
void * unk_274;
UnkStruct_020279FC * unk_278;
AnimationControlFlags * unk_278;
UnkStruct_0202B628 * unk_27C;
UnkStruct_0202CD88 * unk_280;
SaveData * unk_284;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay012/funcptr_ov12_02239E64_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
#include "struct_decls/struct_02022550_decl.h"
#include "overlay012/struct_ov12_0221FCDC_decl.h"

typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, UnkStruct_02022550 *);
typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, GraphicElementData *);

#endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H
2 changes: 1 addition & 1 deletion include/overlay012/funcptr_ov12_02239E68.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
#include "struct_decls/cell_actor_data.h"
#include "overlay012/struct_ov12_0221FCDC_decl.h"

typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, CellActorData *);
typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, CellActorData *);

#endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H
6 changes: 3 additions & 3 deletions include/overlay012/ov12_0221FC20.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ BGL * ov12_02220278(UnkStruct_ov12_0221FCDC * param0);
s32 ov12_02220280(UnkStruct_ov12_0221FCDC * param0, int param1);
CellActorData * ov12_02220298(UnkStruct_ov12_0221FCDC * param0, int param1);
CellActorData * ov12_022202C0(UnkStruct_ov12_0221FCDC * param0, int param1);
UnkStruct_0200C704 * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
UnkStruct_0200C704 * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
UnkStruct_0200C6E4 * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
AnimationResourceCollection * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
AnimationResourceCollection * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
CellTransferStateData * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
void ov12_02220474(void);
int ov12_02220540(UnkStruct_ov12_0221FCDC * param0, int param1);
void ov12_02220590(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * param1, int param2);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay012/ov12_022269C0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ void ov12_022269C0(UnkStruct_ov12_0221FCDC * param0);
void ov12_022269EC(UnkStruct_ov12_0221FCDC * param0);
void ov12_02226A3C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02226A88(UnkStruct_ov12_0221FCDC * param0);
void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);

#endif // POKEPLATINUM_OV12_022269C0_H
10 changes: 5 additions & 5 deletions include/overlay012/ov12_02226B84.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC * param0);
void ov12_022271D8(UnkStruct_ov12_0221FCDC * param0);
void ov12_02227408(UnkStruct_ov12_0221FCDC * param0);
void ov12_02227534(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02227828(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222797C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02227CBC(UnkStruct_ov12_0221FCDC * param0);
Expand All @@ -38,10 +38,10 @@ void ov12_02229B28(UnkStruct_ov12_0221FCDC * param0);
void ov12_02229C5C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02229E54(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222A00C(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222A604(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222A8F4(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222AB50(UnkStruct_ov12_0221FCDC * param0);
Expand Down
6 changes: 3 additions & 3 deletions include/overlay012/ov12_0222AC70.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "struct_decls/cell_actor_data.h"
#include "overlay012/struct_ov12_0221FCDC_decl.h"

void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222B194(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222B45C(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222B68C(UnkStruct_ov12_0221FCDC * param0);
Expand All @@ -22,8 +22,8 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222C8F8(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222CA2C(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222CB90(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222CFA0(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);

#endif // POKEPLATINUM_OV12_0222AC70_H
10 changes: 5 additions & 5 deletions include/overlay012/ov12_0222D6B0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
#include "struct_decls/cell_actor_data.h"
#include "overlay012/struct_ov12_0221FCDC_decl.h"

void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222E1A8(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222E248(CellActorData * param0);
void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);

#endif // POKEPLATINUM_OV12_0222D6B0_H
2 changes: 1 addition & 1 deletion include/overlay012/ov12_0222E91C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "overlay012/struct_ov12_0221FCDC_decl.h"

void ov12_0222EAA0(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222EFB0(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222F2F8(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222F5EC(UnkStruct_ov12_0221FCDC * param0);
Expand Down
28 changes: 14 additions & 14 deletions include/overlay012/ov12_0222F700.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@

void ov12_0222F770(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222F9E4(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_022300C4(UnkStruct_ov12_0221FCDC * param0);
void ov12_022303D0(UnkStruct_ov12_0221FCDC * param0);
void ov12_02230754(UnkStruct_ov12_0221FCDC * param0);
void ov12_02230804(UnkStruct_ov12_0221FCDC * param0);
void ov12_02230A8C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02231444(UnkStruct_ov12_0221FCDC * param0);
void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02231E7C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02232024(UnkStruct_ov12_0221FCDC * param0);
void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0223249C(UnkStruct_ov12_0221FCDC * param0);
void ov12_022326AC(UnkStruct_ov12_0221FCDC * param0);
void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02233178(UnkStruct_ov12_0221FCDC * param0);
void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02233CD4(UnkStruct_ov12_0221FCDC * param0);
void ov12_02233F30(UnkStruct_ov12_0221FCDC * param0);
void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02234214(UnkStruct_ov12_0221FCDC * param0);
void ov12_022342C4(UnkStruct_ov12_0221FCDC * param0);
void ov12_022344D0(UnkStruct_ov12_0221FCDC * param0);
Expand Down
8 changes: 4 additions & 4 deletions include/overlay012/ov12_022346A4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#include "struct_decls/cell_actor_data.h"
#include "overlay012/struct_ov12_0221FCDC_decl.h"

void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);

#endif // POKEPLATINUM_OV12_022346A4_H
4 changes: 2 additions & 2 deletions include/overlay012/struct_ov12_02223764_sub1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "struct_decls/struct_0200C704_decl.h"

typedef struct {
UnkStruct_0200C6E4 * unk_00;
UnkStruct_0200C704 * unk_04;
CellTransferStateData * unk_00;
AnimationResourceCollection * unk_04;
PaletteSys * unk_08;
} UnkStruct_ov12_02223764_sub1;

Expand Down
6 changes: 3 additions & 3 deletions include/overlay012/struct_ov12_0223595C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ typedef struct {
u8 unk_02;
u8 unk_03;
UnkStruct_ov12_0221FCDC * unk_04;
UnkStruct_0200C6E4 * unk_08;
UnkStruct_0200C704 * unk_0C;
UnkStruct_0200C704 * unk_10;
CellTransferStateData * unk_08;
AnimationResourceCollection * unk_0C;
AnimationResourceCollection * unk_10;
BGL * unk_14;
PaletteSys * unk_18;
} UnkStruct_ov12_0223595C;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay012/struct_ov12_02237728.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ typedef struct BallThrow {
int ballID;
int bgPrio;
int surface;
UnkStruct_0200C6E4 *cellActorSys;
CellTransferStateData *cellActorSys;
PaletteSys *paletteSys;
BattleSystem *battleSys;
} BallThrow;
Expand Down
Loading
Loading