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>
102 lines
2.5 KiB
C
102 lines
2.5 KiB
C
#ifndef _Z64LIGHT_H_
|
|
#define _Z64LIGHT_H_
|
|
|
|
#include "ultra64.h"
|
|
#include "PR/gbi.h"
|
|
#include "color.h"
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u8 ambientColor[3];
|
|
/* 0x03 */ s8 diffuseDir1[3];
|
|
/* 0x06 */ u8 diffuseColor1[3];
|
|
/* 0x09 */ s8 diffusePos2[3];
|
|
/* 0x0C */ u8 diffuseColor[3];
|
|
/* 0x0F */ u8 fogColor[3];
|
|
/* 0x12 */ u16 fogNear;
|
|
/* 0x14 */ u16 fogFar;
|
|
} LightSettings; // size = 0x16
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s16 ambientColor[3];
|
|
/* 0x06 */ s16 diffuseColor1[3];
|
|
/* 0x0C */ s16 diffuseColor2[3];
|
|
/* 0x12 */ s16 fogColor[3];
|
|
/* 0x18 */ s16 fogNear;
|
|
/* 0x1A */ s16 fogFar;
|
|
} LightSettings2; // size = 0x1C
|
|
|
|
typedef struct {
|
|
/* 0x0 */ s16 x;
|
|
/* 0x2 */ s16 y;
|
|
/* 0x4 */ s16 z;
|
|
/* 0x6 */ u8 color[3];
|
|
/* 0x9 */ u8 drawGlow;
|
|
/* 0xA */ s16 radius;
|
|
} LightPoint; // size = 0xC
|
|
|
|
typedef struct {
|
|
/* 0x0 */ s8 x;
|
|
/* 0x1 */ s8 y;
|
|
/* 0x2 */ s8 z;
|
|
/* 0x3 */ u8 color[3];
|
|
} LightDirectional; // size = 0x6
|
|
|
|
typedef union LightParams {
|
|
LightPoint point;
|
|
LightDirectional dir;
|
|
} LightParams; // size = 0xC
|
|
|
|
typedef struct LightInfo {
|
|
/* 0x0 */ u8 type;
|
|
/* 0x2 */ LightParams params;
|
|
} LightInfo; // size = 0xE
|
|
|
|
typedef struct Lights {
|
|
/* 0x00 */ u8 enablePosLights;
|
|
/* 0x01 */ u8 numLights;
|
|
/* 0x08 */ Lightsn l;
|
|
} Lights; // size = 0x80
|
|
|
|
typedef struct LightInfoPositional {
|
|
/* 0x0 */ u8 type;
|
|
/* 0x2 */ LightPoint params;
|
|
} LightInfoPositional; // size = 0xE
|
|
|
|
typedef struct LightNode {
|
|
/* 0x0 */ LightInfo* info;
|
|
/* 0x4 */ struct LightNode* prev;
|
|
/* 0x8 */ struct LightNode* next;
|
|
} LightNode; // size = 0xC
|
|
|
|
// TODO move LightsBuffer to .c file once .bss has been split
|
|
#define LIGHTS_BUFFER_SIZE 32
|
|
|
|
typedef struct LightsBuffer {
|
|
/* 0x000 */ s32 numOccupied;
|
|
/* 0x004 */ s32 searchIndex;
|
|
/* 0x008 */ LightNode lights[LIGHTS_BUFFER_SIZE];
|
|
} LightsBuffer; // size = 0x188
|
|
|
|
typedef struct LightContext {
|
|
/* 0x0 */ LightNode* listHead;
|
|
/* 0x4 */ Color_RGB8 ambient;
|
|
/* 0x7 */ u8 unk7;
|
|
/* 0x8 */ u8 unk8;
|
|
/* 0x9 */ u8 unk9;
|
|
/* 0xA */ s16 unkA;
|
|
/* 0xC */ s16 unkC;
|
|
} LightContext; // size = 0x10
|
|
|
|
typedef enum LightType {
|
|
/* 0x00 */ LIGHT_POINT_NOGLOW,
|
|
/* 0x01 */ LIGHT_DIRECTIONAL,
|
|
/* 0x02 */ LIGHT_POINT_GLOW
|
|
} LightType;
|
|
|
|
typedef struct GlobalContext GlobalContext;
|
|
|
|
typedef void (*LightsBindFunc)(Lights* lights, LightParams* params, Vec3f* vec);
|
|
typedef void (*LightsPosBindFunc)(Lights* lights, LightParams* params, GlobalContext* globalCtx);
|
|
|
|
#endif
|