mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-01 09:23:04 -04:00
General Cleanup 2 (#1538)
* Cleanup * Cleanup variables.h * Cleanup fault headers * Some includes/headers cleanup * Libultra btn wrappers * Mark differences to original libultra headers * Remove duplicate include in fault * format * Update include/PR/os_voice.h Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * align --------- Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
This commit is contained in:
Derek Hensley
@@ -5,6 +5,8 @@
|
||||
|
||||
#include "ultratypes.h"
|
||||
|
||||
/* Not original to libultra: Point Lights, DW, and Mtx intPart/FracPart union */
|
||||
|
||||
/* To enable Fast3DEX grucode support, define F3DEX_GBI. */
|
||||
|
||||
/* Types */
|
||||
|
||||
+8
-5
@@ -74,11 +74,14 @@
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#define M_GFXTASK 1
|
||||
#define M_AUDTASK 2
|
||||
#define M_VIDTASK 3
|
||||
#define M_HVQTASK 6
|
||||
#define M_HVQMTASK 7
|
||||
/* Not original to libultra: Some added task defines */
|
||||
#define M_NULTASK 0
|
||||
#define M_GFXTASK 1
|
||||
#define M_AUDTASK 2
|
||||
#define M_VIDTASK 3
|
||||
#define M_NJPEGTASK 4
|
||||
#define M_HVQTASK 6
|
||||
#define M_HVQMTASK 7
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
||||
+31
-16
@@ -41,23 +41,38 @@ typedef struct {
|
||||
#define CONT_ADDR_CRC_ER 0x04
|
||||
#define CONT_EEPROM_BUSY 0x80
|
||||
|
||||
// TODO: use real libultra button defines instead of this
|
||||
#define R_CBUTTONS 0x0001
|
||||
#define L_CBUTTONS 0x0002
|
||||
#define D_CBUTTONS 0x0004
|
||||
#define U_CBUTTONS 0x0008
|
||||
#define R_TRIG 0x0010
|
||||
#define L_TRIG 0x0020
|
||||
#define R_JPAD 0x0100
|
||||
#define L_JPAD 0x0200
|
||||
#define D_JPAD 0x0400
|
||||
#define U_JPAD 0x0800
|
||||
#define START_BUTTON 0x1000
|
||||
#define Z_TRIG 0x2000
|
||||
#define B_BUTTON 0x4000
|
||||
#define A_BUTTON 0x8000
|
||||
|
||||
/* Not original to libultra: button macros */
|
||||
/* Buttons */
|
||||
#define BTN_CRIGHT 0x0001
|
||||
#define BTN_CLEFT 0x0002
|
||||
#define BTN_CDOWN 0x0004
|
||||
#define BTN_CUP 0x0008
|
||||
#define BTN_R 0x0010
|
||||
#define BTN_L 0x0020
|
||||
#define BTN_RESET 0x0080
|
||||
#define BTN_DRIGHT 0x0100
|
||||
#define BTN_DLEFT 0x0200
|
||||
#define BTN_DDOWN 0x0400
|
||||
#define BTN_DUP 0x0800
|
||||
#define BTN_START 0x1000
|
||||
#define BTN_Z 0x2000
|
||||
#define BTN_B 0x4000
|
||||
#define BTN_A 0x8000
|
||||
#define BTN_CRIGHT R_CBUTTONS
|
||||
#define BTN_CLEFT L_CBUTTONS
|
||||
#define BTN_CDOWN D_CBUTTONS
|
||||
#define BTN_CUP U_CBUTTONS
|
||||
#define BTN_R R_TRIG
|
||||
#define BTN_L L_TRIG
|
||||
#define BTN_RESET 0x0080 /* "neutral reset": Corresponds to holding L+R and pressing S */
|
||||
#define BTN_DRIGHT R_JPAD
|
||||
#define BTN_DLEFT L_JPAD
|
||||
#define BTN_DDOWN D_JPAD
|
||||
#define BTN_DUP U_JPAD
|
||||
#define BTN_START START_BUTTON
|
||||
#define BTN_Z Z_TRIG
|
||||
#define BTN_B B_BUTTON
|
||||
#define BTN_A A_BUTTON
|
||||
|
||||
#define CONT_ERR_NO_CONTROLLER PFS_ERR_NOPACK /* 1 */
|
||||
#define CONT_ERR_CONTRFAIL CONT_OVERRUN_ERROR /* 4 */
|
||||
|
||||
@@ -18,9 +18,6 @@
|
||||
#define OS_PHYSICAL_TO_K0(x) (void*)(((u32)(x)+0x80000000))
|
||||
#define OS_PHYSICAL_TO_K1(x) (void*)(((u32)(x)+0xA0000000))
|
||||
|
||||
#define OS_MSEC_TO_CYCLES(n) OS_USEC_TO_CYCLES((n) * 1000)
|
||||
#define OS_SEC_TO_CYCLES(n) OS_MSEC_TO_CYCLES((n) * 1000)
|
||||
|
||||
/* Functions */
|
||||
|
||||
extern uintptr_t osVirtualToPhysical(void*);
|
||||
|
||||
+8
-13
@@ -13,18 +13,18 @@ typedef enum OsVoiceHandleMode {
|
||||
} OsVoiceHandleMode;
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ OSMesgQueue* mq;
|
||||
/* 0x4 */ s32 channel; // Controller port
|
||||
/* 0x8 */ OsVoiceHandleMode mode;
|
||||
/* 0xC */ u8 status;
|
||||
/* 0x0 */ OSMesgQueue* __mq;
|
||||
/* 0x4 */ s32 __channel; // Controller port
|
||||
/* 0x8 */ s32 __mode;
|
||||
/* 0xC */ u8 cmd_status;
|
||||
} OSVoiceHandle; // size = 0x10
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u16 warning; // Warning
|
||||
/* 0x02 */ u16 answerNum; // Candidate number (0~5)
|
||||
/* 0x04 */ u16 voiceLevel; // Voice input level
|
||||
/* 0x06 */ u16 voiceRelLevel; // Relative voice level "voice_sn"
|
||||
/* 0x08 */ u16 voiceTime; // Voice input time
|
||||
/* 0x02 */ u16 answer_num; // Candidate number (0~5)
|
||||
/* 0x04 */ u16 voice_level; // Voice input level
|
||||
/* 0x06 */ u16 voice_sn; // Relative voice level
|
||||
/* 0x08 */ u16 voice_time; // Voice input time
|
||||
/* 0x0A */ u16 answer[5]; // Candidate word number
|
||||
/* 0x14 */ u16 distance[5]; // Distance value
|
||||
} OSVoiceData; // size = 0x20
|
||||
@@ -40,11 +40,6 @@ typedef struct {
|
||||
#define VOICE_WARN_NOT_FIT 0x4000 /* No words match recognition word (No. 1 Candidate Distance Value > 1600) */
|
||||
#define VOICE_WARN_TOO_NOISY 0x8000 /* Too much ambient noise (Relative Voice Level =< 400) */
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ u16 words[20][15]; // 20 words, each with up to 15 syllables
|
||||
/* 0x258 */ u8 numWords;
|
||||
} OSVoiceDictionary; // size = 0x25C
|
||||
|
||||
s32 osVoiceInit(OSMesgQueue* mq, OSVoiceHandle* hd, int channel);
|
||||
s32 osVoiceSetWord(OSVoiceHandle* hd, u8* word);
|
||||
s32 osVoiceCheckWord(u8* word);
|
||||
|
||||
+3
-6
@@ -9,8 +9,10 @@
|
||||
|
||||
#define OS_SC_RETRACE_MSG 1
|
||||
#define OS_SC_DONE_MSG 2
|
||||
#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c
|
||||
#define OS_SC_RDP_DONE_MSG 3
|
||||
#define OS_SC_PRE_NMI_MSG 4
|
||||
#define OS_SC_LAST_MSG 4 /* this should have highest number */
|
||||
#define OS_SC_MAX_MESGS 8
|
||||
|
||||
#define OS_SC_NEEDS_RDP 0x0001
|
||||
#define OS_SC_NEEDS_RSP 0x0002
|
||||
@@ -22,11 +24,6 @@
|
||||
#define OS_SC_RCP_MASK 0x0003
|
||||
#define OS_SC_TYPE_MASK 0x0007
|
||||
|
||||
#define OS_SC_DP 0x0001
|
||||
#define OS_SC_SP 0x0002
|
||||
#define OS_SC_YIELD 0x0010
|
||||
#define OS_SC_YIELDED 0x0020
|
||||
|
||||
typedef struct OSScTask {
|
||||
/* 0x00 */ struct OSScTask* next;
|
||||
/* 0x04 */ u32 state;
|
||||
|
||||
+13
-72
@@ -2,20 +2,7 @@
|
||||
#define PR_SPTASK_H
|
||||
|
||||
#include "PR/ultratypes.h"
|
||||
#include "libc/stddef.h"
|
||||
|
||||
/* Task Types */
|
||||
#define M_NULTASK 0
|
||||
#define M_GFXTASK 1
|
||||
#define M_AUDTASK 2
|
||||
#define M_VIDTASK 3
|
||||
#define M_NJPEGTASK 4
|
||||
#define M_HVQTASK 6
|
||||
#define M_HVQMTASK 7
|
||||
|
||||
/* Task Flags */
|
||||
#define M_TASK_FLAG0 (1 << 0)
|
||||
#define M_TASK_FLAG1 (1 << 1)
|
||||
|
||||
/* Task Flag Fields */
|
||||
#define OS_TASK_YIELDED (1 << 0)
|
||||
@@ -30,76 +17,30 @@
|
||||
#define OS_YIELD_DATA_SIZE 0xC00
|
||||
#define OS_YIELD_AUDIO_SIZE 0x400
|
||||
|
||||
/* SpStatus */
|
||||
|
||||
/* Write */
|
||||
#define SPSTATUS_CLEAR_HALT (1 << 0)
|
||||
#define SPSTATUS_SET_HALT (1 << 1)
|
||||
#define SPSTATUS_CLEAR_BROKE (1 << 2)
|
||||
#define SPSTATUS_CLEAR_INTR (1 << 3)
|
||||
#define SPSTATUS_SET_INTR (1 << 4)
|
||||
#define SPSTATUS_CLEAR_SSTEP (1 << 5)
|
||||
#define SPSTATUS_SET_SSTEP (1 << 6)
|
||||
#define SPSTATUS_CLEAR_INTR_ON_BREAK (1 << 7)
|
||||
#define SPSTATUS_SET_INTR_ON_BREAK (1 << 8)
|
||||
#define SPSTATUS_CLEAR_SIGNAL0 (1 << 9)
|
||||
#define SPSTATUS_SET_SIGNAL0 (1 << 10)
|
||||
#define SPSTATUS_CLEAR_SIGNAL1 (1 << 11)
|
||||
#define SPSTATUS_SET_SIGNAL1 (1 << 12)
|
||||
#define SPSTATUS_CLEAR_SIGNAL2 (1 << 13)
|
||||
#define SPSTATUS_SET_SIGNAL2 (1 << 14)
|
||||
#define SPSTATUS_CLEAR_SIGNAL3 (1 << 15)
|
||||
#define SPSTATUS_SET_SIGNAL3 (1 << 16)
|
||||
#define SPSTATUS_CLEAR_SIGNAL4 (1 << 17)
|
||||
#define SPSTATUS_SET_SIGNAL4 (1 << 18)
|
||||
#define SPSTATUS_CLEAR_SIGNAL5 (1 << 19)
|
||||
#define SPSTATUS_SET_SIGNAL5 (1 << 20)
|
||||
#define SPSTATUS_CLEAR_SIGNAL6 (1 << 21)
|
||||
#define SPSTATUS_SET_SIGNAL6 (1 << 23)
|
||||
#define SPSTATUS_CLEAR_SIGNAL7 (1 << 24)
|
||||
#define SPSTATUS_SET_SIGNAL7 (1 << 25)
|
||||
|
||||
/* Read */
|
||||
#define SPSTATUS_HALT (1 << 0)
|
||||
#define SPSTATUS_BROKE (1 << 1)
|
||||
#define SPSTATUS_DMA_BUSY (1 << 2)
|
||||
#define SPSTATUS_DMA_FULL (1 << 3)
|
||||
#define SPSTATUS_IO_FULL (1 << 4)
|
||||
#define SPSTATUS_SINGLE_STEP (1 << 5)
|
||||
#define SPSTATUS_INTERRUPT_ON_BREAK (1 << 6)
|
||||
#define SPSTATUS_SIGNAL0_SET (1 << 7)
|
||||
#define SPSTATUS_SIGNAL1_SET (1 << 8)
|
||||
#define SPSTATUS_SIGNAL2_SET (1 << 9)
|
||||
#define SPSTATUS_SIGNAL3_SET (1 << 10)
|
||||
#define SPSTATUS_SIGNAL4_SET (1 << 11)
|
||||
#define SPSTATUS_SIGNAL5_SET (1 << 12)
|
||||
#define SPSTATUS_SIGNAL6_SET (1 << 13)
|
||||
#define SPSTATUS_SIGNAL7_SET (1 << 14)
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u32 type;
|
||||
/* 0x04 */ u32 flags;
|
||||
|
||||
/* 0x08 */ u64* ucodeBoot;
|
||||
/* 0x0C */ u32 ucodeBootSize; // ucode will load these sizes with lw, so need to be 32-bit
|
||||
/* 0x08 */ u64* ucode_boot;
|
||||
/* 0x0C */ u32 ucode_boot_size; // ucode will load these sizes with lw, so need to be 32-bit
|
||||
|
||||
/* 0x10 */ u64* ucode;
|
||||
/* 0x14 */ u32 ucodeSize;
|
||||
/* 0x14 */ u32 ucode_size;
|
||||
|
||||
/* 0x18 */ u64* ucodeData;
|
||||
/* 0x1C */ u32 ucodeDataSize;
|
||||
/* 0x18 */ u64* ucode_data;
|
||||
/* 0x1C */ u32 ucode_data_size;
|
||||
|
||||
/* 0x20 */ u64* dramStack;
|
||||
/* 0x24 */ u32 dramStackSize;
|
||||
/* 0x20 */ u64* dram_stack;
|
||||
/* 0x24 */ u32 dram_stack_size;
|
||||
|
||||
/* 0x28 */ u64* outputBuff;
|
||||
/* 0x2C */ u64* outputBuffSize;
|
||||
/* 0x28 */ u64* output_buff;
|
||||
/* 0x2C */ u64* output_buff_size;
|
||||
|
||||
/* 0x30 */ u64* dataPtr;
|
||||
/* 0x34 */ u32 dataSize;
|
||||
/* 0x30 */ u64* data_ptr;
|
||||
/* 0x34 */ u32 data_size;
|
||||
|
||||
/* 0x38 */ u64* yieldDataPtr;
|
||||
/* 0x3C */ u32 yieldDataSize;
|
||||
/* 0x38 */ u64* yield_data_ptr;
|
||||
/* 0x3C */ u32 yield_data_size;
|
||||
} OSTask_t; // size = 0x40
|
||||
|
||||
typedef union {
|
||||
|
||||
+3
-1
@@ -2,12 +2,14 @@
|
||||
#define FAULT_H
|
||||
|
||||
#include "ultra64.h"
|
||||
#include "unk.h"
|
||||
|
||||
#include "libc/stdarg.h"
|
||||
#include "libc/stdint.h"
|
||||
#include "PR/controller.h"
|
||||
|
||||
#include "padmgr.h"
|
||||
#include "stack.h"
|
||||
#include "unk.h"
|
||||
|
||||
// These are the same as the 3-bit ansi color codes
|
||||
#define FAULT_COLOR_BLACK 0
|
||||
|
||||
+7
-2
@@ -2,13 +2,18 @@
|
||||
#define SCHEDULER_H
|
||||
|
||||
#include "PR/ultratypes.h"
|
||||
#include "PR/sched.h"
|
||||
#include "PR/os_vi.h"
|
||||
#include "PR/sched.h"
|
||||
#include "PR/sptask.h"
|
||||
#include "irqmgr.h"
|
||||
|
||||
#include "irqmgr.h"
|
||||
#include "unk.h"
|
||||
|
||||
#define OS_SC_RETRACE_MSG 1
|
||||
#define OS_SC_DONE_MSG 2
|
||||
#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c
|
||||
#define OS_SC_PRE_NMI_MSG 4
|
||||
|
||||
#define TASK_FRAMEBUFFER(task) ((CfbInfo*)(task)->framebuffer)
|
||||
|
||||
typedef struct {
|
||||
|
||||
+2
-1423
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -186,7 +186,7 @@ typedef enum {
|
||||
#define DYNA_INTERACT_ACTOR_ON_SWITCH (1 << 3) // Like the ACTOR_ON_TOP flag but only actors with ACTOR_FLAG_CAN_PRESS_SWITCH
|
||||
#define DYNA_INTERACT_ACTOR_ON_HEAVY_SWITCH (1 << 4) // Like the ACTOR_ON_TOP flag but only actors with ACTOR_FLAG_CAN_PRESS_HEAVY_SWITCH
|
||||
|
||||
typedef struct {
|
||||
typedef struct DynaPolyActor {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ s32 bgId;
|
||||
/* 0x148 */ f32 pushForce;
|
||||
|
||||
+26
-22
@@ -1,6 +1,10 @@
|
||||
#ifndef Z64BGCHECK_H
|
||||
#define Z64BGCHECK_H
|
||||
|
||||
#include "ultra64.h"
|
||||
|
||||
#include "z64math.h"
|
||||
|
||||
struct PlayState;
|
||||
struct Actor;
|
||||
struct DynaPolyActor;
|
||||
@@ -302,7 +306,7 @@ typedef struct {
|
||||
} DynaLookup; // size = 0x8
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Actor* actor;
|
||||
/* 0x00 */ struct Actor* actor;
|
||||
/* 0x04 */ CollisionHeader* colHeader;
|
||||
/* 0x08 */ DynaLookup dynaLookup;
|
||||
/* 0x10 */ u16 vtxStartIndex;
|
||||
@@ -377,7 +381,7 @@ typedef struct
|
||||
/* 0x20 */ f32 outDistSq;
|
||||
/* 0x24 */ f32 checkDist;
|
||||
/* 0x28 */ s32 bccFlags;
|
||||
/* 0x2C */ Actor* actor;
|
||||
/* 0x2C */ struct Actor* actor;
|
||||
} StaticLineTest; // size = 0x30
|
||||
|
||||
typedef struct {
|
||||
@@ -392,7 +396,7 @@ typedef struct {
|
||||
/* 0x20 */ s32 checkOneFace; // bccFlags & 0x8
|
||||
/* 0x24 */ f32* distSq; // distance from posA to poly squared
|
||||
/* 0x28 */ f32 checkDist; // distance from poly
|
||||
/* 0x2C */ Actor* actor;
|
||||
/* 0x2C */ struct Actor* actor;
|
||||
/* 0x30 */ s32 bgId;
|
||||
} DynaLineTest; // size = 0x34
|
||||
|
||||
@@ -465,40 +469,40 @@ void BgCheck_Allocate(CollisionContext* colCtx, struct PlayState* play, Collisio
|
||||
void BgCheck_SetContextFlags(CollisionContext* colCtx, u32 flags);
|
||||
void BgCheck_UnsetContextFlags(CollisionContext* colCtx, u32 flags);
|
||||
CollisionHeader* BgCheck_GetCollisionHeader(CollisionContext* colCtx, s32 bgId);
|
||||
f32 BgCheck_RaycastFloorImpl(struct PlayState* play, CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, Actor* actor, u32 arg7, f32 checkDist, s32 arg9);
|
||||
f32 BgCheck_RaycastFloorImpl(struct PlayState* play, CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, struct Actor* actor, u32 arg7, f32 checkDist, s32 arg9);
|
||||
f32 BgCheck_CameraRaycastFloor1(CollisionContext* colCtx, CollisionPoly** outPoly, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor1(CollisionContext* colCtx, CollisionPoly** outPoly, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor2(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor2_1(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor3(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5(CollisionContext* colCtx, CollisionPoly** outPoly, s32* outBgId, Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5_2(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5_3(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor6(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos, f32 checkDist);
|
||||
f32 BgCheck_EntityRaycastFloor7(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5(CollisionContext* colCtx, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5_2(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, struct Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor5_3(struct PlayState* play, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, struct Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor6(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, struct Actor* actor, Vec3f* pos, f32 checkDist);
|
||||
f32 BgCheck_EntityRaycastFloor7(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, struct Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_AnyRaycastFloor1(CollisionContext* colCtx, CollisionPoly* outPoly, Vec3f* pos);
|
||||
f32 BgCheck_AnyRaycastFloor2(CollisionContext* colCtx, CollisionPoly* outPoly, s32* bgId, Vec3f* pos);
|
||||
f32 BgCheck_CameraRaycastFloor2(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor8(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor8(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, struct Actor* actor, Vec3f* pos);
|
||||
f32 BgCheck_EntityRaycastFloor9(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Vec3f* pos);
|
||||
s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, Actor* actor, f32 checkHeight, u8 argA);
|
||||
s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor, f32 checkHeight, u8 argA);
|
||||
s32 BgCheck_EntitySphVsWall1(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, f32 checkHeight);
|
||||
s32 BgCheck_EntitySphVsWall2(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, f32 checkHeight);
|
||||
s32 BgCheck_EntitySphVsWall3(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, Actor* actor, f32 checkHeight);
|
||||
s32 BgCheck_EntitySphVsWall4(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, Actor* actor, f32 checkHeight);
|
||||
s32 BgCheck_CheckCeilingImpl(CollisionContext* colCtx, u16 xpFlags, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly, s32* outBgId, Actor* actor);
|
||||
s32 BgCheck_EntitySphVsWall3(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor, f32 checkHeight);
|
||||
s32 BgCheck_EntitySphVsWall4(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 radius, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor, f32 checkHeight);
|
||||
s32 BgCheck_CheckCeilingImpl(CollisionContext* colCtx, u16 xpFlags, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor);
|
||||
s32 BgCheck_AnyCheckCeiling(CollisionContext* colCtx, f32* outY, Vec3f* pos, f32 checkHeight);
|
||||
s32 BgCheck_EntityCheckCeiling(CollisionContext* colCtx, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly, s32* outBgId, Actor* actor);
|
||||
s32 BgCheck_EntityCheckCeiling(CollisionContext* colCtx, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly, s32* outBgId, struct Actor* actor);
|
||||
s32 BgCheck_CameraLineTest1(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId);
|
||||
s32 BgCheck_CameraLineTest2(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId);
|
||||
s32 BgCheck_EntityLineTest1(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId);
|
||||
s32 BgCheck_EntityLineTest2(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId, Actor* actor);
|
||||
s32 BgCheck_EntityLineTest3(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId, Actor* actor, f32 checkDist);
|
||||
s32 BgCheck_EntityLineTest2(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId, struct Actor* actor);
|
||||
s32 BgCheck_EntityLineTest3(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId, struct Actor* actor, f32 checkDist);
|
||||
s32 BgCheck_ProjectileLineTest(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId);
|
||||
s32 BgCheck_AnyLineTest1(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkOneFace);
|
||||
s32 BgCheck_AnyLineTest2(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace);
|
||||
s32 BgCheck_AnyLineTest3(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, s32 checkWall, s32 checkFloor, s32 checkCeil, s32 checkOneFace, s32* bgId);
|
||||
s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* center, f32 radius, Actor* actor, u16 bciFlags);
|
||||
s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* center, f32 radius, struct Actor* actor, u16 bciFlags);
|
||||
s32 BgCheck_SphVsFirstPoly(CollisionContext* colCtx, Vec3f* center, f32 radius);
|
||||
s32 BgCheck_SphVsFirstWall(CollisionContext* colCtx, Vec3f* center, f32 radius);
|
||||
void SSNodeList_Init(SSNodeList* this);
|
||||
@@ -513,7 +517,7 @@ void DynaLookup_Reset(DynaLookup* dynaLookup);
|
||||
void DynaLookup_ResetVtxStartIndex(u16* vtxStartIndex);
|
||||
void DynaLookup_ResetWaterBoxStartIndex(u16* waterBoxStartIndex);
|
||||
void BgActor_Init(struct PlayState* play, BgActor* bgActor);
|
||||
void BgActor_SetActor(BgActor* bgActor, Actor* actor, CollisionHeader* colHeader);
|
||||
void BgActor_SetActor(BgActor* bgActor, struct Actor* actor, CollisionHeader* colHeader);
|
||||
s32 BgActor_IsTransformUnchanged(BgActor* bgActor);
|
||||
void DynaPoly_NullPolyList(CollisionPoly** polyList);
|
||||
void DynaPoly_AllocPolyList(struct PlayState* play, CollisionPoly** polyList, s32 numPolys);
|
||||
@@ -525,8 +529,8 @@ void DynaPoly_SetBgActorPrevTransform(struct PlayState* play, BgActor* bgActor);
|
||||
s32 DynaPoly_IsBgIdBgActor(s32 bgId);
|
||||
void DynaPoly_Init(struct PlayState* play, DynaCollisionContext* dyna);
|
||||
void DynaPoly_Alloc(struct PlayState* play, DynaCollisionContext* dyna);
|
||||
s32 DynaPoly_SetBgActor(struct PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader);
|
||||
DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId);
|
||||
s32 DynaPoly_SetBgActor(struct PlayState* play, DynaCollisionContext* dyna, struct Actor* actor, CollisionHeader* colHeader);
|
||||
struct DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId);
|
||||
void DynaPoly_DisableCollision(struct PlayState* play, DynaCollisionContext* dyna, s32 bgId);
|
||||
void DynaPoly_EnableCollision(struct PlayState* play, DynaCollisionContext* dyna, s32 bgId);
|
||||
void DynaPoly_DisableCeilingCollision(struct PlayState* play, DynaCollisionContext* dyna, s32 bgId);
|
||||
@@ -537,7 +541,7 @@ void DynaPoly_InvalidateLookup(struct PlayState* play, DynaCollisionContext* dyn
|
||||
void DynaPoly_DeleteBgActor(struct PlayState* play, DynaCollisionContext* dyna, s32 bgId);
|
||||
void BgCheck_CalcWaterboxDimensions(Vec3f* minPos, Vec3f* maxXPos, Vec3f* maxZPos, Vec3s* minPosOut, s16* xLength, s16* zLength);
|
||||
void DynaPoly_AddBgActorToLookup(struct PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex, s32* waterBoxStartIndex);
|
||||
void DynaPoly_UnsetAllInteractFlags(struct PlayState* play, DynaCollisionContext* dyna, Actor* actor);
|
||||
void DynaPoly_UnsetAllInteractFlags(struct PlayState* play, DynaCollisionContext* dyna, struct Actor* actor);
|
||||
void DynaPoly_UpdateContext(struct PlayState* play, DynaCollisionContext* dyna);
|
||||
void func_800C756C(DynaCollisionContext* dyna, s32* numPolygons, s32* numVertices, s32* numWaterBoxes);
|
||||
void DynaPoly_UpdateBgActorTransforms(struct PlayState* play, DynaCollisionContext* dyna);
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
#include "ultra64.h"
|
||||
#include "z64dma.h"
|
||||
|
||||
struct GraphicsContext;
|
||||
struct Input;
|
||||
struct PlayState;
|
||||
|
||||
#define DEFINE_PERSON(enum, _photo, _description, _metEnum, _metMessage, _metFlag) enum,
|
||||
@@ -52,7 +54,7 @@ typedef struct {
|
||||
} BombersNotebook; // size = 0xAC
|
||||
|
||||
void BombersNotebook_Draw(BombersNotebook* this, struct GraphicsContext* gfxCtx);
|
||||
void BombersNotebook_Update(struct PlayState* play, BombersNotebook* this, Input* input);
|
||||
void BombersNotebook_Update(struct PlayState* play, BombersNotebook* this, struct Input* input);
|
||||
void BombersNotebook_Init(BombersNotebook* this);
|
||||
void BombersNotebook_Destroy(BombersNotebook* this);
|
||||
|
||||
|
||||
@@ -2,8 +2,11 @@
|
||||
#define Z64MESSAGE_H
|
||||
|
||||
#include "PR/ultratypes.h"
|
||||
#include "z64view.h"
|
||||
#include "libc/stdbool.h"
|
||||
|
||||
#include "unk.h"
|
||||
#include "z64bombers_notebook.h"
|
||||
#include "z64view.h"
|
||||
|
||||
struct Actor;
|
||||
struct MessageTableEntry;
|
||||
@@ -328,7 +331,7 @@ void Message_HandleOcarina(struct PlayState* play);
|
||||
void Message_LoadItemIcon(struct PlayState* play, u16 itemId, s16 arg2);
|
||||
void Message_DecodeHeader(struct PlayState* play);
|
||||
void func_801514B0(struct PlayState* play, u16 arg1, u8 arg2);
|
||||
void Message_StartTextbox(struct PlayState* play, u16 textId, Actor* actor);
|
||||
void Message_StartTextbox(struct PlayState* play, u16 textId, struct Actor* actor);
|
||||
void Message_ContinueTextbox(struct PlayState* play, u16 textId);
|
||||
void Message_DisplaySceneTitleCard(struct PlayState* play, u16 textId);
|
||||
void Message_BombersNotebookQueueEvent(struct PlayState* play, u8 event);
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
#ifndef Z64SPEED_METER_H
|
||||
#define Z64SPEED_METER_H
|
||||
|
||||
#include "ultra64.h"
|
||||
#include "PR/ultratypes.h"
|
||||
#include "PR/os_time.h"
|
||||
#include "unk.h"
|
||||
|
||||
struct GameState;
|
||||
struct GraphicsContext;
|
||||
|
||||
typedef struct SpeedMeter {
|
||||
/* 0x00 */ char unk_00[0x18];
|
||||
/* 0x00 */ UNK_TYPE1 unk_00[0x18];
|
||||
/* 0x18 */ s32 x; // Unused
|
||||
/* 0x1C */ s32 y;
|
||||
} SpeedMeter; // size = 0x20
|
||||
|
||||
@@ -5,6 +5,11 @@
|
||||
#include "unk.h"
|
||||
#include "PR/os_voice.h"
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ u16 words[20][15]; // 20 words, each with up to 15 syllables
|
||||
/* 0x258 */ u8 numWords;
|
||||
} OSVoiceDictionary; // size = 0x25C
|
||||
|
||||
typedef enum OSVoiceWordId {
|
||||
/* 0 */ VOICE_WORD_ID_HOURS,
|
||||
/* 1 */ VOICE_WORD_ID_CHEESE,
|
||||
|
||||
Reference in New Issue
Block a user