izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Game bss and cleanup (#1356)

Browse Source 
* Game bss and cleanup

* Match Oot with rdp time variables

* PR review

* Namefixer
This commit is contained in:
Derek Hensley
2023-08-21 21:44:28 -04:00
committed by GitHub
parent 312fcafe2d
commit 8059537150
22 changed files with 135 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
-7
View File
@@ -1457,13 +1457,6 @@ void Sched_SendGfxCancelMsg(SchedContext* sched);
void Sched_FaultClient(void* param1, void* param2);
void Sched_ThreadEntry(void* arg);
void Sched_Init(SchedContext* sched, void* stack, OSPri pri, u8 viModeType, UNK_TYPE arg4, IrqMgr* irqMgr);
// void func_80177390(void);
void func_801773A0(void* arg0);
void func_801773C4(void* arg0);
void SpeedMeter_DrawTimeEntries(void* displayList, GraphicsContext* gfxCtx);
// void func_80177A84(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9);
//void func_80177AC8(void);
void SpeedMeter_DrawAllocEntries(void* displayList, GraphicsContext* gfxCtx, GameState* gameState);
void Mtx_SetTranslateScaleMtx(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY, f32 translateZ);
void Mtx_SetRotationMtx(Mtx* mtx, s32 angle, f32 axisX, f32 axisY, f32 axisZ);
include/variables.h
+4 -2
View File
@@ -2054,13 +2054,15 @@ extern u32 gAudioSPDataSize;
extern volatile OSTime D_801FBAE0;
extern volatile OSTime D_801FBAE8;
extern volatile OSTime D_801FBAF0;
extern volatile OSTime gRDPTimeTotal;
extern volatile OSTime lastRenderFrameDuration;
extern volatile OSTime gRSPAudioTotalTime;
extern volatile OSTime sRSPGFXTotalTime;
extern volatile OSTime sRSPOtherTotalTime;
// extern UNK_TYPE1 D_801FBB18;
extern volatile OSTime gRDPTotalTime;
// Accumulator for `gRDPTimeTotal`
extern volatile OSTime gRDPTimeAcc;
// extern UNK_TYPE1 D_801FBB28;
extern Vec3f D_801FBBF0;
include/z64game.h
+8 -8
View File
@@ -71,16 +71,16 @@ typedef struct GameState {
} GameState; // size = 0xA4
void Game_UpdateFramerateVariables(s32 divisor);
void Game_SetFramerateDivisor(GameState* gameState, s32 divisor);
void GameState_SetFBFilter(Gfx** gfx, void* zbuffer);
void Game_Nop80173534(GameState* gameState);
void GameState_UpdateFramerateDivisors(s32 divisor);
void GameState_SetFramerateDivisor(GameState* gameState, s32 divisor);
void GameState_SetFBFilter(Gfx** gfxP, void* zbuffer);
void GameState_Noop(GameState* gameState);
void GameState_Draw(GameState* gameState, struct GraphicsContext* gfxCtx);
void GameState_SetFrameBuffer(struct GraphicsContext* gfxCtx);
void func_801736DC(struct GraphicsContext* gfxCtx);
void Game_UpdateInput(GameState* gameState);
void Game_Update(GameState* gameState);
void Game_IncrementFrameCount(GameState* gameState);
void GameState_DrawEnd(struct GraphicsContext* gfxCtx);
void GameState_GetInput(GameState* gameState);
void GameState_Update(GameState* gameState);
void GameState_IncrementFrameCount(GameState* gameState);
void GameState_InitArena(GameState* gameState, size_t size);
void GameState_Realloc(GameState* gameState, size_t size);
void GameState_Init(GameState* gameState, GameStateFunc init, struct GraphicsContext* gfxCtx);
include/z64speed_meter.h
+18
View File
@@ -0,0 +1,18 @@
#ifndef Z64SPEED_METER_H
#define Z64SPEED_METER_H
#include "PR/ultratypes.h"
struct GameState;
struct GraphicsContext;
typedef struct SpeedMeter {
/* 0x00 */ char unk_00[0x20];
} SpeedMeter; // size = 0x20
void SpeedMeter_Init(SpeedMeter* this);
void SpeedMeter_Destroy(SpeedMeter* this);
void SpeedMeter_DrawTimeEntries(SpeedMeter* this, struct GraphicsContext* gfxCtx);
void SpeedMeter_DrawAllocEntries(SpeedMeter* this, struct GraphicsContext* gfxCtx, struct GameState* gameState);
#endif