mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-17 21:53:17 -04:00
Match func_80000D3C (renamed) and thread5_game_logic (#35)
* match func_80000D3C + some renames * Improved matching for init_game(). * Match thread5_game_logic * Added osViModeTable and osCreateViManager from libultra
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "libultra_internal.h"
|
||||
#include <macros.h>
|
||||
|
||||
#define OS_VI_MANAGER_MESSAGE_BUFF_SIZE 5
|
||||
|
||||
@@ -15,7 +16,6 @@ extern void __osTimerServicesInit(void);
|
||||
extern void __osTimerInterrupt(void);
|
||||
extern OSTime __osCurrentTime;
|
||||
extern u32 __osBaseCounter;
|
||||
extern u32 D_80365DA8;
|
||||
extern u32 __osViIntrCount;
|
||||
void viMgrMain(void *);
|
||||
|
||||
@@ -47,9 +47,7 @@ void osCreateViManager(OSPri pri) {
|
||||
viMgrMainArgs.eventQueue = &__osViMesgQueue;
|
||||
viMgrMainArgs.accessQueue = NULL;
|
||||
viMgrMainArgs.dma_func = NULL;
|
||||
#if defined(VERSION_EU) || defined(VERSION_SH)
|
||||
viMgrMainArgs.edma_func = NULL;
|
||||
#endif
|
||||
|
||||
osCreateThread(&viMgrThread, 0, viMgrMain, (void *) &viMgrMainArgs, &viMgrStack[0x400], pri);
|
||||
__osViInit();
|
||||
|
||||
@@ -13,12 +13,11 @@ typedef struct {
|
||||
|
||||
extern u32 D_80194040; // maybe initialized?
|
||||
extern s32 __osLeoInterrupt;
|
||||
extern u32 D_800EA5F0;
|
||||
|
||||
|
||||
u64 osClockRate = 62500000;
|
||||
u32 D_800EA5E8 = 0;
|
||||
u32 __OSGlobalIntMask = OS_IM_ALL;
|
||||
u32 D_800EA5F0 = 0;
|
||||
|
||||
#define EXCEPTION_TLB_MISS 0x80000000
|
||||
#define EXCEPTION_XTLB_MISS 0x80000080
|
||||
|
||||
@@ -324,7 +324,6 @@ OSViMode osViModeTable[] = {
|
||||
/*vBurst*/ 918020,
|
||||
/*vIntr*/ 2 } } },
|
||||
|
||||
#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH)
|
||||
/*osViModePalLpn1*/
|
||||
{ /*type*/ 14,
|
||||
/*comRegs*/
|
||||
@@ -773,8 +772,6 @@ OSViMode osViModeTable[] = {
|
||||
/*vStart*/ 6226489,
|
||||
/*vBurst*/ 852585,
|
||||
/*vIntr*/ 2 } } },
|
||||
#endif
|
||||
#if defined(VERSION_US) || defined(VERSION_EU) || defined (VERSION_SH)
|
||||
/*osViModePalLpn1*/
|
||||
{ /*type*/ 28,
|
||||
/*comRegs*/
|
||||
@@ -1097,5 +1094,4 @@ OSViMode osViModeTable[] = {
|
||||
/*vStart*/ 2425343,
|
||||
/*vBurst*/ 918020,
|
||||
/*vIntr*/ 2 } } }
|
||||
#endif
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user