All Changes

include/core2/abilityprogress.h

@@ -0,0 +1,15 @@
+enum ability_used {
+    ABILITY_USED_JUMP = 0x0,
+    ABILITY_USED_FLAP = 0x1,
+    ABILITY_USED_FLIP = 0x2,
+    ABILITY_USED_SWIM = 0x3,
+    ABILITY_USED_CLIMB = 0x4,
+    ABILITY_USED_BEAK_BARGE = 0x5,
+    ABILITY_USED_SLIDE = 0x6,
+    ABILITY_USED_EGG = 0x7,
+    ABILITY_USED_FLY = 0x8,
+    ABILITY_USED_SHOCK = 0x9,
+    ABILITY_USED_PECK = 0xA,
+    ABILITY_USED_CLAW = 0xB,
+    ABILITY_USED_TWIRL = 0xC
+};

include/core2/commonParticle.h

@@ -0,0 +1,75 @@
+#ifndef CORE2_COMMON_PARTICLE_H
+#define CORE2_COMMON_PARTICLE_H
+
+#include <ultra64.h>
+#include "functions.h"
+#include "variables.h"
+#include "core2/anim/sprite.h"
+
+#define PARTICLE_LIMIT 40 
+
+typedef s32 (*FuncUnk40)(ActorMarker *, s32, f32[3]);
+
+enum common_particle_e {
+    COMMON_PARTICLE_1_EGG_HEAD = 1,
+    COMMON_PARTICLE_2 = 2,
+    COMMON_PARTICLE_3 = 3,
+    COMMON_PARTICLE_4_EGG_ASS = 4,
+    COMMON_PARTICLE_5 = 5,
+    COMMON_PARTICLE_6 = 6,
+    COMMON_PARTICLE_7 = 7,
+    COMMON_PARTICLE_8_JIGGY_SHINE = 8,
+    COMMON_PARTICLE_9 = 9,
+    COMMON_PARTICLE_A = 10,
+    COMMON_PARTICLE_B = 11,
+    COMMON_PARTICLE_C = 12,
+    COMMON_PARTICLE_D = 13,
+    COMMON_PARTICLE_E = 14,
+    COMMON_PARTICLE_F = 15,
+    COMMON_PARTICLE_10 = 16,
+    COMMON_PARTICLE_11 = 17
+};
+
+typedef struct particle_struct_s {
+    f32 unk0;
+    f32 unk4;
+    f32 unk8;
+    f32 unkC;
+    f32 unk10;
+    f32 unk14;
+    u8 pad18[8];
+    s32 unk20;
+    s32 unk24;
+    s32 unk28;
+    u8 pad24[0x4];
+    ActorMarker *marker_30;
+    AnimSprite *animSprite;
+    ActorMarker *actorMarker;
+    s32 unk3C;
+    FuncUnk40 unk40;
+    u8 isInUse;
+    u8 projectileIndex;
+    u8 typeMapIndex;
+    u8 unk47;
+} CommonParticle;
+
+ActorMarker *commonParticle_getCurrentActorMarker(void);
+FuncUnk40 func_8033E888(void);
+u8 commonParticle_getCurrentProjectileIndex(void);
+AnimSprite *commonParticle_getCurrentAnimSprite(void);
+CommonParticle *commonParticle_getCurrentParticle(void);
+void commonParticle_setCurrentInUseFalse(void);
+void projectile_setSprite(u8, enum asset_e);
+void func_8033FC34(u8, s32);
+void projectile_setColor(u8, s32, s32, s32);
+void func_8033FCD8(u8, s32);
+void projectile_setRotation(u8, f32[3]);
+void projectile_addRoll(u8, f32);
+void projectile_setPosition(u8, f32[3]);
+void func_8033FFE4(u8, s32, s32);
+void func_80344E18(u8, s32);
+void func_80344E3C(u8, f32[3]);
+void func_80344D94(u8, f32[3]);
+void func_80344EE4(u8, f32, f32);
+
+#endif

include/core2/dustemitter.h

@@ -0,0 +1,10 @@
+#define EMITTER_COUNT 3
+#define EMITTER_CAPACITY 0x20
+
+enum dust_emitter_type_e {
+    DUST_EMITTER_TYPE_DUST = 0,
+    DUST_EMITTER_TYPE_BREAK_DUST = 1
+};
+
+extern void dustEmitter_empty(ParticleEmitter *);
+extern void dustEmitter_emit(f32[3], f32[3], s32[4], bool, f32, f32, s32, s32, enum dust_emitter_type_e);

include/core2/particle.h

@@ -12,7 +12,7 @@ void particleEmitter_setAlpha(ParticleEmitter *this, s32 alpha);
 void particleEmitter_setSfx(ParticleEmitter *this, enum sfx_e sfx_id, s32 arg2);
 void func_802EFA04(ParticleEmitter *this, f32);
 void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(ParticleEmitter *this, f32 pos[3]));
-void func_802EFA20(ParticleEmitter *this, f32, f32);
+void particleEmitter_func_802EFA20(ParticleEmitter *this, f32, f32);
 void func_802EFA34(ParticleEmitter *this, f32);
 void func_802EFA40(ParticleEmitter *this, f32 (*)[3]);
 void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1);

include/core2/particleemittermanager.h

@@ -0,0 +1,20 @@
+#define MAX_EMITTER_COUNT 16 // Effectively reduced by 1, as 0 is saved for an in-progress initialization and empty
+
+typedef struct {
+    f32 freeTime;
+    ParticleEmitter *emitter;
+    u32 isActive: 1;
+    u32 capacity: 10;
+    u32 padding: 21;
+} EmitterData;
+
+ParticleEmitter *pem_getEmitterByIndex(u8 index);
+u8 pem_newEmitter(s32 count);
+void pem_freeAll(void);
+void pem_setAllInactive(void);
+void pem_free(u8 arg0);
+void pem_updateAll(void);
+void pem_freeEmitters(void);
+void pem_defragAll(void);
+void pem_freeDependencies(void);
+void pem_initDependencies(void);

include/core2/statetimer.h

@@ -9,7 +9,7 @@ enum state_timer_e{
     STATE_TIMER_1_THROW = 1,
     STATE_TIMER_2_LONGLEG,
     STATE_TIMER_3_TURBO_TALON,
-    STATE_TIMER_4_UNKNOWN,
+    STATE_TIMER_4_IFRAME,
     STATE_TIMER_5_UNKNOWN, //slide timer
     STATE_TIMER_6_UNKNOWN  //trot slide timer
 };

include/core2/staticcamera.h

@@ -0,0 +1,5 @@
+enum static_camera_id_s {
+    MM_ORANGE_PAD_JIGGY_SPAWN_TOP = 0xE,
+    MM_ORANGE_PAD_JIGGY_SPAWN_LEFT = 0xF,
+    MM_ORANGE_PAD_JIGGY_SPAWN_RIGHT = 0x10
+};