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

Merge pull request #141 from lhearachel/party-gauge

Browse Source 
Document party_gauge.c
This commit is contained in:
Rachel
2024-02-09 17:49:20 -08:00
committed by GitHub
parent 7dac66bd5f 8176ae0ffe
commit 7e48c3e6cf
284 changed files with 4783 additions and 4563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
include/battle/party_gauge.h Normal file
View File

@@ -0,0 +1,105 @@
#ifndef POKEPLATINUM_BATTLE_PARTY_GAUGE_H
#define POKEPLATINUM_BATTLE_PARTY_GAUGE_H
#include "struct_decls/struct_02002F38_decl.h"
#include "struct_decls/struct_0200C6E4_decl.h"
#include "struct_decls/struct_0200C704_decl.h"
#include "overlay016/struct_ov16_0226D160_decl.h"
enum PartyGaugeSide {
PARTY_GAUGE_OURS,
PARTY_GAUGE_THEIRS,
};
enum ShowPartyGaugeType {
SHOW_PARTY_GAUGE_BATTLE_START,
SHOW_PARTY_GAUGE_MID_BATTLE,
};
enum HidePartyGaugeType {
HIDE_PARTY_GAUGE_BATTLE_START,
HIDE_PARTY_GAUGE_MID_BATTLE,
};
enum PartyGaugePosition {
PARTY_GAUGE_POSITION_HIGH,
PARTY_GAUGE_POSITION_MIDDLE,
PARTY_GAUGE_POSITION_LOW,
};
enum HideArrowType {
HIDE_ARROW_FADE_AND_SCROLL,
HIDE_ARROW_FADE_IN_PLACE,
};
/**
* @brief Load the graphics resources needed for the Party Gauge into memory.
*
* @param renderer
* @param gfxHandler
* @param palette
*/
void PartyGauge_LoadGraphics(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, PaletteData *palette);
/**
* @brief Free the graphics resources needed for the Party Gauge from memory.
*
* @param gfxHandler
*/
void PartyGauge_FreeGraphics(SpriteGfxHandler *gfxHandler);
/**
* @brief Show the Party Gauge.
*
* @param ballStatus The status of each battler's, represented as a Pokeball with a particular
* masking filter. Plain Pokeballs represent healthy battlers, gray represent
* fainted, darkened represent those afflicted with a status condition. For
* possible values, see enum PartyGaugeBallStatus.
*
* @param side The side of the battle for which the gauge should be displayed.
*
* @param showType How the gauge should be displayed, whether at the start of a battle (a slow
* inward scroll) or mid-battle after a KO (a faster inward scroll).
*
* @param pos Vertical position of the gauge; only applicable for double battles, so that
* the gauge does not overlap the HP bar.
* @param renderer
* @param gfxHandler
* @return Pointer to the constructed PartyGauge struct, for tracking its progress
* and eventually hiding it.
*/
PartyGauge* PartyGauge_Show(u8 ballStatus[], enum PartyGaugeSide side, enum ShowPartyGaugeType showType, enum PartyGaugePosition pos, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler);
/**
* @brief Check if the Party Gauge has finished the inward scrolling animation.
*
* @param gauge
* @return TRUE if the Party Gauge has finished its animation, else FALSE.
*/
BOOL PartyGauge_ShowIsDone(PartyGauge *gauge);
/**
* @brief Hide the Party Gauge.
*
* @param gauge Gauge to be hidden.
* @param hideArrowType Method by which the arrow element should be hidden.
* @param hideGaugeType Method by which the gauge Pokeballs should be hidden.
*/
void PartyGauge_Hide(PartyGauge *gauge, enum HideArrowType hideArrowType, enum HidePartyGaugeType hideGaugeType);
/**
* @brief Check if the Party Gauge has finished the outward vanishing animation.
*
* @param gauge
* @return TRUE if the Party Gauge has finished its animation, else FALSE.
*/
BOOL PartyGauge_HideIsDone(PartyGauge *gauge);
/**
* @brief Free the Party Gauge and its resources back to the heap.
*
* @param gauge
*/
void PartyGauge_Free(PartyGauge *gauge);
#endif // POKEPLATINUM_BATTLE_PARTY_GAUGE_H

47
include/constants/palette.h Normal file
View File

@@ -0,0 +1,47 @@
#ifndef POKEPLATINUM_CONSTANTS_PALETTE_H
#define POKEPLATINUM_CONSTANTS_PALETTE_H
enum PaletteBufferId {
PLTTBUF_MAIN_BG = 0,
PLTTBUF_SUB_BG,
PLTTBUF_MAIN_OBJ,
PLTTBUF_SUB_OBJ,
PLTTBUF_EX_BEGIN,
PLTTBUF_MAIN_EX_BG_0 = PLTTBUF_EX_BEGIN,
PLTTBUF_MAIN_EX_BG_1,
PLTTBUF_MAIN_EX_BG_2,
PLTTBUF_MAIN_EX_BG_3,
PLTTBUF_SUB_EX_BG_0,
PLTTBUF_SUB_EX_BG_1,
PLTTBUF_SUB_EX_BG_2,
PLTTBUF_SUB_EX_BG_3,
PLTTBUF_MAIN_EX_OBJ,
PLTTBUF_SUB_EX_OBJ,
PLTTBUF_MAX,
};
#define PLTTBUF_MAIN_BG_F (1<<PLTTBUF_MAIN_BG)
#define PLTTBUF_SUB_BG_F (1<<PLTTBUF_SUB_BG)
#define PLTTBUF_MAIN_OBJ_F (1<<PLTTBUF_MAIN_OBJ)
#define PLTTBUF_SUB_OBJ_F (1<<PLTTBUF_SUB_OBJ)
#define PLTTBUF_MAIN_EX_BG_0_F (1<<PLTTBUF_MAIN_EX_BG_0)
#define PLTTBUF_MAIN_EX_BG_1_F (1<<PLTTBUF_MAIN_EX_BG_1)
#define PLTTBUF_MAIN_EX_BG_2_F (1<<PLTTBUF_MAIN_EX_BG_2)
#define PLTTBUF_MAIN_EX_BG_3_F (1<<PLTTBUF_MAIN_EX_BG_3)
#define PLTTBUF_SUB_EX_BG_0_F (1<<PLTTBUF_SUB_EX_BG_0)
#define PLTTBUF_SUB_EX_BG_1_F (1<<PLTTBUF_SUB_EX_BG_1)
#define PLTTBUF_SUB_EX_BG_2_F (1<<PLTTBUF_SUB_EX_BG_2)
#define PLTTBUF_SUB_EX_BG_3_F (1<<PLTTBUF_SUB_EX_BG_3)
#define PLTTBUF_MAIN_EX_OBJ_F (1<<PLTTBUF_MAIN_EX_OBJ)
#define PLTTBUF_SUB_EX_OBJ_F (1<<PLTTBUF_SUB_EX_OBJ)
#define PLTTBUF_ALL_F ((1<<PLTTBUF_MAX)-1)
enum PaletteSelector {
PLTTSEL_TRANSPARENT,
PLTTSEL_OPAQUE,
PLTTSEL_BOTH,
};
#endif // POKEPLATINUM_CONSTANTS_PALETTE_H

4
include/constants/sdat.h
View File

@@ -32,6 +32,10 @@ enum SDATID {
SEQ_BATTLE_REGI_TRIO,
SEQ_CONFIRM = 1500,
SEQ_PARTY_GAUGE_ARROW_IN = 1809,
SEQ_PARTY_GAUGE_BALL_IN,
SEQ_PARTY_GAUGE_BALL_EMPTY,
};
#endif // POKEPLATINUM_CONSTANTS_SDAT_H

4
include/overlay005/ov5_021D2F14.h
View File

@@ -7,7 +7,7 @@
#include "overlay005/struct_ov5_021D30A8.h"
#include "overlay007/struct_ov7_0224F2EC.h"
#include "overlay007/struct_ov7_0224F358.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "overlay104/struct_ov104_02241308.h"
void ov5_021D2F14(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3);
@@ -22,7 +22,7 @@ void ov5_021D3388(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int p
void ov5_021D339C(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4);
void ov5_021D33B0(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, BOOL param3, int param4, int param5);
void ov5_021D3414(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5);
CellActorData * ov5_021D3584(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov104_0223F9E0 * param1);
CellActorData * ov5_021D3584(UnkStruct_ov5_021D30A8 * param0, const SpriteTemplate * param1);
void ov5_021D375C(UnkStruct_ov5_021D30A8 * param0);
#endif // POKEPLATINUM_OV5_021D2F14_H

2
include/overlay011/ov11_0221F800.h
View File

@@ -4,6 +4,6 @@
#include "struct_decls/struct_02002F38_decl.h"
const u16 * ov11_0221F800(int param0);
void ov11_0221F81C(PaletteSys * param0, int param1, int param2, int param3, int param4);
void ov11_0221F81C(PaletteData * param0, int param1, int param2, int param3, int param4);
#endif // POKEPLATINUM_OV11_0221F800_H

2
include/overlay012/funcptr_ov12_02239E64_1.h
View File

@@ -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 *, CellTransferStateData *, AnimationResourceCollection *, GraphicElementData *);
typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, GraphicElementData *);
#endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H

2
include/overlay012/funcptr_ov12_02239E68.h
View File

@@ -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 *, CellTransferStateData *, AnimationResourceCollection *, CellActorData *);
typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, CellActorData *);
#endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H

12
include/overlay012/ov12_0221FC20.h
View File

@@ -18,7 +18,7 @@
#include "overlay012/funcptr_ov12_02239EEC.h"
#include "overlay016/struct_ov16_02264408.h"
#include "overlay016/struct_ov16_02265BBC.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "spl.h"
@@ -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);
AnimationResourceCollection * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
AnimationResourceCollection * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
CellTransferStateData * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
SpriteGfxHandler * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
SpriteGfxHandler * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
SpriteRenderer * 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);
@@ -62,14 +62,14 @@ int ov12_02223178(UnkStruct_ov12_02223178 * param0);
s8 ov12_0222317C(UnkStruct_ov12_0221FCDC * param0, s8 param1);
s8 ov12_02223234(s8 param0, s8 param1, s8 param2);
BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC * param0, int param1[], int param2);
UnkStruct_ov104_0223F9E0 ov12_0222329C(UnkStruct_ov12_0221FCDC * param0);
SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC * param0);
int ov12_022232B8(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_022232C4(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_022232D0(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_022232E0(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_022232EC(UnkStruct_ov12_0221FCDC * param0, int param1);
Sprite * ov12_022232FC(UnkStruct_ov12_0221FCDC * param0, int param1);
PaletteSys * ov12_0222332C(UnkStruct_ov12_0221FCDC * param0);
PaletteData * ov12_0222332C(UnkStruct_ov12_0221FCDC * param0);
int ov12_02223334(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_02223344(UnkStruct_ov12_0221FCDC * param0, int param1);
int ov12_02223354(UnkStruct_ov12_0221FCDC * param0, int param1);

2
include/overlay012/ov12_02225864.h
View File

@@ -79,7 +79,7 @@ void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 * param4)
BOOL ov12_022267A8(int * param0, int param1, s32 param2);
BOOL ov12_02226848(UnkStruct_ov12_022267D4 * param0);
void ov12_02226858(UnkStruct_ov12_022267D4 * param0);
UnkStruct_ov12_022267D4 * ov12_02226870(PaletteSys * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10);
UnkStruct_ov12_022267D4 * ov12_02226870(PaletteData * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10);
void ov12_02226924(UnkStruct_ov12_0221FCDC * param0);
void ov12_02226954(UnkStruct_ov12_0221FCDC * param0);

2
include/overlay012/ov12_022269C0.h
View File

@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
#endif // POKEPLATINUM_OV12_022269C0_H

10
include/overlay012/ov12_02226B84.h
View File

@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02227828(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222797C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02227CBC(UnkStruct_ov12_0221FCDC * param0);
@@ -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, 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_0222A1AC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222A604(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222A8F4(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222AB50(UnkStruct_ov12_0221FCDC * param0);

6
include/overlay012/ov12_0222AC70.h
View File

@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222B194(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222B45C(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222B68C(UnkStruct_ov12_0221FCDC * param0);
@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222CFA0(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
#endif // POKEPLATINUM_OV12_0222AC70_H

10
include/overlay012/ov12_0222D6B0.h
View File

@@ -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, 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_0222D7C0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222E1A8(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222E248(CellActorData * param0);
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);
void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
#endif // POKEPLATINUM_OV12_0222D6B0_H

2
include/overlay012/ov12_0222E91C.h
View File

@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0222EFB0(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222F2F8(UnkStruct_ov12_0221FCDC * param0);
void ov12_0222F5EC(UnkStruct_ov12_0221FCDC * param0);

28
include/overlay012/ov12_0222F700.h
View File

@@ -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, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * 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, 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_02230CEC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02231444(UnkStruct_ov12_0221FCDC * param0);
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_02231650(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02231E7C(UnkStruct_ov12_0221FCDC * param0);
void ov12_02232024(UnkStruct_ov12_0221FCDC * param0);
void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_0223249C(UnkStruct_ov12_0221FCDC * param0);
void ov12_022326AC(UnkStruct_ov12_0221FCDC * param0);
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_022329E0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02233178(UnkStruct_ov12_0221FCDC * param0);
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_02233454(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02233CD4(UnkStruct_ov12_0221FCDC * param0);
void ov12_02233F30(UnkStruct_ov12_0221FCDC * param0);
void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02234214(UnkStruct_ov12_0221FCDC * param0);
void ov12_022342C4(UnkStruct_ov12_0221FCDC * param0);
void ov12_022344D0(UnkStruct_ov12_0221FCDC * param0);

8
include/overlay012/ov12_022346A4.h
View File

@@ -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, 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);
void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3);
#endif // POKEPLATINUM_OV12_022346A4_H

6
include/overlay012/struct_ov12_02223764_sub1.h
View File

@@ -6,9 +6,9 @@
#include "struct_decls/struct_0200C704_decl.h"
typedef struct {
CellTransferStateData * unk_00;
AnimationResourceCollection * unk_04;
PaletteSys * unk_08;
SpriteRenderer * unk_00;
SpriteGfxHandler * unk_04;
PaletteData * unk_08;
} UnkStruct_ov12_02223764_sub1;
#endif // POKEPLATINUM_STRUCT_OV12_02223764_SUB1_H

8
include/overlay012/struct_ov12_0223595C.h
View File

@@ -13,11 +13,11 @@ typedef struct {
u8 unk_02;
u8 unk_03;
UnkStruct_ov12_0221FCDC * unk_04;
CellTransferStateData * unk_08;
AnimationResourceCollection * unk_0C;
AnimationResourceCollection * unk_10;
SpriteRenderer * unk_08;
SpriteGfxHandler * unk_0C;
SpriteGfxHandler * unk_10;
BGL * unk_14;
PaletteSys * unk_18;
PaletteData * unk_18;
} UnkStruct_ov12_0223595C;
#endif // POKEPLATINUM_STRUCT_OV12_0223595C_H

4
include/overlay012/struct_ov12_02237728.h
View File

@@ -13,8 +13,8 @@ typedef struct BallThrow {
int ballID;
int bgPrio;
int surface;
CellTransferStateData *cellActorSys;
PaletteSys *paletteSys;
SpriteRenderer *cellActorSys;
PaletteData *paletteSys;
BattleSystem *battleSys;
} BallThrow;

4
include/overlay013/struct_ov13_022213F0.h
View File

@@ -18,7 +18,7 @@ typedef struct {
UnkStruct_ov13_0221FC20 * unk_00;
UnkStruct_ov13_02221ED0 unk_04[6];
BGL * unk_1E0;
PaletteSys * unk_1E4;
PaletteData * unk_1E4;
u16 unk_1E8[4][96];
u16 unk_4E8[4][96];
u16 unk_7E8[4][65];
@@ -41,7 +41,7 @@ typedef struct {
MessageLoader * unk_1FA4;
UnkStruct_0200B358 * unk_1FA8;
Strbuf* unk_1FAC;
AnimationResourceCollection * unk_1FB0;
SpriteGfxHandler * unk_1FB0;
CellActorData * unk_1FB4[38];
Window unk_204C[2];
Window * unk_206C;

4
include/overlay013/struct_ov13_02227244.h
View File

@@ -18,7 +18,7 @@
typedef struct {
UnkStruct_ov13_022264F4 * unk_00;
BGL * unk_04;
PaletteSys * unk_08;
PaletteData * unk_08;
UnkStruct_0200C440 * unk_0C;
MessageLoader * unk_10;
UnkStruct_0200B358 * unk_14;
@@ -31,7 +31,7 @@ typedef struct {
UnkStruct_ov13_02228A50 * unk_34;
UnkStruct_ov16_0226DEEC * unk_38;
BagItem unk_3C[5][36];
AnimationResourceCollection * unk_30C;
SpriteGfxHandler * unk_30C;
CellActorData * unk_310[6];
u16 unk_328[3][144];
u16 unk_688[4][130];

10
include/overlay016/ov16_0223DF00.h
View File

@@ -37,7 +37,7 @@
#include "overlay016/struct_ov16_02268A14_decl.h"
#include "overlay016/struct_ov16_0226D160_decl.h"
#include "overlay016/ov16_0226D094.h"
#include "battle/party_gauge.h"
#include "enums.h"
@@ -82,8 +82,8 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler);
Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot);
UnkStruct_02007768 * ov16_0223E000(BattleSystem * param0);
UnkStruct_ov12_0221FCDC * ov16_0223E008(BattleSystem * param0);
CellTransferStateData * ov16_0223E010(BattleSystem * param0);
AnimationResourceCollection * ov16_0223E018(BattleSystem * param0);
SpriteRenderer * ov16_0223E010(BattleSystem * param0);
SpriteGfxHandler * ov16_0223E018(BattleSystem * param0);
UnkStruct_ov16_02268520 * ov16_0223E020(BattleSystem * param0, int param1);
UnkStruct_ov16_02268A14 * ov16_0223E02C(BattleSystem * param0);
PartyGauge * ov16_0223E034(BattleSystem * param0, enum PartyGaugeSide param1);
@@ -92,7 +92,7 @@ UnkStruct_0200C440 * ov16_0223E04C(BattleSystem * param0);
UnkStruct_0200C440 * ov16_0223E054(BattleSystem * param0);
MessageLoader * BattleSystem_MessageLoader(BattleSystem * param0);
MessageLoader * ov16_0223E060(BattleSystem * param0);
PaletteSys * BattleSystem_PaletteSys(BattleSystem * param0);
PaletteData * BattleSystem_PaletteSys(BattleSystem * param0);
UnkStruct_02026324 * ov16_0223E068(BattleSystem * param0);
u8 * ov16_0223E06C(BattleSystem * param0);
u8 * ov16_0223E074(BattleSystem * param0);
@@ -292,7 +292,7 @@ void ov16_0223F9A0(BattleSystem * param0, int param1);
* FALSE if not.
*/
BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species);
void ov16_0223F9F0(void);
void Battle_SetDefaultBlend(void);
u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4);
u8 BattleMessage_Print(BattleSystem * param0, MessageLoader * param1, BattleMessage * param2, int param3);
u8 BattleMessage_PrintToWindow(BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8);

4
include/overlay016/ov16_02266F1C.h
View File

@@ -8,8 +8,8 @@
#include "struct_decls/cell_actor_data.h"
#include "overlay016/struct_ov16_022674C4.h"
void ov16_02266F1C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, int param4);
CellActorData * ov16_02267060(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
void ov16_02266F1C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, int param4);
CellActorData * ov16_02267060(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2);
void ov16_02267084(UnkStruct_ov16_022674C4 * param0, u32 param1, u32 param2);
void ov16_02267220(UnkStruct_ov16_022674C4 * param0);
void ov16_02267258(UnkStruct_ov16_022674C4 * param0);

45
include/overlay016/ov16_0226D094.h
View File

@@ -1,45 +0,0 @@
#ifndef POKEPLATINUM_OV16_0226D094_H
#define POKEPLATINUM_OV16_0226D094_H
#include "struct_decls/struct_02002F38_decl.h"
#include "struct_decls/struct_0200C6E4_decl.h"
#include "struct_decls/struct_0200C704_decl.h"
#include "overlay016/struct_ov16_0226D160_decl.h"
#include "enums.h"
enum PartyGaugeSide {
PARTY_GAUGE_OURS,
PARTY_GAUGE_THEIRS,
};
enum ShowPartyGaugeType {
SHOW_PARTY_GAUGE_BATTLE_START,
SHOW_PARTY_GAUGE_MID_BATTLE,
};
enum HidePartyGaugeType {
HIDE_PARTY_GAUGE_BATTLE_START,
HIDE_PARTY_GAUGE_MID_BATTLE,
};
enum PartyGaugePosition {
PARTY_GAUGE_POSITION_HIGH,
PARTY_GAUGE_POSITION_MIDDLE,
PARTY_GAUGE_POSITION_LOW,
};
enum HideArrowType {
HIDE_ARROW_FADE_AND_SCROLL,
HIDE_ARROW_FADE_IN_PLACE,
};
void ov16_0226D094(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2);
void ov16_0226D12C(AnimationResourceCollection * param0);
PartyGauge * ov16_0226D194(u8 param0[], enum PartyGaugeSide param1, enum ShowPartyGaugeType param2, enum PartyGaugePosition param3, CellTransferStateData * param4, AnimationResourceCollection * param5);
BOOL ov16_0226D1FC(PartyGauge * param0);
void ov16_0226D220(PartyGauge * param0, enum HideArrowType param1, enum HidePartyGaugeType param2);
BOOL ov16_0226D258(PartyGauge * param0);
void ov16_0226D27C(PartyGauge * param0);
#endif // POKEPLATINUM_OV16_0226D094_H

6
include/overlay016/ov16_0226DB7C.h
View File

@@ -6,9 +6,9 @@
#include "struct_decls/struct_0200C704_decl.h"
#include "overlay016/struct_ov16_0226DC24_decl.h"
void ov16_0226DB7C(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DBFC(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DC24 * ov16_0226DC24(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DB7C(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DBFC(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DC24 * ov16_0226DC24(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DCA8(UnkStruct_ov16_0226DC24 * param0);
void ov16_0226DCCC(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
void ov16_0226DD54(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8);

6
include/overlay016/ov16_0226DE44.h
View File

@@ -6,9 +6,9 @@
#include "struct_decls/struct_0200C704_decl.h"
#include "overlay016/struct_ov16_0226DEEC_decl.h"
void ov16_0226DE44(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DEC4(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DEEC * ov16_0226DEEC(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DE44(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, PaletteData * param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DEC4(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DEEC * ov16_0226DEEC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DF68(UnkStruct_ov16_0226DEEC * param0);
void ov16_0226DF80(UnkStruct_ov16_0226DEEC * param0, int param1, int param2, fx32 param3);
void ov16_0226DFB0(UnkStruct_ov16_0226DEEC * param0, int param1, int param2);

4
include/overlay016/struct_ov16_02264408.h
View File

@@ -10,9 +10,9 @@
#include "overlay016/struct_ov16_02264408_sub1.h"
typedef struct {
CellTransferStateData * unk_00;
SpriteRenderer * unk_00;
BGL * unk_04;
PaletteSys * unk_08;
PaletteData * unk_08;
UnkStruct_ov16_0223E0C8 * unk_0C[4];
u8 unk_1C[4];
Sprite * unk_20[4];

10
include/overlay017/ov17_0223F118.h
View File

@@ -15,17 +15,17 @@
GenericPointerData * ov17_0223F140(int param0);
void ov17_0223F1E0(GenericPointerData * param0);
void ov17_0223F1E8(int param0, BGL * param1, AnimationResourceCollection * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F1E8(int param0, BGL * param1, SpriteGfxHandler * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 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);
Strbuf* ov17_0223F310(u32 param0, u32 param1);
void ov17_0223F334(UnkStruct_02095C48 * param0, int param1);
void ov17_0223F374(UnkStruct_02095C48 * param0);
void ov17_0223F560(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6);
void ov17_0223F5E8(AnimationResourceCollection * param0, int param1, int param2, int param3, int param4);
void ov17_0223F630(UnkStruct_ov17_0223F6E8 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10);
void ov17_0223F560(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6);
void ov17_0223F5E8(SpriteGfxHandler * param0, int param1, int param2, int param3, int param4);
void ov17_0223F630(UnkStruct_ov17_0223F6E8 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10);
void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 * param0);
UnkStruct_ov17_0223F744 * ov17_0223F70C(int param0, PaletteSys * param1, const u16 * param2, int param3, int param4, u32 param5);
UnkStruct_ov17_0223F744 * ov17_0223F70C(int param0, PaletteData * param1, const u16 * param2, int param3, int param4, u32 param5);
void ov17_0223F744(UnkStruct_ov17_0223F744 * param0);
BOOL ov17_0223F760(void);

12
include/overlay017/ov17_02241270.h
View File

@@ -6,13 +6,13 @@
#include "struct_decls/struct_0200C704_decl.h"
#include "struct_decls/cell_actor_data.h"
void ov17_02241270(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
CellActorData * ov17_022412C0(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
void ov17_022412F0(AnimationResourceCollection * param0);
void ov17_02241270(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
CellActorData * ov17_022412C0(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2);
void ov17_022412F0(SpriteGfxHandler * param0);
void ov17_02241314(CellActorData * param0);
void ov17_0224131C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
CellActorData * ov17_0224136C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4);
void ov17_0224131C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
CellActorData * ov17_0224136C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4);
void ov17_022413AC(CellActorData * param0);
void ov17_022413B4(AnimationResourceCollection * param0);
void ov17_022413B4(SpriteGfxHandler * param0);
#endif // POKEPLATINUM_OV17_02241270_H

16
include/overlay017/ov17_022413D8.h
View File

@@ -26,8 +26,8 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C * param0);
void ov17_022416E4(UnkStruct_ov17_0223F88C * param0);
void ov17_02241928(UnkStruct_ov17_0223F88C * param0, UnkStruct_02095C48 * param1, NARC * param2);
void ov17_0224197C(UnkStruct_ov17_0223F88C * param0);
void ov17_022419AC(PaletteSys * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, NARC * param3);
void ov17_02241A00(AnimationResourceCollection * param0);
void ov17_022419AC(PaletteData * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, NARC * param3);
void ov17_02241A00(SpriteGfxHandler * param0);
void ov17_02241A24(UnkStruct_ov17_0223F88C * param0);
void ov17_02241A64(UnkStruct_ov17_0223F88C * param0);
void ov17_02241A8C(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
@@ -35,12 +35,12 @@ void ov17_02241B1C(UnkStruct_ov17_0223F88C * param0);
void ov17_02241B3C(UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3);
void ov17_02241D94(UnkStruct_ov17_0223F88C * param0, int param1, NARC * param2);
void ov17_02241E24(UnkStruct_ov17_0223F88C * param0);
void ov17_02241E58(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_02241EA4(AnimationResourceCollection * param0);
void ov17_02241E58(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_02241EA4(SpriteGfxHandler * param0);
void ov17_02241EF0(UnkStruct_ov17_0223F88C * param0);
void ov17_02241F34(UnkStruct_ov17_0223F88C * param0, int param1, int param2, int param3);
void ov17_02242154(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_022421E0(AnimationResourceCollection * param0);
void ov17_02242154(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_022421E0(SpriteGfxHandler * param0);
void ov17_02242248(UnkStruct_ov17_0223F88C * param0);
BOOL ov17_022424A8(UnkStruct_ov17_0223F88C * param0, int param1);
void ov17_022424D4(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
@@ -53,8 +53,8 @@ void ov17_02242EE4(UnkStruct_ov17_02246F24 * param0, int param1);
void ov17_02242FA4(UnkStruct_ov17_02246F24 * param0);
void ov17_02242FC0(UnkStruct_ov17_02246F24 * param0);
void ov17_02242FE8(UnkStruct_ov17_02246F24 * param0);
void ov17_02243040(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224308C(AnimationResourceCollection * param0);
void ov17_02243040(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224308C(SpriteGfxHandler * param0);
void ov17_022430AC(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
void ov17_022430F8(UnkStruct_ov17_0223F88C * param0);
void ov17_02243120(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_022449B8 * param1, int param2);

4
include/overlay017/ov17_022476F8.h
View File

@@ -10,8 +10,8 @@
void ov17_022476F8(UnkStruct_ov17_022476F8 * param0, int param1);
void ov17_02247734(UnkStruct_ov17_022476F8 * param0);
void ov17_0224774C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_02247798(AnimationResourceCollection * param0);
void ov17_0224774C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_02247798(SpriteGfxHandler * param0);
void ov17_022477B8(UnkStruct_ov17_02247A48 * param0, int param1, int param2, fx32 param3, int param4);
void ov17_022478D0(UnkStruct_ov17_02247A48 * param0, int param1);
void ov17_02247918(UnkStruct_ov17_02247A48 * param0);

48
include/overlay017/ov17_0224A0FC.h
View File

@@ -22,42 +22,42 @@ s16 ov17_0224A10C(int param0);
s16 ov17_0224A120(int param0);
void ov17_0224A134(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224A1EC(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A20C(CellTransferStateData * param0, AnimationResourceCollection * param1);
void ov17_0224A210(AnimationResourceCollection * param0);
void ov17_0224A20C(SpriteRenderer * param0, SpriteGfxHandler * param1);
void ov17_0224A210(SpriteGfxHandler * param0);
void ov17_0224A214(UnkStruct_ov17_0224A1EC * param0, int param1, int param2);
void ov17_0224A368(UnkStruct_ov17_0224A1EC * param0, int param1, int param2, int param3);
void ov17_0224A390(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224A428(AnimationResourceCollection * param0);
void ov17_0224A390(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224A428(SpriteGfxHandler * param0);
void ov17_0224A580(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A5A8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224A5F8(AnimationResourceCollection * param0);
void ov17_0224A61C(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
void ov17_0224A5A8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224A5F8(SpriteGfxHandler * param0);
void ov17_0224A61C(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2);
void ov17_0224A650(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A674(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A7B8(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A7E0(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, u8 param5);
void ov17_0224A7E0(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, u8 param5);
void ov17_0224A95C(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224A984(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224A9D4(AnimationResourceCollection * param0);
void ov17_0224A9F8(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
void ov17_0224A984(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224A9D4(SpriteGfxHandler * param0);
void ov17_0224A9F8(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2);
void ov17_0224AA1C(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224AA38(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224AA58(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224AA94(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224AAE4(AnimationResourceCollection * param0);
void ov17_0224AB08(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
void ov17_0224AA94(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224AAE4(SpriteGfxHandler * param0);
void ov17_0224AB08(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2);
void ov17_0224ABB0(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224ABDC(UnkStruct_ov17_0224A1EC * param0, int param1);
void ov17_0224AC78(UnkStruct_ov17_0224ABFC * param0, int param1, int param2);
void ov17_0224AC80(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224ACD0(AnimationResourceCollection * param0);
void ov17_0224ACF4(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
void ov17_0224AC80(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224ACD0(SpriteGfxHandler * param0);
void ov17_0224ACF4(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2);
void ov17_0224ACF8(UnkStruct_ov17_0224A1EC * param0);
void ov17_0224ACFC(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224AD4C(AnimationResourceCollection * param0);
void ov17_0224ACFC(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224AD4C(SpriteGfxHandler * param0);
BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 * param0, int param1, int param2);
void ov17_0224AFA8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224AFF8(AnimationResourceCollection * param0);
void ov17_0224AFA8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224AFF8(SpriteGfxHandler * param0);
BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224B058(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224B068(UnkStruct_ov17_0224A1EC * param0, int param1);
@@ -75,9 +75,9 @@ int ov17_0224BDF0(UnkStruct_ov17_0224DF54 * param0, int param1);
int ov17_0224BE24(UnkStruct_ov17_0224DF54 * param0, int param1);
void ov17_0224C2CC(UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2);
int ov17_0224C300(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224C310(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
void ov17_0224C360(AnimationResourceCollection * param0);
void ov17_0224C384(UnkStruct_ov17_0224DF54 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
void ov17_0224C310(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2);
void ov17_0224C360(SpriteGfxHandler * param0);
void ov17_0224C384(UnkStruct_ov17_0224DF54 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2);
void ov17_0224C3E4(UnkStruct_ov17_0224DF54 * param0);
void ov17_0224C434(UnkStruct_ov17_0224B058 * param0, u32 param1, u32 param2, int param3);
void ov17_0224C47C(UnkStruct_ov17_0224B058 * param0, int param1);

12
include/overlay017/ov17_0224F080.h
View File

@@ -4,7 +4,7 @@
#include "struct_decls/struct_0200C6E4_decl.h"
#include "struct_decls/struct_0200C704_decl.h"
#include "struct_decls/cell_actor_data.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include <nnsys.h>
@@ -13,11 +13,11 @@ u32 ov17_0224F098(void);
u32 ov17_0224F09C(void);
u8 ov17_0224F0A0(int param0);
u32 ov17_0224F0B8(void);
void ov17_0224F0BC(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void ov17_0224F0F0(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3);
void ov17_0224F138(AnimationResourceCollection * param0, u32 param1);
void ov17_0224F140(AnimationResourceCollection * param0, u32 param1, u32 param2);
CellActorData * ov17_0224F154(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
void ov17_0224F0BC(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void ov17_0224F0F0(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3);
void ov17_0224F138(SpriteGfxHandler * param0, u32 param1);
void ov17_0224F140(SpriteGfxHandler * param0, u32 param1, u32 param2);
CellActorData * ov17_0224F154(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3);
void ov17_0224F184(CellActorData * param0);
#endif // POKEPLATINUM_OV17_0224F080_H

6
include/overlay017/ov17_02252AB0.h
View File

@@ -6,9 +6,9 @@
#include "struct_decls/struct_0200C704_decl.h"
#include "overlay017/struct_ov17_02252B48_decl.h"
void ov17_02252AB0(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6);
void ov17_02252B20(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov17_02252B48 * ov17_02252B48(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov17_02252AB0(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, u32 param3, u32 param4, u32 param5, u32 param6);
void ov17_02252B20(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov17_02252B48 * ov17_02252B48(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov17_02252BCC(UnkStruct_ov17_02252B48 * param0);
void ov17_02252BF0(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
void ov17_02252C78(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, fx32 param5);

2
include/overlay017/struct_ov17_0223F744.h
View File

@@ -6,7 +6,7 @@
typedef struct {
SysTask * unk_00;
PaletteSys * unk_04;
PaletteData * unk_04;
s32 unk_08;
const u16 * unk_0C;
u8 unk_10;

6
include/overlay017/struct_ov17_0223F88C.h
View File

@@ -22,8 +22,8 @@ typedef struct {
UnkStruct_02095C48_sub1 * unk_00;
UnkStruct_02007768 * unk_04;
Sprite * unk_08[4];
CellTransferStateData * unk_18;
AnimationResourceCollection * unk_1C;
SpriteRenderer * unk_18;
SpriteGfxHandler * unk_1C;
UnkStruct_ov12_0221FCDC * unk_20;
BGL * unk_24;
Window unk_28[1];
@@ -33,7 +33,7 @@ typedef struct {
MessageLoader * unk_44;
UnkStruct_0200B358 * unk_48;
Strbuf* unk_4C;
PaletteSys * unk_50;
PaletteData * unk_50;
UnkStruct_02012744 * unk_54;
UnkStruct_ov16_0223E0C8 unk_58[4];
UnkStruct_ov16_0223E0C8 unk_98;

2
include/overlay017/struct_ov17_0224145C.h
View File

@@ -5,7 +5,7 @@
#include "struct_decls/sys_task.h"
typedef struct {
PaletteSys * unk_00;
PaletteData * unk_00;
SysTask * unk_04;
s16 unk_08;
u8 unk_0A;

6
include/overlay017/struct_ov17_022476F8.h
View File

@@ -21,14 +21,14 @@ typedef struct {
UnkStruct_02007768 * unk_04;
Sprite * unk_08[4];
Sprite * unk_18;
CellTransferStateData * unk_1C;
AnimationResourceCollection * unk_20;
SpriteRenderer * unk_1C;
SpriteGfxHandler * unk_20;
BGL * unk_24;
Window unk_28[1];
MessageLoader * unk_38;
UnkStruct_0200B358 * unk_3C;
Strbuf* unk_40;
PaletteSys * unk_44;
PaletteData * unk_44;
UnkStruct_ov16_0223E0C8 unk_48[4];
CellActorData * unk_88[8];
UnkStruct_ov17_0223F6E8 unk_A8;

6
include/overlay017/struct_ov17_0224A1EC.h
View File

@@ -32,14 +32,14 @@ typedef struct {
UnkStruct_ov17_0224B09C unk_04[4];
UnkStruct_02007768 * unk_44;
Sprite * unk_48[4];
CellTransferStateData * unk_58;
AnimationResourceCollection * unk_5C;
SpriteRenderer * unk_58;
SpriteGfxHandler * unk_5C;
BGL * unk_60;
Window unk_64[2];
MessageLoader * unk_84;
UnkStruct_0200B358 * unk_88;
Strbuf* unk_8C;
PaletteSys * unk_90;
PaletteData * unk_90;
UnkStruct_02012744 * unk_94;
UnkStruct_ov16_0223E0C8 unk_98[4];
CellActorData * unk_D8[68];

6
include/overlay017/struct_ov17_022507C4.h
View File

@@ -22,14 +22,14 @@ typedef struct {
UnkStruct_02095C48_sub1 * unk_00;
UnkStruct_02007768 * unk_04;
Sprite * unk_08[4];
CellTransferStateData * unk_18;
AnimationResourceCollection * unk_1C;
SpriteRenderer * unk_18;
SpriteGfxHandler * unk_1C;
BGL * unk_20;
Window unk_24[9];
MessageLoader * unk_B4;
UnkStruct_0200B358 * unk_B8;
Strbuf* unk_BC;
PaletteSys * unk_C0;
PaletteData * unk_C0;
UnkStruct_02012744 * unk_C4;
UnkStruct_ov16_0223E0C8 unk_C8[4];
UnkStruct_ov17_0223F6E8 unk_108;

2
include/overlay021/struct_ov21_021E8E0C.h
View File

@@ -8,7 +8,7 @@
typedef struct {
BGL * unk_00;
PaletteSys * unk_04;
PaletteData * unk_04;
UnkStruct_02007768 * unk_08;
int unk_0C;
Pokemon * unk_10;

6
include/overlay062/struct_ov62_0223118C.h
View File

@@ -19,11 +19,11 @@
typedef struct {
NARC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
u8 padding_0C[4];
BGL * unk_10;
PaletteSys * unk_14;
PaletteData * unk_14;
UnkStruct_02023FCC * unk_18;
UnkUnion_02022594 unk_1C[5];
BOOL unk_30;

6
include/overlay062/struct_ov62_02246BF4_sub2.h
View File

@@ -11,10 +11,10 @@
typedef struct {
NARC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
BGL * unk_0C;
PaletteSys * unk_10;
PaletteData * unk_10;
UnkStruct_02023FCC * unk_14;
UnkUnion_02022594 unk_18[24];
BOOL unk_78;

2
include/overlay063/ov63_0222AE60.h
View File

@@ -8,7 +8,7 @@
#include "overlay063/struct_ov63_0222BB38_decl.h"
#include "overlay064/struct_ov64_022302EC.h"
UnkStruct_ov63_0222AE60 * ov63_0222AE60(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3);
UnkStruct_ov63_0222AE60 * ov63_0222AE60(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3);
void ov63_0222AF14(UnkStruct_ov63_0222AE60 * param0);
void ov63_0222AF94(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4);
void ov63_0222AFD0(UnkStruct_ov63_0222AE60 * param0, u32 param1);

4
include/overlay063/ov63_0222CCE4.h
View File

@@ -8,8 +8,8 @@
#include "overlay063/struct_ov63_0222CD2C.h"
#include "overlay063/struct_ov63_0222CE44.h"
UnkStruct_ov63_0222CD2C * ov63_0222CCE4(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov63_0222CD2C * ov63_0222CD2C(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
UnkStruct_ov63_0222CD2C * ov63_0222CCE4(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov63_0222CD2C * ov63_0222CD2C(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
void ov63_0222CD9C(UnkStruct_ov63_0222CD2C * param0);
void ov63_0222CDE8(UnkStruct_ov63_0222CD2C * param0, u32 param1, int param2, u32 param3);
void ov63_0222CE0C(UnkStruct_ov63_0222CD2C * param0, u32 param1);

6
include/overlay076/ov76_0223B870.h
View File

@@ -41,14 +41,14 @@ void ov76_0223C4AC(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C544(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C568(UnkStruct_ov76_0223DE00 * param0, int param1);
void ov76_0223C588(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C5A4(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
void ov76_0223C5A4(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
void ov76_0223C61C(UnkStruct_ov76_0223DE00 * param0, NARC * param1);
void ov76_0223C7E0(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C80C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2);
void ov76_0223C88C(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C8BC(UnkStruct_ov76_0223DE00 * param0);
void ov76_0223C8EC(BGL * param0, PaletteSys * param1, int param2);
void ov76_0223C974(BGL * param0, PaletteSys * param1, int param2);
void ov76_0223C8EC(BGL * param0, PaletteData * param1, int param2);
void ov76_0223C974(BGL * param0, PaletteData * param1, int param2);
void ov76_0223CA30(Window * param0, int param1);
void ov76_0223CA98(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7);
void ov76_0223CB58(UnkStruct_ov76_0223DE00 * param0);

6
include/overlay076/struct_ov76_0223C398.h
View File

@@ -25,10 +25,10 @@
typedef struct {
int unk_00;
BOOL unk_04;
CellTransferStateData * unk_08;
AnimationResourceCollection * unk_0C;
SpriteRenderer * unk_08;
SpriteGfxHandler * unk_0C;
BGL * unk_10;
PaletteSys * unk_14;
PaletteData * unk_14;
Window unk_18[11];
ResourceMetadata * unk_C8;
UIControlData * unk_CC;

4
include/overlay079/struct_ov79_021D0E1C.h
View File

@@ -53,8 +53,8 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
NNSG2dScreenData * unk_E0;
NNSG2dScreenData * unk_E4;
Window unk_E8[13];
CellTransferStateData * unk_1B8;
AnimationResourceCollection * unk_1BC;
SpriteRenderer * unk_1B8;
SpriteGfxHandler * unk_1BC;
GraphicElementData * unk_1C0[3];
GraphicElementData * unk_1CC[5];
GraphicElementData * unk_1E0[6];

2
include/overlay080/ov80_021D2AF4.h
View File

@@ -8,7 +8,7 @@
#include "overlay080/struct_ov80_021D2C5C.h"
#include "overlay080/struct_ov80_021D2E10.h"
UnkStruct_ov80_021D2C1C * ov80_021D2AF4(CellTransferStateData * param0, AnimationResourceCollection * param1, u8 * param2, short param3, int param4);
UnkStruct_ov80_021D2C1C * ov80_021D2AF4(SpriteRenderer * param0, SpriteGfxHandler * param1, u8 * param2, short param3, int param4);
void ov80_021D2C1C(UnkStruct_ov80_021D2C1C * param0);
UnkStruct_ov80_021D2C5C * ov80_021D2C5C(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3);
int ov80_021D2CC0(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3);

4
include/overlay080/struct_ov80_021D2A08.h
View File

@@ -59,8 +59,8 @@ typedef struct UnkStruct_ov80_021D2A08_t {
NNSG2dScreenData * unk_CC;
NNSG2dScreenData * unk_D0;
NNSG2dScreenData * unk_D4;
CellTransferStateData * unk_D8;
AnimationResourceCollection * unk_DC;
SpriteRenderer * unk_D8;
SpriteGfxHandler * unk_DC;
CellActorData * unk_E0;
} UnkStruct_ov80_021D2A08;

4
include/overlay084/struct_ov84_0223B5A0.h
View File

@@ -30,8 +30,8 @@ typedef struct {
TrainerInfo * unk_CC;
AnimationControlFlags * unk_D0;
NARC * unk_D4;
CellTransferStateData * unk_D8;
AnimationResourceCollection * unk_DC;
SpriteRenderer * unk_D8;
SpriteGfxHandler * unk_DC;
CellActorData * unk_E0[12];
UnkStruct_0200C440 * unk_110;
MessageLoader * unk_114;

6
include/overlay099/struct_ov99_021D2CB0.h
View File

@@ -24,11 +24,11 @@ typedef struct {
UnkStruct_0203E274 * unk_00;
BOOL unk_04;
BGL * unk_08;
PaletteSys * unk_0C;
PaletteData * unk_0C;
GenericPointerData * unk_10;
SysTask * unk_14;
CellTransferStateData * unk_18;
AnimationResourceCollection * unk_1C;
SpriteRenderer * unk_18;
SpriteGfxHandler * unk_1C;
MessageLoader * unk_20;
Window * unk_24;
UnkStruct_020203AC * unk_28;

6
include/overlay100/struct_ov100_021D46C8.h
View File

@@ -20,10 +20,10 @@
typedef struct {
NARC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
BGL * unk_0C;
PaletteSys * unk_10;
PaletteData * unk_10;
GenericPointerData * unk_14;
UnkStruct_020203AC * unk_18;
NNSFndAllocator unk_1C;

6
include/overlay104/ov104_0223D768.h
View File

@@ -7,9 +7,9 @@
#include "struct_decls/struct_0200C704_decl.h"
#include "struct_decls/cell_actor_data.h"
void ov104_0223D768(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, u16 param4);
void ov104_0223D7EC(AnimationResourceCollection * param0, u16 param1);
CellActorData * ov104_0223D828(CellTransferStateData * param0, AnimationResourceCollection * param1, u16 param2);
void ov104_0223D768(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, u16 param4);
void ov104_0223D7EC(SpriteGfxHandler * param0, u16 param1);
CellActorData * ov104_0223D828(SpriteRenderer * param0, SpriteGfxHandler * param1, u16 param2);
void ov104_0223D858(CellActorData * param0);
#endif // POKEPLATINUM_OV104_0223D768_H

2
include/overlay104/ov104_0223D9E4.h
View File

@@ -5,7 +5,7 @@
#include "struct_decls/struct_02018340_decl.h"
#include "overlay104/struct_ov104_0223DA28_decl.h"
UnkStruct_ov104_0223DA28 * ov104_0223D9E4(BGL * param0, PaletteSys * param1);
UnkStruct_ov104_0223DA28 * ov104_0223D9E4(BGL * param0, PaletteData * param1);
void ov104_0223DA28(UnkStruct_ov104_0223DA28 * param0);
#endif // POKEPLATINUM_OV104_0223D9E4_H

6
include/overlay104/struct_ov104_0223C4CC.h
View File

@@ -23,7 +23,7 @@
typedef struct UnkStruct_ov104_0223C4CC_t {
BGL * unk_00;
PaletteSys * unk_04;
PaletteData * unk_04;
UnkStruct_0209B75C * unk_08;
GenericPointerData * unk_0C;
UnkStruct_ov104_0223D5F0 * unk_10;
@@ -36,8 +36,8 @@ typedef struct UnkStruct_ov104_0223C4CC_t {
UnkStruct_ov63_0222D848 * unk_2C;
UnkStruct_ov63_0222D77C * unk_30;
struct {
CellTransferStateData * unk_00;
AnimationResourceCollection * unk_04;
SpriteRenderer * unk_00;
SpriteGfxHandler * unk_04;
} unk_34;
UnkStruct_ov104_0223D3B0_1 unk_3C;
CellActorData * unk_80[4];

17
include/overlay104/struct_ov104_0223F9E0.h
View File

@@ -1,17 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV104_0223F9E0_H
#define POKEPLATINUM_STRUCT_OV104_0223F9E0_H
typedef struct {
s16 unk_00;
s16 unk_02;
s16 unk_04;
u16 unk_06;
int unk_08;
int unk_0C;
int unk_10;
int unk_14[6];
int unk_2C;
int unk_30;
} UnkStruct_ov104_0223F9E0;
#endif // POKEPLATINUM_STRUCT_OV104_0223F9E0_H

6
include/overlay116/struct_ov116_022649E4.h
View File

@@ -15,10 +15,10 @@
typedef struct {
NARC * unk_00;
NARC * unk_04;
CellTransferStateData * unk_08;
AnimationResourceCollection * unk_0C;
SpriteRenderer * unk_08;
SpriteGfxHandler * unk_0C;
BGL * unk_10;
PaletteSys * unk_14;
PaletteData * unk_14;
GenericPointerData * unk_18;
UnkStruct_020203AC * unk_1C;
u8 padding_20[4];

2
include/overlay117/ov117_02263AF0.h
View File

@@ -46,7 +46,7 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C
void ov117_02265B3C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1);
void ov117_02265B58(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1, int param2, int param3, int param4);
void ov117_02265C1C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1);
void ov117_02265DB8(BGL * param0, AnimationResourceCollection * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov117_02265DB8(BGL * param0, SpriteGfxHandler * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov117_02265EB0(UnkStruct_ov117_02265EB0 * param0);
void ov117_02265EC8(UnkStruct_ov117_02265EC8 * param0);
void ov117_02265F34(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 * param1);

6
include/overlay117/struct_ov117_02261280.h
View File

@@ -42,14 +42,14 @@ typedef struct UnkStruct_ov117_02261280_t {
u32 unk_0C[4];
UnkStruct_ov114_0225CAD4 * unk_1C;
int unk_20;
CellTransferStateData * unk_24;
AnimationResourceCollection * unk_28;
SpriteRenderer * unk_24;
SpriteGfxHandler * unk_28;
BGL * unk_2C;
Window unk_30[5];
MessageLoader * unk_80;
UnkStruct_0200B358 * unk_84;
Strbuf* unk_88;
PaletteSys * unk_8C;
PaletteData * unk_8C;
UnkStruct_02012744 * unk_90;
SysTask * unk_94;
GenericPointerData * unk_98;

6
include/overlay119/ov119_021D0D80.h
View File

@@ -22,14 +22,14 @@ void ov119_021D0FD0(void * param0);
void ov119_021D1004(void);
void ov119_021D1028(void);
void ov119_021D1048(void);
void ov119_021D1068(BGL * param0, PaletteSys * param1, int param2);
void ov119_021D1068(BGL * param0, PaletteData * param1, int param2);
void ov119_021D10F0(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8);
int ov119_021D1158(Window * param0, int param1, Pokemon * param2, int param3);
void ov119_021D11E4(UnkStruct_ov119_021D0FD0 * param0, BGL * param1, Window * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9);
void ov119_021D12CC(UnkStruct_ov119_021D0FD0 * param0);
void ov119_021D12F8(Window * param0);
void ov119_021D1308(BGL * param0, PaletteSys * param1);
void ov119_021D135C(BGL * param0, PaletteSys * param1);
void ov119_021D1308(BGL * param0, PaletteData * param1);
void ov119_021D135C(BGL * param0, PaletteData * param1);
void ov119_021D145C(UnkStruct_02014014 * param0);
UnkStruct_ov119_021D14DC * ov119_021D14AC(UnkStruct_ov119_021D1930 * param0);
void ov119_021D14DC(UnkStruct_ov119_021D14DC * param0, int param1);

6
include/overlay119/struct_ov119_021D17B8.h
View File

@@ -16,7 +16,7 @@
typedef struct {
BGL * unk_00;
PaletteSys * unk_04;
PaletteData * unk_04;
int unk_08;
int unk_0C;
int unk_10;
@@ -27,8 +27,8 @@ typedef struct {
UnkStruct_ov119_021D14DC * unk_40;
ResourceMetadata * unk_44;
UIControlData * unk_48;
AnimationResourceCollection * unk_4C;
CellTransferStateData * unk_50;
SpriteGfxHandler * unk_4C;
SpriteRenderer * unk_50;
PokemonAnimationSys * unk_54;
} UnkStruct_ov119_021D17B8;

2
include/pokemon.h
View File

@@ -665,7 +665,7 @@ u8 BoxPokemon_SpriteYOffset(BoxPokemon *boxMon, u8 face, BOOL preferDP);
*/
u8 LoadPokemonSpriteYOffset(u16 species, u8 gender, u8 face, u8 form, u32 personality);
void sub_0207697C(ArchivedSprite *param0, u16 param1);
CellActorData *sub_02076994(CellTransferStateData *param0, AnimationResourceCollection *param1, PaletteSys *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
CellActorData *sub_02076994(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 *param2);
/**

2
include/struct_decls/struct_02002F38_decl.h
View File

@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_02002F38_DECL_H
#define POKEPLATINUM_STRUCT_02002F38_DECL_H
typedef struct UnkStruct_02002F38_t PaletteSys;
typedef struct UnkStruct_02002F38_t PaletteData;
#endif // POKEPLATINUM_STRUCT_02002F38_DECL_H

2
include/struct_decls/struct_0200C6E4_decl.h
View File

@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_0200C6E4_DECL_H
#define POKEPLATINUM_STRUCT_0200C6E4_DECL_H
typedef struct CellTransferStateData_t CellTransferStateData;
typedef struct CellTransferStateData_t SpriteRenderer;
#endif // POKEPLATINUM_STRUCT_0200C6E4_DECL_H

2
include/struct_decls/struct_0200C704_decl.h
View File

@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_0200C704_DECL_H
#define POKEPLATINUM_STRUCT_0200C704_DECL_H
typedef struct AnimationResourceCollection_t AnimationResourceCollection;
typedef struct AnimationResourceCollection_t SpriteGfxHandler;
#endif // POKEPLATINUM_STRUCT_0200C704_DECL_H

6
include/struct_defs/battle_system.h
View File

@@ -54,7 +54,7 @@ struct BattleSystem {
SysTask * unk_1C;
SysTask * unk_20;
SysTask * unk_24;
PaletteSys * unk_28;
PaletteData * unk_28;
u32 battleType;
BattleContext *battleCtx;
BattlerData *battlers[MAX_BATTLERS];
@@ -68,8 +68,8 @@ struct BattleSystem {
ChatotCry * unk_78[4];
UnkStruct_02007768 * unk_88;
UnkStruct_ov12_0221FCDC * unk_8C;
CellTransferStateData * unk_90;
AnimationResourceCollection * unk_94;
SpriteRenderer * unk_90;
SpriteGfxHandler * unk_94;
UnkStruct_02056B24 * unk_98;
UnkStruct_0206D140 * unk_9C;
u16 trainerIDs[4];

22
include/struct_defs/sprite_template.h Normal file
View File

@@ -0,0 +1,22 @@
#ifndef POKEPLATINUM_STRUCT_DEFS_SPRITE_TEMPLATE_H
#define POKEPLATINUM_STRUCT_DEFS_SPRITE_TEMPLATE_H
#include <nnsys/g2d/g2d_Image.h>
#define MAX_SPRITE_RESOURCES 6
#define SPRITE_RESOURCE_NONE -1
typedef struct SpriteTemplate {
s16 x; //!< Starting X-coordinate of the sprite
s16 y; //!< Starting Y-coordinate of the sprite
s16 z; //!< Starting Z-coordinate of the sprite
u16 animIdx; //!< Index in the animation file to use
int priority; //!< Priority layer to draw the sprite against
int plttIdx; //!< Index in the palette file to use
enum NNS_G2D_VRAM_TYPE vramType; //!< VRAM type which will own any loaded resources
int resources[MAX_SPRITE_RESOURCES]; //!< Set of resource IDs to register as loaded into VRAM
int bgPriority;
BOOL transferToVRAM;
} SpriteTemplate;
#endif // POKEPLATINUM_STRUCT_DEFS_SPRITE_TEMPLATE_H

2
include/struct_defs/struct_0207A778.h
View File

@@ -11,7 +11,7 @@ typedef struct {
BattleParams * unk_00;
BGL * unk_04;
Window * unk_08;
PaletteSys * unk_0C;
PaletteData * unk_0C;
UnkStruct_02027F8C * unk_10[4];
u8 unk_20[0x1000];
u8 unk_1020;

2
include/struct_defs/struct_0207AE68_t.h
View File

@@ -29,7 +29,7 @@ struct UnkStruct_0207AE68_t {
MessageLoader * unk_08;
UnkStruct_0200B358 * unk_0C;
Strbuf* unk_10;
PaletteSys * unk_14;
PaletteData * unk_14;
UnkStruct_02007768 * unk_18;
Sprite * unk_1C[2];
Party * unk_24;

4
include/struct_defs/struct_0207F248.h
View File

@@ -32,8 +32,8 @@ typedef struct {
u16 unk_3E4[96];
u16 unk_4A4[128];
PartyManagementData * unk_5A4;
CellTransferStateData * unk_5A8;
AnimationResourceCollection * unk_5AC;
SpriteRenderer * unk_5A8;
SpriteGfxHandler * unk_5AC;
GraphicElementData * unk_5B0[29];
CellActorData * unk_624[29];
UnkStruct_0200C440 * unk_698;

6
include/struct_defs/struct_02089688_sub1.h
View File

@@ -15,10 +15,10 @@
typedef struct {
NARC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
BGL * unk_0C;
PaletteSys * unk_10;
PaletteData * unk_10;
UnkStruct_02023FCC * unk_14;
UnkUnion_02022594 unk_18[28];
BOOL unk_88;

6
include/struct_defs/struct_0208B878_sub1.h
View File

@@ -8,9 +8,9 @@
typedef struct {
NARC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
PaletteSys * unk_0C;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
PaletteData * unk_0C;
} UnkStruct_0208B878_sub1;
#endif // POKEPLATINUM_STRUCT_0208B878_SUB1_H

4
include/struct_defs/struct_0208D7BC.h
View File

@@ -29,8 +29,8 @@ typedef struct {
UnkStruct_02091850 unk_350[4];
UnkStruct_02091850 unk_3B0[4];
u32 unk_410;
CellTransferStateData * unk_414;
AnimationResourceCollection * unk_418;
SpriteRenderer * unk_414;
SpriteGfxHandler * unk_418;
GraphicElementData * unk_41C[77];
CellActorData * unk_550[77];
UnkStruct_0200C440 * unk_684;

44
include/unk_02002F38.h
View File

@@ -3,31 +3,31 @@
#include "struct_decls/struct_02002F38_decl.h"
PaletteSys * sub_02002F38(int param0);
void sub_02002F54(PaletteSys * param0);
void sub_02002F5C(PaletteSys * param0, int param1, void * param2, void * param3, u32 param4);
void sub_02002F70(PaletteSys * param0, int param1, u32 param2, u32 param3);
void sub_02002FA0(PaletteSys * param0, int param1);
void sub_02002FBC(PaletteSys * param0, const void * param1, int param2, u16 param3, u16 param4);
void sub_02002FEC(PaletteSys * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, u16 param7);
void PaletteSys_LoadPalette(PaletteSys * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6);
void sub_02003070(PaletteSys * param0, int param1, u16 param2, u32 param3);
PaletteData * sub_02002F38(int param0);
void sub_02002F54(PaletteData * param0);
void sub_02002F5C(PaletteData * param0, int param1, void * param2, void * param3, u32 param4);
void sub_02002F70(PaletteData * param0, int param1, u32 param2, u32 param3);
void sub_02002FA0(PaletteData * param0, int param1);
void sub_02002FBC(PaletteData * param0, const void * param1, int param2, u16 param3, u16 param4);
void sub_02002FEC(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, u16 param7);
void PaletteSys_LoadPalette(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6);
void sub_02003070(PaletteData * param0, int param1, u16 param2, u32 param3);
void sub_020030E4(u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void * param5);
void sub_02003120(PaletteSys * param0, int param1, u16 param2, int param3, u16 param4, u16 param5);
u16 * sub_02003164(PaletteSys * param0, int param1);
u16 * sub_0200316C(PaletteSys * param0, int param1);
u8 sub_02003178(PaletteSys * param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6);
void sub_02003694(PaletteSys * param0);
u16 sub_0200384C(PaletteSys * param0);
void sub_02003858(PaletteSys * param0, int param1);
void sub_0200387C(PaletteSys * param0, u8 param1);
void sub_020038B0(PaletteSys * param0, int param1, int param2, u16 param3, u16 param4, u16 param5);
u16 sub_02003910(PaletteSys * param0, int param1, int param2, u16 param3);
void sub_02003120(PaletteData * param0, int param1, u16 param2, int param3, u16 param4, u16 param5);
u16 * sub_02003164(PaletteData * param0, int param1);
u16 * sub_0200316C(PaletteData * param0, int param1);
u8 sub_02003178(PaletteData * param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6);
void sub_02003694(PaletteData * param0);
u16 sub_0200384C(PaletteData * param0);
void sub_02003858(PaletteData * param0, int param1);
void sub_0200387C(PaletteData * param0, u8 param1);
void sub_020038B0(PaletteData * param0, int param1, int param2, u16 param3, u16 param4, u16 param5);
u16 sub_02003910(PaletteData * param0, int param1, int param2, u16 param3);
void sub_0200393C(const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4);
void sub_020039B0(PaletteSys * param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5);
void sub_020039B0(PaletteData * param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5);
void sub_020039F8(const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4);
void sub_02003A2C(PaletteSys * param0, int param1, u16 param2, u8 param3, u16 param4);
void sub_02003A2C(PaletteData * param0, int param1, u16 param2, u8 param3, u16 param4);
void sub_02003A8C(u16 * param0, int param1, int param2, int param3, int param4);
void sub_02003B08(PaletteSys * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9);
void sub_02003B08(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9);
#endif // POKEPLATINUM_UNK_02002F38_H

98
include/unk_0200C6E4.h
View File

@@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_UNK_0200C6E4_H
#define POKEPLATINUM_UNK_0200C6E4_H
#include "constants/palette.h"
#include "struct_decls/struct_02002F38_decl.h"
#include "struct_decls/struct_02006C24_decl.h"
#include "struct_decls/struct_0200C6E4_decl.h"
@@ -11,7 +13,7 @@
#include "struct_decls/struct_02022550_decl.h"
#include "overlay007/struct_ov7_0224F2EC.h"
#include "overlay007/struct_ov7_0224F358.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "overlay104/struct_ov104_022412F4.h"
#include "overlay104/struct_ov104_02241308.h"
#include "overlay104/struct_ov104_0224133C.h"
@@ -19,46 +21,46 @@
#include <nitro/gx.h>
#include <nnsys.h>
CellTransferStateData * sub_0200C6E4(int param0);
AnimationResourceCollection * sub_0200C704(CellTransferStateData * param0);
UnkStruct_0200C738 * sub_0200C738(CellTransferStateData * param0);
BOOL sub_0200C73C(CellTransferStateData * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3);
BOOL sub_0200C7C0(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
SpriteRenderer * sub_0200C6E4(int param0);
SpriteGfxHandler * sub_0200C704(SpriteRenderer * param0);
UnkStruct_0200C738 * sub_0200C738(SpriteRenderer * param0);
BOOL sub_0200C73C(SpriteRenderer * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3);
BOOL sub_0200C7C0(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2);
void sub_0200C7E4(GraphicElementData * param0);
void sub_0200C7EC(AnimationResourceCollection * param0);
void sub_0200C7EC(SpriteGfxHandler * param0);
void sub_0200C800(void);
void sub_0200C808(void);
void sub_0200C810(AnimationResourceCollection * param0);
void sub_0200C81C(AnimationResourceCollection * param0);
void sub_0200C82C(AnimationResourceCollection * param0);
void sub_0200C880(CellTransferStateData * param0);
void sub_0200C8A0(CellTransferStateData * param0, AnimationResourceCollection * param1);
void sub_0200C8B0(CellTransferStateData * param0, AnimationResourceCollection * param1);
void sub_0200C8D4(CellTransferStateData * param0);
BOOL sub_0200C8F0(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F2EC * param2);
GraphicElementData * sub_0200CA08(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F358 * param2);
GraphicElementData * sub_0200CA44(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13);
BOOL sub_0200CB30(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_02241308 * param2);
BOOL sub_0200CBDC(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6);
BOOL sub_0200CC3C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6);
s8 sub_0200CC9C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6, int param7);
s8 sub_0200CD0C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7);
u8 sub_0200CD7C(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, int param4, int param5, int param6, int param7, int param8, int param9);
u8 sub_0200CDC4(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NARC * param4, int param5, int param6, int param7, int param8, int param9);
BOOL sub_0200CE0C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5);
BOOL sub_0200CE24(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5);
BOOL sub_0200CE3C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5);
BOOL sub_0200CE54(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5);
CellActorData * sub_0200CE6C(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_0223F9E0 * param2);
const NNSG2dImagePaletteProxy * sub_0200D04C(AnimationResourceCollection * param0, int param1);
u32 sub_0200D05C(AnimationResourceCollection * param0, int param1, NNS_G2D_VRAM_TYPE param2);
BOOL sub_0200D070(AnimationResourceCollection * param0, int param1);
BOOL sub_0200D080(AnimationResourceCollection * param0, int param1);
BOOL sub_0200D090(AnimationResourceCollection * param0, int param1);
BOOL sub_0200D0A0(AnimationResourceCollection * param0, int param1);
void sub_0200D0B0(CellTransferStateData * param0, AnimationResourceCollection * param1);
void sub_0200C810(SpriteGfxHandler * param0);
void sub_0200C81C(SpriteGfxHandler * param0);
void sub_0200C82C(SpriteGfxHandler * param0);
void sub_0200C880(SpriteRenderer * param0);
void sub_0200C8A0(SpriteRenderer * param0, SpriteGfxHandler * param1);
void sub_0200C8B0(SpriteRenderer * param0, SpriteGfxHandler * param1);
void sub_0200C8D4(SpriteRenderer * param0);
BOOL sub_0200C8F0(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F2EC * param2);
GraphicElementData * sub_0200CA08(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2);
GraphicElementData * sub_0200CA44(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13);
BOOL sub_0200CB30(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov104_02241308 * param2);
BOOL sub_0200CBDC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6);
BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int vram, int resID);
s8 sub_0200CC9C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5, int param6, int param7);
s8 sub_0200CD0C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7);
u8 sub_0200CD7C(PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, int param4, int param5, int param6, int param7, int param8, int param9);
u8 SpriteRenderer_LoadPalette(PaletteData *palette, enum PaletteBufferId paletteBuffer, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int palID, int vram, int resID);
BOOL sub_0200CE0C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5);
BOOL SpriteRenderer_LoadCellResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int resID);
BOOL sub_0200CE3C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5);
BOOL SpriteRenderer_LoadAnimResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int resID);
CellActorData * SpriteActor_LoadResources(SpriteRenderer * param0, SpriteGfxHandler * param1, const SpriteTemplate * param2);
const NNSG2dImagePaletteProxy * sub_0200D04C(SpriteGfxHandler * param0, int param1);
u32 sub_0200D05C(SpriteGfxHandler * param0, int param1, NNS_G2D_VRAM_TYPE param2);
BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler * param0, int param1);
BOOL SpriteGfxHandler_UnloadPlttObjById(SpriteGfxHandler * param0, int param1);
BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler * param0, int param1);
BOOL SpriteGfxHandler_UnloadAnimObjById(SpriteGfxHandler * param0, int param1);
void sub_0200D0B0(SpriteRenderer * param0, SpriteGfxHandler * param1);
void sub_0200D0F4(CellActorData * param0);
void sub_0200D324(GraphicElementData * param0);
void SpriteActor_UpdateObject(GraphicElementData * param0);
void sub_0200D330(CellActorData * param0);
void sub_0200D33C(CellActorData * param0);
void sub_0200D34C(CellActorData * param0, fx32 param1);
@@ -76,7 +78,7 @@ void sub_0200D3C4(GraphicElementData * param0, u16 param1);
void sub_0200D3CC(CellActorData * param0, u16 param1);
u16 sub_0200D3D8(GraphicElementData * param0);
u16 sub_0200D3E0(CellActorData * param0);
void sub_0200D3EC(GraphicElementData * param0, int param1);
void SpriteActor_DrawSprite(GraphicElementData * param0, int param1);
void sub_0200D3F4(CellActorData * param0, int param1);
int sub_0200D400(GraphicElementData * param0);
int sub_0200D408(CellActorData * param0);
@@ -93,11 +95,11 @@ void sub_0200D474(CellActorData * param0, int param1);
u32 sub_0200D480(GraphicElementData * param0);
u32 sub_0200D488(CellActorData * param0);
void sub_0200D494(GraphicElementData * param0, s16 param1, s16 param2);
void sub_0200D4C4(CellActorData * param0, s16 param1, s16 param2);
void SpriteActor_SetSpritePositionXY(CellActorData * param0, s16 param1, s16 param2);
void sub_0200D4D0(GraphicElementData * param0, s16 param1, s16 param2, fx32 param3);
void sub_0200D500(CellActorData * param0, s16 param1, s16 param2, fx32 param3);
void sub_0200D50C(GraphicElementData * param0, s16 * param1, s16 * param2);
void sub_0200D550(CellActorData * param0, s16 * param1, s16 * param2);
void SpriteActor_GetSpritePositionXY(CellActorData * param0, s16 * param1, s16 * param2);
void sub_0200D55C(GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3);
void sub_0200D5A0(CellActorData * param0, s16 * param1, s16 * param2, fx32 param3);
void sub_0200D5AC(GraphicElementData * param0, s16 param1, s16 param2);
@@ -124,14 +126,14 @@ void sub_0200D7D4(CellActorData * param0, int param1);
void sub_0200D7E0(CellActorData * param0, s16 param1, s16 param2);
void sub_0200D7FC(CellActorData * param0, BOOL param1);
void sub_0200D808(GraphicElementData * param0, GXOamMode param1);
void sub_0200D810(CellActorData * param0, GXOamMode param1);
void SpriteActor_SetOAMMode(CellActorData * param0, GXOamMode param1);
u32 sub_0200D81C(CellActorData * param0);
BOOL sub_0200D828(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6);
BOOL sub_0200D888(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6);
BOOL sub_0200D8E8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5, int param6);
void sub_0200D948(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5);
void sub_0200D97C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5);
GraphicElementManager * sub_0200D9B0(AnimationResourceCollection * param0);
void sub_0200D9B4(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5);
BOOL sub_0200D828(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6);
BOOL sub_0200D888(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6);
BOOL sub_0200D8E8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5, int param6);
void sub_0200D948(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5);
void sub_0200D97C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5);
GraphicElementManager * sub_0200D9B0(SpriteGfxHandler * param0);
void sub_0200D9B4(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5);
#endif // POKEPLATINUM_UNK_0200C6E4_H

2
include/unk_0201567C.h
View File

@@ -3,7 +3,7 @@
#include "struct_decls/struct_02002F38_decl.h"
void * sub_0201567C(PaletteSys * param0, u16 param1, u16 param2, u32 param3);
void * sub_0201567C(PaletteData * param0, u16 param1, u16 param2, u32 param3);
void sub_02015738(void * param0, u8 param1);
void sub_02015760(void * param0);

4
include/unk_020218BC.h
View File

@@ -37,12 +37,12 @@ u16 sub_02021D30(const GraphicElementData * param0);
int sub_02021D34(const GraphicElementData * param0);
int sub_02021D3C(const GraphicElementData * param0);
u32 sub_02021D44(const GraphicElementData * param0);
void sub_02021D6C(GraphicElementData * param0, u32 param1);
void SpriteActor_SetSpriteAnimActive(GraphicElementData * param0, u32 param1);
void sub_02021DCC(GraphicElementData * param0, u32 param1);
void sub_02021DE0(GraphicElementData * param0);
u32 sub_02021E24(const GraphicElementData * param0);
void sub_02021E2C(GraphicElementData * param0, fx32 param1);
void sub_02021E50(GraphicElementData * param0, u16 param1);
void SpriteActor_SetAnimFrame(GraphicElementData * param0, u16 param1);
u16 sub_02021E74(const GraphicElementData * param0);
void sub_02021E80(GraphicElementData * param0, u8 param1);
u8 sub_02021E88(const GraphicElementData * param0);

22
include/unk_0207C908.h
View File

@@ -5,7 +5,7 @@
#include "struct_decls/struct_0200C6E4_decl.h"
#include "struct_decls/struct_0200C704_decl.h"
#include "struct_decls/cell_actor_data.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include <nnsys.h>
@@ -15,20 +15,20 @@ u32 sub_0207C924(void);
u32 sub_0207C928(void);
u8 sub_0207C92C(int param0);
u32 sub_0207C944(void);
void sub_0207C948(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void sub_0207C97C(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, u32 param3);
void sub_0207C9B0(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NNS_G2D_VRAM_TYPE param4, u32 param5);
void sub_0207C9EC(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3);
void sub_0207CA34(AnimationResourceCollection * param0, u32 param1);
void sub_0207CA3C(AnimationResourceCollection * param0, u32 param1);
void sub_0207CA44(AnimationResourceCollection * param0, u32 param1, u32 param2);
CellActorData * sub_0207CA58(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
void sub_0207C948(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void sub_0207C97C(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, u32 param3);
void sub_0207C9B0(PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, NNS_G2D_VRAM_TYPE param4, u32 param5);
void sub_0207C9EC(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3);
void sub_0207CA34(SpriteGfxHandler * param0, u32 param1);
void sub_0207CA3C(SpriteGfxHandler * param0, u32 param1);
void sub_0207CA44(SpriteGfxHandler * param0, u32 param1, u32 param2);
CellActorData * sub_0207CA58(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3);
void sub_0207CA88(CellActorData * param0);
u32 sub_0207CA90(int param0);
u8 sub_0207CAA8(int param0);
u32 sub_0207CAC0(void);
void sub_0207CAC4(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void sub_0207CAF8(AnimationResourceCollection * param0, u32 param1);
void sub_0207CAC4(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
void sub_0207CAF8(SpriteGfxHandler * param0, u32 param1);
void sub_0207CB00(CellActorData * param0);
#endif // POKEPLATINUM_UNK_0207C908_H

2
include/unk_0208B284.h
View File

@@ -7,7 +7,7 @@
#include "struct_defs/struct_0208B284.h"
#include "struct_defs/struct_0208B878.h"
UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, CellTransferStateData * param1, AnimationResourceCollection * param2, PaletteSys * param3);
UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer * param1, SpriteGfxHandler * param2, PaletteData * param3);
void sub_0208B63C(UnkStruct_0208B878 * param0, int param1);
BOOL sub_0208B878(UnkStruct_0208B878 * param0, int param1);
BOOL sub_0208B8B0(UnkStruct_0208B878 * param0, BOOL param1);

2
platinum.us/main.lsf
View File

@@ -702,7 +702,7 @@ Overlay overlay16
Object main.nef.p/src_overlay016_ov16_02266F1C.c.o
Object main.nef.p/src_overlay016_ov16_02268520.c.o
Object main.nef.p/src_overlay016_ov16_0226871C.c.o
Object main.nef.p/src_overlay016_ov16_0226D094.c.o
Object main.nef.p/src_overlay016_party_gauge.c.o
Object main.nef.p/src_overlay016_ov16_0226DB7C.c.o
Object main.nef.p/src_overlay016_ov16_0226DE44.c.o
Object main.nef.p/src_overlay016_ov16_0226E148.c.o

2
src/meson.build
View File

@@ -540,7 +540,7 @@ pokeplatinum_c = files(
'overlay016/ov16_02266F1C.c',
'overlay016/ov16_02268520.c',
'overlay016/ov16_0226871C.c',
'overlay016/ov16_0226D094.c',
'overlay016/party_gauge.c',
'overlay016/ov16_0226DB7C.c',
'overlay016/ov16_0226DE44.c',
'overlay016/ov16_0226E148.c',

26
src/overlay005/ov5_021D2F14.c
View File

@@ -13,7 +13,7 @@
#include "overlay007/struct_ov7_0224F2EC.h"
#include "overlay007/struct_ov7_0224F358.h"
#include "overlay019/struct_ov19_021DA864.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "overlay104/struct_ov104_02241308.h"
#include "overlay115/struct_ov115_02261520.h"
@@ -122,7 +122,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
v1 = sub_02021AA0(&v0);
GF_ASSERT(v1);
sub_02021D6C(v1, param1->unk_0A);
SpriteActor_SetSpriteAnimActive(v1, param1->unk_0A);
sub_02021EC4(v1, param1->unk_10);
return v1;
@@ -334,7 +334,7 @@ static void ov5_021D3518 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int pa
GF_ASSERT(0);
}
CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov104_0223F9E0 * param1)
CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTemplate * param1)
{
int v0;
int v1;
@@ -349,7 +349,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_o
v2->unk_04 = v2->unk_08->unk_00;
for (v0 = 0; v0 < 6; v0++) {
v4[v0] = param1->unk_14[v0];
v4[v0] = param1->resources[v0];
}
if ((param0->unk_194[4] == NULL) || (param0->unk_194[5] == NULL)) {
@@ -365,15 +365,15 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_o
}
}
sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->unk_30, param1->unk_2C, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->transferToVRAM, param1->bgPriority, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
v3.unk_00 = param0->unk_00;
v3.unk_04 = v2->unk_04;
v3.unk_08.x = FX32_CONST(param1->unk_00);
v3.unk_08.y = FX32_CONST(param1->unk_02);
v3.unk_08.z = FX32_CONST(param1->unk_04);
v3.unk_08.x = FX32_CONST(param1->x);
v3.unk_08.y = FX32_CONST(param1->y);
v3.unk_08.z = FX32_CONST(param1->z);
if (param1->unk_10 == NNS_G2D_VRAM_TYPE_2DSUB) {
if (param1->vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
v3.unk_08.y += (192 << FX32_SHIFT);
}
@@ -381,16 +381,16 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_o
v3.unk_14.y = FX32_ONE;
v3.unk_14.z = FX32_ONE;
v3.unk_20 = 0;
v3.unk_24 = param1->unk_08;
v3.unk_28 = param1->unk_10;
v3.unk_24 = param1->priority;
v3.unk_28 = param1->vramType;
v3.unk_2C = param0->unk_1C6;
v2->unk_00 = sub_02021AA0(&v3);
if (v2->unk_00 != NULL) {
v1 = sub_02021EE8(v2->unk_00);
sub_02021D6C(v2->unk_00, param1->unk_06);
sub_02021E90(v2->unk_00, v1 + param1->unk_0C);
SpriteActor_SetSpriteAnimActive(v2->unk_00, param1->animIdx);
sub_02021E90(v2->unk_00, v1 + param1->plttIdx);
} else {
GF_ASSERT(FALSE);
}

22
src/overlay005/ov5_021D5EB8.c
View File

@@ -2245,7 +2245,7 @@ static void ov5_021D78A4 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v3[0] = 0;
v4 = v6 % 3;
sub_02021E50(v1->unk_04, v4);
SpriteActor_SetAnimFrame(v1->unk_04, v4);
v2 = (v6 % 20);
v3[2] = 10 * (v4 + 1) + v2;
@@ -2294,7 +2294,7 @@ static void ov5_021D7960 (UnkStruct_ov5_021D6FA8 * param0)
} else {
v2[3] = 1;
v2[0] = 4;
sub_02021E50(v1->unk_04, 3);
SpriteActor_SetAnimFrame(v1->unk_04, 3);
}
}
@@ -2444,7 +2444,7 @@ static void ov5_021D7C40 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v4 = (s32 *)v2->unk_08;
v5 = MTRNG_Next() % 4;
sub_02021E50(v2->unk_04, v5);
SpriteActor_SetAnimFrame(v2->unk_04, v5);
v4[4] = 10;
v4[5] = 0;
@@ -2685,7 +2685,7 @@ static void ov5_021D8098 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v4[1] = 4 + (MTRNG_Next() % (46 - 4));
v7 = (v4[1] - 4) / (((46 - 4) / 3) + 1);
sub_02021E50(v1->unk_04, v7);
SpriteActor_SetAnimFrame(v1->unk_04, v7);
v4[4] = -1 * (v7 + 1);
v4[2] = v6[v2] * (v7 + 1);
@@ -3230,7 +3230,7 @@ static void ov5_021D8B88 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v5[2] += v5[2] / 2;
}
sub_02021E50(v1->unk_04, v6);
SpriteActor_SetAnimFrame(v1->unk_04, v6);
{
VecFx32 v9;
@@ -3548,7 +3548,7 @@ static void ov5_021D92C4 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v4[1] = 18 + (MTRNG_Next() % (24 - 18));
v5 = MTRNG_Next() % 4;
sub_02021E50(v1->unk_04, v5);
SpriteActor_SetAnimFrame(v1->unk_04, v5);
v4[4] = Unk_ov5_021F8CDC[v2] * ((v5) + 1);
v4[2] = Unk_ov5_021F8CEC[v2] * ((v5) + 1);
@@ -3768,7 +3768,7 @@ static void ov5_021D9690 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v5 = MTRNG_Next() % 4;
}
sub_02021E50(v1->unk_04, v5);
SpriteActor_SetAnimFrame(v1->unk_04, v5);
}
}
@@ -4288,7 +4288,7 @@ static void ov5_021DA0A8 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v3[0] = 0;
v6 = v8 % 3;
sub_02021E50(v1->unk_04, v6);
SpriteActor_SetAnimFrame(v1->unk_04, v6);
v3[4] = -24 * (v6 + 1);
v3[2] = 24 * (v6 + 1);
@@ -4331,7 +4331,7 @@ static void ov5_021DA1A8 (UnkStruct_ov5_021D6FA8 * param0)
} else {
v2[3] = 1;
v2[0] = 4;
sub_02021E50(v1->unk_04, 3);
SpriteActor_SetAnimFrame(v1->unk_04, 3);
}
}
@@ -4524,7 +4524,7 @@ static void ov5_021DA5A0 (UnkStruct_ov5_021DB4B8 * param0, int param1)
v5 = (s32 *)v2->unk_08;
v4 = MTRNG_Next() % 4;
sub_02021E50(v2->unk_04, v4);
SpriteActor_SetAnimFrame(v2->unk_04, v4);
v5[4] = 10;
v5[5] = 0;
@@ -4770,7 +4770,7 @@ static void ov5_021DA9DC (UnkStruct_ov5_021DB4B8 * param0, int param1)
v2 = (s32 *)v1->unk_08;
v4 = MTRNG_Next() % 0xe;
sub_02021E50(v1->unk_04, v4);
SpriteActor_SetAnimFrame(v1->unk_04, v4);
v3 = v4 / 4;
v3++;

8
src/overlay005/ov5_021E2338.c
View File

@@ -692,9 +692,9 @@ void ov5_021E2B54 (SysTask * param0, void * param1)
ov5_021DDF9C(v0, v1->unk_44, 96, 6, 0, (255 * FX32_ONE), (FX32_ONE * 10));
sub_02021D6C(
SpriteActor_SetSpriteAnimActive(
v1->unk_21C[0], 1);
sub_02021D6C(
SpriteActor_SetSpriteAnimActive(
v1->unk_21C[1], 2);
ov5_021DDE14(&v1->unk_2C, 0, (255 * FX32_ONE), (FX32_ONE * 10), 6);
@@ -2567,7 +2567,7 @@ static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47
if (v0 != 3) {
sub_02021CF8(param0->unk_04[v0], 2);
sub_02021D6C(param0->unk_04[v0], 1);
SpriteActor_SetSpriteAnimActive(param0->unk_04[v0], 1);
ov5_021DDDBC(&param0->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
} else {
@@ -3034,7 +3034,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
v0->unk_2CC[v5] = ov5_021DE62C(
&v0->unk_5C, v7, 0, 0, 0, 0);
sub_02021CAC(v0->unk_2CC[v5], 0);
sub_02021D6C(v0->unk_2CC[v5], v8);
SpriteActor_SetSpriteAnimActive(v0->unk_2CC[v5], v8);
sub_02021E80(v0->unk_2CC[v5], 1);
}

2
src/overlay006/ov6_022426AC.c
View File

@@ -223,6 +223,6 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
param0->unk_1C8 = sub_02021AA0(&v2);
sub_02021CC8(param0->unk_1C8, 0);
sub_02021D6C(param0->unk_1C8, 0);
SpriteActor_SetSpriteAnimActive(param0->unk_1C8, 0);
}
}

22
src/overlay006/ov6_02243258.c
View File

@@ -600,7 +600,7 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
v1 = ov6_02243740(param0, &v0, 2, v2, 2, 1, 0, 131);
sub_02021CAC(v1, 0);
sub_02021D6C(v1, 6);
SpriteActor_SetSpriteAnimActive(v1, 6);
return v1;
}
@@ -739,7 +739,7 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
sub_02021C60(v3, &v4);
sub_02021C70(v3, &v5);
sub_02021C94(v3, sub_0201D2A4(0));
sub_02021D6C(v3, 2);
SpriteActor_SetSpriteAnimActive(v3, 2);
}
ov6_02243F2C();
@@ -868,7 +868,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0)
{
sub_02021CAC(param0->unk_68, 0);
sub_02021D6C(param0->unk_58.unk_08, 1);
SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1);
param0->unk_04 = 0;
param0->unk_01++;
@@ -902,7 +902,7 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
sub_02021C70(param0->unk_68, &v1);
sub_02021C94(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
sub_02021CAC(param0->unk_68, 1);
sub_02021D6C(param0->unk_58.unk_08, 6);
SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 6);
sub_02021CC8(param0->unk_58.unk_08, 1);
}
@@ -971,7 +971,7 @@ static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0)
param0->unk_04++;
if (param0->unk_04 == 8) {
sub_02021D6C(param0->unk_58.unk_08, 1);
SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1);
ov6_02243F74(param0->unk_58.unk_04, 0);
}
@@ -1435,7 +1435,7 @@ static int ov6_022444D0 (UnkStruct_ov6_02243FFC * param0)
return 0;
}
sub_02021D6C(param0->unk_248, 1);
SpriteActor_SetSpriteAnimActive(param0->unk_248, 1);
param0->unk_00++;
return 0;
@@ -1872,7 +1872,7 @@ static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const
GraphicElementData * v0;
v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2);
sub_02021D6C(v0, param3);
SpriteActor_SetSpriteAnimActive(v0, param3);
return v0;
}
@@ -1889,7 +1889,7 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
v0 = ov6_02244C20(param0, param1, 2, v1, 2, 1, 0, 131);
sub_02021CAC(v0, 0);
sub_02021D6C(v0, 6);
SpriteActor_SetSpriteAnimActive(v0, 6);
return v0;
}
@@ -2618,7 +2618,7 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
{
GraphicElementData * v0 = param0->unk_5C.unk_00->unk_248;
sub_02021D6C(v0, 3);
SpriteActor_SetSpriteAnimActive(v0, 3);
{
fx32 v1, v2;
@@ -2760,7 +2760,7 @@ static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0)
v0 = *v1;
sub_020715D4(param0, &v0);
sub_02021D6C(v2->unk_20, 5);
SpriteActor_SetSpriteAnimActive(v2->unk_20, 5);
}
static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
@@ -2777,7 +2777,7 @@ static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
ov6_022437C8(v1->unk_20, &v0);
sub_020715D4(param0, &v0);
sub_02021D6C(v1->unk_20, 4);
SpriteActor_SetSpriteAnimActive(v1->unk_20, 4);
}
static int ov6_02245C04 (UnkStruct_ov101_021D5D90 * param0, void * param1)

2
src/overlay007/ov7_0224BE9C.c
View File

@@ -661,7 +661,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
v3.unk_08.y = v4[v0] * FX32_ONE;
param0->unk_158[v0] = sub_02021B90(&v3);
sub_02021D6C(param0->unk_158[v0], v0);
SpriteActor_SetSpriteAnimActive(param0->unk_158[v0], v0);
sub_02021CC8(param0->unk_158[v0], 1);
}
}

98
src/overlay010/ov10_0221F800.c
View File

@@ -27,7 +27,7 @@
#include "overlay061/struct_ov61_0222C884.h"
#include "overlay084/struct_ov84_0223BA5C.h"
#include "overlay097/struct_ov97_0222DB78.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "overlay104/struct_ov104_022412F4.h"
#include "overlay104/struct_ov104_02241308.h"
#include "overlay104/struct_ov104_0224133C.h"
@@ -102,11 +102,11 @@ typedef struct {
typedef struct UnkStruct_ov10_0221FB28_t {
UnkStruct_ov10_0221F800 * unk_00;
const UnkFuncPtr_ov10_02222AD0 * unk_04;
PaletteSys * unk_08;
PaletteData * unk_08;
BGL * unk_0C;
Window unk_10[24];
CellTransferStateData * unk_190;
AnimationResourceCollection * unk_194;
SpriteRenderer * unk_190;
SpriteGfxHandler * unk_194;
CellActorData * unk_198[30];
u32 unk_210;
UnkStruct_ov10_0221FB28_sub1 unk_214[6];
@@ -1226,23 +1226,23 @@ static void ov10_02220B00 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_ov104_022
static CellActorData * ov10_02220BA0 (UnkStruct_ov10_0221FB28 * param0, const u32 * param1)
{
UnkStruct_ov104_0223F9E0 v0;
SpriteTemplate v0;
v0.unk_00 = 0;
v0.unk_02 = 0;
v0.unk_04 = 0;
v0.unk_06 = 0;
v0.unk_08 = param1[5];
v0.unk_0C = param1[6];
v0.unk_10 = NNS_G2D_VRAM_TYPE_2DMAIN;
v0.unk_14[0] = param1[0];
v0.unk_14[1] = param1[1];
v0.unk_14[2] = param1[2];
v0.unk_14[3] = param1[3];
v0.unk_2C = param1[4];
v0.unk_30 = 0;
v0.x = 0;
v0.y = 0;
v0.z = 0;
v0.animIdx = 0;
v0.priority = param1[5];
v0.plttIdx = param1[6];
v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v0.resources[0] = param1[0];
v0.resources[1] = param1[1];
v0.resources[2] = param1[2];
v0.resources[3] = param1[3];
v0.bgPriority = param1[4];
v0.transferToVRAM = FALSE;
return sub_0200CE6C(param0->unk_190, param0->unk_194, &v0);
return SpriteActor_LoadResources(param0->unk_190, param0->unk_194, &v0);
}
static void ov10_02220BE8 (UnkStruct_ov10_0221FB28 * param0)
@@ -1505,10 +1505,10 @@ static void ov10_022210F4 (UnkStruct_ov10_0221FB28 * param0)
v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->unk_24);
sub_0200CC3C(param0->unk_190, param0->unk_194, v0, 208, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 208, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47111);
sub_0200CC9C(param0->unk_190, param0->unk_194, 108, 8, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47111);
sub_0200CE24(param0->unk_190, param0->unk_194, v0, 207, 1, 47111);
sub_0200CE54(param0->unk_190, param0->unk_194, v0, 209, 1, 47111);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 207, 1, 47111);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 209, 1, 47111);
NARC_dtor(v0);
}
@@ -1518,7 +1518,7 @@ static void ov10_02221188 (UnkStruct_ov10_0221FB28 * param0, u8 param1, s16 para
u8 v1[] = {0, 3, 6, 9};
for (v0 = 0; v0 < 3; v0++) {
sub_0200D4C4(param0->unk_198[v1[param1] + v0], param0->unk_B58[param1] + v0 * 19 + param2, param0->unk_B5C[param1] + param3);
SpriteActor_SetSpritePositionXY(param0->unk_198[v1[param1] + v0], param0->unk_B58[param1] + v0 * 19 + param2, param0->unk_B5C[param1] + param3);
}
}
@@ -1708,9 +1708,9 @@ static void ov10_0222166C (UnkStruct_ov10_0221FB28 * param0)
v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24);
sub_0200CC3C(param0->unk_190, param0->unk_194, v0, 5, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47112);
sub_0200CE24(param0->unk_190, param0->unk_194, v0, 6, 0, 47112);
sub_0200CE54(param0->unk_190, param0->unk_194, v0, 7, 0, 47112);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 5, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47112);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 6, 0, 47112);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 7, 0, 47112);
NARC_dtor(v0);
}
@@ -1720,26 +1720,26 @@ static void ov10_022216E0 (UnkStruct_ov10_0221FB28 * param0)
sub_0200D3F4(param0->unk_198[13], 0);
if (param0->unk_00->unk_2A == 3) {
sub_0200D4C4(param0->unk_198[12], 128, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[12], 128, (96 - 24));
sub_0200D364(param0->unk_198[12], 3 - 1);
return;
}
if (ov10_02220AD0() == 1) {
if (param0->unk_00->unk_2A == 1) {
sub_0200D4C4(param0->unk_198[12], 48, (96 - 24));
sub_0200D4C4(param0->unk_198[13], 208, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[12], 48, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[13], 208, (96 - 24));
} else {
sub_0200D4C4(param0->unk_198[12], 208, (96 - 24));
sub_0200D4C4(param0->unk_198[13], 48, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[12], 208, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[13], 48, (96 - 24));
}
} else {
if (param0->unk_00->unk_2A == 1) {
sub_0200D4C4(param0->unk_198[12], 208, (96 - 24));
sub_0200D4C4(param0->unk_198[13], 48, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[12], 208, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[13], 48, (96 - 24));
} else {
sub_0200D4C4(param0->unk_198[12], 48, (96 - 24));
sub_0200D4C4(param0->unk_198[13], 208, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[12], 48, (96 - 24));
SpriteActor_SetSpritePositionXY(param0->unk_198[13], 208, (96 - 24));
}
}
@@ -2103,7 +2103,7 @@ static void ov10_02221EEC (UnkStruct_ov10_0221FB28 * param0, u32 param1)
for (v0 = 0; v0 < 5; v0++) {
param0->unk_198[param1 * 5 + v0] = ov10_02220BA0(param0, &Unk_ov10_02222F3C[param1 * 5 + v0][0]);
sub_0200D4C4(param0->unk_198[param1 * 5 + v0], Unk_ov10_02222C6C[param1][v0 * 2], Unk_ov10_02222C6C[param1][v0 * 2 + 1]);
SpriteActor_SetSpritePositionXY(param0->unk_198[param1 * 5 + v0], Unk_ov10_02222C6C[param1][v0 * 2], Unk_ov10_02222C6C[param1][v0 * 2 + 1]);
}
if (param0->unk_214[param1].unk_04 == 0) {
@@ -2166,11 +2166,11 @@ static void ov10_022220B4 (UnkStruct_ov10_0221FB28 * param0)
v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->unk_24);
sub_0200CD0C(param0->unk_190, param0->unk_194, v1, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 47112);
sub_0200CE24(param0->unk_190, param0->unk_194, v1, PokeIcon32KCellsFileIndex(), 0, 47113);
sub_0200CE54(param0->unk_190, param0->unk_194, v1, PokeIcon32KAnimationFileIndex(), 0, 47113);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v1, PokeIcon32KCellsFileIndex(), 0, 47113);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v1, PokeIcon32KAnimationFileIndex(), 0, 47113);
for (v0 = 0; v0 < 6; v0++) {
sub_0200CC3C(param0->unk_190, param0->unk_194, v1, param0->unk_214[v0].unk_00, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47113 + v0);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v1, param0->unk_214[v0].unk_00, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47113 + v0);
}
NARC_dtor(v1);
@@ -2182,10 +2182,10 @@ static void ov10_0222216C (UnkStruct_ov10_0221FB28 * param0)
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24);
sub_0200CC3C(param0->unk_190, param0->unk_194, v0, 20, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47119);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 20, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47119);
sub_0200CD0C(param0->unk_190, param0->unk_194, v0, 21, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47113);
sub_0200CE24(param0->unk_190, param0->unk_194, v0, 19, 0, 47114);
sub_0200CE54(param0->unk_190, param0->unk_194, v0, 18, 0, 47114);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 19, 0, 47114);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 18, 0, 47114);
NARC_dtor(v0);
}
@@ -2195,10 +2195,10 @@ static void ov10_02222208 (UnkStruct_ov10_0221FB28 * param0)
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_24);
sub_0200CC3C(param0->unk_190, param0->unk_194, v0, 64, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47120);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 64, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47120);
sub_0200CD0C(param0->unk_190, param0->unk_194, v0, 65, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47114);
sub_0200CE24(param0->unk_190, param0->unk_194, v0, 63, 0, 47115);
sub_0200CE54(param0->unk_190, param0->unk_194, v0, 62, 0, 47115);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 63, 0, 47115);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 62, 0, 47115);
NARC_dtor(v0);
}
@@ -2208,10 +2208,10 @@ static void ov10_022222A4 (UnkStruct_ov10_0221FB28 * param0)
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24);
sub_0200CC3C(param0->unk_190, param0->unk_194, v0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47121);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 47121);
sub_0200CD0C(param0->unk_190, param0->unk_194, v0, 8, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47115);
sub_0200CE24(param0->unk_190, param0->unk_194, v0, 1, 0, 47116);
sub_0200CE54(param0->unk_190, param0->unk_194, v0, 0, 0, 47116);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 1, 0, 47116);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 0, 0, 47116);
NARC_dtor(v0);
}
@@ -2229,7 +2229,7 @@ static void ov10_02222340 (UnkStruct_ov10_0221FB28 * param0, s16 param1)
for (v0 = 0; v0 < 3; v0++) {
for (v1 = 0; v1 < 5; v1++) {
sub_0200D4C4(
SpriteActor_SetSpritePositionXY(
param0->unk_198[(v2 + v0) * 5 + v1], Unk_ov10_02222C6C[v2 + v0][v1 * 2] + param1, Unk_ov10_02222C6C[v2 + v0][v1 * 2 + 1]);
}
}

2
src/overlay011/ov11_0221F800.c
View File

@@ -430,7 +430,7 @@ const u16 * ov11_0221F800 (int param0)
return v0;
}
void ov11_0221F81C (PaletteSys * param0, int param1, int param2, int param3, int param4)
void ov11_0221F81C (PaletteData * param0, int param1, int param2, int param3, int param4)
{
const u16 * v0;

158
src/overlay012/ov12_0221FC20.c
View File

@@ -29,7 +29,7 @@
#include "overlay016/struct_ov16_02264408.h"
#include "overlay016/struct_ov16_02264408_sub1.h"
#include "overlay016/struct_ov16_02265BBC.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "overlay104/struct_ov104_02241308.h"
#include "spl.h"
@@ -74,7 +74,7 @@ typedef struct UnkStruct_ov12_02223178_t {
int unk_18;
UnkStruct_02014014 * unk_1C[16];
UnkSPLStruct6 * unk_5C[20];
CellTransferStateData * unk_AC;
SpriteRenderer * unk_AC;
UnkStruct_ov16_0223E0C8 * unk_B0[4];
u8 unk_C0[4];
Sprite * unk_C4[4];
@@ -100,7 +100,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
CellActorData * unk_08;
BOOL unk_0C;
} UnkStruct_ov12_02221810;
@@ -126,11 +126,11 @@ typedef struct UnkStruct_ov12_0221FCDC_t {
UnkFuncPtr_ov12_02239EEC unk_B8;
UnkStruct_ov12_02223178 * unk_BC;
BGL * unk_C0;
PaletteSys * unk_C4;
AnimationResourceCollection * unk_C8[4];
PaletteData * unk_C4;
SpriteGfxHandler * unk_C8[4];
CellActorData * unk_D8[10];
UnkStruct_ov104_0223F9E0 unk_100;
AnimationResourceCollection * unk_134;
SpriteTemplate unk_100;
SpriteGfxHandler * unk_134;
CellActorData * unk_138[5];
BOOL unk_14C[5];
UnkStruct_ov12_0222118C * unk_160[5];
@@ -768,18 +768,18 @@ CellActorData * ov12_022202C0 (UnkStruct_ov12_0221FCDC * param0, int param1)
return param0->unk_138[param1];
}
AnimationResourceCollection * ov12_022202EC (UnkStruct_ov12_0221FCDC * param0)
SpriteGfxHandler * ov12_022202EC (UnkStruct_ov12_0221FCDC * param0)
{
GF_ASSERT(param0 != NULL);
return param0->unk_134;
}
AnimationResourceCollection * ov12_02220300 (UnkStruct_ov12_0221FCDC * param0)
SpriteGfxHandler * ov12_02220300 (UnkStruct_ov12_0221FCDC * param0)
{
return param0->unk_C8[0];
}
CellTransferStateData * ov12_02220308 (UnkStruct_ov12_0221FCDC * param0)
SpriteRenderer * ov12_02220308 (UnkStruct_ov12_0221FCDC * param0)
{
return param0->unk_BC->unk_AC;
}
@@ -1324,7 +1324,7 @@ static void ov12_02220798 (UnkStruct_ov12_0221FCDC * param0)
}
if (ov12_0221FDD4(param0) == 0) {
ov16_0223F9F0();
Battle_SetDefaultBlend();
sub_02019690(ov12_022233B0(param0, 1), 0x4000, 0, ov12_0221FDE4(param0));
sub_02019EBC(ov12_02220278(param0), ov12_022233B0(param0, 1));
@@ -1965,7 +1965,7 @@ static void ov12_0222118C (SysTask * param0, void * param1)
v2 = sub_020080C0(v0->unk_04.unk_04, 1);
v2 -= sub_020080C0(v0->unk_04.unk_04, 41);
sub_0200D4C4(v0->unk_00, v1, v2);
SpriteActor_SetSpritePositionXY(v0->unk_00, v1, v2);
}
static void ov12_022211D8 (SysTask * param0, void * param1)
@@ -2139,10 +2139,10 @@ static void ov12_022214C4 (UnkStruct_ov12_0221FCDC * param0)
v0[4] = 0;
v0[5] = 0;
sub_0200CC3C(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 76, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v0[0]);
sub_0200CDC4(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 75, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[1]);
sub_0200CE24(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 77, 0, v0[2]);
sub_0200CE54(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, 0, v0[3]);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 76, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v0[0]);
SpriteRenderer_LoadPalette(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 75, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[1]);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 77, 0, v0[2]);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, 0, v0[3]);
}
static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0)
@@ -2186,7 +2186,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0)
v0 = param0->unk_BC->unk_B0[v7]->unk_00;
v10 = param0->unk_BC->unk_E8[v7];
{
UnkStruct_ov104_0223F9E0 v11;
SpriteTemplate v11;
Sprite * v12 = ov12_022232FC(param0, v7);
int v13;
int v14;
@@ -2199,21 +2199,21 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0)
v16 -= sub_020080C0(v12, 41);
}
v11.unk_00 = v15;
v11.unk_02 = v16;
v11.unk_04 = 0;
v11.unk_06 = 0;
v11.unk_08 = 100;
v11.unk_0C = 0;
v11.unk_10 = 1;
v11.unk_2C = 1;
v11.unk_30 = 0;
v11.x = v15;
v11.y = v16;
v11.z = 0;
v11.animIdx = 0;
v11.priority = 100;
v11.plttIdx = 0;
v11.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v11.bgPriority = 1;
v11.transferToVRAM = FALSE;
for (v14 = 0; v14 < 6; v14++) {
v11.unk_14[v14] = v2[v14];
v11.resources[v14] = v2[v14];
}
v1 = sub_0200CE6C(param0->unk_BC->unk_AC, param0->unk_134, &v11);
v1 = SpriteActor_LoadResources(param0->unk_BC->unk_AC, param0->unk_134, &v11);
if (v12 == NULL) {
sub_0200D3F4(v1, 0);
@@ -2777,7 +2777,7 @@ static BOOL ov12_02221D50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1)
break;
case 4:
if (ov12_0221FDD4(param1->unk_48) == 0) {
ov16_0223F9F0();
Battle_SetDefaultBlend();
} else {
ov17_022413D8();
}
@@ -3617,7 +3617,7 @@ static void ov12_02222D84 (UnkStruct_ov12_0221FCDC * param0)
v1 = inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
sub_0200CC3C(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[2], v1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v1 + 5000);
SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[2], v1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v1 + 5000);
}
static void ov12_02222DCC (UnkStruct_ov12_0221FCDC * param0)
@@ -3637,7 +3637,7 @@ static void ov12_02222DCC (UnkStruct_ov12_0221FCDC * param0)
v2 = inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
sub_0200CDC4(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[3], v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v2, v1 + 5000);
SpriteRenderer_LoadPalette(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[3], v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v2, v1 + 5000);
}
static void ov12_02222E2C (UnkStruct_ov12_0221FCDC * param0)
@@ -3653,7 +3653,7 @@ static void ov12_02222E2C (UnkStruct_ov12_0221FCDC * param0)
v1 = inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
sub_0200CE24(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[4], v1, 1, v1 + 5000);
SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[4], v1, 1, v1 + 5000);
}
static void ov12_02222E74 (UnkStruct_ov12_0221FCDC * param0)
@@ -3669,7 +3669,7 @@ static void ov12_02222E74 (UnkStruct_ov12_0221FCDC * param0)
v1 = inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
sub_0200CE54(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[5], v1, 1, v1 + 5000);
SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[5], v1, 1, v1 + 5000);
}
static void ov12_02222EBC (UnkStruct_ov12_0221FCDC * param0)
@@ -3690,29 +3690,29 @@ static void ov12_02222EBC (UnkStruct_ov12_0221FCDC * param0)
param0->unk_18 += 1;
{
UnkStruct_ov104_0223F9E0 v6;
SpriteTemplate v6;
int v7;
v7 = ov12_02220248(param0);
v6.unk_00 = ov12_022258E0(param0, v7, 0);
v6.unk_02 = ov12_022258E0(param0, v7, 1);
v6.unk_04 = 0;
v6.unk_06 = 0;
v6.unk_08 = 100;
v6.unk_0C = 0;
v6.unk_10 = 1;
v6.unk_2C = 1;
v6.unk_30 = 0;
v6.x = ov12_022258E0(param0, v7, 0);
v6.y = ov12_022258E0(param0, v7, 1);
v6.z = 0;
v6.animIdx = 0;
v6.priority = 100;
v6.plttIdx = 0;
v6.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v6.bgPriority = 1;
v6.transferToVRAM = FALSE;
for (v0 = 0; v0 < 6; v0++) {
v6.unk_14[v0] = inline_ov12_022204C4(param0->unk_18) + 5000;
v6.resources[v0] = inline_ov12_022204C4(param0->unk_18) + 5000;
param0->unk_18 += 1;
}
param0->unk_100 = v6;
v4 = sub_0200CE6C(param0->unk_BC->unk_AC, param0->unk_C8[v2], &v6);
v4 = SpriteActor_LoadResources(param0->unk_BC->unk_AC, param0->unk_C8[v2], &v6);
}
v3 = inline_ov12_022204C4(param0->unk_18);
@@ -3748,29 +3748,29 @@ static void ov12_02222FC8 (UnkStruct_ov12_0221FCDC * param0)
param0->unk_18 += 1;
{
UnkStruct_ov104_0223F9E0 v5;
SpriteTemplate v5;
int v6;
v6 = ov12_02220248(param0);
v5.unk_00 = ov12_022258E0(param0, v6, 0);
v5.unk_02 = ov12_022258E0(param0, v6, 1);
v5.unk_04 = 0;
v5.unk_06 = 0;
v5.unk_08 = 100;
v5.unk_0C = 0;
v5.unk_10 = 1;
v5.unk_2C = 1;
v5.unk_30 = 0;
v5.x = ov12_022258E0(param0, v6, 0);
v5.y = ov12_022258E0(param0, v6, 1);
v5.z = 0;
v5.animIdx = 0;
v5.priority = 100;
v5.plttIdx = 0;
v5.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v5.bgPriority = 1;
v5.transferToVRAM = FALSE;
for (v0 = 0; v0 < 6; v0++) {
v5.unk_14[v0] = inline_ov12_022204C4(param0->unk_18) + 5000;
v5.resources[v0] = inline_ov12_022204C4(param0->unk_18) + 5000;
param0->unk_18 += 1;
}
param0->unk_100 = v5;
v3 = sub_0200CE6C(param0->unk_BC->unk_AC, param0->unk_C8[v1], &v5);
v3 = SpriteActor_LoadResources(param0->unk_BC->unk_AC, param0->unk_C8[v1], &v5);
GF_ASSERT(param0->unk_D8[v2] == NULL);
param0->unk_D8[v2] = v3;
}
@@ -3944,7 +3944,7 @@ BOOL ov12_0222325C (UnkStruct_ov12_0221FCDC * param0, int param1[], int param2)
return 1;
}
UnkStruct_ov104_0223F9E0 ov12_0222329C (UnkStruct_ov12_0221FCDC * param0)
SpriteTemplate ov12_0222329C (UnkStruct_ov12_0221FCDC * param0)
{
return param0->unk_100;
}
@@ -3987,7 +3987,7 @@ Sprite * ov12_022232FC (UnkStruct_ov12_0221FCDC * param0, int param1)
}
}
PaletteSys * ov12_0222332C (UnkStruct_ov12_0221FCDC * param0)
PaletteData * ov12_0222332C (UnkStruct_ov12_0221FCDC * param0)
{
return param0->unk_C4;
}
@@ -4241,10 +4241,10 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int
v3[4] = 0;
v3[5] = 0;
sub_0200CC3C(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 76, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v3[0]);
sub_0200CDC4(v2->unk_08.unk_08, 2, v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 75, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v3[1]);
sub_0200CE24(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 77, 0, v3[2]);
sub_0200CE54(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 78, 0, v3[3]);
SpriteRenderer_LoadCharResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 76, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v3[0]);
SpriteRenderer_LoadPalette(v2->unk_08.unk_08, 2, v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 75, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v3[1]);
SpriteRenderer_LoadCellResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 77, 0, v3[2]);
SpriteRenderer_LoadAnimResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 78, 0, v3[3]);
}
NARC_dtor(v4);
@@ -4278,7 +4278,7 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int
{
int v11;
UnkStruct_ov104_0223F9E0 v12;
SpriteTemplate v12;
Sprite * v13;
s16 v14, v15;
@@ -4292,21 +4292,21 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int
continue;
}
v12.unk_00 = v14;
v12.unk_02 = v15;
v12.unk_04 = 0;
v12.unk_06 = 0;
v12.unk_08 = v1[v2->unk_44[v5]];
v12.unk_0C = 0;
v12.unk_10 = 1;
v12.unk_2C = 1;
v12.unk_30 = 0;
v12.x = v14;
v12.y = v15;
v12.z = 0;
v12.animIdx = 0;
v12.priority = v1[v2->unk_44[v5]];
v12.plttIdx = 0;
v12.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v12.bgPriority = 1;
v12.transferToVRAM = FALSE;
for (v11 = 0; v11 < 6; v11++) {
v12.unk_14[v11] = v9[v11];
v12.resources[v11] = v9[v11];
}
v10 = sub_0200CE6C(v2->unk_08.unk_00, v2->unk_08.unk_04, &v12);
v10 = SpriteActor_LoadResources(v2->unk_08.unk_00, v2->unk_08.unk_04, &v12);
sub_0200D330(v10);
v2->unk_24[v5] = v10;
@@ -4362,8 +4362,8 @@ void ov12_02223770 (UnkStruct_ov12_02223764 * param0)
continue;
}
sub_0200D070(param0->unk_08.unk_04, param0->unk_14[v0]);
sub_0200D080(param0->unk_08.unk_04, param0->unk_14[v0]);
SpriteGfxHandler_UnloadCharObjById(param0->unk_08.unk_04, param0->unk_14[v0]);
SpriteGfxHandler_UnloadPlttObjById(param0->unk_08.unk_04, param0->unk_14[v0]);
sub_0200D0F4(param0->unk_24[v0]);
}
@@ -4379,8 +4379,8 @@ void ov12_022237A4 (UnkStruct_ov12_02223764 * param0, int param1)
continue;
}
sub_0200D070(param0->unk_08.unk_04, param0->unk_14[v0]);
sub_0200D080(param0->unk_08.unk_04, param0->unk_14[v0]);
SpriteGfxHandler_UnloadCharObjById(param0->unk_08.unk_04, param0->unk_14[v0]);
SpriteGfxHandler_UnloadPlttObjById(param0->unk_08.unk_04, param0->unk_14[v0]);
sub_0200D0F4(param0->unk_24[v0]);
}

16
src/overlay012/ov12_02225864.c
View File

@@ -72,7 +72,7 @@ typedef struct UnkStruct_ov12_022267D4_t {
s8 unk_15;
s8 unk_16;
s8 unk_17;
PaletteSys * unk_18;
PaletteData * unk_18;
} UnkStruct_ov12_022267D4;
static void ov12_022268DC(u16 * param0, u16 param1);
@@ -217,7 +217,7 @@ u32 ov12_022259AC (fx32 param0, fx32 param1, fx32 param2)
void ov12_022259DC (UnkStruct_ov12_02225F6C * param0, CellActorData * param1, s16 param2, s16 param3)
{
sub_0200D4C4(param1, param2 + param0->unk_00, param3 + param0->unk_02);
SpriteActor_SetSpritePositionXY(param1, param2 + param0->unk_00, param3 + param0->unk_02);
}
void ov12_022259FC (UnkStruct_ov12_02225F6C * param0, CellActorData * param1)
@@ -620,8 +620,8 @@ void ov12_0222605C (CellActorData * param0, s16 param1, s16 param2, fx32 param3,
v1 = param1 - param2;
}
sub_0200D550(param0, &v2, &v3);
sub_0200D4C4(param0, v2, v1 + v0);
SpriteActor_GetSpritePositionXY(param0, &v2, &v3);
SpriteActor_SetSpritePositionXY(param0, v2, v1 + v0);
}
BOOL ov12_022260A8 (UnkStruct_ov12_02225F6C * param0, CellActorData * param1)
@@ -778,7 +778,7 @@ BOOL ov12_02226274 (UnkStruct_ov12_02226274 * param0)
if (v1[v0]) {
if (param0->unk_AE == 0) {
sub_0200D4C4(param0->unk_98[v0], param0->unk_00 + param0->unk_04[v0].unk_00, param0->unk_02 + param0->unk_04[v0].unk_02);
SpriteActor_SetSpritePositionXY(param0->unk_98[v0], param0->unk_00 + param0->unk_04[v0].unk_00, param0->unk_02 + param0->unk_04[v0].unk_02);
} else {
ov12_02225FA4(&param0->unk_04[v0], &v2, &v3);
sub_0200D6E8(param0->unk_98[v0], v2, v3);
@@ -1154,7 +1154,7 @@ void ov12_02226858 (UnkStruct_ov12_022267D4 * param0)
Heap_FreeToHeap(param0);
}
UnkStruct_ov12_022267D4 * ov12_02226870 (PaletteSys * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10)
UnkStruct_ov12_022267D4 * ov12_02226870 (PaletteData * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10)
{
UnkStruct_ov12_022267D4 * v0 = NULL;
@@ -1203,7 +1203,7 @@ static void ov12_022268DC (u16 * param0, u16 param1)
void ov12_02226924 (UnkStruct_ov12_0221FCDC * param0)
{
PaletteSys * v0;
PaletteData * v0;
u16 * v1;
v0 = ov12_0222332C(param0);
@@ -1218,7 +1218,7 @@ void ov12_02226924 (UnkStruct_ov12_0221FCDC * param0)
void ov12_02226954 (UnkStruct_ov12_0221FCDC * param0)
{
PaletteSys * v0;
PaletteData * v0;
v0 = ov12_0222332C(param0);

18
src/overlay012/ov12_022269C0.c
View File

@@ -8,7 +8,7 @@
#include "overlay012/struct_ov12_0221FCDC_decl.h"
#include "struct_defs/struct_0200D0F4.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_0200C6E4.h"
#include "unk_0200D9E8.h"
@@ -34,8 +34,8 @@ typedef struct {
typedef struct {
u8 unk_00;
UnkStruct_ov12_0221FCDC * unk_04;
CellTransferStateData * unk_08;
AnimationResourceCollection * unk_0C;
SpriteRenderer * unk_08;
SpriteGfxHandler * unk_0C;
CellActorData * unk_10;
CellActorData * unk_14[100];
GraphicElementData * unk_1A4[10];
@@ -133,9 +133,9 @@ static void ov12_02226AAC (SysTask * param0, void * param1)
switch (v0->unk_00) {
case 0:
sub_0200D324(v0->unk_14[0]->unk_00);
sub_0200D324(v0->unk_14[1]->unk_00);
sub_0200D324(v0->unk_14[2]->unk_00);
SpriteActor_UpdateObject(v0->unk_14[0]->unk_00);
SpriteActor_UpdateObject(v0->unk_14[1]->unk_00);
SpriteActor_UpdateObject(v0->unk_14[2]->unk_00);
sub_0200D5AC(v0->unk_14[0]->unk_00, 1, 0);
sub_0200D5AC(v0->unk_14[1]->unk_00, -1, 0);
@@ -155,10 +155,10 @@ static void ov12_02226AAC (SysTask * param0, void * param1)
}
}
void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02226AAC * v0;
UnkStruct_ov104_0223F9E0 v1;
SpriteTemplate v1;
v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov12_02226AAC));
@@ -177,7 +177,7 @@ void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
int v2;
for (v2 = 1; v2 < 3; v2++) {
v0->unk_14[v2] = sub_0200CE6C(v0->unk_08, v0->unk_0C, &v1);
v0->unk_14[v2] = SpriteActor_LoadResources(v0->unk_08, v0->unk_0C, &v1);
}
}

42
src/overlay012/ov12_02226B84.c
View File

@@ -87,8 +87,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
CellActorData * unk_14;
@@ -103,7 +103,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
PaletteSys * unk_04;
PaletteData * unk_04;
} UnkStruct_ov12_02227808;
typedef struct {
@@ -119,7 +119,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
int unk_08;
s16 unk_0C;
s16 unk_0E;
@@ -153,7 +153,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
UnkStruct_ov12_02226454 unk_08;
} UnkStruct_ov12_0222813C;
@@ -321,7 +321,7 @@ typedef struct {
int unk_24;
BGL * unk_28;
UnkStruct_ov12_0221FCDC * unk_2C;
AnimationResourceCollection * unk_30;
SpriteGfxHandler * unk_30;
UnkStruct_ov12_02235998 unk_34[4];
UnkStruct_ov12_02235998 unk_84[4];
UnkStruct_ov12_02225F6C unk_D4;
@@ -471,7 +471,7 @@ static void ov12_02226BA0 (SysTask * param0, void * param1)
continue;
}
sub_0200D4C4(v1->unk_2C[v0].unk_0C, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02);
SpriteActor_SetSpritePositionXY(v1->unk_2C[v0].unk_0C, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02);
sub_0200D330(v1->unk_2C[v0].unk_0C);
}
@@ -963,7 +963,7 @@ void ov12_02227534 (UnkStruct_ov12_0221FCDC * param0)
static void ov12_02227620 (UnkStruct_ov12_02227620 * param0, s16 param1, s16 param2)
{
sub_0200D3F4(param0->unk_14, 1);
sub_0200D4C4(param0->unk_14, param1, param2);
SpriteActor_SetSpritePositionXY(param0->unk_14, param1, param2);
param0->unk_40 = 0;
ov12_02225E68(&param0->unk_18, 10, 10, 14, 4);
}
@@ -1038,7 +1038,7 @@ static void ov12_02227738 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02227620 * v0;
Sprite * v1;
@@ -1385,7 +1385,7 @@ void ov12_02227CBC (UnkStruct_ov12_0221FCDC * param0)
sub_0200D474(v0->unk_10, 100);
sub_0200D460(v0->unk_10, 1);
sub_0200D810(v0->unk_10, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_10, GX_OAM_MODE_XLU);
sub_0200D6A4(v0->unk_10, 2);
ov12_02235780(v0->unk_00, v0->unk_38, 16 - v0->unk_38);
@@ -1625,7 +1625,7 @@ void ov12_02228168 (UnkStruct_ov12_0221FCDC * param0)
for (v2 = 0; v2 < 4; v2++) {
if (v1 & (1 << v2)) {
v3 = ov12_022202C0(v0->unk_00, v2);
sub_0200D810(v3, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v3, GX_OAM_MODE_XLU);
}
}
@@ -2086,7 +2086,7 @@ void ov12_02228B40 (UnkStruct_ov12_0221FCDC * param0)
v1->unk_24 = ov12_022202C0(v1->unk_04.unk_04, 0);
sub_0200D810(v1->unk_24, GX_OAM_MODE_OBJWND);
SpriteActor_SetOAMMode(v1->unk_24, GX_OAM_MODE_OBJWND);
sub_0200D6A4(v1->unk_24, 2);
sub_0200D6E8(v1->unk_24, 1.2f, 1.2f);
@@ -3219,7 +3219,7 @@ static void ov12_0222A178 (SysTask * param0, void * param1)
sub_0200C7EC(v1->unk_00.unk_10);
}
void ov12_0222A1AC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222A1AC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222A178 * v0 = NULL;
@@ -3366,7 +3366,7 @@ static void ov12_0222A1F4 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222A1F478 * v0 = NULL;
@@ -3382,7 +3382,7 @@ void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
s16 v2 = ov12_022258E0(param0, v1, 0);
s16 v3 = ov12_022258E0(param0, v1, 1);
sub_0200D4C4(v0->unk_1C, v2, v3);
SpriteActor_SetSpritePositionXY(v0->unk_1C, v2, v3);
}
if (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4) {
@@ -3415,7 +3415,7 @@ static void ov12_0222A3DC (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222A3DC * v0;
@@ -3443,7 +3443,7 @@ void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
}
}
sub_0200D4C4(v0->unk_1C, v3, v4);
SpriteActor_SetSpritePositionXY(v0->unk_1C, v3, v4);
sub_0200D364(v0->unk_1C, v1);
}
@@ -3471,7 +3471,7 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1)
BOOL v2 = sub_0200D3B8(v0->unk_1C);
if (v2 == 0) {
sub_0200D810(v0->unk_1C, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_1C, GX_OAM_MODE_XLU);
v0->unk_20 = 16;
v0->unk_21 = 0;
ov12_02235780(v0->unk_00.unk_04, v0->unk_20, v0->unk_21);
@@ -3505,7 +3505,7 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222A4A0 * v0;
@@ -3513,7 +3513,7 @@ void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
ov12_0223595C(param0, &v0->unk_00);
v0->unk_1C = param3;
sub_0200D4C4(v0->unk_1C, -30, 160);
SpriteActor_SetSpritePositionXY(v0->unk_1C, -30, 160);
sub_0200D460(v0->unk_1C, ov12_02223428(v0->unk_00.unk_04, 2));
ov12_022201E8(v0->unk_00.unk_04, ov12_0222A4A0, v0);
@@ -3616,7 +3616,7 @@ static void ov12_0222A624 (UnkStruct_ov12_0222A624 * param0)
{
s16 v0, v1;
sub_0200D550(param0->unk_1C, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0->unk_1C, &v0, &v1);
if (v1 > 130) {
sub_0200D3F4(param0->unk_1C, 0);

102
src/overlay012/ov12_0222AC70.c
View File

@@ -18,7 +18,7 @@
#include "overlay012/struct_ov12_02235350.h"
#include "overlay012/struct_ov12_0223595C.h"
#include "overlay012/struct_ov12_02235998.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_02002F38.h"
#include "unk_0200762C.h"
@@ -39,8 +39,8 @@ typedef struct {
u8 unk_05;
u8 unk_06;
UnkStruct_ov12_0221FCDC * unk_08;
CellTransferStateData * unk_0C;
AnimationResourceCollection * unk_10;
SpriteRenderer * unk_0C;
SpriteGfxHandler * unk_10;
CellActorData * unk_14[3];
UnkStruct_ov12_02225F6C unk_20;
} UnkStruct_ov12_0222AC70;
@@ -79,7 +79,7 @@ typedef struct {
s16 unk_0A;
UnkStruct_ov12_0221FCDC * unk_0C;
Sprite * unk_10;
AnimationResourceCollection * unk_14;
SpriteGfxHandler * unk_14;
CellActorData * unk_18[4];
UnkStruct_ov12_02225F6C unk_28[4];
} UnkStruct_ov12_0222B4C8;
@@ -117,7 +117,7 @@ typedef struct {
typedef struct {
u8 unk_00;
u8 unk_01;
PaletteSys * unk_04;
PaletteData * unk_04;
UnkStruct_ov12_0221FCDC * unk_08;
UnkStruct_ov12_022267D4 * unk_0C;
Sprite * unk_10;
@@ -139,7 +139,7 @@ typedef struct {
u8 unk_00;
u8 unk_01;
UnkStruct_ov12_0221FCDC * unk_04;
AnimationResourceCollection * unk_08;
SpriteGfxHandler * unk_08;
CellActorData * unk_0C;
CellActorData * unk_10;
} UnkStruct_ov12_0222BFF4;
@@ -159,7 +159,7 @@ typedef struct {
s8 unk_08;
Sprite * unk_0C;
UnkStruct_ov12_0221FCDC * unk_10;
AnimationResourceCollection * unk_14;
SpriteGfxHandler * unk_14;
UnkStruct_ov12_0222C1A4_sub1 unk_18[3];
} UnkStruct_ov12_0222C1A4;
@@ -171,7 +171,7 @@ typedef struct {
int unk_04;
BGL * unk_08;
UnkStruct_ov12_0221FCDC * unk_0C;
AnimationResourceCollection * unk_10;
SpriteGfxHandler * unk_10;
UnkStruct_ov12_02235998 unk_14[4];
UnkStruct_ov12_02235998 unk_64[4];
UnkStruct_ov12_02225F6C unk_B4;
@@ -185,7 +185,7 @@ typedef struct {
UnkStruct_ov12_02235350 unk_04;
BGL * unk_08;
UnkStruct_ov12_0221FCDC * unk_0C;
AnimationResourceCollection * unk_10;
SpriteGfxHandler * unk_10;
Sprite * unk_14;
CellActorData * unk_18;
UnkStruct_ov12_02225F6C unk_1C;
@@ -269,8 +269,8 @@ typedef struct {
int unk_08;
u8 unk_0C;
UnkStruct_ov12_0221FCDC * unk_10;
CellTransferStateData * unk_14;
AnimationResourceCollection * unk_18;
SpriteRenderer * unk_14;
SpriteGfxHandler * unk_18;
Sprite * unk_1C;
s16 unk_20;
int unk_24;
@@ -300,7 +300,7 @@ static void ov12_0222AC70 (SysTask * param0, void * param1)
for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
{
s16 v2, v3;
sub_0200D550(v1->unk_14[v0], &v2, &v3);
SpriteActor_GetSpritePositionXY(v1->unk_14[v0], &v2, &v3);
}
if (v1->unk_04 >= Unk_ov12_0223A09E[v0][0]) {
@@ -373,17 +373,17 @@ static void ov12_0222AC70 (SysTask * param0, void * param1)
}
for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
sub_0200D324(v1->unk_14[v0]->unk_00);
SpriteActor_UpdateObject(v1->unk_14[v0]->unk_00);
}
sub_0200C7EC(v1->unk_10);
}
void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
UnkStruct_ov12_0222AC70 * v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222AC70));
@@ -416,18 +416,18 @@ void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
}
for (v0 = 1; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
v1->unk_14[v0] = sub_0200CE6C(v1->unk_0C, v1->unk_10, &v2);
sub_0200D4C4(v1->unk_14[v0], v3.unk_00, v3.unk_02);
v1->unk_14[v0] = SpriteActor_LoadResources(v1->unk_0C, v1->unk_10, &v2);
SpriteActor_SetSpritePositionXY(v1->unk_14[v0], v3.unk_00, v3.unk_02);
}
sub_0200D4C4(v1->unk_14[0], v3.unk_00, v3.unk_02);
SpriteActor_SetSpritePositionXY(v1->unk_14[0], v3.unk_00, v3.unk_02);
}
for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
v1->unk_01[v0] = 0;
sub_0200D6A4(v1->unk_14[v0], 2);
sub_0200D5DC(v1->unk_14[v0], 0, 32 - (v0 * 4));
sub_0200D810(v1->unk_14[v0], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v1->unk_14[v0], GX_OAM_MODE_XLU);
}
ov12_022201CC(param0, ov12_0222AC70, v1, 0x1000);
@@ -657,7 +657,7 @@ static void ov12_0222B4C8 (SysTask * param0, void * param1)
if (ov12_02225C14(&v2->unk_28[v0]) == 0) {
v1++;
} else {
sub_0200D4C4(v2->unk_18[v0], v2->unk_28[v0].unk_00, v2->unk_28[v0].unk_02);
SpriteActor_SetSpritePositionXY(v2->unk_18[v0], v2->unk_28[v0].unk_00, v2->unk_28[v0].unk_02);
}
sub_0200D330(v2->unk_18[v0]);
@@ -724,7 +724,7 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0)
for (v1 = 0; v1 < 4; v1++) {
v0->unk_18[v1] = ov12_022202C0(v0->unk_0C, v1);
sub_0200D810(v0->unk_18[v1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
}
if (ov12_0223525C(v0->unk_0C, ov12_02220240(v0->unk_0C)) == 0x3) {
@@ -1097,7 +1097,7 @@ static void ov12_0222BFF4 (SysTask * param0, void * param1)
case 1:
sub_0200D3F4(v0->unk_0C, 1);
sub_0200D3F4(v0->unk_10, 1);
sub_0200D810(v0->unk_10, GX_OAM_MODE_OBJWND);
SpriteActor_SetOAMMode(v0->unk_10, GX_OAM_MODE_OBJWND);
v0->unk_00++;
break;
case 2:
@@ -1208,8 +1208,8 @@ static void ov12_0222C1A4 (SysTask * param0, void * param1)
s16 v5;
s16 v6;
sub_0200D550(v2->unk_18[v0].unk_04, &v5, &v6);
sub_0200D4C4(v2->unk_18[v0].unk_04, v5, v2->unk_02);
SpriteActor_GetSpritePositionXY(v2->unk_18[v0].unk_04, &v5, &v6);
SpriteActor_SetSpritePositionXY(v2->unk_18[v0].unk_04, v5, v2->unk_02);
sub_0200D6E8(v2->unk_18[v0].unk_04, 1.0f * v2->unk_08, 1.0f);
}
v2->unk_18[v0].unk_00 = 0;
@@ -1224,7 +1224,7 @@ static void ov12_0222C1A4 (SysTask * param0, void * param1)
break;
case 2:
for (v0 = 0; v0 < 3; v0++) {
sub_0200D810(v2->unk_18[v0].unk_04, GX_OAM_MODE_NORMAL);
SpriteActor_SetOAMMode(v2->unk_18[v0].unk_04, GX_OAM_MODE_NORMAL);
ov12_02225EF0(&v2->unk_18[v0].unk_08, 5, 100, 5, 100, 100, 5);
}
@@ -1286,7 +1286,7 @@ void ov12_0222C3C0 (UnkStruct_ov12_0221FCDC * param0)
v0->unk_18[v1].unk_04 = ov12_022202C0(v0->unk_10, v1);
sub_0200D6A4(v0->unk_18[v1].unk_04, 2);
sub_0200D810(v0->unk_18[v1].unk_04, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18[v1].unk_04, GX_OAM_MODE_XLU);
sub_0200D474(v0->unk_18[v1].unk_04, v1 + 1);
}
}
@@ -1431,7 +1431,7 @@ static void ov12_0222C678 (SysTask * param0, void * param1)
ov12_02226138(&v0->unk_1C);
ov12_02226454(&v0->unk_64);
sub_0200D4C4(v0->unk_18, v0->unk_40.unk_00, v0->unk_40.unk_02);
SpriteActor_SetSpritePositionXY(v0->unk_18, v0->unk_40.unk_00, v0->unk_40.unk_02);
sub_0200D330(v0->unk_18);
sub_0200C7EC(v0->unk_10);
break;
@@ -1476,7 +1476,7 @@ void ov12_0222C6D4 (UnkStruct_ov12_0221FCDC * param0)
ov12_022357BC(v0->unk_0C, (1 << ov12_022233EC(param0, 2)) | GX_BLEND_PLANEMASK_BD | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0, 0xffffffff, 0xffffffff);
ov12_02226424(&v0->unk_64, 31, 0, 0, 31, (20 - 5));
sub_0200D810(v0->unk_18, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18, GX_OAM_MODE_XLU);
ov12_022201E8(v0->unk_0C, ov12_0222C678, v0);
}
@@ -1685,8 +1685,8 @@ static void ov12_0222CACC (SysTask * param0, void * param1)
if (ov12_02226138(&v1->unk_40[0]) == 0) {
v1->unk_00.unk_00++;
} else {
sub_0200D4C4(v1->unk_38[0], +v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
sub_0200D4C4(v1->unk_38[1], -v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
SpriteActor_SetSpritePositionXY(v1->unk_38[0], +v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
SpriteActor_SetSpritePositionXY(v1->unk_38[1], -v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
sub_0200D330(v1->unk_38[0]);
sub_0200D330(v1->unk_38[1]);
}
@@ -1738,7 +1738,7 @@ static void ov12_0222CBFC (SysTask * param0, void * param1)
sub_0200C7EC(v1->unk_10.unk_10);
}
void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
int v1;
@@ -1805,7 +1805,7 @@ static void ov12_0222CDF0 (SysTask * param0, void * param1)
ov12_02225FA4(&v0->unk_9C, &v1, &v2);
sub_0200D6E8(v0->unk_40, v1, v2);
v3 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
sub_0200D4C4(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
SpriteActor_SetSpritePositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
if (v0->unk_0C < v0->unk_10) {
v0->unk_0C++;
@@ -1833,7 +1833,7 @@ static void ov12_0222CDF0 (SysTask * param0, void * param1)
ov12_02225FA4(&v0->unk_9C, &v4, &v5);
sub_0200D6E8(v0->unk_40, v4, v5);
v6 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
sub_0200D4C4(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v6);
SpriteActor_SetSpritePositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v6);
if (v0->unk_0C > v0->unk_0E) {
v0->unk_0C--;
@@ -1913,9 +1913,9 @@ void ov12_0222CFA0 (UnkStruct_ov12_0221FCDC * param0)
v0->unk_12 = +1;
}
sub_0200D4C4(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02);
SpriteActor_SetSpritePositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02);
sub_0200D6A4(v0->unk_40, 2);
sub_0200D810(v0->unk_40, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_40, GX_OAM_MODE_XLU);
{
f32 v1, v2;
@@ -1928,7 +1928,7 @@ void ov12_0222CFA0 (UnkStruct_ov12_0221FCDC * param0)
sub_0200D6E8(v0->unk_40, v1, v2);
v3 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
sub_0200D4C4(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
SpriteActor_SetSpritePositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
}
ov12_022201E8(v0->unk_18.unk_04, ov12_0222CDF0, v0);
@@ -1978,7 +1978,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
{
s16 v3, v4;
sub_0200D550(v1->unk_30[0].unk_00, &v3, &v4);
SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v3, &v4);
if (v4 <= ((40 - 16 + 20 + 10) + 50)) {
sub_0200D5DC(v1->unk_30[0].unk_00, 0, 2);
@@ -1992,7 +1992,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
{
s16 v5, v6;
sub_0200D550(v1->unk_30[0].unk_00, &v5, &v6);
SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v5, &v6);
if (v6 <= (((40 - 16 + 20 + 10) + 50))) {
sub_0200D5DC(v1->unk_30[0].unk_00, 0, 2);
@@ -2027,8 +2027,8 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
{
s16 v7, v8, v9, v10;
sub_0200D550(v1->unk_30[0].unk_00, &v7, &v8);
sub_0200D550(v1->unk_30[1].unk_00, &v9, &v10);
SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v7, &v8);
SpriteActor_GetSpritePositionXY(v1->unk_30[1].unk_00, &v9, &v10);
ov12_02226728(v7, v8, v9, v10, &v1->unk_C8, &v1->unk_CA);
ov12_02226744(v7, v8, v1->unk_C8, v1->unk_CA, &v1->unk_2C);
@@ -2050,8 +2050,8 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
{+1, -1},
};
sub_0200D550(v1->unk_30[0].unk_00, &v11, &v12);
sub_0200D550(v1->unk_30[1].unk_00, &v13, &v14);
SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v11, &v12);
SpriteActor_GetSpritePositionXY(v1->unk_30[1].unk_00, &v13, &v14);
ov12_02225C98(&v1->unk_30[0].unk_04[0], &v1->unk_30[0].unk_04[1], v11, v13, v12, v14, 10, v1->unk_2C * v15[v1->unk_0C][0]);
ov12_02225C98(&v1->unk_30[1].unk_04[0], &v1->unk_30[1].unk_04[1], v13, v11, v14, v12, 10, v1->unk_2C * v15[v1->unk_0C][1]);
@@ -2113,7 +2113,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
s16 v18, v19;
for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
sub_0200D550(v1->unk_30[v0].unk_00, &v18, &v19);
SpriteActor_GetSpritePositionXY(v1->unk_30[v0].unk_00, &v18, &v19);
if (v19 < 80) {
sub_0200D460(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10));
@@ -2138,11 +2138,11 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
sub_0200C7EC(v1->unk_18);
}
void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
UnkStruct_ov12_0222D128 * v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222D128));
@@ -2165,21 +2165,21 @@ void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
for (v0 = 1; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
v1->unk_30[v0].unk_00 = sub_0200CE6C(v1->unk_14, v1->unk_18, &v2);
v1->unk_30[v0].unk_00 = SpriteActor_LoadResources(v1->unk_14, v1->unk_18, &v2);
}
}
for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
sub_0200D810(v1->unk_30[v0].unk_00, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v1->unk_30[v0].unk_00, GX_OAM_MODE_XLU);
sub_0200D460(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10) + 1);
}
if (ov12_0221FDD4(param0) == 1) {
sub_0200D4C4(v1->unk_30[0].unk_00, 180 - 20, (40 - 16 + 20 + 10));
sub_0200D4C4(v1->unk_30[1].unk_00, 100 - 20, (25 - 16 + 20 + 10));
SpriteActor_SetSpritePositionXY(v1->unk_30[0].unk_00, 180 - 20, (40 - 16 + 20 + 10));
SpriteActor_SetSpritePositionXY(v1->unk_30[1].unk_00, 100 - 20, (25 - 16 + 20 + 10));
} else {
sub_0200D4C4(v1->unk_30[0].unk_00, 100, (40 - 16 + 20 + 10));
sub_0200D4C4(v1->unk_30[1].unk_00, 180, (25 - 16 + 20 + 10));
SpriteActor_SetSpritePositionXY(v1->unk_30[0].unk_00, 100, (40 - 16 + 20 + 10));
SpriteActor_SetSpritePositionXY(v1->unk_30[1].unk_00, 180, (25 - 16 + 20 + 10));
}
ov12_022201E8(v1->unk_10, ov12_0222D128, v1);

94
src/overlay012/ov12_0222D6B0.c
View File

@@ -14,7 +14,7 @@
#include "overlay012/struct_ov12_02226454.h"
#include "overlay012/struct_ov12_02235350.h"
#include "overlay012/struct_ov12_0223595C.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
@@ -34,8 +34,8 @@ typedef struct {
u8 unk_06;
u8 unk_07;
UnkStruct_ov12_0221FCDC * unk_08;
CellTransferStateData * unk_0C;
AnimationResourceCollection * unk_10;
SpriteRenderer * unk_0C;
SpriteGfxHandler * unk_10;
CellActorData * unk_14[3];
UnkStruct_ov12_02225F6C unk_20;
} UnkStruct_ov12_0222D6B0;
@@ -48,8 +48,8 @@ typedef struct {
u8 unk_09;
u8 unk_0A;
UnkStruct_ov12_0221FCDC * unk_0C;
CellTransferStateData * unk_10;
AnimationResourceCollection * unk_14;
SpriteRenderer * unk_10;
SpriteGfxHandler * unk_14;
CellActorData * unk_18[6];
int unk_30;
CellActorData * unk_34;
@@ -60,8 +60,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
u8 unk_0C;
u8 unk_0D;
u8 unk_0E;
@@ -79,8 +79,8 @@ typedef struct {
u8 unk_03;
u8 unk_04;
UnkStruct_ov12_0221FCDC * unk_08;
CellTransferStateData * unk_0C;
AnimationResourceCollection * unk_10;
SpriteRenderer * unk_0C;
SpriteGfxHandler * unk_10;
UnkStruct_ov12_0222DC98 unk_14[20];
int unk_514[20];
} UnkStruct_ov12_0222DE24;
@@ -139,7 +139,7 @@ static void ov12_0222D6B0 (SysTask * param0, void * param1)
for (v0 = 0; v0 < v1->unk_05; v0++) {
{
s16 v2, v3;
sub_0200D550(v1->unk_14[v0], &v2, &v3);
SpriteActor_GetSpritePositionXY(v1->unk_14[v0], &v2, &v3);
}
if (v1->unk_04 >= Unk_ov12_0223A144[v0][0]) {
@@ -182,17 +182,17 @@ static void ov12_0222D6B0 (SysTask * param0, void * param1)
}
for (v0 = 0; v0 < v1->unk_05; v0++) {
sub_0200D324(v1->unk_14[v0]->unk_00);
SpriteActor_UpdateObject(v1->unk_14[v0]->unk_00);
}
sub_0200C7EC(v1->unk_10);
}
void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
UnkStruct_ov12_0222D6B0 * v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222D6B0));
@@ -216,7 +216,7 @@ void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
for (v0 = 1; v0 < v1->unk_05; v0++) {
v1->unk_14[v0] = sub_0200CE6C(v1->unk_0C, v1->unk_10, &v2);
v1->unk_14[v0] = SpriteActor_LoadResources(v1->unk_0C, v1->unk_10, &v2);
}
}
@@ -227,7 +227,7 @@ void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D364(v1->unk_14[0], 1);
}
sub_0200D4C4(v1->unk_14[0], 128, 80);
SpriteActor_SetSpritePositionXY(v1->unk_14[0], 128, 80);
} else {
if ((ov12_0223525C(param0, ov12_02220248(param0)) == 0x4) && (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4)) {
sub_0200D364(v1->unk_14[0], 1);
@@ -235,13 +235,13 @@ void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D364(v1->unk_14[0], 0);
}
sub_0200D4C4(v1->unk_14[0], 128, 80);
SpriteActor_SetSpritePositionXY(v1->unk_14[0], 128, 80);
}
for (v0 = 0; v0 < v1->unk_05; v0++) {
v1->unk_01[v0] = 0;
sub_0200D6A4(v1->unk_14[v0], 2);
sub_0200D810(v1->unk_14[v0], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v1->unk_14[v0], GX_OAM_MODE_XLU);
if (ov12_0221FDD4(v1->unk_08) == 1) {
sub_0200D6E8(v1->unk_14[v0], -1.0f, 1.0f);
@@ -334,10 +334,10 @@ static void ov12_0222D934 (SysTask * param0, void * param1)
{
s16 v3, v4;
sub_0200D550(v2->unk_34, &v3, &v4);
SpriteActor_GetSpritePositionXY(v2->unk_34, &v3, &v4);
ov12_02225BC8(&v2->unk_3C, v3, Unk_ov12_0223A17A[v2->unk_30][0].unk_00, v4, Unk_ov12_0223A17A[v2->unk_30][0].unk_02, Unk_ov12_0223A140[v2->unk_30]);
sub_0200D550(v2->unk_38, &v3, &v4);
SpriteActor_GetSpritePositionXY(v2->unk_38, &v3, &v4);
ov12_02225BC8(&v2->unk_60, v3, Unk_ov12_0223A17A[v2->unk_30][1].unk_00, v4, Unk_ov12_0223A17A[v2->unk_30][1].unk_02, Unk_ov12_0223A140[v2->unk_30]);
}
v2->unk_30++;
@@ -402,18 +402,18 @@ static void ov12_0222D934 (SysTask * param0, void * param1)
if ((v2->unk_00 < 3) && (v1 == 0)) {
for (v0 = 0; v0 < v2->unk_08; v0++) {
sub_0200D324(v2->unk_18[v0]->unk_00);
SpriteActor_UpdateObject(v2->unk_18[v0]->unk_00);
}
}
sub_0200C7EC(v2->unk_14);
}
void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
UnkStruct_ov12_0222D934 * v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222D934));
@@ -439,7 +439,7 @@ void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
for (v0 = 1; v0 < v1->unk_08; v0++) {
v1->unk_18[v0] = sub_0200CE6C(v1->unk_10, v1->unk_14, &v2);
v1->unk_18[v0] = SpriteActor_LoadResources(v1->unk_10, v1->unk_14, &v2);
}
}
@@ -454,8 +454,8 @@ void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
for (v0 = 0; v0 < v1->unk_08; v0++) {
sub_0200D390(v1->unk_18[v0], 1);
sub_0200D4C4(v1->unk_18[v0], Unk_ov12_0223A162[v0].unk_00, Unk_ov12_0223A162[v0].unk_02);
sub_0200D810(v1->unk_18[v0], GX_OAM_MODE_XLU);
SpriteActor_SetSpritePositionXY(v1->unk_18[v0], Unk_ov12_0223A162[v0].unk_00, Unk_ov12_0223A162[v0].unk_02);
SpriteActor_SetOAMMode(v1->unk_18[v0], GX_OAM_MODE_XLU);
}
sub_0200D3F4(v1->unk_18[1], 0);
@@ -535,7 +535,7 @@ static void ov12_0222DC98 (SysTask * param0, void * param1)
v2 = 10 + (LCRNG_Next() % 10);
sub_0200D550(v0->unk_10, &v1.unk_00, &v1.unk_02);
SpriteActor_GetSpritePositionXY(v0->unk_10, &v1.unk_00, &v1.unk_02);
ov12_02225BC8(&v0->unk_14, v1.unk_00, Unk_ov12_0223A14A[v0->unk_0F].unk_00, v1.unk_02, Unk_ov12_0223A14A[v0->unk_0F].unk_02, v2);
v0->unk_0C++;
}
@@ -632,12 +632,12 @@ static const s16 Unk_ov12_0223A19A[][4] = {
{0x50, 0x92, 0x32, 0x35}
};
void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
int v0;
int v1;
UnkStruct_ov12_0222DE24 * v2;
UnkStruct_ov104_0223F9E0 v3;
SpriteTemplate v3;
v2 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222DE24));
GF_ASSERT(v2 != NULL);
@@ -663,7 +663,7 @@ void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
for (v1 = 0; v1 < v2->unk_02; v1++) {
if (v1 != 0) {
v2->unk_14[v1].unk_10 = sub_0200CE6C(v2->unk_0C, v2->unk_10, &v3);
v2->unk_14[v1].unk_10 = SpriteActor_LoadResources(v2->unk_0C, v2->unk_10, &v3);
}
v6 = v2->unk_14[v1].unk_10;
@@ -681,7 +681,7 @@ void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v4 = Unk_ov12_0223A19A[v0][1] + (LCRNG_Next() % Unk_ov12_0223A19A[v0][3]);
v5 = Unk_ov12_0223A19A[v0][0] + (LCRNG_Next() % Unk_ov12_0223A19A[v0][2]);
sub_0200D4C4(v6, v4, v5);
SpriteActor_SetSpritePositionXY(v6, v4, v5);
sub_0200D6A4(v6, 2);
sub_0200D6E8(v6, v2->unk_14[v1].unk_38, v2->unk_14[v1].unk_38);
sub_0200D3F4(v6, 0);
@@ -764,14 +764,14 @@ void ov12_0222E1A8 (UnkStruct_ov12_0221FCDC * param0)
ov12_0223595C(param0, &v0->unk_04);
v0->unk_20 = ov12_022202C0(v0->unk_04.unk_04, 0);
sub_0200D810(v0->unk_20, GX_OAM_MODE_OBJWND);
SpriteActor_SetOAMMode(v0->unk_20, GX_OAM_MODE_OBJWND);
GX_SetVisibleWnd(GX_WNDMASK_OW);
G2_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 0);
G2_SetWndOBJInsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_OBJ, 0);
v0->unk_24 = ov12_022202C0(v0->unk_04.unk_04, 1);
sub_0200D810(v0->unk_24, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_24, GX_OAM_MODE_XLU);
ov12_02226424(&v0->unk_2C, 16, 2, 2, 16, 16);
ov12_02222590(v0->unk_04.unk_04, 2);
@@ -828,7 +828,7 @@ static void ov12_0222E25C (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222E25C * v0 = NULL;
@@ -839,7 +839,7 @@ void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
int v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v2 = ov12_0222329C(v0->unk_00.unk_04);
@@ -848,7 +848,7 @@ void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
for (v1 = 1; v1 < 4; v1++) {
v0->unk_1E[v1] = 0;
v0->unk_28[v1] = sub_0200CE6C(v0->unk_00.unk_08, v0->unk_00.unk_10, &v2);
v0->unk_28[v1] = SpriteActor_LoadResources(v0->unk_00.unk_08, v0->unk_00.unk_10, &v2);
}
sub_0200D7D4(v0->unk_28[0], 1);
@@ -887,10 +887,10 @@ static void ov12_0222E390 (SysTask * param0, void * param1)
if (v0->unk_22[0] == 110) {
ov12_02235780(v0->unk_00.unk_04, 0xffffffff, 0xffffffff);
sub_0200D810(v0->unk_2C[0], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[1], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[2], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[3], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[0], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[2], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[3], GX_OAM_MODE_XLU);
v0->unk_54 = 15;
v0->unk_58 = 0;
@@ -924,10 +924,10 @@ static void ov12_0222E390 (SysTask * param0, void * param1)
if (v0->unk_22[0] == 110) {
ov12_02235780(v0->unk_00.unk_04, 0xffffffff, 0xffffffff);
sub_0200D810(v0->unk_2C[0], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[1], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[2], GX_OAM_MODE_XLU);
sub_0200D810(v0->unk_2C[3], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[0], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[2], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_2C[3], GX_OAM_MODE_XLU);
v0->unk_54 = 15;
v0->unk_58 = 0;
@@ -967,7 +967,7 @@ static void ov12_0222E390 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222E390 * v0 = NULL;
@@ -979,7 +979,7 @@ void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
int v1;
s16 v2, v3;
UnkStruct_ov104_0223F9E0 v4;
SpriteTemplate v4;
v4 = ov12_0222329C(v0->unk_00.unk_04);
@@ -988,7 +988,7 @@ void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
for (v1 = 1; v1 < 4; v1++) {
v0->unk_22[v1] = (LCRNG_Next() % 4) + (v1 * 5);
v0->unk_2C[v1] = sub_0200CE6C(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
v0->unk_2C[v1] = SpriteActor_LoadResources(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
}
sub_0200D7D4(v0->unk_2C[1], 1);
@@ -1013,7 +1013,7 @@ void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
}
for (v1 = 0; v1 < 4; v1++) {
sub_0200D4C4(v0->unk_2C[v1], v5, v6);
SpriteActor_SetSpritePositionXY(v0->unk_2C[v1], v5, v6);
}
}

22
src/overlay012/ov12_0222E91C.c
View File

@@ -14,7 +14,7 @@
#include "overlay012/struct_ov12_0223595C.h"
#include "overlay012/struct_ov12_02235998.h"
#include "overlay012/struct_ov12_022380DC.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_02002F38.h"
#include "unk_0200762C.h"
@@ -178,14 +178,14 @@ void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0)
v2 = sub_0201FAB4(sub_02021F9C(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
sub_0200D810(v1, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
v1 = v0->unk_30;
sub_0200D460(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
v2 = sub_0201FAB4(sub_02021F9C(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
sub_0200D810(v1, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
}
ov12_022201E8(v0->unk_00.unk_04, ov12_0222E91C, v0);
@@ -228,7 +228,7 @@ static void ov12_0222EC18 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_00.unk_10);
}
void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222EC18 * v0 = NULL;
@@ -242,13 +242,13 @@ void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
{
s16 v2, v3;
UnkStruct_ov104_0223F9E0 v4;
SpriteTemplate v4;
v4 = ov12_0222329C(v0->unk_00.unk_04);
v0->unk_30[0] = param3;
for (v1 = 1; v1 < 8; v1++) {
v0->unk_30[v1] = sub_0200CE6C(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
v0->unk_30[v1] = SpriteActor_LoadResources(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
if (v1 % 2) {
sub_0200D7D4(v0->unk_30[v1], 1);
@@ -286,7 +286,7 @@ void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v11 % 2) {
if (v13 == 0) {
if (v12 < 8) {
sub_0200D4C4(v0->unk_30[v12], v0->unk_50.unk_00, v0->unk_50.unk_02);
SpriteActor_SetSpritePositionXY(v0->unk_30[v12], v0->unk_50.unk_00, v0->unk_50.unk_02);
v12++;
}
} else {
@@ -416,8 +416,8 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0)
v0->unk_36 = +1;
}
sub_0200D550(v0->unk_1C[1], &v2, &v3);
sub_0200D4C4(v0->unk_1C[0], v2 + v4, v3);
SpriteActor_GetSpritePositionXY(v0->unk_1C[1], &v2, &v3);
SpriteActor_SetSpritePositionXY(v0->unk_1C[0], v2 + v4, v3);
sub_0200D6A4(v0->unk_1C[0], 2);
sub_0200D6E8(v0->unk_1C[0], v0->unk_2C * v0->unk_36, v0->unk_30);
}
@@ -444,7 +444,7 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0)
v9 = ov12_02235254(v0->unk_00.unk_04, v8);
ov12_02235350(v9, ov12_0221FDD4(v0->unk_00.unk_04), &v11);
sub_0200D550(v0->unk_1C[0], &v12.unk_00, &v12.unk_02);
SpriteActor_GetSpritePositionXY(v0->unk_1C[0], &v12.unk_00, &v12.unk_02);
{
int v13;
@@ -463,7 +463,7 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0)
v7 = LoadPokemonSpriteYOffset(ov12_022232D0(v0->unk_00.unk_04, v8), ov12_022232C4(v0->unk_00.unk_04, v8), v13, ov12_022232E0(v0->unk_00.unk_04, v8), ov12_022232EC(v0->unk_00.unk_04, v8));
}
sub_0200D4C4(v0->unk_1C[0], v12.unk_00, v11.unk_02 + v7);
SpriteActor_SetSpritePositionXY(v0->unk_1C[0], v12.unk_00, v11.unk_02 + v7);
}
sub_0200D3F4(v0->unk_1C[0], 1);

212
src/overlay012/ov12_0222F700.c
View File

@@ -17,7 +17,7 @@
#include "overlay012/struct_ov12_02225F6C.h"
#include "overlay012/struct_ov12_02226274.h"
#include "overlay012/struct_ov12_02226454.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_02002F38.h"
#include "unk_0200762C.h"
@@ -34,7 +34,7 @@
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
Sprite * unk_08;
UnkStruct_ov12_02225F6C unk_0C;
CellActorData * unk_30[2];
@@ -68,8 +68,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
UnkStruct_ov12_0222FAFC unk_0C;
UnkStruct_ov12_0222FAFC unk_58[2];
int unk_EC;
@@ -80,7 +80,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
int unk_08;
int unk_0C;
UnkStruct_ov12_02225F6C unk_10;
@@ -109,7 +109,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
int unk_08;
int unk_0C;
CellActorData * unk_10;
@@ -137,7 +137,7 @@ typedef struct {
int unk_0C;
Sprite * unk_10;
UnkStruct_ov12_0222660C * unk_14;
PaletteSys * unk_18;
PaletteData * unk_18;
UnkStruct_ov12_02226454 unk_1C;
int unk_44;
CellActorData * unk_48;
@@ -145,8 +145,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
CellActorData * unk_10;
UnkStruct_ov12_02225F6C unk_14;
@@ -167,8 +167,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
int unk_14;
@@ -182,8 +182,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
s16 unk_14;
@@ -200,7 +200,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
int unk_08;
int unk_0C;
Sprite * unk_10;
@@ -214,8 +214,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
UnkStruct_ov12_02225F6C unk_14;
@@ -231,8 +231,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
CellActorData * unk_14;
@@ -246,8 +246,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
Sprite * unk_14[4];
@@ -288,8 +288,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
CellActorData * unk_14;
@@ -330,8 +330,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
int unk_14;
@@ -347,8 +347,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
UnkStruct_ov12_02225F6C unk_14;
@@ -362,7 +362,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
int unk_08;
int unk_0C;
int unk_10;
@@ -377,15 +377,15 @@ typedef struct {
int unk_94;
int unk_98;
UnkStruct_ov12_02226454 unk_9C;
PaletteSys * unk_C4;
PaletteData * unk_C4;
BOOL unk_C8;
BOOL unk_CC;
} UnkStruct_ov12_02232D38;
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
Sprite * unk_10;
UnkStruct_ov12_02225F6C unk_14;
@@ -398,8 +398,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
int unk_14;
@@ -412,8 +412,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
int unk_14;
@@ -448,8 +448,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
CellActorData * unk_10;
UnkStruct_ov12_02226454 unk_14;
@@ -475,7 +475,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
AnimationResourceCollection * unk_04;
SpriteGfxHandler * unk_04;
UnkStruct_ov12_02225F6C unk_08;
CellActorData * unk_2C;
} UnkStruct_ov12_02234290;
@@ -558,7 +558,7 @@ void ov12_0222F770 (UnkStruct_ov12_0221FCDC * param0)
v0->unk_30[v1] = ov12_022202C0(v0->unk_00, v1);
sub_0200D474(v0->unk_30[v1], 100);
sub_0200D460(v0->unk_30[v1], 1);
sub_0200D810(v0->unk_30[v1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_30[v1], GX_OAM_MODE_XLU);
}
ov12_022261C4(&v0->unk_38, &v3, ov12_02225AE0, v0->unk_E8, v0->unk_EA - v0->unk_EC, 2, 2, 0, v0->unk_30[0], v0->unk_30[1], NULL, NULL);
@@ -671,9 +671,9 @@ void ov12_0222F9E4 (UnkStruct_ov12_0221FCDC * param0)
ov12_022201E8(v0->unk_00, ov12_0222F888, v0);
}
static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, const UnkStruct_ov104_0223F9E0 * param3, const UnkStruct_ov12_0222FAFC * param4)
static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, const SpriteTemplate * param3, const UnkStruct_ov12_0222FAFC * param4)
{
param0->unk_00 = sub_0200CE6C(param1, param2, param3);
param0->unk_00 = SpriteActor_LoadResources(param1, param2, param3);
param0->unk_04 = param4->unk_04;
param0->unk_28 = param4->unk_28;
param0->unk_3C = param4->unk_3C;
@@ -709,7 +709,7 @@ static BOOL ov12_0222FB84 (UnkStruct_ov12_0222FAFC * param0)
if (ov12_02225AE0(&param0->unk_04)) {
ov12_02225E0C(&param0->unk_28);
param0->unk_04.unk_04[5] = param0->unk_3C + param0->unk_28.unk_00;
sub_0200D4C4(param0->unk_00, param0->unk_3E + param0->unk_04.unk_00, param0->unk_40 + param0->unk_04.unk_02);
SpriteActor_SetSpritePositionXY(param0->unk_00, param0->unk_3E + param0->unk_04.unk_00, param0->unk_40 + param0->unk_04.unk_02);
} else {
if (param0->unk_44 < 1) {
if (param0->unk_44 == 0) {
@@ -746,7 +746,7 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
G2_ChangeBlendAlpha((v0->unk_F8 / 10), 31 - (v0->unk_F8 / 10));
if (v0->unk_F8 >= 310) {
sub_0200D810(v0->unk_0C.unk_00, GX_OAM_MODE_NORMAL);
SpriteActor_SetOAMMode(v0->unk_0C.unk_00, GX_OAM_MODE_NORMAL);
v0->unk_EC++;
}
@@ -787,7 +787,7 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
sub_0200D330(v0->unk_0C.unk_00);
if (sub_02021FD0(v0->unk_0C.unk_00->unk_00) == 0) {
sub_0200D810(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
v0->unk_EC++;
}
break;
@@ -814,10 +814,10 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0222FC44 * v0;
UnkStruct_ov104_0223F9E0 v1;
SpriteTemplate v1;
int v2;
int v3;
int v4;
@@ -846,13 +846,13 @@ void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v0->unk_0C.unk_3E = ov12_022258E0(param0, v3, 0);
v0->unk_0C.unk_40 = ov12_022258E0(param0, v3, 1);
sub_0200D4C4(v0->unk_0C.unk_00, v0->unk_0C.unk_3E, v0->unk_0C.unk_40);
SpriteActor_SetSpritePositionXY(v0->unk_0C.unk_00, v0->unk_0C.unk_3E, v0->unk_0C.unk_40);
sub_0200D474(v0->unk_0C.unk_00, 100);
sub_0200D460(v0->unk_0C.unk_00, 1);
v1 = ov12_0222329C(v0->unk_00);
v1.unk_00 = v0->unk_0C.unk_3E;
v1.unk_02 = v0->unk_0C.unk_40;
v1.x = v0->unk_0C.unk_3E;
v1.y = v0->unk_0C.unk_40;
for (v2 = 0; v2 < 2; v2++) {
ov12_0222FAFC(&v0->unk_58[v2], v0->unk_04, v0->unk_08, &v1, &v0->unk_0C);
@@ -861,10 +861,10 @@ void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v0->unk_F8 = 0;
ov12_02235780(v0->unk_00, 0, 31);
sub_0200D810(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
for (v2 = 0; v2 < 2; v2++) {
sub_0200D810(v0->unk_58[v2].unk_00, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_58[v2].unk_00, GX_OAM_MODE_XLU);
}
ov12_022201E8(v0->unk_00, ov12_0222FC44, v0);
@@ -876,7 +876,7 @@ static void ov12_0222FF80 (UnkStruct_ov12_0222FF80 * param0)
sub_02007DEC(param0->unk_5C, 0, param0->unk_60 + param0->unk_10.unk_00);
sub_02007DEC(param0->unk_5C, 1, param0->unk_62 + param0->unk_10.unk_02);
sub_0200D4C4(param0->unk_58, param0->unk_60 + param0->unk_10.unk_00, param0->unk_62 + param0->unk_10.unk_02 - param0->unk_66);
SpriteActor_SetSpritePositionXY(param0->unk_58, param0->unk_60 + param0->unk_10.unk_00, param0->unk_62 + param0->unk_10.unk_02 - param0->unk_66);
ov12_02225FA4(&param0->unk_34, &v0, &v1);
v0 += (f32)(param0->unk_64 * (0.10f));
@@ -941,7 +941,7 @@ void ov12_022300C4 (UnkStruct_ov12_0221FCDC * param0)
ov12_02226108(&v0->unk_10, 2, 0, 1, 6);
v0->unk_58 = ov12_022202C0(v0->unk_00, 0);
sub_0200D810(v0->unk_58, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_58, GX_OAM_MODE_XLU);
sub_0200D6A4(v0->unk_58, 2);
sub_0200D474(v0->unk_58, 100);
sub_0200D460(v0->unk_58, 1);
@@ -1188,7 +1188,7 @@ static void ov12_02230600 (SysTask * param0, void * param1)
sub_02007DEC(v0->unk_08, 6, 0);
}
sub_0200D4C4(v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C);
SpriteActor_SetSpritePositionXY(v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C);
}
v0->unk_04++;
@@ -1217,7 +1217,7 @@ void ov12_02230754 (UnkStruct_ov12_0221FCDC * param0)
ov12_02225E68(&v0->unk_14, 14, 10, 10, 8);
ov12_02225D78(&v0->unk_38, 0, 16, 8);
sub_0200D810(v0->unk_10, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_10, GX_OAM_MODE_XLU);
ov12_02235780(v0->unk_00, 0, 31);
sub_0200D6A4(v0->unk_10, 2);
@@ -1453,7 +1453,7 @@ static void ov12_02230BE0 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02230BE0 * v0;
int v1;
@@ -1483,7 +1483,7 @@ void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D6A4(v0->unk_10, 2);
sub_0200D6E8(v0->unk_10, 1, 1);
sub_0200D4C4(v0->unk_10, v3, v4);
SpriteActor_SetSpritePositionXY(v0->unk_10, v3, v4);
sub_0200D5DC(v0->unk_10, 40 * v1, 0);
sub_0200D474(v0->unk_10, 100);
sub_0200D460(v0->unk_10, 1);
@@ -1519,8 +1519,8 @@ static void ov12_02230E24 (UnkStruct_ov12_02230E24 * param0, CellActorData * par
param0->unk_34 = 10;
param0->unk_28 = param4;
sub_0200D4C4(param0->unk_00, param2, param3);
sub_0200D4C4(param0->unk_00, param2, param3);
SpriteActor_SetSpritePositionXY(param0->unk_00, param2, param3);
SpriteActor_SetSpritePositionXY(param0->unk_00, param2, param3);
sub_0200D6A4(param0->unk_00, 2);
sub_0200D474(param0->unk_00, 100);
sub_0200D460(param0->unk_00, 1);
@@ -1624,14 +1624,14 @@ static void ov12_02230F3C (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02230F3C * v0;
int v1;
int v2;
int v3;
int v4;
UnkStruct_ov104_0223F9E0 v5;
SpriteTemplate v5;
v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02230F3C));
v0->unk_00 = param0;
@@ -1654,7 +1654,7 @@ void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v1 == 0) {
ov12_02230E24(&v0->unk_44[v1], param3, v0->unk_1C, v3, v4);
} else {
ov12_02230E24(&v0->unk_44[v1], sub_0200CE6C(param1, param2, &v5), v0->unk_1C, v3, v4);
ov12_02230E24(&v0->unk_44[v1], SpriteActor_LoadResources(param1, param2, &v5), v0->unk_1C, v3, v4);
}
v3 -= 10;
@@ -1730,7 +1730,7 @@ static void ov12_022310D4 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_022310D4 * v0;
@@ -1815,7 +1815,7 @@ void ov12_02231444 (UnkStruct_ov12_0221FCDC * param0)
v0->unk_1A -= -8;
v0->unk_14 = ov12_022202C0(v0->unk_00, 0);
sub_0200D810(v0->unk_14, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_14, GX_OAM_MODE_XLU);
sub_02007DEC(v0->unk_10, 6, 1);
ov12_022263A4(&v0->unk_1C, 2, 16);
@@ -1912,7 +1912,7 @@ static void ov12_02231608 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02231508 * v0;
int v1;
@@ -1939,7 +1939,7 @@ void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D390(v0->unk_3C, 1);
sub_0200D6A4(v0->unk_3C, 2);
sub_0200D810(v0->unk_3C, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_3C, GX_OAM_MODE_XLU);
sub_0200D474(v0->unk_3C, 100);
sub_0200D460(v0->unk_3C, 1);
@@ -2013,7 +2013,7 @@ static void ov12_0223181C (SysTask * param0, void * param1)
} else {
v0->unk_0C++;
sub_0200D810(v0->unk_14, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_14, GX_OAM_MODE_XLU);
ov12_02226424(
&v0->unk_3C, 16, 0, 0, 16, 16);
@@ -2046,7 +2046,7 @@ static void ov12_0223181C (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02231760 * v0;
@@ -2060,7 +2060,7 @@ void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D474(v0->unk_14, 100);
sub_0200D460(v0->unk_14, 1);
sub_0200D550(v0->unk_14, &v0->unk_64, &v0->unk_66);
SpriteActor_GetSpritePositionXY(v0->unk_14, &v0->unk_64, &v0->unk_66);
ov12_022201E8(v0->unk_00, ov12_0223181C, v0);
}
@@ -2180,7 +2180,7 @@ static void ov12_02231A38 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_022319AC * v0;
int v1;
@@ -2200,13 +2200,13 @@ void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D474(v0->unk_24, 100);
sub_0200D460(v0->unk_24, 1);
sub_0200D550(v0->unk_24, &v0->unk_4C, &v0->unk_4E);
SpriteActor_GetSpritePositionXY(v0->unk_24, &v0->unk_4C, &v0->unk_4E);
v0->unk_4C -= 80 / 2;
v0->unk_4E -= 80 / 2;
sub_0200D4C4(v0->unk_24, v0->unk_4C, v0->unk_4E);
sub_0200D810(v0->unk_24, GX_OAM_MODE_XLU);
SpriteActor_SetSpritePositionXY(v0->unk_24, v0->unk_4C, v0->unk_4E);
SpriteActor_SetOAMMode(v0->unk_24, GX_OAM_MODE_XLU);
v0->unk_54 = -16;
@@ -2559,7 +2559,7 @@ static void ov12_0223223C (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02232084 * v0;
Sprite * v1;
@@ -2574,7 +2574,7 @@ void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D474(v0->unk_14, 100);
sub_0200D460(v0->unk_14, 1);
sub_0200D6A4(v0->unk_14, 2);
sub_0200D810(v0->unk_14, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_14, GX_OAM_MODE_XLU);
sub_0200D3CC(v0->unk_14, 4);
v0->unk_6C = 3;
@@ -2869,10 +2869,10 @@ static void ov12_022328B8 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02232720 * v0;
UnkStruct_ov104_0223F9E0 v1;
SpriteTemplate v1;
int v2;
s16 v3;
s16 v4;
@@ -2898,7 +2898,7 @@ void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v2 == 0) {
v0->unk_48[v2] = param3;
} else {
v0->unk_48[v2] = sub_0200CE6C(param1, param2, &v1);
v0->unk_48[v2] = SpriteActor_LoadResources(param1, param2, &v1);
}
sub_0200D3F4(v0->unk_48[v2], 0);
@@ -2914,7 +2914,7 @@ void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
}
v6 = v4 - v6;
sub_0200D4C4(v0->unk_48[v2], v5, v6);
SpriteActor_SetSpritePositionXY(v0->unk_48[v2], v5, v6);
if (v2 < 2) {
v0->unk_78[v2] = 8;
@@ -2968,7 +2968,7 @@ static void ov12_02232B40 (SysTask * param0, void * param1)
break;
case 4:
if (ov12_02225C14(&v0->unk_60)) {
sub_0200D4C4(v0->unk_5C, v0->unk_88, v0->unk_60.unk_02);
SpriteActor_SetSpritePositionXY(v0->unk_5C, v0->unk_88, v0->unk_60.unk_02);
} else {
v0->unk_0C++;
}
@@ -2983,7 +2983,7 @@ static void ov12_02232B40 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02232B40 * v0;
s16 v1, v2;
@@ -3002,7 +3002,7 @@ void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
sub_0200D474(v0->unk_5C, 100);
sub_0200D460(v0->unk_5C, 1);
sub_0200D4C4(v0->unk_5C, v0->unk_88, v0->unk_8A);
SpriteActor_SetSpritePositionXY(v0->unk_5C, v0->unk_88, v0->unk_8A);
ov12_022201E8(v0->unk_00, ov12_02232B40, v0);
}
@@ -3109,7 +3109,7 @@ static void ov12_02232F30 (UnkStruct_ov12_02232D38 * param0)
f32 v2, v3;
int v4;
sub_0200D550(param0->unk_1C, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0->unk_1C, &v0, &v1);
ov12_02225BC8(&param0->unk_70, v0, v0, v1 - 64, v1, 8);
ov12_02225EF0(&param0->unk_28, 2, 10, 20, 10, 10, 8);
@@ -3252,18 +3252,18 @@ void ov12_02233178 (UnkStruct_ov12_0221FCDC * param0)
sub_0200D474(v0->unk_18, 100);
sub_0200D460(v0->unk_18, 1);
sub_0200D4C4(v0->unk_18, v2, v3);
SpriteActor_SetSpritePositionXY(v0->unk_18, v2, v3);
sub_0200D3F4(v0->unk_18, 0);
sub_0200D810(v0->unk_18, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18, GX_OAM_MODE_XLU);
sub_0200D6A4(v0->unk_18, 2);
v0->unk_1C = ov12_022202C0(v0->unk_00, 1);
sub_0200D474(v0->unk_1C, 100);
sub_0200D460(v0->unk_1C, 1);
sub_0200D4C4(v0->unk_1C, v4, v5);
SpriteActor_SetSpritePositionXY(v0->unk_1C, v4, v5);
sub_0200D3F4(v0->unk_1C, 0);
sub_0200D810(v0->unk_1C, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_1C, GX_OAM_MODE_XLU);
sub_0200D6A4(v0->unk_1C, 2);
sub_0200D7E0(v0->unk_1C, 0, 80 / 2);
@@ -3332,11 +3332,11 @@ static void ov12_02233394 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_022332E8 * v0;
int v1;
UnkStruct_ov104_0223F9E0 v2;
SpriteTemplate v2;
v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022332E8));
@@ -3355,13 +3355,13 @@ void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v0->unk_3C[v1] = param3;
sub_0200D364(v0->unk_3C[v1], 1);
} else {
v0->unk_3C[v1] = sub_0200CE6C(v0->unk_04, v0->unk_08, &v2);
sub_0200D810(v0->unk_3C[v1], GX_OAM_MODE_XLU);
v0->unk_3C[v1] = SpriteActor_LoadResources(v0->unk_04, v0->unk_08, &v2);
SpriteActor_SetOAMMode(v0->unk_3C[v1], GX_OAM_MODE_XLU);
}
sub_0200D474(v0->unk_3C[v1], 100);
sub_0200D460(v0->unk_3C[v1], 1);
sub_0200D4C4(v0->unk_3C[v1], v0->unk_38, v0->unk_3A);
SpriteActor_SetSpritePositionXY(v0->unk_3C[v1], v0->unk_38, v0->unk_3A);
sub_0200D3F4(v0->unk_3C[v1], 0);
sub_0200D6A4(v0->unk_3C[v1], 2);
}
@@ -3395,7 +3395,7 @@ static void ov12_02233574 (UnkStruct_ov12_0223351C * param0)
v2 = param0->unk_30[v0].unk_04[1] * 5;
v1 = FX_Mul(FX_SinIdx(v2), (FX32_ONE * 10) * param0->unk_14) >> FX32_SHIFT;
sub_0200D4C4(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132 + v1);
SpriteActor_SetSpritePositionXY(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132 + v1);
if ((param0->unk_30[v0].unk_04[1] >= ((90 * 0xffff) / 360)) && (param0->unk_30[v0].unk_04[1] <= ((269 * 0xffff) / 360))) {
sub_0200D460(param0->unk_18[v0], 1);
@@ -3455,12 +3455,12 @@ static void ov12_02233644 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_0223351C * v0;
int v1;
Sprite * v2;
UnkStruct_ov104_0223F9E0 v3;
SpriteTemplate v3;
v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0223351C));
@@ -3479,11 +3479,11 @@ void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v1 == 0) {
v0->unk_18[v1] = param3;
} else {
v0->unk_18[v1] = sub_0200CE6C(v0->unk_04, v0->unk_08, &v3);
v0->unk_18[v1] = SpriteActor_LoadResources(v0->unk_04, v0->unk_08, &v3);
}
sub_0200D474(v0->unk_18[v1], 100);
sub_0200D810(v0->unk_18[v1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
sub_0200D390(v0->unk_18[v1], 1);
}
@@ -3495,7 +3495,7 @@ static void ov12_022337E0 (CellActorData * param0, UnkStruct_ov12_02225F6C * par
{
s16 v0, v1;
sub_0200D550(param0, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0, &v0, &v1);
ov12_02225BC8(param1, v0 + (0 * param2), v0 + (256 * param2), v1 + (0 * param3), v1 + (-128 * param3), 59);
sub_0200D3F4(param0, 1);
}
@@ -3509,12 +3509,12 @@ static BOOL ov12_02233834 (CellActorData * param0, UnkStruct_ov12_02225F6C * par
u16 v5;
if (ov12_02225C50(param1, param0)) {
sub_0200D550(param0, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0, &v0, &v1);
v5 = v0 * (((2 * 0xffff) / 360));
v2 = FX_Mul(FX_SinIdx(v5), (FX32_ONE * 14)) >> FX32_SHIFT;
sub_0200D4C4(param0, v0, v1 + v2);
SpriteActor_SetSpritePositionXY(param0, v0, v1 + v2);
v3 = FX_Mul(FX_SinIdx(v5), (FX32_CONST(0.17f)));
v3 *= -1;
@@ -3573,13 +3573,13 @@ static void ov12_02233988 (SysTask * param0, void * param1)
}
}
void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02233900 * v0;
int v1;
s16 v2, v3;
Sprite * v4;
UnkStruct_ov104_0223F9E0 v5;
SpriteTemplate v5;
v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233900));
@@ -3596,14 +3596,14 @@ void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v1 == 0) {
v0->unk_18[v1] = param3;
} else {
v0->unk_18[v1] = sub_0200CE6C(v0->unk_04, v0->unk_08, &v5);
v0->unk_18[v1] = SpriteActor_LoadResources(v0->unk_04, v0->unk_08, &v5);
}
sub_0200D474(v0->unk_18[v1], 100);
sub_0200D460(v0->unk_18[v1], 1);
sub_0200D6A4(v0->unk_18[v1], 2);
sub_0200D3F4(v0->unk_18[v1], 0);
sub_0200D4C4(v0->unk_18[v1], v2, v3);
SpriteActor_SetSpritePositionXY(v0->unk_18[v1], v2, v3);
sub_0200D364(v0->unk_18[v1], v1 % 3);
}
@@ -3858,7 +3858,7 @@ static void ov12_02233F4C (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02233F4C * v0;
@@ -3870,7 +3870,7 @@ void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v0->unk_10 = param3;
sub_0200D390(v0->unk_10, 1);
sub_0200D810(v0->unk_10, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_10, GX_OAM_MODE_XLU);
ov12_022201E8(v0->unk_00, ov12_02233F4C, v0);
}
@@ -3999,7 +3999,7 @@ void ov12_022342C4 (UnkStruct_ov12_0221FCDC * param0)
v4 += 64 * v2;
v5 += -16 * v3;
sub_0200D4C4(v0->unk_2C, v4, v5);
SpriteActor_SetSpritePositionXY(v0->unk_2C, v4, v5);
ov12_02225BC8(&v0->unk_08, v4, v4 + (48 * v2), v5, v5 + (-16 * v3), 6);
ov12_022201E8(v0->unk_00, ov12_02234290, v0);

56
src/overlay012/ov12_022346A4.c
View File

@@ -10,7 +10,7 @@
#include "struct_defs/struct_0200D0F4.h"
#include "overlay012/struct_ov12_02225F6C.h"
#include "overlay012/struct_ov12_02226454.h"
#include "overlay104/struct_ov104_0223F9E0.h"
#include "struct_defs/sprite_template.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
@@ -24,7 +24,7 @@ typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
int unk_04;
int unk_08;
AnimationResourceCollection * unk_0C;
SpriteGfxHandler * unk_0C;
int unk_10;
CellActorData * unk_14[2];
UnkStruct_ov12_02225F6C unk_1C[2];
@@ -35,7 +35,7 @@ typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
int unk_04;
int unk_08;
AnimationResourceCollection * unk_0C;
SpriteGfxHandler * unk_0C;
CellActorData * unk_10;
UnkStruct_ov12_02226454 unk_14;
} UnkStruct_ov12_022348C8;
@@ -43,7 +43,7 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
int unk_04;
AnimationResourceCollection * unk_08;
SpriteGfxHandler * unk_08;
CellActorData * unk_0C[6];
int unk_24[6];
int unk_3C[6];
@@ -51,8 +51,8 @@ typedef struct {
typedef struct {
UnkStruct_ov12_0221FCDC * unk_00;
CellTransferStateData * unk_04;
AnimationResourceCollection * unk_08;
SpriteRenderer * unk_04;
SpriteGfxHandler * unk_08;
int unk_0C;
int unk_10;
int unk_14;
@@ -72,9 +72,9 @@ static BOOL ov12_02234B34(CellActorData * param0, int * param1, int * param2);
static void ov12_02234AE0(CellActorData * param0, int * param1, int * param2, int param3, int param4);
static void ov12_02234CA8(SysTask * param0, void * param1);
void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov104_0223F9E0 v0;
SpriteTemplate v0;
UnkStruct_ov12_022346A4 * v1;
int v2;
int v3;
@@ -88,15 +88,15 @@ void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v1->unk_10 = ov12_02225964(param0, v3);
v0 = ov12_0222329C(v1->unk_00);
v0.unk_00 = ov12_022258E0(param0, v3, 0);
v0.unk_02 = ov12_022258E0(param0, v3, 1);
v0.x = ov12_022258E0(param0, v3, 0);
v0.y = ov12_022258E0(param0, v3, 1);
for (v2 = 0; v2 < 2; v2++) {
if (v2 == 0) {
v1->unk_14[v2] = param3;
sub_0200D4C4(v1->unk_14[v2], v0.unk_00, v0.unk_02);
SpriteActor_SetSpritePositionXY(v1->unk_14[v2], v0.x, v0.y);
} else {
v1->unk_14[v2] = sub_0200CE6C(param1, param2, &v0);
v1->unk_14[v2] = SpriteActor_LoadResources(param1, param2, &v0);
}
sub_0200D3F4(v1->unk_14[v2], 0);
@@ -159,7 +159,7 @@ static void ov12_0223483C (CellActorData * param0, UnkStruct_ov12_02225F6C * par
sub_0200D6A4(param0, 2);
sub_0200D3F4(param0, 1);
sub_0200D550(param0, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0, &v0, &v1);
ov12_02225BC8(param1, v0, v0 + (16 * param3), v1, v1 + -32, 32);
ov12_02225E68(param2, 2, 10, 10, 32);
@@ -180,7 +180,7 @@ static BOOL ov12_0223489C (CellActorData * param0, UnkStruct_ov12_02225F6C * par
return 1;
}
void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_022348C8 * v0;
int v1;
@@ -192,7 +192,7 @@ void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v0->unk_10 = param3;
sub_0200D3F4(v0->unk_10, 0);
sub_0200D810(v0->unk_10, GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_10, GX_OAM_MODE_XLU);
sub_0200D474(v0->unk_10, 100);
sub_0200D460(v0->unk_10, 1);
@@ -248,9 +248,9 @@ static void ov12_02234918 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_0C);
}
void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov104_0223F9E0 v0;
SpriteTemplate v0;
UnkStruct_ov12_02234A10 * v1;
int v2;
int v3;
@@ -265,15 +265,15 @@ void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
v4 = ov12_02225964(param0, v2);
v0 = ov12_0222329C(v1->unk_00);
v0.unk_00 = ov12_022258E0(param0, v2, 0);
v0.unk_02 = ov12_022258E0(param0, v2, 1);
v0.x = ov12_022258E0(param0, v2, 0);
v0.y = ov12_022258E0(param0, v2, 1);
for (v3 = 6 - 1; v3 >= 0; v3--) {
if (v3 == 6 - 1) {
v1->unk_0C[v3] = param3;
sub_0200D4C4(param3, v0.unk_00, v0.unk_02);
SpriteActor_SetSpritePositionXY(param3, v0.x, v0.y);
} else {
v1->unk_0C[v3] = sub_0200CE6C(param1, param2, &v0);
v1->unk_0C[v3] = SpriteActor_LoadResources(param1, param2, &v0);
}
sub_0200D474(v1->unk_0C[v3], 100);
@@ -295,12 +295,12 @@ static void ov12_02234AE0 (CellActorData * param0, int * param1, int * param2, i
*param2 = param3 * 2;
*param1 = 16;
sub_0200D550(param0, &v0, &v1);
SpriteActor_GetSpritePositionXY(param0, &v0, &v1);
v0 += (40 + (-12 * param3)) * param4;
v1 += 40;
sub_0200D4C4(param0, v0, v1);
SpriteActor_SetSpritePositionXY(param0, v0, v1);
}
static BOOL ov12_02234B34 (CellActorData * param0, int * param1, int * param2)
@@ -374,7 +374,7 @@ static void ov12_02234C30 (UnkStruct_ov12_02234BD8 * param0)
for (v0 = 0; v0 < 6; v0++) {
ov12_02225AE0(&param0->unk_30[v0]);
sub_0200D4C4(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132);
SpriteActor_SetSpritePositionXY(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132);
if ((param0->unk_30[v0].unk_04[1] >= ((90 * 0xffff) / 360)) && (param0->unk_30[v0].unk_04[1] <= ((269 * 0xffff) / 360))) {
sub_0200D460(param0->unk_18[v0], 1);
@@ -435,12 +435,12 @@ static void ov12_02234CA8 (SysTask * param0, void * param1)
sub_0200C7EC(v0->unk_08);
}
void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3)
{
UnkStruct_ov12_02234BD8 * v0;
int v1;
Sprite * v2;
UnkStruct_ov104_0223F9E0 v3;
SpriteTemplate v3;
v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234BD8));
@@ -459,11 +459,11 @@ void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * pa
if (v1 == 0) {
v0->unk_18[v1] = param3;
} else {
v0->unk_18[v1] = sub_0200CE6C(v0->unk_04, v0->unk_08, &v3);
v0->unk_18[v1] = SpriteActor_LoadResources(v0->unk_04, v0->unk_08, &v3);
}
sub_0200D474(v0->unk_18[v1], 100);
sub_0200D810(v0->unk_18[v1], GX_OAM_MODE_XLU);
SpriteActor_SetOAMMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
sub_0200D390(v0->unk_18[v1], 1);
}

2
src/overlay012/ov12_02234E44.c
View File

@@ -202,7 +202,7 @@ static void ov12_0223507C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0223
G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 1);
GX_SetVisibleWnd(GX_WNDMASK_OW);
sub_0200D810(v0->unk_38, GX_OAM_MODE_OBJWND);
SpriteActor_SetOAMMode(v0->unk_38, GX_OAM_MODE_OBJWND);
}
v0->unk_00.unk_10 = 0;

Some files were not shown because too many files have changed in this diff Show More