mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 15:01:32 -04:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
314 lines
9.2 KiB
C
314 lines
9.2 KiB
C
#ifndef _Z64EFFECT_H_
|
|
#define _Z64EFFECT_H_
|
|
|
|
#include "PR/ultratypes.h"
|
|
#include "color.h"
|
|
#include "z64light.h"
|
|
#include "z64math.h"
|
|
#include "unk.h"
|
|
|
|
struct GraphicsContext;
|
|
struct GlobalContext;
|
|
|
|
typedef void(*eff_destroy_func)(void* params);
|
|
|
|
typedef void(*eff_draw_func)(void* params, struct GraphicsContext* gfxCtx);
|
|
|
|
typedef void(*eff_init_func)(void* params, void* init);
|
|
|
|
typedef s32(*eff_update_func)(void* params);
|
|
|
|
#define SPARK_COUNT 3
|
|
#define BLURE_COUNT 25
|
|
#define SHIELD_PARTICLE_COUNT 3
|
|
#define TIRE_MARK_COUNT 15
|
|
|
|
#define TOTAL_EFFECT_COUNT SPARK_COUNT + BLURE_COUNT + SHIELD_PARTICLE_COUNT + TIRE_MARK_COUNT
|
|
|
|
/* G Effect Regs */
|
|
|
|
#define rgTexIdx regs[0]
|
|
#define rgScale regs[1]
|
|
#define rgTexIdxStep regs[2]
|
|
#define rgPrimColorR regs[3]
|
|
#define rgPrimColorG regs[4]
|
|
#define rgPrimColorB regs[5]
|
|
#define rgPrimColorA regs[6]
|
|
#define rgEnvColorR regs[7]
|
|
#define rgEnvColorG regs[8]
|
|
#define rgEnvColorB regs[9]
|
|
#define rgEnvColorA regs[10]
|
|
#define rgObjBankIdx regs[11]
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u8 active;
|
|
/* 0x1 */ u8 unk1;
|
|
/* 0x2 */ u8 unk2;
|
|
/* 0x3 */ UNK_TYPE1 pad3[0x1];
|
|
} EffCommon; // size = 0x4
|
|
|
|
typedef struct {
|
|
/* 0x00 */ Vec3f velocity;
|
|
/* 0x0C */ Vec3f position;
|
|
/* 0x18 */ Vec3s unk18;
|
|
/* 0x1E */ Vec3s unk1E;
|
|
} EffSparkParticle; // size = 0x24
|
|
|
|
typedef struct {
|
|
/* 0x000 */ Vec3s position;
|
|
/* 0x008 */ s32 numParticles; // Will be calculated as particleFactor1 * particleFactor2 + 2
|
|
/* 0x00C */ EffSparkParticle particles[32];
|
|
/* 0x48C */ f32 velocity;
|
|
/* 0x490 */ f32 gravity;
|
|
/* 0x494 */ u32 particleFactor1;
|
|
/* 0x498 */ u32 particleFactor2;
|
|
/* 0x49C */ Color_RGBA8 colorStart[4];
|
|
/* 0x4AC */ Color_RGBA8 colorEnd[4];
|
|
/* 0x4BC */ s32 age;
|
|
/* 0x4C0 */ s32 duration;
|
|
} EffSparkParams; // size = 0x4C4
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffCommon base;
|
|
/* 0x004 */ EffSparkParams params;
|
|
} EffSpark; // size = 0x4C8
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s32 state;
|
|
/* 0x04 */ s32 timer;
|
|
/* 0x08 */ Vec3s p1;
|
|
/* 0x0E */ Vec3s p2;
|
|
/* 0x14 */ u16 flags;
|
|
} EffectBlureElement; // size = 0x18
|
|
|
|
typedef struct {
|
|
/* 0x000 */ UNK_TYPE1 pad0[0x184];
|
|
/* 0x184 */ Color_RGBA8 unk184;
|
|
/* 0x188 */ Color_RGBA8 unk188;
|
|
/* 0x18C */ Color_RGBA8 unk18C;
|
|
/* 0x190 */ Color_RGBA8 unk190;
|
|
/* 0x194 */ UNK_TYPE1 pad194[0xC];
|
|
} EffBlureInit1; // size = 0x1A0
|
|
|
|
typedef struct {
|
|
/* 0x00 */ UNK_TYPE1 pad0[0x8];
|
|
/* 0x08 */ Color_RGBA8 unk8;
|
|
/* 0x0C */ Color_RGBA8 unkC;
|
|
/* 0x10 */ Color_RGBA8 unk10;
|
|
/* 0x14 */ Color_RGBA8 unk14;
|
|
/* 0x18 */ UNK_TYPE1 pad18[0xC];
|
|
} EffBlureInit2; // size = 0x24
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffectBlureElement elements[16];
|
|
/* 0x180 */ s32 calcMode;
|
|
/* 0x184 */ f32 mode4Param;
|
|
/* 0x188 */ u16 flags;
|
|
/* 0x18A */ s16 addAngleChange;
|
|
/* 0x18C */ s16 addAngle;
|
|
/* 0x18E */ Color_RGBA8 p1StartColor;
|
|
/* 0x192 */ Color_RGBA8 p2StartColor;
|
|
/* 0x196 */ Color_RGBA8 p1EndColor;
|
|
/* 0x19A */ Color_RGBA8 p2EndColor;
|
|
/* 0x19E */ u8 numElements;
|
|
/* 0x19F */ u8 elemDuration;
|
|
/* 0x1A0 */ u8 unkFlag;
|
|
/* 0x1A1 */ u8 drawMode; // 0: simple; 1: simple with alt colors; 2+: smooth
|
|
/* 0x1A2 */ Color_RGBA8 altPrimColor;
|
|
/* 0x1A6 */ Color_RGBA8 altEnvColor;
|
|
} EffectBlure; // size = 0x1AC
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffCommon base;
|
|
/* 0x004 */ EffectBlure params;
|
|
} EffBlure; // size = 0x1B0
|
|
|
|
typedef struct {
|
|
/* 0x00 */ f32 startSpeed;
|
|
/* 0x04 */ f32 endXChange;
|
|
/* 0x08 */ f32 endX;
|
|
/* 0x0C */ f32 startXChange;
|
|
/* 0x10 */ f32 startX;
|
|
/* 0x14 */ s16 rotationY;
|
|
/* 0x16 */ s16 rotationZ;
|
|
} EffShieldParticleParticle; // size = 0x18
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u8 numParticles;
|
|
/* 0x02 */ Vec3s position;
|
|
/* 0x08 */ Color_RGBA8 primColorStart;
|
|
/* 0x0C */ Color_RGBA8 envColorStart;
|
|
/* 0x10 */ Color_RGBA8 primColorMid;
|
|
/* 0x14 */ Color_RGBA8 envColorMid;
|
|
/* 0x18 */ Color_RGBA8 primColorEnd;
|
|
/* 0x1C */ Color_RGBA8 envColorEnd;
|
|
/* 0x20 */ f32 acceleration;
|
|
/* 0x24 */ f32 maxInitialSpeed;
|
|
/* 0x28 */ f32 lengthCutoff;
|
|
/* 0x2C */ u8 duration;
|
|
/* 0x2E */ LightPoint lightPoint;
|
|
/* 0x3C */ s32 hasLight;
|
|
} EffShieldParticleInit; // size = 0x40
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffShieldParticleParticle particles[16];
|
|
/* 0x180 */ u8 numParticles;
|
|
/* 0x181 */ UNK_TYPE1 pad181[0x1];
|
|
/* 0x182 */ Vec3s position;
|
|
/* 0x188 */ Color_RGBA8 primColorStart;
|
|
/* 0x18C */ Color_RGBA8 envColorStart;
|
|
/* 0x190 */ Color_RGBA8 primColorMid;
|
|
/* 0x194 */ Color_RGBA8 envColorMid;
|
|
/* 0x198 */ Color_RGBA8 primColorEnd;
|
|
/* 0x19C */ Color_RGBA8 envColorEnd;
|
|
/* 0x1A0 */ f32 acceleration;
|
|
/* 0x1A4 */ UNK_TYPE1 pad1A4[0x4];
|
|
/* 0x1A8 */ f32 maxInitialSpeed;
|
|
/* 0x1AC */ f32 lengthCutoff;
|
|
/* 0x1B0 */ u8 duration;
|
|
/* 0x1B1 */ u8 age;
|
|
/* 0x1B2 */ LightInfo lightInfo;
|
|
/* 0x1C0 */ LightNode* light;
|
|
/* 0x1C4 */ s32 hasLight;
|
|
} EffShieldParticleParams; // size = 0x1C8
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffCommon base;
|
|
/* 0x004 */ EffShieldParticleParams params;
|
|
} EffShieldParticle; // size = 0x1CC
|
|
|
|
typedef struct {
|
|
/* 0x00 */ UNK_TYPE2 active;
|
|
/* 0x02 */ Vec3s position1;
|
|
/* 0x08 */ Vec3s position2;
|
|
/* 0x0E */ s16 life;
|
|
/* 0x10 */ UNK_TYPE1 pad10[0x4];
|
|
/* 0x14 */ UNK_TYPE4 unk14;
|
|
} EffTireMarkParticle; // size = 0x18
|
|
|
|
typedef struct {
|
|
/* 0x0 */ s16 unk0;
|
|
/* 0x2 */ s16 maxLife;
|
|
/* 0x4 */ Color_RGBA8 color;
|
|
} EffTireMarkInit; // size = 0x8
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffTireMarkParticle particles[64];
|
|
/* 0x600 */ s16 unk600;
|
|
/* 0x602 */ s16 numParticles;
|
|
/* 0x604 */ s16 maxLife;
|
|
/* 0x606 */ Color_RGBA8 color;
|
|
/* 0x60A */ UNK_TYPE1 pad60A[0x2];
|
|
} EffTireMarkParams; // size = 0x60C
|
|
|
|
typedef struct {
|
|
/* 0x000 */ EffCommon base;
|
|
/* 0x004 */ EffTireMarkParams params;
|
|
} EffTireMark; // size = 0x610
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 paramsSize;
|
|
/* 0x04 */ eff_init_func init;
|
|
/* 0x08 */ eff_destroy_func destroy;
|
|
/* 0x0C */ eff_update_func update;
|
|
/* 0x10 */ eff_draw_func draw;
|
|
} EffInfo; // size = 0x14
|
|
|
|
typedef struct {
|
|
/* 0x0000 */ struct GlobalContext* globalCtx;
|
|
/* 0x0004 */ EffSpark sparks[SPARK_COUNT];
|
|
/* 0x0E5C */ EffBlure blures[BLURE_COUNT];
|
|
/* 0x388C */ EffShieldParticle shieldParticles[SHIELD_PARTICLE_COUNT];
|
|
/* 0x3DF0 */ EffTireMark tireMarks[TIRE_MARK_COUNT];
|
|
} EffTables; // size = 0x98E0
|
|
|
|
/* Effect Soft Sprites */
|
|
|
|
struct EffectSs;
|
|
|
|
typedef u32 (*EffectSsInitFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs, void* initParams);
|
|
typedef void(*EffectSsUpdateFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* particle);
|
|
typedef void(*EffectSsDrawFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* particle);
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 type;
|
|
/* 0x04 */ EffectSsInitFunc init;
|
|
} EffectSsInit; // size = 0x08
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 vromStart;
|
|
/* 0x04 */ u32 vromEnd;
|
|
/* 0x08 */ void* vramStart;
|
|
/* 0x0C */ void* vramEnd;
|
|
/* 0x10 */ void* loadedRamAddr;
|
|
/* 0x14 */ EffectSsInit* initInfo;
|
|
/* 0x18 */ u32 unk18; // Always 0x01000000?
|
|
} EffectSsOverlay; // size = 0x1C
|
|
|
|
typedef struct EffectSs {
|
|
/* 0x00 */ Vec3f pos;
|
|
/* 0x0C */ Vec3f velocity;
|
|
/* 0x18 */ Vec3f accel;
|
|
/* 0x24 */ EffectSsUpdateFunc update;
|
|
/* 0x28 */ EffectSsDrawFunc draw;
|
|
/* 0x2C */ Vec3f vec;
|
|
/* 0x38 */ void* gfx;
|
|
/* 0x3C */ Actor* actor;
|
|
/* 0x40 */ s16 regs[13]; // These are particle-specific
|
|
/* 0x5A */ u16 flags; // bit 0: set if this entry is not considered free on a priority tie bit 1: ? bit 2: ?
|
|
/* 0x5C */ s16 life; // -1 means this entry is free
|
|
/* 0x5E */ u8 priority; // Lower number mean higher priority
|
|
/* 0x5F */ u8 type;
|
|
} EffectSs; // size = 0x60
|
|
|
|
typedef struct {
|
|
/* 0x0 */ EffectSs* data_table; // Name from debug assert
|
|
/* 0x4 */ s32 searchIndex;
|
|
/* 0x8 */ s32 size;
|
|
} EffectSsInfo; // size = 0xC
|
|
|
|
typedef enum {
|
|
/* 0x00 */ EFFECT_SS_DUST,
|
|
/* 0x01 */ EFFECT_SS_KIRAKIRA,
|
|
/* 0x02 */ EFFECT_SS_UNSET_02,
|
|
/* 0x03 */ EFFECT_SS_BOMB2,
|
|
/* 0x04 */ EFFECT_SS_BLAST,
|
|
/* 0x05 */ EFFECT_SS_G_SPK,
|
|
/* 0x06 */ EFFECT_SS_D_FIRE,
|
|
/* 0x07 */ EFFECT_SS_BUBBLE,
|
|
/* 0x08 */ EFFECT_SS_UNSET_08,
|
|
/* 0x09 */ EFFECT_SS_G_RIPPLE,
|
|
/* 0x0A */ EFFECT_SS_G_SPLASH,
|
|
/* 0x0B */ EFFECT_SS_UNSET_0B,
|
|
/* 0x0C */ EFFECT_SS_G_FIRE,
|
|
/* 0x0D */ EFFECT_SS_LIGHTNING,
|
|
/* 0x0E */ EFFECT_SS_DT_BUBBLE,
|
|
/* 0x0F */ EFFECT_SS_HAHEN,
|
|
/* 0x10 */ EFFECT_SS_STICK,
|
|
/* 0x11 */ EFFECT_SS_SIBUKI,
|
|
/* 0x12 */ EFFECT_SS_UNSET_12,
|
|
/* 0x13 */ EFFECT_SS_UNSET_13,
|
|
/* 0x14 */ EFFECT_SS_STONE1,
|
|
/* 0x15 */ EFFECT_SS_HITMARK,
|
|
/* 0x16 */ EFFECT_SS_FHG_FLASH,
|
|
/* 0x17 */ EFFECT_SS_K_FIRE,
|
|
/* 0x18 */ EFFECT_SS_SOLDER_SRCH_BALL,
|
|
/* 0x19 */ EFFECT_SS_KAKERA,
|
|
/* 0x1A */ EFFECT_SS_ICE_PIECE,
|
|
/* 0x1B */ EFFECT_SS_EN_ICE,
|
|
/* 0x1C */ EFFECT_SS_FIRE_TAIL,
|
|
/* 0x1D */ EFFECT_SS_EN_FIRE,
|
|
/* 0x1E */ EFFECT_SS_EXTRA,
|
|
/* 0x1F */ EFFECT_SS_UNSET_1F,
|
|
/* 0x20 */ EFFECT_SS_DEAD_DB,
|
|
/* 0x21 */ EFFECT_SS_DEAD_DD,
|
|
/* 0x22 */ EFFECT_SS_DEAD_DS,
|
|
/* 0x23 */ EFFECT_SS_UNSET_23,
|
|
/* 0x24 */ EFFECT_SS_ICE_SMOKE,
|
|
/* 0x25 */ EFFECT_EN_ICE_BLOCK,
|
|
/* 0x26 */ EFFECT_SS_SBN,
|
|
/* 0x27 */ EFFECT_SS_MAX
|
|
} EffectSsType;
|
|
|
|
#endif
|