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

Fix misc 12 (#1222)

Browse source 
* (light) `src` to `src/code/code_8006C510.c`

* `setup + entrance` -> `entrance + setup`

* Decimal for `gdSPDefLights1` args (colors, unit vector)

* Run formatter

* `firstDone` bool -> `materialFlag`

* `ENTR_MAX`: 0x613 -> 0x614

* revert `materialFlag` to bool++ for now
This commit is contained in:
Dragorn421 2022-05-15 16:38:31 +02:00 • committed by GitHub
parent bf56c94f0f
commit 811b2d6ad2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/code/code_800FC620.c
View file

@ -29,20 +29,19 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi
u32 ovlOffset;
u32 size;
size = vRomEnd - vRomStart;
end = (u32)allocatedVRamAddr + size;
if (gOverlayLogSeverity >= 3) {
// "Start loading dynamic link function"
osSyncPrintf("\nダイナミックリンクファンクションのロードを開始します\n");
}
if (gOverlayLogSeverity >= 3) {
size = vRomEnd - vRomStart;
// "DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x)"
osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedVRamAddr,
(u32)allocatedVRamAddr + size);
osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedVRamAddr, end);
}
size = vRomEnd - vRomStart;
end = (u32)allocatedVRamAddr + size;
DmaMgr_SendRequest0((u32)allocatedVRamAddr, vRomStart, size);
ovlOffset = ((s32*)end)[-1];
@ -101,7 +100,7 @@ void* func_800FC800(u32 size) {
return __osMallocDebug(&gSystemArena, size, sNew, 0);
}
// possible some kind of delete() function
// possibly some kind of delete() function
void func_800FC83C(void* ptr) {
if (ptr != NULL) {
__osFree(&gSystemArena, ptr);
@ -144,25 +143,18 @@ void* func_800FC948(void* blk, u32 nBlk, u32 blkSize, arg3_800FC948 arg3) {
void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg4) {
u32 pos;
u32 end;
s32 masked_arg2;
if (blk == 0) {
return;
}
if (arg3 != 0) {
end = (u32)blk;
masked_arg2 = (s32)(blkSize & ~0);
pos = (u32)end + (nBlk * blkSize);
if (masked_arg2) {}
while (pos > end) {
pos -= masked_arg2;
pos -= (s32)(blkSize & ~0);
arg3((void*)pos, 2);
if (1) {}
}
if (!masked_arg2) {}
}
if (arg4 != 0) {