Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 08:41:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup and rename ov11_0221F840 -> particle_helper

Browse Source
This commit is contained in:
Fexty12573 2025-08-08 16:52:40 +02:00
parent e4a7367bd8
commit 1fbcc8f7c6
23 changed files with 198 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/overlay011/ov11_0221F840.h
View File

@ -1,11 +0,0 @@
#ifndef POKEPLATINUM_OV11_0221F840_H
#define POKEPLATINUM_OV11_0221F840_H
#include "particle_system.h"
ParticleSystem *ov11_0221F840(int heapID);
ParticleSystem *ov11_0221F888(int heapID);
void ov11_0221F8D8(ParticleSystem *param0);
void ov11_0221F8F0(void);
#endif // POKEPLATINUM_OV11_0221F840_H

11
include/overlay011/particle_helper.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef POKEPLATINUM_PARTICLE_HELPER_H
#define POKEPLATINUM_PARTICLE_HELPER_H
#include "particle_system.h"
ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID);
ParticleSystem *ov11_0221F888(enum HeapId heapID);
void ParticleHelper_FreeParticleSystem(ParticleSystem *param0);
void ParticleHelper_DrawParticleSystems(void);
#endif // POKEPLATINUM_PARTICLE_HELPER_H

4
include/overlay012/ov12_022237EC.h
View File

@ -5,9 +5,9 @@
#include "particle_system.h"
#include "spl.h"
ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int param1, BOOL param2);
ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int narcMemberIndex, BOOL uploadResImmediately);
ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately);
void *ov12_02223844(NARC *param0, int param1, int param2);
void *BattleParticleUtil_ReadMemberFromNARC(NARC *param0, int param1, enum HeapId heapID);
ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, BOOL param3);
SPLEmitter *BattleParticleUtil_CreateEmitter(ParticleSystem *param0, int param1, int param2, void *param3);
void BattleParticleUtil_FreeParticleSystem(ParticleSystem *param0);

8
include/overlay012/ov12_02226998.h
View File

@ -8,11 +8,7 @@ struct BattleAnimSystem;
typedef void (*BattleAnimScriptFunc)(struct BattleAnimSystem *system);
typedef void (*BattleAnimScriptSpriteFunc)(struct BattleAnimSystem *, SpriteSystem *, SpriteManager *, ManagedSprite *);
enum BattleAnimScriptFuncID {
BATTLE_ANIM_SCRIPT_FUNC_NOOP = 0,
};
BattleAnimScriptFunc BattleAnimScript_GetFunc(enum BattleAnimScriptFuncID param0);
BattleAnimScriptSpriteFunc BattleAnimScript_GetSpriteFunc(u32 param0);
BattleAnimScriptFunc BattleAnimScript_GetFunc(u32 id);
BattleAnimScriptSpriteFunc BattleAnimScript_GetSpriteFunc(u32 id);
#endif // POKEPLATINUM_OV12_02226998_H

8
include/overlay012/ov12_022269C0.h
View File

@ -5,10 +5,10 @@
#include "sprite_system.h"
void BattleAnimScriptFunc_Nop(BattleAnimSystem *param0);
void BattleAnimScriptFunc_AnimExample(BattleAnimSystem *param0);
void BattleAnimScriptFunc_SoundExample(BattleAnimSystem *param0);
void BattleAnimScriptFunc_GenericExample(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Nop(BattleAnimSystem *system);
void BattleAnimScriptFunc_AnimExample(BattleAnimSystem *system);
void BattleAnimScriptFunc_SoundExample(BattleAnimSystem *system);
void BattleAnimScriptFunc_GenericExample(BattleAnimSystem *system);
void ov12_02226B1C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
#endif // POKEPLATINUM_OV12_022269C0_H

70
include/overlay012/ov12_02226B84.h
View File

@ -5,45 +5,45 @@
#include "sprite_system.h"
void BattleAnimScriptFunc_Shake(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ScrollCustomBg(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MuddyWater(BattleAnimSystem *param0);
void BattleAnimScriptFunc_RotateMon(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Submission(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Shake(BattleAnimSystem *system);
void BattleAnimScriptFunc_ScrollCustomBg(BattleAnimSystem *system);
void BattleAnimScriptFunc_MuddyWater(BattleAnimSystem *system);
void BattleAnimScriptFunc_RotateMon(BattleAnimSystem *system);
void BattleAnimScriptFunc_Submission(BattleAnimSystem *system);
void ov12_0222777C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_FadeBg(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FadeBattlerSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ScalePokemonSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ScaleBattlerSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_AlphaFadePokemonSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_HideBattler(BattleAnimSystem *param0);
void BattleAnimScriptFunc_BlinkAttacker(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattlerX(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattlerX2(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ShakeAndScaleAttacker(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ShakeAndScaleAttacker2(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Superpower(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattler(BattleAnimSystem *param0);
void BattleAnimScriptFunc_RevolveBattler(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattlerOffScreen(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattlerOnOrOffScreen(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveBattlerToDefaultPos(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FadePokemonSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_BattlerPartialDrawTest(BattleAnimSystem *param0);
void BattleAnimScriptFunc_BattlerPartialDraw(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ShakeBg(BattleAnimSystem *param0);
void BattleAnimScriptFunc_PixelatePokemonSprite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveEmitterA2BLinear(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveEmitterViewportTop(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MoveEmitterA2BParabolic(BattleAnimSystem *param0);
void BattleAnimScriptFunc_RevolveEmitter(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FadeBg(BattleAnimSystem *system);
void BattleAnimScriptFunc_FadeBattlerSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_ScalePokemonSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_ScaleBattlerSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_AlphaFadePokemonSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_HideBattler(BattleAnimSystem *system);
void BattleAnimScriptFunc_BlinkAttacker(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattlerX(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattlerX2(BattleAnimSystem *system);
void BattleAnimScriptFunc_ShakeAndScaleAttacker(BattleAnimSystem *system);
void BattleAnimScriptFunc_ShakeAndScaleAttacker2(BattleAnimSystem *system);
void BattleAnimScriptFunc_Superpower(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattler(BattleAnimSystem *system);
void BattleAnimScriptFunc_RevolveBattler(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattlerOffScreen(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattlerOnOrOffScreen(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveBattlerToDefaultPos(BattleAnimSystem *system);
void BattleAnimScriptFunc_FadePokemonSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_BattlerPartialDrawTest(BattleAnimSystem *system);
void BattleAnimScriptFunc_BattlerPartialDraw(BattleAnimSystem *system);
void BattleAnimScriptFunc_ShakeBg(BattleAnimSystem *system);
void BattleAnimScriptFunc_PixelatePokemonSprite(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveEmitterA2BLinear(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveEmitterViewportTop(BattleAnimSystem *system);
void BattleAnimScriptFunc_MoveEmitterA2BParabolic(BattleAnimSystem *system);
void BattleAnimScriptFunc_RevolveEmitter(BattleAnimSystem *system);
void ov12_0222A1AC(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222A34C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222A410(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222A5C0(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_SetBgGrayscale(BattleAnimSystem *param0);
void BattleAnimScriptFunc_SetPokemonSpritePriority(BattleAnimSystem *param0);
void BattleAnimScriptFunc_RenderPokemonSprites(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ScrollSwitchedBg(BattleAnimSystem *param0);
void BattleAnimScriptFunc_SetBgGrayscale(BattleAnimSystem *system);
void BattleAnimScriptFunc_SetPokemonSpritePriority(BattleAnimSystem *system);
void BattleAnimScriptFunc_RenderPokemonSprites(BattleAnimSystem *system);
void BattleAnimScriptFunc_ScrollSwitchedBg(BattleAnimSystem *system);
#endif // POKEPLATINUM_OV12_02226B84_H

30
include/overlay012/ov12_0222AC70.h
View File

@ -6,21 +6,21 @@
#include "sprite_system.h"
void ov12_0222AE68(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Strength(BattleAnimSystem *param0);
void BattleAnimScriptFunc_BulkUp(BattleAnimSystem *param0);
void BattleAnimScriptFunc_DoubleTeam(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Growth(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Meditate(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Teleport(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Flash(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Splash(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Harden(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Minimize(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Earthquake(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Nightmare(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Flail(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Magnitude(BattleAnimSystem *param0);
void BattleAnimScriptFunc_OdorSleuth(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Strength(BattleAnimSystem *system);
void BattleAnimScriptFunc_BulkUp(BattleAnimSystem *system);
void BattleAnimScriptFunc_DoubleTeam(BattleAnimSystem *system);
void BattleAnimScriptFunc_Growth(BattleAnimSystem *system);
void BattleAnimScriptFunc_Meditate(BattleAnimSystem *system);
void BattleAnimScriptFunc_Teleport(BattleAnimSystem *system);
void BattleAnimScriptFunc_Flash(BattleAnimSystem *system);
void BattleAnimScriptFunc_Splash(BattleAnimSystem *system);
void BattleAnimScriptFunc_Harden(BattleAnimSystem *system);
void BattleAnimScriptFunc_Minimize(BattleAnimSystem *system);
void BattleAnimScriptFunc_Earthquake(BattleAnimSystem *system);
void BattleAnimScriptFunc_Nightmare(BattleAnimSystem *system);
void BattleAnimScriptFunc_Flail(BattleAnimSystem *system);
void BattleAnimScriptFunc_Magnitude(BattleAnimSystem *system);
void BattleAnimScriptFunc_OdorSleuth(BattleAnimSystem *system);
void ov12_0222CC54(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Surf(BattleAnimSystem *system);
void ov12_0222D56C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);

2
include/overlay012/ov12_0222D6B0.h
View File

@ -8,7 +8,7 @@
void ov12_0222D7C0(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222DB60(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222DEFC(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Camouflage(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Camouflage(BattleAnimSystem *system);
void ov12_0222E248(ManagedSprite *param0);
void ov12_0222E2F8(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_0222E61C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);

2
include/overlay012/ov12_0222E784.h
View File

@ -3,6 +3,6 @@
#include "overlay012/battle_anim_system.h"
void BattleAnimScriptFunc_Mimic(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Mimic(BattleAnimSystem *system);
#endif // POKEPLATINUM_OV12_0222E784_H

8
include/overlay012/ov12_0222E91C.h
View File

@ -5,10 +5,10 @@
#include "sprite_system.h"
void BattleAnimScriptFunc_ShadowPunch(BattleAnimSystem *param0);
void BattleAnimScriptFunc_ShadowPunch(BattleAnimSystem *system);
void ov12_0222EC90(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_RolePlay(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Snatch(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Sketch(BattleAnimSystem *param0);
void BattleAnimScriptFunc_RolePlay(BattleAnimSystem *system);
void BattleAnimScriptFunc_Snatch(BattleAnimSystem *system);
void BattleAnimScriptFunc_Sketch(BattleAnimSystem *system);
#endif // POKEPLATINUM_OV12_0222E91C_H

38
include/overlay012/ov12_0222F700.h
View File

@ -5,38 +5,38 @@
#include "sprite_system.h"
void BattleAnimScriptFunc_QuickAttack(BattleAnimSystem *param0);
void BattleAnimScriptFunc_DrillPeck(BattleAnimSystem *param0);
void BattleAnimScriptFunc_QuickAttack(BattleAnimSystem *system);
void BattleAnimScriptFunc_DrillPeck(BattleAnimSystem *system);
void ov12_0222FE30(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Confusion(BattleAnimSystem *param0);
void BattleAnimScriptFunc_AcidArmor(BattleAnimSystem *param0);
void BattleAnimScriptFunc_NightShadeAttacker(BattleAnimSystem *param0);
void BattleAnimScriptFunc_NightShadeDefender(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Spite(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Confusion(BattleAnimSystem *system);
void BattleAnimScriptFunc_AcidArmor(BattleAnimSystem *system);
void BattleAnimScriptFunc_NightShadeAttacker(BattleAnimSystem *system);
void BattleAnimScriptFunc_NightShadeDefender(BattleAnimSystem *system);
void BattleAnimScriptFunc_Spite(BattleAnimSystem *system);
void ov12_02230CEC(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_02231010(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_022312A4(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_FaintAttack(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FaintAttack(BattleAnimSystem *system);
void ov12_02231650(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_02231950(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_02231C1C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_PlayfulHops(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Swagger(BattleAnimSystem *param0);
void BattleAnimScriptFunc_PlayfulHops(BattleAnimSystem *system);
void BattleAnimScriptFunc_Swagger(BattleAnimSystem *system);
void ov12_02232378(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Return(BattleAnimSystem *param0);
void BattleAnimScriptFunc_VitalThrow(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Return(BattleAnimSystem *system);
void BattleAnimScriptFunc_VitalThrow(BattleAnimSystem *system);
void ov12_022329E0(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_02232CA8(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Memento(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Memento(BattleAnimSystem *system);
void ov12_02233454(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_02233734(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void ov12_022339C4(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_Extrasensory(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FakeOutCurtain(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Extrasensory(BattleAnimSystem *system);
void BattleAnimScriptFunc_FakeOutCurtain(BattleAnimSystem *system);
void ov12_02234008(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
void BattleAnimScriptFunc_FakeOut(BattleAnimSystem *param0);
void BattleAnimScriptFunc_Megahorn(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MegahornAttacker(BattleAnimSystem *param0);
void BattleAnimScriptFunc_MegahornDefender(BattleAnimSystem *param0);
void BattleAnimScriptFunc_FakeOut(BattleAnimSystem *system);
void BattleAnimScriptFunc_Megahorn(BattleAnimSystem *system);
void BattleAnimScriptFunc_MegahornAttacker(BattleAnimSystem *system);
void BattleAnimScriptFunc_MegahornDefender(BattleAnimSystem *system);
#endif // POKEPLATINUM_OV12_0222F700_H

8
include/overlay012/ov12_02234E44.h
View File

@ -3,9 +3,9 @@
#include "overlay012/battle_anim_system.h"
void BattleAnimScriptFunc_StatChangeUp(BattleAnimSystem *param0);
void BattleAnimScriptFunc_StatChangeDown(BattleAnimSystem *param0);
void BattleAnimScriptFunc_StatChangeHeal(BattleAnimSystem *param0);
void BattleAnimScriptFunc_StatChangeMetal(BattleAnimSystem *param0);
void BattleAnimScriptFunc_StatChangeUp(BattleAnimSystem *system);
void BattleAnimScriptFunc_StatChangeDown(BattleAnimSystem *system);
void BattleAnimScriptFunc_StatChangeHeal(BattleAnimSystem *system);
void BattleAnimScriptFunc_StatChangeMetal(BattleAnimSystem *system);
#endif // POKEPLATINUM_OV12_02234E44_H

2
platinum.us/main.lsf
View File

@ -627,7 +627,7 @@ Overlay overlay11
{
After overlay4
Object main.nef.p/src_overlay011_move_palettes.c.o
Object main.nef.p/src_overlay011_ov11_0221F840.c.o
Object main.nef.p/src_overlay011_particle_helper.c.o
}
Overlay overlay12

4
src/battle/ov16_0223B140.c
View File

@ -30,7 +30,7 @@
#include "battle/struct_ov16_022674C4.h"
#include "overlay010/ov10_0221F800.h"
#include "overlay010/struct_ov10_0221F800.h"
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay012/battle_anim_system.h"
#include "bag.h"
@ -1540,7 +1540,7 @@ static void ov16_0223CF48(SysTask *param0, void *param1)
if ((v0->unk_23F9 == 0) || (v0->unk_23F9 == 3)) {
if (v0->unk_23F9 == 0) {
ov11_0221F8F0();
ParticleHelper_DrawParticleSystems();
}
PokemonSpriteManager_DrawSprites(v0->unk_88);

2
src/meson.build
View File

@ -490,7 +490,7 @@ pokeplatinum_c = files(
'overlay009/ov9_02249960.c',
'overlay010/ov10_0221F800.c',
'overlay011/move_palettes.c',
'overlay011/ov11_0221F840.c',
'overlay011/particle_helper.c',
'overlay012/is_form_symmetrical.c',
'overlay012/battle_anim_system.c',
'overlay012/ov12_022237EC.c',

104
src/overlay011/ov11_0221F840.c
View File

@ -1,104 +0,0 @@
#include "overlay011/ov11_0221F840.h"
#include <nitro.h>
#include <string.h>
#include "camera.h"
#include "heap.h"
#include "particle_system.h"
#include "unk_0202419C.h"
static u32 ov11_0221F914(u32 param0, BOOL param1);
static u32 ov11_0221F930(u32 param0, BOOL param1);
ParticleSystem *ov11_0221F840(int heapID)
{
ParticleSystem *v0;
void *v1;
Camera *camera;
v1 = Heap_AllocFromHeap(heapID, 0x4800);
v0 = ParticleSystem_New(ov11_0221F914, ov11_0221F930, v1, 0x4800, 1, heapID);
camera = ParticleSystem_GetCamera(v0);
if (camera != NULL) {
Camera_SetClipping(FX32_ONE, FX32_ONE * 900, camera);
}
return v0;
}
ParticleSystem *ov11_0221F888(int heapID)
{
ParticleSystem *v0;
void *v1;
Camera *camera;
v1 = Heap_AllocFromHeap(heapID, 0x4200);
if (v1 == NULL) {
return NULL;
}
v0 = ParticleSystem_New(ov11_0221F914, ov11_0221F930, v1, 0x4200, 1, heapID);
camera = ParticleSystem_GetCamera(v0);
if (camera != NULL) {
Camera_SetClipping(FX32_ONE, FX32_ONE * 900, camera);
}
return v0;
}
void ov11_0221F8D8(ParticleSystem *param0)
{
void *v0 = ParticleSystem_GetHeapStart(param0);
ParticleSystem_Free(param0);
Heap_Free(v0);
}
void ov11_0221F8F0(void)
{
int v0;
const MtxFx43 *v1;
G3_ResetG3X();
if (ParticleSystem_GetActiveAmount() == 0) {
return;
}
v0 = ParticleSystem_DrawAll();
if (v0 > 0) {
G3_ResetG3X();
NNS_G2dSetupSoftwareSpriteCamera();
}
ParticleSystem_UpdateAll();
}
static u32 ov11_0221F914(u32 param0, BOOL param1)
{
NNSGfdTexKey v0;
u32 v1;
v0 = NNS_GfdAllocTexVram(param0, param1, 0);
ParticleSystem_RegisterTextureKey(v0);
v1 = NNS_GfdGetTexKeyAddr(v0);
return v1;
}
static u32 ov11_0221F930(u32 param0, BOOL param1)
{
NNSGfdPlttKey v0;
u32 v1;
v0 = NNS_GfdAllocPlttVram(param0, param1, 0);
ParticleSystem_RegisterPaletteKey(v0);
v1 = NNS_GfdGetPlttKeyAddr(v0);
return v1;
}

78
src/overlay011/particle_helper.c Normal file
View File

@ -0,0 +1,78 @@
#include "overlay011/particle_helper.h"
#include "camera.h"
#include "heap.h"
#include "particle_system.h"
#include "unk_0202419C.h"
static u32 ParticleHelper_AllocTexVram(u32 param0, BOOL param1);
static u32 ParticleHelper_AllocPalVram(u32 param0, BOOL param1);
ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID)
{
void *heap = Heap_AllocFromHeap(heapID, 0x4800);
ParticleSystem *ps = ParticleSystem_New(ParticleHelper_AllocTexVram, ParticleHelper_AllocPalVram, heap, 0x4800, TRUE, heapID);
Camera *camera = ParticleSystem_GetCamera(ps);
if (camera != NULL) {
Camera_SetClipping(FX32_ONE, FX32_CONST(900), camera);
}
return ps;
}
ParticleSystem *ov11_0221F888(enum HeapId heapID)
{
void *heap = Heap_AllocFromHeap(heapID, 0x4200);
if (heap == NULL) {
return NULL;
}
ParticleSystem *ps = ParticleSystem_New(ParticleHelper_AllocTexVram, ParticleHelper_AllocPalVram, heap, 0x4200, TRUE, heapID);
Camera *camera = ParticleSystem_GetCamera(ps);
if (camera != NULL) {
Camera_SetClipping(FX32_ONE, FX32_CONST(900), camera);
}
return ps;
}
void ParticleHelper_FreeParticleSystem(ParticleSystem *ps)
{
void *heap = ParticleSystem_GetHeapStart(ps);
ParticleSystem_Free(ps);
Heap_Free(heap);
}
void ParticleHelper_DrawParticleSystems(void)
{
G3_ResetG3X();
if (ParticleSystem_GetActiveAmount() == 0) {
return;
}
int drawn = ParticleSystem_DrawAll();
if (drawn > 0) {
G3_ResetG3X();
NNS_G2dSetupSoftwareSpriteCamera();
}
ParticleSystem_UpdateAll();
}
static u32 ParticleHelper_AllocTexVram(u32 size, BOOL is4x4comp)
{
NNSGfdTexKey texKey = NNS_GfdAllocTexVram(size, is4x4comp, 0);
ParticleSystem_RegisterTextureKey(texKey);
return NNS_GfdGetTexKeyAddr(texKey);
}
static u32 ParticleHelper_AllocPalVram(u32 size, BOOL is4pal)
{
NNSGfdPlttKey palKey = NNS_GfdAllocPlttVram(size, is4pal, 0);
ParticleSystem_RegisterPaletteKey(palKey);
return NNS_GfdGetPlttKeyAddr(palKey);
}

14
src/overlay012/ov12_022237EC.c
View File

@ -3,7 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay012/ov12_0222389C.h"
#include "overlay012/ov12_0222421C.h"
@ -46,7 +46,7 @@ static void ov12_022237EC(SPLEmitter *param0)
ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int narcMemberIndex, BOOL uploadResImmediately)
{
ParticleSystem *ps = ov11_0221F840(heapID);
ParticleSystem *ps = ParticleHelper_CreateParticleSystem(heapID);
void *resource = ParticleSystem_LoadResourceFromNARC(NARC_INDEX_WAZAEFFECT__EFFECTDATA__WAZA_PARTICLE, narcMemberIndex, heapID);
ParticleSystem_SetResource(ps, resource, VRAM_AUTO_RELEASE_TEXTURE_LNK | VRAM_AUTO_RELEASE_PALETTE_LNK, uploadResImmediately);
@ -55,16 +55,16 @@ ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int
ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately)
{
ParticleSystem *ps = ov11_0221F840(heapID);
ParticleSystem *ps = ParticleHelper_CreateParticleSystem(heapID);
void *resource = ParticleSystem_LoadResourceFromNARC(narcID, memberIndex, heapID);
ParticleSystem_SetResource(ps, resource, VRAM_AUTO_RELEASE_TEXTURE_LNK | VRAM_AUTO_RELEASE_PALETTE_LNK, uploadResImmediately);
return ps;
}
void *ov12_02223844(NARC *param0, int param1, int param2)
void *BattleParticleUtil_ReadMemberFromNARC(NARC *narc, int memberIdx, enum HeapId heapID)
{
return NARC_AllocAndReadWholeMember(param0, param1, param2);
return NARC_AllocAndReadWholeMember(narc, memberIdx, heapID);
}
ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, int param3)
@ -78,7 +78,7 @@ ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, int
return NULL;
}
v1 = ov12_02223844(param0, param2, heapID);
v1 = BattleParticleUtil_ReadMemberFromNARC(param0, param2, heapID);
ParticleSystem_SetResource(v0, v1, (1 << 1) | (1 << 3), param3);
return v0;
@ -91,5 +91,5 @@ SPLEmitter *BattleParticleUtil_CreateEmitter(ParticleSystem *ps, int resourceID,
void BattleParticleUtil_FreeParticleSystem(ParticleSystem *ps)
{
ov11_0221F8D8(ps);
ParticleHelper_FreeParticleSystem(ps);
}

6
src/overlay012/ov12_02226998.c
View File

@ -148,9 +148,9 @@ void UnusedSpriteFunc()
UNUSED(sUnusedSpriteFuncs[0]);
}
BattleAnimScriptFunc BattleAnimScript_GetFunc(enum BattleAnimScriptFuncID id)
BattleAnimScriptFunc BattleAnimScript_GetFunc(u32 id)
{
if (id >= (NELEMS(sBattleAnimScriptFuncs))) {
if (id >= NELEMS(sBattleAnimScriptFuncs)) {
return NULL;
}
@ -159,7 +159,7 @@ BattleAnimScriptFunc BattleAnimScript_GetFunc(enum BattleAnimScriptFuncID id)
BattleAnimScriptSpriteFunc BattleAnimScript_GetSpriteFunc(u32 id)
{
if (id >= (NELEMS(sBattleAnimScriptSpriteFuncs))) {
if (id >= NELEMS(sBattleAnimScriptSpriteFuncs)) {
return NULL;
}

4
src/overlay017/ov17_0223B140.c
View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_02099F80.h"
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay012/battle_anim_system.h"
#include "overlay017/const_ov17_022536B4.h"
#include "overlay017/ov17_0223F118.h"
@ -400,7 +400,7 @@ static void ov17_0223B6F0(SysTask *param0, void *param1)
if (v0->unk_7EC == 1) {
PokemonSpriteManager_DrawSprites(v0->unk_0C.unk_04);
ov11_0221F8F0();
ParticleHelper_DrawParticleSystems();
SpriteSystem_DrawSprites(v0->unk_0C.unk_1C);
SpriteSystem_UpdateTransfer();
G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);

4
src/overlay017/ov17_0223CB1C.c
View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_02099F80.h"
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay017/ov17_0223F118.h"
#include "overlay017/ov17_022476F8.h"
#include "overlay017/ov17_02247A48.h"
@ -392,7 +392,7 @@ static void ov17_0223D164(SysTask *param0, void *param1)
}
}
ov11_0221F8F0();
ParticleHelper_DrawParticleSystems();
SpriteSystem_DrawSprites(v0->unk_0C.unk_20);
SpriteSystem_UpdateTransfer();

4
src/overlay017/ov17_0223DAD0.c
View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_02099F80.h"
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay017/ov17_0223F118.h"
#include "overlay017/ov17_022492DC.h"
#include "overlay017/ov17_0224A0FC.h"
@ -552,7 +552,7 @@ static void ov17_0223E1FC(SysTask *param0, void *param1)
}
}
ov11_0221F8F0();
ParticleHelper_DrawParticleSystems();
SpriteSystem_DrawSprites(v0->unk_14.unk_5C);
SpriteSystem_UpdateTransfer();

4
src/overlay017/ov17_0224F4D4.c
View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_02099F80.h"
#include "overlay011/ov11_0221F840.h"
#include "overlay011/particle_helper.h"
#include "overlay017/ov17_0223F118.h"
#include "overlay017/ov17_0224F18C.h"
#include "overlay017/ov17_02250744.h"
@ -395,7 +395,7 @@ static void ov17_0224FAFC(SysTask *param0, void *param1)
if (v0->unk_850 == 1) {
PokemonSpriteManager_DrawSprites(v0->unk_10.unk_04);
ov11_0221F8F0();
ParticleHelper_DrawParticleSystems();
SpriteSystem_DrawSprites(v0->unk_10.unk_1C);
SpriteSystem_UpdateTransfer();
G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);