Rename bootbufferthing to artifact

This commit is contained in:
Ryan Dwyer
2022-08-06 10:03:50 +10:00
parent 7364fb8e0e
commit 03cedcf233
12 changed files with 135 additions and 126 deletions
+2 -2
View File
@@ -12,8 +12,8 @@ extern OSViMode *var8008dd60[2];
extern u32 var8008de08;
extern s32 var8008de0c;
extern s32 var8008de10;
extern u8 g_BootBufferDirtyIndexes[3];
extern s32 g_BootBufferIndex0;
extern u8 g_SchedSpecialArtifactIndexes[3];
extern s32 g_SchedWriteArtifactsIndex;
extern OSPiHandle CartRomHandle;
extern OSPiHandle LeoDiskHandle;
extern OSTimer var80090ab0;
+5
View File
@@ -244,6 +244,10 @@
#define ANIMHEADERFLAG_40 0x40 // len 5
#define ANIMHEADERFLAG_80 0x80 // len 0
#define ARTIFACTTYPE_FREE 0
#define ARTIFACTTYPE_CIRCLE 1 // from a sun lens flare or teleport
#define ARTIFACTTYPE_GLARE 2 // from a light
#define ATTACKFLAG_AIMATBOND 0x0001 // aim/shoot at Jo
#define ATTACKFLAG_AIMFORWARD 0x0002 // aim/shoot in front of self
#define ATTACKFLAG_AIMATCHR 0x0004 // aim/shoot at chr (ID should be given in entityid)
@@ -1467,6 +1471,7 @@
#define MA_PUNCHING 54
#define MA_END 55
#define MAX_ARTIFACTS 120
#define MAX_CHRWAYPOINTS 6
#define MAX_DANGEROUSPROPS 12
#define MAX_LIFTS 10
+4 -4
View File
@@ -4,14 +4,14 @@
#include "data.h"
#include "types.h"
void func0f13c510(void);
void func0f13c54c(void);
void artifactsClear(void);
void artifactsTick(void);
u16 func0f13c574(f32 arg0);
s32 func0f13c710(f32 arg0);
void artifactsCalculateGlaresForRoom(s32 roomnum);
u8 func0f13d3c4(u8 arg0, u8 arg1);
Gfx *func0f13d40c(Gfx *gdl);
Gfx *func0f13d54c(Gfx *gdl);
Gfx *artifactsConfigureForGlares(Gfx *gdl);
Gfx *artifactsUnconfigureForGlares(Gfx *gdl);
Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum);
#endif
+2 -2
View File
@@ -21,8 +21,8 @@ void sky0f1228d0(struct skything18 *arg0, Mtxf *arg1, u16 arg2, f32 arg3, f32 ar
bool sky0f122ce8(struct skything38 *arg0, struct skything38 *arg1);
Gfx *sky0f122d4c(Gfx *gdl, struct skything38 *arg1, struct skything38 *arg2, struct skything38 *arg3, f32 arg4, bool arg5);
Gfx *sky0f123fd4(Gfx *gdl, struct skything38 *arg1, struct skything38 *arg2, struct skything38 *arg3, struct skything38 *arg4, f32 arg5);
void sky0f125948(struct bootbufferthingdeep *arg0, s32 x, s32 y);
f32 sky0f125a1c(struct bootbufferthingdeep *arg0);
void skyCreateArtifact(struct artifact *artifact, s32 x, s32 y);
f32 sky0f125a1c(struct artifact *artifacts);
Gfx *skyRenderSuns(Gfx *gdl, bool xray);
Gfx *sky0f126384(Gfx *gdl, f32 x, f32 y, f32 arg3, f32 orbsize, s32 arg5, f32 arg6);
Gfx *sky0f126c3c(Gfx *gdl, f32 x, f32 y, f32 z, f32 arg4, f32 arg5);
+6 -6
View File
@@ -13,12 +13,12 @@ void __scAppendList(OSSched *sc, OSScTask *t);
void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp);
void __scMain(void *arg);
void __scYield(OSSched *sc);
void bbufResetBuffers(void);
struct bootbufferthing *bbufGetIndex0Buffer(void);
struct bootbufferthing *bbufGetIndex1Buffer(void);
void bbufIncIndex0(void);
void bbufIncIndex1(void);
void bbufUpdateIndex2Buffer(void);
void schedInitArtifacts(void);
struct artifact *schedGetWriteArtifacts(void);
struct artifact *schedGetFrontArtifacts(void);
void schedIncrementWriteArtifacts(void);
void schedIncrementFrontArtifacts(void);
void schedUpdatePendingArtifacts(void);
void schedConsiderScreenshot(void);
#endif
+2 -10
View File
@@ -3457,8 +3457,8 @@ struct audioconfig {
u32 flags;
};
struct bootbufferthingdeep {
u16 unk00;
struct artifact {
u16 type;
u16 unk02;
u16 unk04;
u16 unk06;
@@ -3473,14 +3473,6 @@ struct bootbufferthingdeep {
struct light *light;
};
struct bootbufferthing2 {
struct bootbufferthingdeep unk00[8];
};
struct bootbufferthing {
struct bootbufferthing2 unk00[15];
};
struct credit {
u8 more : 1;
u8 retain : 2;