mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-14 20:05:02 +00:00
Enable int-conversion warnings and fix all current instances (#1280)
* Enable int-conversion warnings for gcc/clang * Fix all current int-conversion warnings * Run format.sh * Apply review suggestions
This commit is contained in:
Roman971
GitHub
parent
5299208291
commit
08c8126ba5
46 changed files with 225 additions and 224 deletions
|
|
@ -79,7 +79,7 @@ void* THA_GetTail(TwoHeadArena* tha) {
|
|||
void* THA_AllocStart(TwoHeadArena* tha, u32 size) {
|
||||
void* start = tha->head;
|
||||
|
||||
tha->head = (u32)tha->head + size;
|
||||
tha->head = (void*)((u32)tha->head + size);
|
||||
return start;
|
||||
}
|
||||
|
||||
|
|
@ -100,19 +100,19 @@ void* THA_AllocEnd(TwoHeadArena* tha, u32 size) {
|
|||
mask = (size >= 0x10) ? ~0xF : 0;
|
||||
}
|
||||
|
||||
tha->tail = (((u32)tha->tail & mask) - size) & mask;
|
||||
tha->tail = (void*)((((u32)tha->tail & mask) - size) & mask);
|
||||
return tha->tail;
|
||||
}
|
||||
|
||||
void* THA_AllocEndAlign16(TwoHeadArena* tha, u32 size) {
|
||||
u32 mask = ~0xF;
|
||||
|
||||
tha->tail = (((u32)tha->tail & mask) - size) & (u64)mask;
|
||||
tha->tail = (void*)((((u32)tha->tail & mask) - size) & (u32)(u64)mask);
|
||||
return tha->tail;
|
||||
}
|
||||
|
||||
void* THA_AllocEndAlign(TwoHeadArena* tha, u32 size, u32 mask) {
|
||||
tha->tail = (((u32)tha->tail & mask) - size) & mask;
|
||||
tha->tail = (void*)((((u32)tha->tail & mask) - size) & mask);
|
||||
return tha->tail;
|
||||
}
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ u32 THA_IsCrash(TwoHeadArena* tha) {
|
|||
|
||||
void THA_Init(TwoHeadArena* tha) {
|
||||
tha->head = tha->bufp;
|
||||
tha->tail = (u32)tha->bufp + tha->size;
|
||||
tha->tail = (void*)((u32)tha->bufp + tha->size);
|
||||
}
|
||||
|
||||
void THA_Ct(TwoHeadArena* tha, void* ptr, u32 size) {
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ void __osFree_NoLock(Arena* arena, void* ptr) {
|
|||
ArenaImpl_SetDebugInfo(node, NULL, 0, arena);
|
||||
|
||||
if (arena->flag & FILL_FREEBLOCK) {
|
||||
__osMemset((u32)node + sizeof(ArenaNode), BLOCK_FREE_MAGIC, node->size);
|
||||
__osMemset((void*)((u32)node + sizeof(ArenaNode)), BLOCK_FREE_MAGIC, node->size);
|
||||
}
|
||||
|
||||
newNext = next;
|
||||
|
|
@ -512,7 +512,7 @@ void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line) {
|
|||
ArenaImpl_SetDebugInfo(node, file, line, arena);
|
||||
|
||||
if (arena->flag & FILL_FREEBLOCK) {
|
||||
__osMemset((u32)node + sizeof(ArenaNode), BLOCK_FREE_MAGIC, node->size);
|
||||
__osMemset((void*)((u32)node + sizeof(ArenaNode)), BLOCK_FREE_MAGIC, node->size);
|
||||
}
|
||||
|
||||
newNext = node->next;
|
||||
|
|
|
|||
|
|
@ -1400,7 +1400,7 @@ void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 sampleBankId) {
|
|||
|
||||
sampleBankTable = gAudioContext.sampleBankTable;
|
||||
numFonts = gAudioContext.soundFontTable->numEntries;
|
||||
change.oldAddr = AudioHeap_SearchCaches(SAMPLE_TABLE, CACHE_EITHER, sampleBankId);
|
||||
change.oldAddr = (u32)AudioHeap_SearchCaches(SAMPLE_TABLE, CACHE_EITHER, sampleBankId);
|
||||
if (change.oldAddr == 0) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -407,10 +407,10 @@ s32 AudioLoad_SyncLoadSample(SoundFontSample* sample, s32 fontId) {
|
|||
}
|
||||
|
||||
if (sample->medium == MEDIUM_UNK) {
|
||||
AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, sampleAddr, sample->size,
|
||||
AudioLoad_SyncDmaUnkMedium((u32)sample->sampleAddr, sampleAddr, sample->size,
|
||||
gAudioContext.sampleBankTable->unkMediumParam);
|
||||
} else {
|
||||
AudioLoad_SyncDma(sample->sampleAddr, sampleAddr, sample->size, sample->medium);
|
||||
AudioLoad_SyncDma((u32)sample->sampleAddr, sampleAddr, sample->size, sample->medium);
|
||||
}
|
||||
sample->medium = MEDIUM_RAM;
|
||||
sample->sampleAddr = sampleAddr;
|
||||
|
|
@ -600,7 +600,7 @@ u32 AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad
|
|||
AudioLoad_SetSampleFontLoadStatus(realTableId, LOAD_STATUS_COMPLETE);
|
||||
}
|
||||
*outMedium = MEDIUM_RAM;
|
||||
return ramAddr;
|
||||
return (u32)ramAddr;
|
||||
}
|
||||
|
||||
cachePolicy = sampleBankTable->entries[sampleBankId].cachePolicy;
|
||||
|
|
@ -612,7 +612,7 @@ u32 AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad
|
|||
ramAddr = AudioLoad_SyncLoad(SAMPLE_TABLE, sampleBankId, &noLoad);
|
||||
if (ramAddr != NULL) {
|
||||
*outMedium = MEDIUM_RAM;
|
||||
return ramAddr;
|
||||
return (u32)ramAddr;
|
||||
}
|
||||
|
||||
*outMedium = sampleBankTable->entries[sampleBankId].medium;
|
||||
|
|
@ -809,10 +809,10 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample
|
|||
s32 numDrums = gAudioContext.soundFonts[fontId].numDrums;
|
||||
s32 numInstruments = gAudioContext.soundFonts[fontId].numInstruments;
|
||||
s32 numSfx = gAudioContext.soundFonts[fontId].numSfx;
|
||||
void** fontData = (void**)fontDataStartAddr;
|
||||
u32* fontData = (u32*)fontDataStartAddr;
|
||||
|
||||
// Relocate an offset (relative to the start of the font data) to a pointer (a ram address)
|
||||
#define RELOC_TO_RAM(offset) (void*)((u32)(offset) + (u32)(fontDataStartAddr))
|
||||
#define RELOC_TO_RAM(offset) ((u32)(offset) + (u32)(fontDataStartAddr))
|
||||
|
||||
// Drums relocation
|
||||
|
||||
|
|
@ -828,19 +828,19 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample
|
|||
// Loop through the drum offsets
|
||||
for (i = 0; i < numDrums; i++) {
|
||||
// Get the i'th drum offset
|
||||
soundOffset = ((Drum**)fontData[0])[i];
|
||||
soundOffset = (u32)((Drum**)fontData[0])[i];
|
||||
|
||||
// Some drum data entries are empty, represented by an offset of 0 in the list of drum offsets
|
||||
if (soundOffset != 0) {
|
||||
soundOffset = RELOC_TO_RAM(soundOffset);
|
||||
((Drum**)fontData[0])[i] = drum = soundOffset;
|
||||
((Drum**)fontData[0])[i] = drum = (Drum*)soundOffset;
|
||||
|
||||
// The drum may be in the list multiple times and already relocated
|
||||
if (!drum->isRelocated) {
|
||||
AudioLoad_RelocateSample(&drum->sound, fontDataStartAddr, sampleBankReloc);
|
||||
|
||||
soundOffset = drum->envelope;
|
||||
drum->envelope = RELOC_TO_RAM(soundOffset);
|
||||
soundOffset = (u32)drum->envelope;
|
||||
drum->envelope = (AdsrEnvelope*)RELOC_TO_RAM(soundOffset);
|
||||
|
||||
drum->isRelocated = true;
|
||||
}
|
||||
|
|
@ -862,15 +862,12 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample
|
|||
// Loop through the sound effects
|
||||
for (i = 0; i < numSfx; i++) {
|
||||
// Get a pointer to the i'th sound effect
|
||||
soundOffset = ((SoundFontSound*)fontData[1]) + i;
|
||||
soundOffset = (u32)(((SoundFontSound*)fontData[1]) + i);
|
||||
sfx = (SoundFontSound*)soundOffset;
|
||||
|
||||
// Check for NULL (note: the pointer is guaranteed to be in fontData and can never be NULL)
|
||||
if ((SoundFontSound*)soundOffset != NULL) {
|
||||
sfx = soundOffset;
|
||||
|
||||
if ((u32)sfx->sample != 0) {
|
||||
AudioLoad_RelocateSample(sfx, fontDataStartAddr, sampleBankReloc);
|
||||
}
|
||||
if ((sfx != NULL) && ((u32)sfx->sample != 0)) {
|
||||
AudioLoad_RelocateSample(sfx, fontDataStartAddr, sampleBankReloc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -887,9 +884,9 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample
|
|||
// Loop through the instruments
|
||||
for (i = 2; i <= 2 + numInstruments - 1; i++) {
|
||||
// Some instrument data entries are empty, represented by an offset of 0 in the list of instrument offsets
|
||||
if ((u32)fontData[i] != 0) {
|
||||
if (fontData[i] != 0) {
|
||||
fontData[i] = RELOC_TO_RAM(fontData[i]);
|
||||
inst = fontData[i];
|
||||
inst = (Instrument*)fontData[i];
|
||||
|
||||
// The instrument may be in the list multiple times and already relocated
|
||||
if (!inst->isRelocated) {
|
||||
|
|
@ -906,8 +903,8 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample
|
|||
AudioLoad_RelocateSample(&inst->highNotesSound, fontDataStartAddr, sampleBankReloc);
|
||||
}
|
||||
|
||||
soundOffset = inst->envelope;
|
||||
inst->envelope = RELOC_TO_RAM(soundOffset);
|
||||
soundOffset = (u32)inst->envelope;
|
||||
inst->envelope = (AdsrEnvelope*)RELOC_TO_RAM(soundOffset);
|
||||
|
||||
inst->isRelocated = true;
|
||||
}
|
||||
|
|
@ -1221,9 +1218,9 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
|
|||
AudioHeap_ResetStep();
|
||||
|
||||
// Initialize audio tables
|
||||
AudioLoad_InitTable(gAudioContext.sequenceTable, _AudioseqSegmentRomStart, 0);
|
||||
AudioLoad_InitTable(gAudioContext.soundFontTable, _AudiobankSegmentRomStart, 0);
|
||||
AudioLoad_InitTable(gAudioContext.sampleBankTable, _AudiotableSegmentRomStart, 0);
|
||||
AudioLoad_InitTable(gAudioContext.sequenceTable, (u32)_AudioseqSegmentRomStart, 0);
|
||||
AudioLoad_InitTable(gAudioContext.soundFontTable, (u32)_AudiobankSegmentRomStart, 0);
|
||||
AudioLoad_InitTable(gAudioContext.sampleBankTable, (u32)_AudiotableSegmentRomStart, 0);
|
||||
numFonts = gAudioContext.soundFontTable->numEntries;
|
||||
gAudioContext.soundFonts = AudioHeap_Alloc(&gAudioContext.initPool, numFonts * sizeof(SoundFont));
|
||||
|
||||
|
|
@ -1285,7 +1282,7 @@ s32 AudioLoad_SlowLoadSample(s32 fontId, s32 instId, s8* status) {
|
|||
slowLoad->state = SLOW_LOAD_STATE_START;
|
||||
slowLoad->bytesRemaining = ALIGN16(sample->size);
|
||||
slowLoad->ramAddr = slowLoad->curRamAddr;
|
||||
slowLoad->curDevAddr = sample->sampleAddr;
|
||||
slowLoad->curDevAddr = (u32)sample->sampleAddr;
|
||||
slowLoad->medium = sample->medium;
|
||||
slowLoad->seqOrFontId = fontId;
|
||||
slowLoad->instId = instId;
|
||||
|
|
@ -1577,7 +1574,7 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) {
|
|||
break;
|
||||
}
|
||||
|
||||
doneMsg = asyncLoad->retMsg;
|
||||
doneMsg = (OSMesg)asyncLoad->retMsg;
|
||||
if (1) {}
|
||||
asyncLoad->status = 0;
|
||||
osSendMesg(asyncLoad->retQueue, doneMsg, OS_MESG_NOBLOCK);
|
||||
|
|
|
|||
|
|
@ -392,11 +392,11 @@ void AudioSynth_EnvSetup1(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
|
|||
void func_800DBD08(void) {
|
||||
}
|
||||
|
||||
void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) {
|
||||
void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, void* arg3) {
|
||||
aLoadBuffer(cmd, arg3, arg1, arg2);
|
||||
}
|
||||
|
||||
void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) {
|
||||
void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, void* arg3) {
|
||||
aSaveBuffer(cmd, arg1, arg3, arg2);
|
||||
}
|
||||
|
||||
|
|
@ -454,11 +454,11 @@ void func_800DBE64(void) {
|
|||
void func_800DBE6C(void) {
|
||||
}
|
||||
|
||||
void AudioSynth_LoadFilter(Acmd* cmd, s32 flags, s32 countOrBuf, s32 addr) {
|
||||
void AudioSynth_LoadFilter(Acmd* cmd, s32 flags, s32 countOrBuf, void* addr) {
|
||||
aFilter(cmd, flags, countOrBuf, addr);
|
||||
}
|
||||
|
||||
void AudioSynth_LoadFilterCount(Acmd* cmd, s32 count, s32 addr) {
|
||||
void AudioSynth_LoadFilterCount(Acmd* cmd, s32 count, void* addr) {
|
||||
aFilter(cmd, 2, count, addr);
|
||||
}
|
||||
|
||||
|
|
@ -781,7 +781,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS
|
|||
sample = noteSubEu->sound.soundFontSound->sample;
|
||||
loopInfo = sample->loop;
|
||||
loopEndPos = loopInfo->end;
|
||||
sampleAddr = sample->sampleAddr;
|
||||
sampleAddr = (u32)sample->sampleAddr;
|
||||
resampledTempLen = 0;
|
||||
|
||||
for (curPart = 0; curPart < nParts; curPart++) {
|
||||
|
|
|
|||
|
|
@ -223,11 +223,11 @@ void func_800E5584(AudioCmd* cmd) {
|
|||
|
||||
case 0x82:
|
||||
AudioLoad_SyncInitSeqPlayer(cmd->arg0, cmd->arg1, cmd->arg2);
|
||||
func_800E59AC(cmd->arg0, cmd->data);
|
||||
func_800E59AC(cmd->arg0, cmd->asInt);
|
||||
break;
|
||||
|
||||
case 0x85:
|
||||
AudioLoad_SyncInitSeqPlayerSkipTicks(cmd->arg0, cmd->arg1, cmd->data);
|
||||
AudioLoad_SyncInitSeqPlayerSkipTicks(cmd->arg0, cmd->arg1, cmd->asInt);
|
||||
break;
|
||||
|
||||
case 0x83:
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ uintptr_t Fault_ConvertAddress(uintptr_t addr) {
|
|||
|
||||
while (client != NULL) {
|
||||
if (client->callback != NULL) {
|
||||
ret = Fault_ProcessClient(client->callback, addr, client->arg);
|
||||
ret = Fault_ProcessClient(client->callback, (void*)addr, client->arg);
|
||||
if (ret == -1) {
|
||||
Fault_RemoveAddrConvClient(client);
|
||||
} else if (ret != 0) {
|
||||
|
|
@ -1093,9 +1093,9 @@ void Fault_ResumeThread(OSThread* thread) {
|
|||
thread->context.cause = 0;
|
||||
thread->context.fpcsr = 0;
|
||||
thread->context.pc += sizeof(u32);
|
||||
*(u32*)thread->context.pc = 0x0000000D; // write in a break instruction
|
||||
osWritebackDCache(thread->context.pc, 4);
|
||||
osInvalICache(thread->context.pc, 4);
|
||||
*((u32*)thread->context.pc) = 0x0000000D; // write in a break instruction
|
||||
osWritebackDCache((void*)thread->context.pc, 4);
|
||||
osInvalICache((void*)thread->context.pc, 4);
|
||||
osStartThread(thread);
|
||||
}
|
||||
|
||||
|
|
@ -1112,7 +1112,7 @@ void Fault_DisplayFrameBuffer(void) {
|
|||
} else {
|
||||
fb = osViGetNextFramebuffer();
|
||||
if ((uintptr_t)fb == K0BASE) {
|
||||
fb = (PHYS_TO_K0(osMemSize) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
|
||||
fb = (void*)(PHYS_TO_K0(osMemSize) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ UCodeInfo D_8012D248[3] = {
|
|||
|
||||
void Graph_FaultClient(void) {
|
||||
void* nextFb = osViGetNextFramebuffer();
|
||||
void* newFb = ((u32)SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1);
|
||||
void* newFb = (void*)((SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1));
|
||||
|
||||
osViSwapBuffer(newFb);
|
||||
Fault_WaitForInput();
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void*
|
|||
// "Clear BSS area (% 08x-% 08x)"
|
||||
osSyncPrintf("BSS領域をクリアします(%08x-%08x)\n", end, end + ovl->bssSize);
|
||||
}
|
||||
bzero(end, ovl->bssSize);
|
||||
bzero((void*)end, ovl->bssSize);
|
||||
}
|
||||
|
||||
size = (uintptr_t)&ovl->relocations[ovl->nRelocations] - (uintptr_t)ovl;
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ void Main(void* arg) {
|
|||
OSMesg irqMgrMsgBuf[60];
|
||||
u32 systemHeapStart;
|
||||
u32 fb;
|
||||
s32 debugHeapStart;
|
||||
s32 debugHeapSize;
|
||||
u32 debugHeapStart;
|
||||
u32 debugHeapSize;
|
||||
s16* msg;
|
||||
|
||||
osSyncPrintf("mainproc 実行開始\n"); // "Start running"
|
||||
|
|
@ -55,16 +55,16 @@ void Main(void* arg) {
|
|||
gSystemHeapSize = fb - systemHeapStart;
|
||||
// "System heap initalization"
|
||||
osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
|
||||
SystemHeap_Init(systemHeapStart, gSystemHeapSize); // initializes the system heap
|
||||
SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
|
||||
if (osMemSize >= 0x800000) {
|
||||
debugHeapStart = SysCfb_GetFbEnd();
|
||||
debugHeapSize = PHYS_TO_K0(0x600000) - debugHeapStart;
|
||||
} else {
|
||||
debugHeapSize = 0x400;
|
||||
debugHeapStart = SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
|
||||
debugHeapStart = (u32)SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
|
||||
}
|
||||
osSyncPrintf("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
|
||||
DebugArena_Init(debugHeapStart, debugHeapSize);
|
||||
DebugArena_Init((void*)debugHeapStart, debugHeapSize);
|
||||
func_800636C0();
|
||||
|
||||
R_ENABLE_ARENA_DBG = 0;
|
||||
|
|
|
|||
|
|
@ -657,8 +657,8 @@ void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_T
|
|||
// Create message queues for receiving interrupt events and tasks
|
||||
osCreateMesgQueue(&sc->interruptQueue, sc->interruptMsgBuf, ARRAY_COUNT(sc->interruptMsgBuf));
|
||||
osCreateMesgQueue(&sc->cmdQueue, sc->cmdMsgBuf, ARRAY_COUNT(sc->cmdMsgBuf));
|
||||
osSetEventMesg(OS_EVENT_SP, &sc->interruptQueue, RSP_DONE_MSG);
|
||||
osSetEventMesg(OS_EVENT_DP, &sc->interruptQueue, RDP_DONE_MSG);
|
||||
osSetEventMesg(OS_EVENT_SP, &sc->interruptQueue, (OSMesg)RSP_DONE_MSG);
|
||||
osSetEventMesg(OS_EVENT_DP, &sc->interruptQueue, (OSMesg)RDP_DONE_MSG);
|
||||
IrqMgr_AddClient(irqMgr, &sc->irqClient, &sc->interruptQueue);
|
||||
osCreateThread(&sc->thread, THREAD_ID_SCHED, Sched_ThreadEntry, sc, stack, priority);
|
||||
osStartThread(&sc->thread);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
if (this->enableLog) \
|
||||
osSyncPrintf
|
||||
|
||||
u32 UCodeDisas_TranslateAddr(UCodeDisas* this, u32 addr) {
|
||||
void* UCodeDisas_TranslateAddr(UCodeDisas* this, u32 addr) {
|
||||
u32 physical = this->segments[SEGMENT_NUMBER(addr)] + SEGMENT_OFFSET(addr);
|
||||
|
||||
return PHYSICAL_TO_VIRTUAL(physical);
|
||||
|
|
@ -461,12 +461,12 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
while (!exit) {
|
||||
this->dlCnt++;
|
||||
|
||||
ptr = UCodeDisas_TranslateAddr(this, ptr);
|
||||
ptr = UCodeDisas_TranslateAddr(this, (u32)ptr);
|
||||
DISAS_LOG("%08x:", ptr);
|
||||
|
||||
*curGfx = *ptr;
|
||||
cmd = curGfx->dma.cmd;
|
||||
addr = UCodeDisas_TranslateAddr(this, curGfx->dma.addr);
|
||||
addr = (u32)UCodeDisas_TranslateAddr(this, curGfx->dma.addr);
|
||||
|
||||
DISAS_LOG("%08x-%08x:", curGfx->words.w0, curGfx->words.w1);
|
||||
|
||||
|
|
@ -485,7 +485,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
switch (dma.par) {
|
||||
case 0: {
|
||||
DISAS_LOG("gsSPDisplayList(0x%08x),", dma.addr);
|
||||
this->dlStack[this->dlDepth++] = (u32)(ptr + 1);
|
||||
this->dlStack[this->dlDepth++] = (Gfx*)(ptr + 1);
|
||||
ptr = (GfxMod*)addr - 1;
|
||||
} break;
|
||||
|
||||
|
|
@ -519,7 +519,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
DISAS_LOG("gsSPLoadUcodeEx(0x%08x, 0x%08x, 0x%05x),", curGfx->dma.addr, rdpHalf,
|
||||
curGfx->dma.len + 1);
|
||||
}
|
||||
UCodeDisas_SetCurUCodeImpl(this, (void*)UCodeDisas_TranslateAddr(this, curGfx->dma.addr));
|
||||
UCodeDisas_SetCurUCodeImpl(this, UCodeDisas_TranslateAddr(this, curGfx->dma.addr));
|
||||
this->loaducodeCnt++;
|
||||
} break;
|
||||
|
||||
|
|
@ -989,7 +989,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
this->spvtxCnt++;
|
||||
|
||||
if (this->enableLog >= 2) {
|
||||
UCodeDisas_PrintVertices(this, addr, numv, vbidx);
|
||||
UCodeDisas_PrintVertices(this, (Vtx*)addr, numv, vbidx);
|
||||
}
|
||||
} break;
|
||||
|
||||
|
|
@ -1067,7 +1067,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
} break;
|
||||
|
||||
case G_BRANCH_Z: {
|
||||
addr = UCodeDisas_TranslateAddr(this, rdpHalf);
|
||||
addr = (u32)UCodeDisas_TranslateAddr(this, rdpHalf);
|
||||
DISAS_LOG("gsSPBranchLessZraw(0x%08x(0x%08x), %d, 0x%08x),", rdpHalf, addr,
|
||||
(curGfx->words.w0 & 0xFFF) / 2, curGfx->words.w1);
|
||||
ptr = (GfxMod*)addr - 1;
|
||||
|
|
@ -1299,7 +1299,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
|
|||
|
||||
case G_SELECT_DL: {
|
||||
Gdma dma = ptr->dma;
|
||||
u32 dlAddr = UCodeDisas_TranslateAddr(this, (dma.len << 16) | (linkDlLow));
|
||||
u32 dlAddr = (u32)UCodeDisas_TranslateAddr(this, (dma.len << 16) | (linkDlLow));
|
||||
u32 dmaAddr = dma.addr;
|
||||
|
||||
if (dma.par == 0) {
|
||||
|
|
|
|||
|
|
@ -4142,7 +4142,7 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3) {
|
|||
* Spawns En_Part (Dissipating Flames) actor as a child of the given actor.
|
||||
*/
|
||||
Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, PlayState* play,
|
||||
s16 params, s32 arg8) {
|
||||
s16 params, Gfx* dList) {
|
||||
EnPart* spawnedEnPart;
|
||||
|
||||
spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, spawnPos->x, spawnPos->y,
|
||||
|
|
@ -4150,7 +4150,7 @@ Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3,
|
|||
if (spawnedEnPart != NULL) {
|
||||
spawnedEnPart->actor.scale = actor->scale;
|
||||
spawnedEnPart->actor.speedXZ = arg3[0];
|
||||
spawnedEnPart->displayList = arg8;
|
||||
spawnedEnPart->displayList = dList;
|
||||
spawnedEnPart->action = 2;
|
||||
spawnedEnPart->timer = timer;
|
||||
spawnedEnPart->rotZ = arg3[1];
|
||||
|
|
|
|||
|
|
@ -6072,7 +6072,7 @@ s32 Camera_Demo5(Camera* camera) {
|
|||
|
||||
framesDiff = sDemo5PrevSfxFrame - camera->play->state.frames;
|
||||
if ((framesDiff > 50) || (framesDiff < -50)) {
|
||||
func_80078884(camera->data1);
|
||||
func_80078884((u32)camera->data1);
|
||||
}
|
||||
|
||||
sDemo5PrevSfxFrame = camera->play->state.frames;
|
||||
|
|
|
|||
|
|
@ -83,29 +83,29 @@ void func_801109B0(PlayState* play) {
|
|||
|
||||
if (gSaveContext.equips.buttonItems[0] < 0xF0) {
|
||||
DmaMgr_SendRequest1(interfaceCtx->iconItemSegment,
|
||||
_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
|
||||
(u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
|
||||
"../z_construct.c", 198);
|
||||
} else if (gSaveContext.equips.buttonItems[0] != 0xFF) {
|
||||
DmaMgr_SendRequest1(interfaceCtx->iconItemSegment,
|
||||
_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
|
||||
(u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
|
||||
"../z_construct.c", 203);
|
||||
}
|
||||
|
||||
if (gSaveContext.equips.buttonItems[1] < 0xF0) {
|
||||
DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x1000,
|
||||
_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[1] * 0x1000, 0x1000,
|
||||
(u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[1] * 0x1000, 0x1000,
|
||||
"../z_construct.c", 209);
|
||||
}
|
||||
|
||||
if (gSaveContext.equips.buttonItems[2] < 0xF0) {
|
||||
DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x2000,
|
||||
_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[2] * 0x1000, 0x1000,
|
||||
(u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[2] * 0x1000, 0x1000,
|
||||
"../z_construct.c", 214);
|
||||
}
|
||||
|
||||
if (gSaveContext.equips.buttonItems[3] < 0xF0) {
|
||||
DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x3000,
|
||||
_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[3] * 0x1000, 0x1000,
|
||||
(u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[3] * 0x1000, 0x1000,
|
||||
"../z_construct.c", 219);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ void func_8006EE50(Font* font, u16 arg1, u16 arg2) {
|
|||
*/
|
||||
void Font_LoadChar(Font* font, u8 character, u16 codePointIndex) {
|
||||
DmaMgr_SendRequest1(&font->charTexBuf[codePointIndex],
|
||||
&_nes_font_staticSegmentRomStart[character * FONT_CHAR_TEX_SIZE], FONT_CHAR_TEX_SIZE,
|
||||
(u32)&_nes_font_staticSegmentRomStart[character * FONT_CHAR_TEX_SIZE], FONT_CHAR_TEX_SIZE,
|
||||
"../z_kanfont.c", 93);
|
||||
}
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ void Font_LoadChar(Font* font, u8 character, u16 codePointIndex) {
|
|||
*/
|
||||
void Font_LoadMessageBoxIcon(Font* font, u16 icon) {
|
||||
DmaMgr_SendRequest1(font->iconBuf,
|
||||
&_message_staticSegmentRomStart[4 * MESSAGE_STATIC_TEX_SIZE + icon * FONT_CHAR_TEX_SIZE],
|
||||
(u32)&_message_staticSegmentRomStart[4 * MESSAGE_STATIC_TEX_SIZE + icon * FONT_CHAR_TEX_SIZE],
|
||||
FONT_CHAR_TEX_SIZE, "../z_kanfont.c", 100);
|
||||
}
|
||||
|
||||
|
|
@ -31,18 +31,18 @@ void Font_LoadMessageBoxIcon(Font* font, u16 icon) {
|
|||
*/
|
||||
void Font_LoadOrderedFont(Font* font) {
|
||||
u8* fontBuf;
|
||||
s32 fontStatic;
|
||||
u32 fontStatic;
|
||||
s32 len;
|
||||
s32 jj;
|
||||
s32 codePointIndex;
|
||||
s32 fontBufIndex;
|
||||
s32 offset;
|
||||
u32 offset;
|
||||
|
||||
font->msgOffset = _message_0xFFFC_nes - (const char*)_nes_message_data_staticSegmentStart;
|
||||
len = font->msgLength = _message_0xFFFD_nes - _message_0xFFFC_nes;
|
||||
|
||||
DmaMgr_SendRequest1(font->msgBuf, &_nes_message_data_staticSegmentRomStart[font->msgOffset], len, "../z_kanfont.c",
|
||||
122);
|
||||
DmaMgr_SendRequest1(font->msgBuf, (u32)&_nes_message_data_staticSegmentRomStart[font->msgOffset], len,
|
||||
"../z_kanfont.c", 122);
|
||||
osSyncPrintf("msg_data=%x, msg_data0=%x jj=%x\n", font->msgOffset, font->msgLength, jj = len);
|
||||
|
||||
len = jj;
|
||||
|
|
@ -54,7 +54,7 @@ void Font_LoadOrderedFont(Font* font) {
|
|||
|
||||
if (font->msgBuf[codePointIndex] != MESSAGE_NEWLINE) {
|
||||
fontBuf = font->fontBuf + fontBufIndex * 8;
|
||||
fontStatic = _nes_font_staticSegmentRomStart;
|
||||
fontStatic = (u32)_nes_font_staticSegmentRomStart;
|
||||
|
||||
osSyncPrintf("nes_mes_buf[%d]=%d\n", codePointIndex, font->msgBuf[codePointIndex]);
|
||||
|
||||
|
|
|
|||
|
|
@ -370,9 +370,9 @@ void Play_Init(GameState* thisx) {
|
|||
|
||||
osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetSize(&this->state.tha));
|
||||
zAllocSize = THA_GetSize(&this->state.tha);
|
||||
zAlloc = GameState_Alloc(&this->state, zAllocSize, "../z_play.c", 2918);
|
||||
zAlloc = (u32)GameState_Alloc(&this->state, zAllocSize, "../z_play.c", 2918);
|
||||
zAllocAligned = (zAlloc + 8) & ~0xF;
|
||||
ZeldaArena_Init(zAllocAligned, zAllocSize - zAllocAligned + zAlloc);
|
||||
ZeldaArena_Init((void*)zAllocAligned, zAllocSize - zAllocAligned + zAlloc);
|
||||
// "Zelda Heap"
|
||||
osSyncPrintf("ゼルダヒープ %08x-%08x\n", zAllocAligned,
|
||||
(s32)(zAllocAligned + zAllocSize) - (s32)(zAllocAligned - zAlloc));
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ void Sample_LoadTitleStatic(SampleContext* this) {
|
|||
u32 size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart;
|
||||
|
||||
this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163);
|
||||
DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, "../z_sample.c", 164);
|
||||
DmaMgr_SendRequest1(this->staticSegment, (u32)_title_staticSegmentRomStart, size, "../z_sample.c", 164);
|
||||
}
|
||||
|
||||
void Sample_Init(GameState* thisx) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ void SsSram_Init(u32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8
|
|||
|
||||
if ((u32)OS_PHYSICAL_TO_K1(addr) != (*handle).baseAddress) {
|
||||
sSsSramContext.piHandle.type = handleType;
|
||||
(*handle).baseAddress = OS_PHYSICAL_TO_K1(addr);
|
||||
(*handle).baseAddress = (u32)OS_PHYSICAL_TO_K1(addr);
|
||||
sSsSramContext.piHandle.latency = handleLatency;
|
||||
sSsSramContext.piHandle.pulse = handlePulse;
|
||||
sSsSramContext.piHandle.pageSize = handlePageSize;
|
||||
|
|
|
|||
|
|
@ -449,16 +449,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_BAZAAR:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_SP1a_staticSegmentRomStart;
|
||||
size = _vr_SP1a_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_SP1a_staticSegmentRomStart;
|
||||
size = (u32)_vr_SP1a_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1127);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1128);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1129);
|
||||
|
||||
start = _vr_SP1a_pal_staticSegmentRomStart;
|
||||
size = _vr_SP1a_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_SP1a_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_SP1a_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1132);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1133);
|
||||
|
||||
|
|
@ -466,8 +466,8 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
skyboxCtx->rot.y = 0.8f;
|
||||
break;
|
||||
case SKYBOX_OVERCAST_SUNSET:
|
||||
start = _vr_cloud2_staticSegmentRomStart;
|
||||
size = _vr_cloud2_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_cloud2_staticSegmentRomStart;
|
||||
size = (u32)_vr_cloud2_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1155);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1156);
|
||||
|
|
@ -480,8 +480,8 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1166);
|
||||
|
||||
start = _vr_cloud2_pal_staticSegmentRomStart;
|
||||
size = _vr_cloud2_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_cloud2_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_cloud2_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1170);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1171);
|
||||
|
||||
|
|
@ -491,16 +491,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_MARKET_ADULT:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_RUVR_staticSegmentRomStart;
|
||||
size = _vr_RUVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_RUVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_RUVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1182);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1183);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1184);
|
||||
|
||||
start = _vr_RUVR_pal_staticSegmentRomStart;
|
||||
size = _vr_RUVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_RUVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_RUVR_pal_staticSegmentRomEnd - start;
|
||||
osSyncPrintf("ＳＩＺＥ = %d\n", size);
|
||||
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1188);
|
||||
|
|
@ -509,44 +509,44 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
DmaMgr_SendRequest1(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1190);
|
||||
break;
|
||||
case SKYBOX_CUTSCENE_MAP:
|
||||
start = _vr_holy0_staticSegmentRomStart;
|
||||
size = _vr_holy0_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_holy0_staticSegmentRomStart;
|
||||
size = (u32)_vr_holy0_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1196);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1197);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1200);
|
||||
|
||||
start = _vr_holy1_staticSegmentRomStart;
|
||||
size = _vr_holy1_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_holy1_staticSegmentRomStart;
|
||||
size = (u32)_vr_holy1_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[1] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1203);
|
||||
ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
|
||||
1204);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1207);
|
||||
|
||||
start = _vr_holy0_pal_staticSegmentRomStart;
|
||||
size = _vr_holy0_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_holy0_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_holy0_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1211);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1212);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1214);
|
||||
DmaMgr_SendRequest1((u8*)skyboxCtx->palettes + size, _vr_holy1_pal_staticSegmentRomStart, size,
|
||||
DmaMgr_SendRequest1((u8*)skyboxCtx->palettes + size, (u32)_vr_holy1_pal_staticSegmentRomStart, size,
|
||||
"../z_vr_box.c", 1216);
|
||||
break;
|
||||
case SKYBOX_HOUSE_LINK:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_LHVR_staticSegmentRomStart;
|
||||
size = _vr_LHVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_LHVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_LHVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1226);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1227);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1228);
|
||||
|
||||
start = _vr_LHVR_pal_staticSegmentRomStart;
|
||||
size = _vr_LHVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_LHVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_LHVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1231);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1232);
|
||||
|
||||
|
|
@ -555,16 +555,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_MARKET_CHILD_DAY:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_MDVR_staticSegmentRomStart;
|
||||
size = _vr_MDVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MDVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_MDVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1257);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1258);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1259);
|
||||
|
||||
start = _vr_MDVR_pal_staticSegmentRomStart;
|
||||
size = _vr_MDVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MDVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_MDVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1262);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1263);
|
||||
|
||||
|
|
@ -573,16 +573,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_MARKET_CHILD_NIGHT:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_MNVR_staticSegmentRomStart;
|
||||
size = _vr_MNVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MNVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_MNVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1271);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1272);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1273);
|
||||
|
||||
start = _vr_MNVR_pal_staticSegmentRomStart;
|
||||
size = _vr_MNVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MNVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_MNVR_pal_staticSegmentRomEnd - start;
|
||||
osSyncPrintf("ＳＩＺＥ = %d\n", size);
|
||||
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1277);
|
||||
|
|
@ -593,16 +593,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HAPPY_MASK_SHOP:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_FCVR_staticSegmentRomStart;
|
||||
size = _vr_FCVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_FCVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_FCVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1286);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1287);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1288);
|
||||
|
||||
start = _vr_FCVR_pal_staticSegmentRomStart;
|
||||
size = _vr_FCVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_FCVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_FCVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1291);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1292);
|
||||
|
||||
|
|
@ -612,16 +612,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_KHVR_staticSegmentRomStart;
|
||||
size = _vr_KHVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KHVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_KHVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1301);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1302);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1303);
|
||||
|
||||
start = _vr_KHVR_pal_staticSegmentRomStart;
|
||||
size = _vr_KHVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KHVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_KHVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1306);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1307);
|
||||
|
||||
|
|
@ -630,16 +630,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_OF_TWINS:
|
||||
skyboxCtx->unk_140 = 2;
|
||||
|
||||
start = _vr_K3VR_staticSegmentRomStart;
|
||||
size = _vr_K3VR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K3VR_staticSegmentRomStart;
|
||||
size = (u32)_vr_K3VR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1331);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1332);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1333);
|
||||
|
||||
start = _vr_K3VR_pal_staticSegmentRomStart;
|
||||
size = _vr_K3VR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K3VR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_K3VR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1336);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1337);
|
||||
|
||||
|
|
@ -648,16 +648,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_STABLES:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_MLVR_staticSegmentRomStart;
|
||||
size = _vr_MLVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MLVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_MLVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1345);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1346);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1347);
|
||||
|
||||
start = _vr_MLVR_pal_staticSegmentRomStart;
|
||||
size = _vr_MLVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_MLVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_MLVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1350);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1351);
|
||||
|
||||
|
|
@ -666,16 +666,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_KAKARIKO:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_KKRVR_staticSegmentRomStart;
|
||||
size = _vr_KKRVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KKRVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_KKRVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1359);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1360);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1361);
|
||||
|
||||
start = _vr_KKRVR_pal_staticSegmentRomStart;
|
||||
size = _vr_KKRVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KKRVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_KKRVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1364);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1365);
|
||||
|
||||
|
|
@ -684,16 +684,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_KOKIRI_SHOP:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_KSVR_staticSegmentRomStart;
|
||||
size = _vr_KSVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KSVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_KSVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1373);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1374);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1375);
|
||||
|
||||
start = _vr_KSVR_pal_staticSegmentRomStart;
|
||||
size = _vr_KSVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KSVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_KSVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1378);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1379);
|
||||
|
||||
|
|
@ -703,16 +703,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_GORON_SHOP:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_GLVR_staticSegmentRomStart;
|
||||
size = _vr_GLVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_GLVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_GLVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1405);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1406);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1407);
|
||||
|
||||
start = _vr_GLVR_pal_staticSegmentRomStart;
|
||||
size = _vr_GLVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_GLVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_GLVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1410);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1411);
|
||||
|
||||
|
|
@ -722,16 +722,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_ZORA_SHOP:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_ZRVR_staticSegmentRomStart;
|
||||
size = _vr_ZRVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_ZRVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_ZRVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1420);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1421);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1422);
|
||||
|
||||
start = _vr_ZRVR_pal_staticSegmentRomStart;
|
||||
size = _vr_ZRVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_ZRVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_ZRVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1425);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1426);
|
||||
|
||||
|
|
@ -741,16 +741,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_POTION_SHOP_KAKARIKO:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_DGVR_staticSegmentRomStart;
|
||||
size = _vr_DGVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_DGVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_DGVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1451);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1452);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1453);
|
||||
|
||||
start = _vr_DGVR_pal_staticSegmentRomStart;
|
||||
size = _vr_DGVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_DGVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_DGVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1456);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1457);
|
||||
|
||||
|
|
@ -760,16 +760,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_POTION_SHOP_MARKET:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_ALVR_staticSegmentRomStart;
|
||||
size = _vr_ALVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_ALVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_ALVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1466);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1467);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1468);
|
||||
|
||||
start = _vr_ALVR_pal_staticSegmentRomStart;
|
||||
size = _vr_ALVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_ALVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_ALVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1471);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1472);
|
||||
|
||||
|
|
@ -779,16 +779,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_BOMBCHU_SHOP:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_NSVR_staticSegmentRomStart;
|
||||
size = _vr_NSVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_NSVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_NSVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1481);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1482);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1483);
|
||||
|
||||
start = _vr_NSVR_pal_staticSegmentRomStart;
|
||||
size = _vr_NSVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_NSVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_NSVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1486);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1487);
|
||||
|
||||
|
|
@ -798,16 +798,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_RICHARD:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_IPVR_staticSegmentRomStart;
|
||||
size = _vr_IPVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_IPVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_IPVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1512);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1513);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1514);
|
||||
|
||||
start = _vr_IPVR_pal_staticSegmentRomStart;
|
||||
size = _vr_IPVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_IPVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_IPVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1517);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1518);
|
||||
|
||||
|
|
@ -816,16 +816,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_IMPA:
|
||||
skyboxCtx->unk_140 = 1;
|
||||
|
||||
start = _vr_LBVR_staticSegmentRomStart;
|
||||
size = _vr_LBVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_LBVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_LBVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1526);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1527);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1528);
|
||||
|
||||
start = _vr_LBVR_pal_staticSegmentRomStart;
|
||||
size = _vr_LBVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_LBVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_LBVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1531);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1532);
|
||||
|
||||
|
|
@ -834,16 +834,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_TENT:
|
||||
skyboxCtx->unk_140 = 2;
|
||||
|
||||
start = _vr_TTVR_staticSegmentRomStart;
|
||||
size = _vr_TTVR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_TTVR_staticSegmentRomStart;
|
||||
size = (u32)_vr_TTVR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1540);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1541);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1542);
|
||||
|
||||
start = _vr_TTVR_pal_staticSegmentRomStart;
|
||||
size = _vr_TTVR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_TTVR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_TTVR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1545);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1546);
|
||||
|
||||
|
|
@ -852,16 +852,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_MIDO:
|
||||
skyboxCtx->unk_140 = 2;
|
||||
|
||||
start = _vr_K4VR_staticSegmentRomStart;
|
||||
size = _vr_K4VR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K4VR_staticSegmentRomStart;
|
||||
size = (u32)_vr_K4VR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1560);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1561);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1562);
|
||||
|
||||
start = _vr_K4VR_pal_staticSegmentRomStart;
|
||||
size = _vr_K4VR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K4VR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_K4VR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1565);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1566);
|
||||
|
||||
|
|
@ -870,16 +870,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_SARIA:
|
||||
skyboxCtx->unk_140 = 2;
|
||||
|
||||
start = _vr_K5VR_staticSegmentRomStart;
|
||||
size = _vr_K5VR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K5VR_staticSegmentRomStart;
|
||||
size = (u32)_vr_K5VR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1574);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1575);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1576);
|
||||
|
||||
start = _vr_K5VR_pal_staticSegmentRomStart;
|
||||
size = _vr_K5VR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_K5VR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_K5VR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1579);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1580);
|
||||
|
||||
|
|
@ -888,16 +888,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|||
case SKYBOX_HOUSE_ALLEY:
|
||||
skyboxCtx->unk_140 = 2;
|
||||
|
||||
start = _vr_KR3VR_staticSegmentRomStart;
|
||||
size = _vr_KR3VR_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KR3VR_staticSegmentRomStart;
|
||||
size = (u32)_vr_KR3VR_staticSegmentRomEnd - start;
|
||||
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1588);
|
||||
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
||||
1589);
|
||||
|
||||
DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1590);
|
||||
|
||||
start = _vr_KR3VR_pal_staticSegmentRomStart;
|
||||
size = _vr_KR3VR_pal_staticSegmentRomEnd - start;
|
||||
start = (u32)_vr_KR3VR_pal_staticSegmentRomStart;
|
||||
size = (u32)_vr_KR3VR_pal_staticSegmentRomEnd - start;
|
||||
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1593);
|
||||
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1594);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue