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

Misc cleanup 13 (#1189)

Browse Source 
* FaultAddrConv Functions

* Invisible Ruppe macros

* skybox

* Z64 header defines

* ActorId

* remove i from KaleidoManager_FaultAddrConv

* size_t and parens
This commit is contained in:
Derek Hensley
2023-03-07 23:44:18 -05:00
committed by GitHub
parent d7af72273d
commit c917880261
28 changed files with 122 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -4
View File
@@ -776,8 +776,8 @@ s32 Actor_IsSmallChest(struct EnBox* chest);
void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16 limbPosCount, f32 effectScale, f32 frozenSteamScale, f32 effectAlpha, u8 type);
void Actor_SpawnIceEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s32 limbPosCount, s32 effectsPerLimb, f32 scale, f32 scaleRange);
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1);
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1);
void ActorOverlayTable_FaultClient(void* arg0, void* arg1);
void* ActorOverlayTable_FaultAddrConv(void* address, void* param);
void ActorOverlayTable_Init(void);
void ActorOverlayTable_Cleanup(void);
@@ -2242,7 +2242,7 @@ void func_80161C0C(void);
// void func_801631DC(void);
// void func_80163334(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_80163660(void);
void* KaleidoManager_FaultAddrConvFunc(void* address, void* param);
void* KaleidoManager_FaultAddrConv(void* address, void* param);
void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl);
void KaleidoManager_ClearOvl(KaleidoMgrOverlay* ovl);
void KaleidoManager_Init(PlayState* play);
@@ -2443,7 +2443,7 @@ void Graph_FaultClient(void);
void Graph_InitTHGA(TwoHeadGfxArena* arena, Gfx* buffer, s32 size);
void Graph_SetNextGfxPool(GraphicsContext* gfxCtx);
GameStateOverlay* Graph_GetNextGameState(GameState* gameState);
void* Graph_FaultAddrConvFunc(void* address, void* param);
void* Graph_FaultAddrConv(void* address, void* param);
void Graph_Init(GraphicsContext* gfxCtx);
void Graph_Destroy(GraphicsContext* gfxCtx);
void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState);
include/variables.h
+4 -4
View File
@@ -490,7 +490,7 @@ extern PlayState* actorCutscenesPlayState;
extern s16 actorCutsceneReturnCamera;
extern s16 D_801BD8C6;
extern GameStateOverlay gGameStateOverlayTable[];
extern s32 graphNumGameStates;
extern s32 gGraphNumGameStates;
// extern UNK_TYPE2 D_801BDA70;
// extern UNK_TYPE2 D_801BDA74;
// extern UNK_TYPE2 D_801BDA78;
@@ -2304,8 +2304,8 @@ extern f32 D_801ED8D0;
// extern UNK_TYPE1 D_801ED8DC;
extern Mtx D_801ED8E0;
// extern UNK_TYPE1 D_801ED920;
extern FaultClient D_801ED930;
extern FaultAddrConvClient D_801ED940;
extern FaultClient sActorOverlayTableFaultClient;
extern FaultAddrConvClient sActorOverlayTableFaultAddrConvClient;
extern char D_801ED950[80];
extern char D_801ED9A0[80];
extern Vec3f D_801ED9F0[3];
@@ -2476,7 +2476,7 @@ extern s16 D_801F4E7A;
// extern UNK_TYPE1 D_801F6B58;
extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
extern void (*sKaleidoScopeDrawFunc)(PlayState* play);
extern FaultAddrConvClient sKaleidoAreaFaultClient;
extern FaultAddrConvClient sKaleidoMgrFaultAddrConvClient;
extern s16 sTransitionFillTimer;
extern Input D_801F6C18;
extern TransitionTile sTransitionTile;
include/z64animation.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_ANIMATION_H
#define Z64_ANIMATION_H
#ifndef Z64ANIMATION_H
#define Z64ANIMATION_H
#include "PR/ultratypes.h"
#include "PR/gbi.h"
include/z64audio.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_AUDIO_H
#define Z64_AUDIO_H
#ifndef Z64AUDIO_H
#define Z64AUDIO_H
#include "audiothread_cmd.h"
include/z64bgcheck.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_BGCHECK_H
#define Z64_BGCHECK_H
#ifndef Z64BGCHECK_H
#define Z64BGCHECK_H
struct PlayState;
struct Actor;
include/z64collision_check.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _Z_COLLISION_CHECK_H_
#define _Z_COLLISION_CHECK_H_
#ifndef Z64COLLISION_CHECK_H
#define Z64COLLISION_CHECK_H
#include "PR/ultratypes.h"
#include "z64math.h"
include/z64curve.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_CURVE_H
#define Z64_CURVE_H
#ifndef Z64CURVE_H
#define Z64CURVE_H
#include "PR/ultratypes.h"
#include "z64math.h"
include/z64dma.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _Z64_DMA_H_
#define _Z64_DMA_H_
#ifndef Z64DMA_H
#define Z64DMA_H
#include "ultra64.h"
include/z64effect.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _Z64EFFECT_H_
#define _Z64EFFECT_H_
#ifndef Z64EFFECT_H
#define Z64EFFECT_H
#include "PR/ultratypes.h"
#include "color.h"
include/z64jpeg.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_JPEG_H
#define Z64_JPEG_H
#ifndef Z64JPEG_H
#define Z64JPEG_H
#include "PR/ultratypes.h"
#include "ultra64/message.h"
include/z64skin.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_SKIN_H
#define Z64_SKIN_H
#ifndef Z64SKIN_H
#define Z64SKIN_H
#include "z64animation.h"
include/z64skybox.h
+6 -11
View File
@@ -1,8 +1,9 @@
#ifndef Z64_SKYBOX_H
#define Z64_SKYBOX_H
#ifndef Z64SKYBOX_H
#define Z64SKYBOX_H
#include "PR/ultratypes.h"
#include "PR/gbi.h"
#include "color.h"
#include "z64dma.h"
#include "z64math.h"
@@ -33,17 +34,11 @@ typedef struct SkyboxContext {
/* 0x1E8 */ OSMesgQueue loadQueue;
/* 0x200 */ OSMesg loadMsg;
/* 0x204 */ s16 skyboxShouldDraw;
/* 0x208 */ f32 rotX;
/* 0x20C */ f32 rotY;
/* 0x210 */ f32 rotZ;
/* 0x208 */ Vec3f rot;
/* 0x214 */ Vec3f eye;
/* 0x220 */ s16 angle;
/* 0x222 */ u8 primR;
/* 0x223 */ u8 primG;
/* 0x224 */ u8 primB;
/* 0x225 */ u8 envR;
/* 0x226 */ u8 envG;
/* 0x227 */ u8 envB;
/* 0x222 */ Color_RGB8 prim;
/* 0x225 */ Color_RGB8 env;
} SkyboxContext; // size = 0x228
typedef struct struct_801C5F44 {
include/z64snap.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_SNAP_H
#define Z64_SNAP_H
#ifndef Z64SNAP_H
#define Z64SNAP_H
#include "PR/ultratypes.h"
#include "z64actor.h"
include/z_en_hy_code.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z_EN_HY_CODE_H
#define Z_EN_HY_CODE_H
#ifndef Z64ENHY_CODE_H
#define Z64ENHY_CODE_H
#include "global.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
include/z_prenmi.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_PRENMI_H
#define Z64_PRENMI_H
#ifndef Z64PRENMI_H
#define Z64PRENMI_H
#include "global.h"
include/z_title_setup.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef Z64_TITLE_SETUP_H
#define Z64_TITLE_SETUP_H
#ifndef Z64TITLE_SETUP_H
#define Z64TITLE_SETUP_H
#include "global.h"
src/code/graph.c
+6 -6
View File
@@ -90,21 +90,21 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
return NULL;
}
void* Graph_FaultAddrConvFunc(void* address, void* param) {
void* Graph_FaultAddrConv(void* address, void* param) {
uintptr_t addr = address;
GameStateOverlay* gameStateOvl = &gGameStateOverlayTable[0];
uintptr_t ramConv;
size_t ramConv;
void* ramStart;
uintptr_t diff;
size_t diff;
s32 i;
for (i = 0; i < graphNumGameStates; i++, gameStateOvl++) {
for (i = 0; i < gGraphNumGameStates; i++, gameStateOvl++) {
diff = VRAM_PTR_SIZE(gameStateOvl);
ramStart = gameStateOvl->loadedRamAddr;
ramConv = (uintptr_t)gameStateOvl->vramStart - (uintptr_t)ramStart;
if (ramStart != NULL) {
if (addr >= (uintptr_t)ramStart && addr < (uintptr_t)ramStart + diff) {
if ((addr >= (uintptr_t)ramStart) && (addr < (uintptr_t)ramStart + diff)) {
return addr + ramConv;
}
}
@@ -122,7 +122,7 @@ void Graph_Init(GraphicsContext* gfxCtx) {
gfxCtx->yScale = gViConfigYScale;
osCreateMesgQueue(&gfxCtx->queue, gfxCtx->msgBuff, ARRAY_COUNT(gfxCtx->msgBuff));
Fault_AddClient(&sGraphFaultClient, Graph_FaultClient, NULL, NULL);
Fault_AddAddrConvClient(&sGraphFaultAddrConvClient, Graph_FaultAddrConvFunc, NULL);
Fault_AddAddrConvClient(&sGraphFaultAddrConvClient, Graph_FaultAddrConv, NULL);
}
void Graph_Destroy(GraphicsContext* gfxCtx) {
src/code/z_actor_dlftbls.c
+24 -25
View File
@@ -38,45 +38,44 @@ ActorOverlay gActorOverlayTable[] = {
ActorId gMaxActorId = 0;
FaultClient D_801ED930;
FaultAddrConvClient D_801ED940;
FaultClient sActorOverlayTableFaultClient;
FaultAddrConvClient sActorOverlayTableFaultAddrConvClient;
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) {
void ActorOverlayTable_FaultClient(void* arg0, void* arg1) {
ActorOverlay* overlayEntry;
u32 overlaySize;
ActorId i;
ActorId actorId;
FaultDrawer_SetCharPad(-2, 0);
FaultDrawer_Printf("actor_dlftbls %u\n", gMaxActorId);
FaultDrawer_Printf("No. RamStart- RamEnd cn Name\n");
for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxActorId; i++, overlayEntry++) {
for (actorId = 0, overlayEntry = &gActorOverlayTable[0]; actorId < gMaxActorId; actorId++, overlayEntry++) {
overlaySize = VRAM_PTR_SIZE(overlayEntry);
if (overlayEntry->loadedRamAddr != NULL) {
FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", i, overlayEntry->loadedRamAddr,
FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", actorId, overlayEntry->loadedRamAddr,
(u32)overlayEntry->loadedRamAddr + overlaySize, overlayEntry->numLoaded, "");
}
}
}
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1) {
u8* ptr = arg0;
ActorOverlay* overlayEntry = &gActorOverlayTable[0];
ActorId i;
u8* ramStart;
u8* ramEnd;
size_t size;
u32 offset;
void* ActorOverlayTable_FaultAddrConv(void* address, void* param) {
uintptr_t addr = address;
ActorOverlay* actorOvl = &gActorOverlayTable[0];
size_t ramConv;
void* ramStart;
size_t diff;
ActorId actorId;
for (actorId = 0; actorId < gMaxActorId; actorId++, actorOvl++) {
diff = VRAM_PTR_SIZE(actorOvl);
ramStart = actorOvl->loadedRamAddr;
ramConv = (uintptr_t)actorOvl->vramStart - (uintptr_t)ramStart;
for (i = 0; i < gMaxActorId; i++, overlayEntry++) {
size = VRAM_PTR_SIZE(overlayEntry);
ramStart = overlayEntry->loadedRamAddr;
ramEnd = ramStart + size;
offset = (u8*)overlayEntry->vramStart - ramStart;
if (ramStart != NULL) {
if (ptr >= ramStart && ptr < ramEnd) {
return ptr + offset;
if ((addr >= (uintptr_t)ramStart) && (addr < (uintptr_t)ramStart + diff)) {
return addr + ramConv;
}
}
}
@@ -85,12 +84,12 @@ void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1) {
void ActorOverlayTable_Init(void) {
gMaxActorId = ACTOR_ID_MAX;
Fault_AddClient(&D_801ED930, &ActorOverlayTable_FaultPrint, NULL, NULL);
Fault_AddAddrConvClient(&D_801ED940, &ActorOverlayTable_FaultAddrConv, NULL);
Fault_AddClient(&sActorOverlayTableFaultClient, ActorOverlayTable_FaultClient, NULL, NULL);
Fault_AddAddrConvClient(&sActorOverlayTableFaultAddrConvClient, ActorOverlayTable_FaultAddrConv, NULL);
}
void ActorOverlayTable_Cleanup(void) {
Fault_RemoveClient(&D_801ED930);
Fault_RemoveAddrConvClient(&D_801ED940);
Fault_RemoveClient(&sActorOverlayTableFaultClient);
Fault_RemoveAddrConvClient(&sActorOverlayTableFaultAddrConvClient);
gMaxActorId = 0;
}
src/code/z_game_dlftbls.c
+1 -1
View File
@@ -24,4 +24,4 @@ GameStateOverlay gGameStateOverlayTable[] = {
GAMESTATE_OVERLAY(daytelop, DayTelop_Init, DayTelop_Destroy, sizeof(DayTelopState)),
};
s32 graphNumGameStates = ARRAY_COUNT(gGameStateOverlayTable);
s32 gGraphNumGameStates = ARRAY_COUNT(gGameStateOverlayTable);
src/code/z_kaleido_manager.c
+16 -17
View File
@@ -14,24 +14,23 @@ KaleidoMgrOverlay gKaleidoMgrOverlayTable[] = {
void* sKaleidoAreaPtr = NULL;
KaleidoMgrOverlay* gKaleidoMgrCurOvl = NULL;
FaultAddrConvClient sKaleidoAreaFaultClient;
FaultAddrConvClient sKaleidoMgrFaultAddrConvClient;
void* KaleidoManager_FaultAddrConvFunc(void* address, void* param) {
u8* ptr = address;
KaleidoMgrOverlay* ovl = &gKaleidoMgrCurOvl[0];
u8* ramStart;
u8* ramEnd;
size_t size;
uintptr_t offset;
void* KaleidoManager_FaultAddrConv(void* address, void* param) {
uintptr_t addr = address;
KaleidoMgrOverlay* kaleidoMgrOvl = gKaleidoMgrCurOvl;
size_t ramConv;
void* ramStart;
size_t diff;
if (kaleidoMgrOvl != NULL) {
diff = VRAM_PTR_SIZE(kaleidoMgrOvl);
ramStart = kaleidoMgrOvl->loadedRamAddr;
ramConv = (uintptr_t)kaleidoMgrOvl->vramStart - (uintptr_t)ramStart;
if (ovl != NULL) {
size = VRAM_PTR_SIZE(ovl);
ramStart = ovl->loadedRamAddr;
ramEnd = ramStart + size;
offset = (u8*)ovl->vramStart - ramStart;
if (ramStart != NULL) {
if (ptr >= ramStart && ptr < ramEnd) {
return ptr + offset;
if ((addr >= (uintptr_t)ramStart) && (addr < (uintptr_t)ramStart + diff)) {
return addr + ramConv;
}
}
}
@@ -68,11 +67,11 @@ void KaleidoManager_Init(PlayState* play) {
sKaleidoAreaPtr = THA_AllocEndAlign16(&play->state.heap, largestSize);
gKaleidoMgrCurOvl = NULL;
Fault_AddAddrConvClient(&sKaleidoAreaFaultClient, KaleidoManager_FaultAddrConvFunc, NULL);
Fault_AddAddrConvClient(&sKaleidoMgrFaultAddrConvClient, KaleidoManager_FaultAddrConv, NULL);
}
void KaleidoManager_Destroy() {
Fault_RemoveAddrConvClient(&sKaleidoAreaFaultClient);
Fault_RemoveAddrConvClient(&sKaleidoMgrFaultAddrConvClient);
if (gKaleidoMgrCurOvl != NULL) {
KaleidoManager_ClearOvl(gKaleidoMgrCurOvl);

Some files were not shown because too many files have changed in this diff Show More