mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 23:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Memstuff (#1164)

Browse source 
* Un-fake a couple of matches in memory manip functions

* Document fmodf

* Un-fake a couple of matches in memory manip functions

* Document fmodf

* Rename functions and files

* Document memmove, memsets, memcpys

* Format

* Sort out some missing sizeofs

* Name fmodf

* Rename local variables

* size_t

* Use COBRA_SHADOW_TEX_SIZE

* Review

* Tweak the Doxyfile to remove @brief requirement

* Roman's review

* Fix a bug comment

* Change fmodf
This commit is contained in:
EllipticEllipsis 2022-05-01 23:06:35 +01:00 • committed by GitHub
parent 7334ffa373
commit e84f5ab387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 282 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/code/z_demo.c
View file

@ -1571,9 +1571,9 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
s32 cutsceneEndFrame;
s16 j;
MemCopy(&totalEntries, cutscenePtr, 4);
MemCpy(&totalEntries, cutscenePtr, 4);
cutscenePtr += 4;
MemCopy(&cutsceneEndFrame, cutscenePtr, 4);
MemCpy(&cutsceneEndFrame, cutscenePtr, 4);
cutscenePtr += 4;
if ((cutsceneEndFrame < csCtx->frames) && (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC)) {
@ -1587,7 +1587,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
for (i = 0; i < totalEntries; i++) {
MemCopy(&cmdType, cutscenePtr, 4);
MemCpy(&cmdType, cutscenePtr, 4);
cutscenePtr += 4;
if (cmdType == -1) {
@ -1596,7 +1596,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
switch (cmdType) {
case CS_CMD_MISC:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
func_80064824(globalCtx, csCtx, (void*)cutscenePtr);
@ -1604,7 +1604,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_SET_LIGHTING:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
Cutscene_Command_SetLighting(globalCtx, csCtx, (void*)cutscenePtr);
@ -1612,7 +1612,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_PLAYBGM:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
Cutscene_Command_PlayBGM(globalCtx, csCtx, (void*)cutscenePtr);
@ -1620,7 +1620,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_STOPBGM:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
Cutscene_Command_StopBGM(globalCtx, csCtx, (void*)cutscenePtr);
@ -1628,7 +1628,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_FADEBGM:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
Cutscene_Command_FadeBGM(globalCtx, csCtx, (void*)cutscenePtr);
@ -1636,7 +1636,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_09:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
Cutscene_Command_09(globalCtx, csCtx, (void*)cutscenePtr);
@ -1644,7 +1644,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_SETTIME:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
func_80065134(globalCtx, csCtx, (void*)cutscenePtr);
@ -1652,7 +1652,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_SET_PLAYER_ACTION:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1680,7 +1680,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 138:
case 139:
case 144:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1708,7 +1708,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 125:
case 131:
case 141:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1732,7 +1732,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 121:
case 126:
case 132:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1755,7 +1755,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 108:
case 127:
case 133:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1774,7 +1774,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 83:
case 128:
case 135:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1791,7 +1791,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 90:
case 129:
case 136:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1809,7 +1809,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 115:
case 130:
case 137:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1826,7 +1826,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
case 114:
case 134:
case 142:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1837,7 +1837,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_SET_ACTOR_ACTION_9:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1848,7 +1848,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
}
break;
case CS_CMD_SET_ACTOR_ACTION_10:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1882,7 +1882,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
cutscenePtr += 8;
break;
case CS_CMD_TEXTBOX:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cmd = (CsCmdBase*)cutscenePtr;
@ -1898,7 +1898,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
cutscenePtr += 8;
break;
default:
MemCopy(&cmdEntries, cutscenePtr, 4);
MemCpy(&cmdEntries, cutscenePtr, 4);
cutscenePtr += 4;
for (j = 0; j < cmdEntries; j++) {
cutscenePtr += 0x30;