mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-17 12:59:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds in scene support (#117)

Browse Source 
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
This commit is contained in:
Kenix3
2021-04-29 18:56:18 -04:00
committed by GitHub
parent e97f10a6fa
commit c40bb119e1
158 changed files with 9168 additions and 6817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libultra/io/contquery.c
+2 -4
View File
@@ -1,7 +1,5 @@
#include <osint.h>
#include "io/controller.h"
#include "siint.h"
#include <ultra64.h>
#include <global.h>
s32 osContStartQuery(OSMesgQueue* mq)
{
src/libultra/io/sptask.c
+11 -12
View File
@@ -1,6 +1,5 @@
#include <bstring.h>
#include <sptask.h>
#include <osint.h>
#include <ultra64.h>
#include <global.h>
OSTask* _VirtualToPhysicalTask(OSTask* intp)
{
@@ -27,31 +26,31 @@ OSTask* _VirtualToPhysicalTask(OSTask* intp)
if (tp->t.yield_data_ptr) {
tp->t.yield_data_ptr = (u64*)osVirtualToPhysical(tp->t.yield_data_ptr);
}
return &tmp_task;
}
void osSpTaskLoad(OSTask* intp)
{
OSTask* tp;
tp = _VirtualToPhysicalTask(intp);
if ((tp->t.flags & 0x1) != 0) {
tp->t.ucode_data = tp->t.yield_data_ptr;
tp->t.ucode_data_size = tp->t.yield_data_size;
intp->t.flags = intp->t.flags & 0xFFFFFFFE;
if ((tp->t.flags & 0x4) != 0) {
tp->t.ucode = *(u64**)(((u32)intp->t.yield_data_ptr + 3068) | 0xA0000000);
}
}
osWritebackDCache((void*)tp, sizeof(OSTask));
__osSpSetStatus(11008);
while (__osSpSetPc(0x04001000) == -1);
while (__osSpRawStartDma(1, 0x04000FC0, (void*)tp, sizeof(OSTask)) == -1);
while (__osSpDeviceBusy());
@@ -61,6 +60,6 @@ void osSpTaskLoad(OSTask* intp)
void osSpTaskStartGo(OSTask* tp)
{
while (__osSpDeviceBusy());
__osSpSetStatus(293);
}
src/libultra/io/vigetcurrcontext.c
+2 -3
View File
@@ -1,6 +1,5 @@
#include <osint.h>
#include <viint.h>
#include <assert.h>
#include <ultra64.h>
#include <global.h>
__OSViContext* __osViGetCurrentContext(void) {
return __osViCurr;
src/libultra/io/visetyscale.c
+2 -4
View File
@@ -1,7 +1,5 @@
#include <stdarg.h>
#include <osint.h>
#include <viint.h>
#include <assert.h>
#include <ultra64.h>
#include <global.h>
void osViSetYScale(f32 value) {
register u32 saveMask;
src/libultra/os/createthread.c
+2 -2
View File
@@ -1,5 +1,5 @@
#include <PR/ultratypes.h>
#include <osint.h>
#include <ultra64.h>
#include <global.h>
void osCreateThread(OSThread* t, OSId id, void* entry, void* arg, void* sp, OSPri p) {
register u32 saveMask;
src/libultra/os/destroythread.c
+7 -6
View File
@@ -1,19 +1,20 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
void osDestroyThread(OSThread* t)
{
register u32 saveMask;
register OSThread* pred;
register OSThread* succ;
saveMask = __osDisableInt();
if (t == NULL) {
t = __osRunningThread;
} else if (t->state != 1) {
__osDequeueThread(t->queue, t);
}
if (__osActiveQueue == t) {
__osActiveQueue = __osActiveQueue->tlnext;
} else {
@@ -27,10 +28,10 @@ void osDestroyThread(OSThread* t)
pred = succ;
}
}
if (t == __osRunningThread) {
__osDispatchThread();
}
__osRestoreInt(saveMask);
}
src/libultra/os/getcurrfaultthread.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
OSThread* __osGetCurrFaultedThread(void) {
return __osFaultedThread;
src/libultra/os/getthreadid.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
OSId osGetThreadId(OSThread* t) {
if (t == NULL) {
src/libultra/os/getthreadpri.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
OSPri osGetThreadPri(OSThread* t) {
if (t == NULL) {
src/libultra/os/initialize.c
+2 -2
View File
@@ -1,5 +1,5 @@
#include <ramrom.h>
#include <osint.h>
#include <ultra64.h>
#include <global.h>
u64 osClockRate = 0x0000000003B9ACA0;
s32 osViClock = 0x02E6D354;
src/libultra/os/jammesg.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
s32 osJamMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) {
register u32 saveMask;
src/libultra/os/recvmesg.c
+5 -4
View File
@@ -1,8 +1,9 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flags) {
register u32 saveMask;
saveMask = __osDisableInt();
while (mq->validCount == 0)
@@ -19,10 +20,10 @@ s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flags) {
if (msg != NULL) {
*msg = mq->msg[mq->first];
}
mq->first = (mq->first + 1) % mq->msgCount;
mq->validCount--;
if (mq->fullqueue->next != NULL) {
osStartThread(__osPopThread(&mq->fullqueue));
}
src/libultra/os/sendmesg.c
+8 -7
View File
@@ -1,11 +1,12 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
s32 osSendMesg(OSMesgQueue* mq, OSMesg msg, s32 flags) {
register u32 saveMask;
register s32 last;
saveMask = __osDisableInt();
while (mq->validCount >= mq->msgCount) {
if (flags == 1) {
__osRunningThread->state = 8;
@@ -15,16 +16,16 @@ s32 osSendMesg(OSMesgQueue* mq, OSMesg msg, s32 flags) {
return -1;
}
}
last = (mq->first + mq->validCount) % mq->msgCount;
mq->msg[last] = msg;
mq->validCount++;
if (mq->mtqueue->next != NULL) {
osStartThread(__osPopThread(&mq->mtqueue));
}
__osRestoreInt(saveMask);
return 0;
}
src/libultra/os/seteventmesg.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
UNK_TYPE4 D_80097F10 = 0;
src/libultra/os/setthreadpri.c
+6 -5
View File
@@ -1,14 +1,15 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
void osSetThreadPri(OSThread* t, OSPri p) {
register u32 saveMask;
saveMask = __osDisableInt();
if (t == NULL) {
t = __osRunningThread;
}
if (t->priority != p) {
t->priority = p;
@@ -22,6 +23,6 @@ void osSetThreadPri(OSThread* t, OSPri p) {
__osEnqueueAndYield(&__osRunQueue);
}
}
__osRestoreInt(saveMask);
}
src/libultra/os/startthread.c
+6 -5
View File
@@ -1,10 +1,11 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
void osStartThread(OSThread* t) {
register u32 saveMask;
saveMask = __osDisableInt();
switch (t->state) {
case 8:
t->state = 2;
@@ -21,7 +22,7 @@ void osStartThread(OSThread* t) {
}
break;
}
if (__osRunningThread == NULL) {
__osDispatchThread();
} else {
@@ -30,6 +31,6 @@ void osStartThread(OSThread* t) {
__osEnqueueAndYield(&__osRunQueue);
}
}
__osRestoreInt(saveMask);
}
src/libultra/os/stopthread.c
+4 -3
View File
@@ -1,9 +1,10 @@
#include <osint.h>
#include <ultra64.h>
#include <global.h>
void osStopThread(OSThread* t) {
register u32 saveMask;
register u16 state;
saveMask = __osDisableInt();
if (t == NULL) {
@@ -11,7 +12,7 @@ void osStopThread(OSThread* t) {
} else {
state = t->state;
}
switch (state)
{
case 4:
src/libultra/os/stoptimer.c
+2 -4
View File
@@ -1,7 +1,5 @@
#include <PR/ultratypes.h>
#include <rmon.h>
#include <osint.h>
#include <viint.h>
#include <ultra64.h>
#include <global.h>
s32 osStopTimer(OSTimer* t)
{
src/libultra/os/thread.c
+2 -2
View File
@@ -1,5 +1,5 @@
#include <PR/ultratypes.h>
#include <osint.h>
#include <ultra64.h>
#include <global.h>
OSThread* __osThreadTail = NULL;
UNK_TYPE D_80097E14 = -1;