Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2024-11-27 01:00:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Donkey Kong 2023-08-07 23:28:16 +09:30
parent a9dd10ff8e
commit cce3b10165
11 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/rarezip.h
View File

@ -2,14 +2,14 @@
#define RAREZIP_H
#include <ultra64.h>
extern u8 *D_80013AC0; // extern u8 *inbuf;
extern u8 *D_80013AC4; //slide
extern u32 D_80013AEC; // extern u32 inptr;
extern u32 D_80013AF0; // wp
extern struct huft *D_80013AB0; //unk
extern u32 D_80013AB4; // extern u32 bb;
extern u32 D_80013AB8; // extern u32 bk;
extern s32 D_80013ABC; //hufts
extern u8 *D_dk64_boot_80013AC0; // extern u8 *inbuf;
extern u8 *D_dk64_boot_80013AC4; //slide
extern u32 D_dk64_boot_80013AEC; // extern u32 inptr;
extern u32 D_dk64_boot_80013AF0; // wp
extern struct huft *D_dk64_boot_80013AB0; //unk
extern u32 D_dk64_boot_80013AB4; // extern u32 bb;
extern u32 D_dk64_boot_80013AB8; // extern u32 bk;
extern s32 D_dk64_boot_80013ABC; //hufts
extern u8 D_8000EDE0[]; // border
extern u16 D_8000EDF4[]; // cplens
@ -26,7 +26,7 @@ extern u16 mask_bits[]; // mask_bits
//#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
// #define get_byte() (inbuf[inptr++])
#define get_byte() (D_80013AC0[D_80013AEC++])
#define get_byte() (D_dk64_boot_80013AC0[D_dk64_boot_80013AEC++])
#ifdef CRYPT
uch cc;

20
src/dk64_boot/gu/cosf.c
View File

@ -66,11 +66,11 @@
* ====================================================================
*/
extern f64 D_800105D0[5]; // P
extern f64 D_800105F8; // rpi
extern f64 D_80010600; // pihi
extern f64 D_80010608; // pilo
extern f32 D_80010610; // zero
extern f64 D_dk64_boot_800105D0[5]; // P
extern f64 D_dk64_boot_800105F8; // rpi
extern f64 D_dk64_boot_80010600; // pihi
extern f64 D_dk64_boot_80010608; // pilo
extern f32 D_dk64_boot_80010610; // zero
float
fcos( float x )
@ -102,18 +102,18 @@ int ix, xpt;
dx = absx;
dn = dx*D_800105F8 + 0.5;
dn = dx*D_dk64_boot_800105F8 + 0.5;
n = ROUND(dn);
dn = n;
dn -= 0.5;
dx = dx - dn*D_80010600;
dx = dx - dn*D_80010608; /* dx = x - (n - 0.5)*pi */
dx = dx - dn*D_dk64_boot_80010600;
dx = dx - dn*D_dk64_boot_80010608; /* dx = x - (n - 0.5)*pi */
xsq = dx*dx;
poly = ((D_800105D0[4]*xsq + D_800105D0[3])*xsq + D_800105D0[2])*xsq + D_800105D0[1];
poly = ((D_dk64_boot_800105D0[4]*xsq + D_dk64_boot_800105D0[3])*xsq + D_dk64_boot_800105D0[2])*xsq + D_dk64_boot_800105D0[1];
result = dx + (dx*xsq)*poly;
@ -139,5 +139,5 @@ int ix, xpt;
/* just give up and return 0.0 */
return ( D_80010610 );
return ( D_dk64_boot_80010610 );
}

22
src/dk64_boot/gu/sinf.c
View File

@ -70,11 +70,11 @@
* ====================================================================
*/
extern f64 D_80010620[5]; // P
extern f64 D_80010648; // rpi
extern f64 D_80010650; // phhi
extern f64 D_80010658; // phlo
extern f32 D_80010660; // zero
extern f64 D_dk64_boot_80010620[5]; // P
extern f64 D_dk64_boot_80010648; // rpi
extern f64 D_dk64_boot_80010650; // phhi
extern f64 D_dk64_boot_80010658; // phlo
extern f32 D_dk64_boot_80010660; // zero
float
fsin( float x )
@ -106,7 +106,7 @@ int ix, xpt;
xsq = dx*dx;
poly = ((D_80010620[4]*xsq + D_80010620[3])*xsq + D_80010620[2])*xsq + D_80010620[1];
poly = ((D_dk64_boot_80010620[4]*xsq + D_dk64_boot_80010620[3])*xsq + D_dk64_boot_80010620[2])*xsq + D_dk64_boot_80010620[1];
result = dx + (dx*xsq)*poly;
@ -124,20 +124,20 @@ int ix, xpt;
/* reduce argument to +/- pi/2 */
dn = dx*D_80010648;
dn = dx*D_dk64_boot_80010648;
n = ROUND(dn);
dn = n;
dx = dx - dn*D_80010650;
dx = dx - dn*D_80010658; /* dx = x - n*pi */
dx = dx - dn*D_dk64_boot_80010650;
dx = dx - dn*D_dk64_boot_80010658; /* dx = x - n*pi */
/* compute sin(dx) as before, negating result if n is odd
*/
xsq = dx*dx;
poly = ((D_80010620[4]*xsq + D_80010620[3])*xsq + D_80010620[2])*xsq + D_80010620[1];
poly = ((D_dk64_boot_80010620[4]*xsq + D_dk64_boot_80010620[3])*xsq + D_dk64_boot_80010620[2])*xsq + D_dk64_boot_80010620[1];
result = dx + (dx*xsq)*poly;
@ -162,5 +162,5 @@ int ix, xpt;
/* just give up and return 0.0 */
return ( D_80010660 );
return ( D_dk64_boot_80010660 );
}

22
src/dk64_boot/io/contreaddata.c
View File

@ -4,8 +4,8 @@
// contreaddata.c
extern OSPifRam D_80014DC0; // __osContPifRam
extern u8 D_80014E01; // __osMaxControllers
extern OSPifRam D_dk64_boot_80014DC0; // __osContPifRam
extern u8 D_dk64_boot_80014E01; // __osMaxControllers
void func_dk64_boot_800074E0(void);
@ -15,10 +15,10 @@ s32 func_dk64_boot_800073D0(OSMesgQueue *arg0) {
__osSiGetAccess();
if (__osContLastCmd != CONT_CMD_READ_BUTTON) {
func_dk64_boot_800074E0();
__osSiRawStartDma(OS_WRITE, &D_80014DC0);
__osSiRawStartDma(OS_WRITE, &D_dk64_boot_80014DC0);
osRecvMesg(arg0, NULL, OS_MESG_BLOCK);
}
temp_v0 = __osSiRawStartDma(OS_READ, &D_80014DC0);
temp_v0 = __osSiRawStartDma(OS_READ, &D_dk64_boot_80014DC0);
__osContLastCmd = CONT_CMD_READ_BUTTON;
__osSiRelAccess();
return temp_v0;
@ -29,8 +29,8 @@ void func_dk64_boot_80007454(OSContPad *data) //void osContGetReadData(OSContPad
u8 *ptr;
__OSContReadFormat readformat;
int i;
ptr = (u8 *)&D_80014DC0.ramarray;
for (i = 0; i < D_80014E01; i++, ptr += sizeof(__OSContReadFormat), data++)
ptr = (u8 *)&D_dk64_boot_80014DC0.ramarray;
for (i = 0; i < D_dk64_boot_80014E01; i++, ptr += sizeof(__OSContReadFormat), data++)
{
readformat = *(__OSContReadFormat *)ptr;
data->errno = CHNL_ERR(readformat);
@ -49,12 +49,12 @@ void func_dk64_boot_800074E0(void) //static void __osPackReadData(void)
__OSContReadFormat readformat;
int i;
ptr = (u8*)&D_80014DC0.ramarray;
for (i = 0; i < ARRLEN(D_80014DC0.ramarray); i++)
ptr = (u8*)&D_dk64_boot_80014DC0.ramarray;
for (i = 0; i < ARRLEN(D_dk64_boot_80014DC0.ramarray); i++)
{
D_80014DC0.ramarray[i] = 0;
D_dk64_boot_80014DC0.ramarray[i] = 0;
}
D_80014DC0.pifstatus = CONT_CMD_EXE;
D_dk64_boot_80014DC0.pifstatus = CONT_CMD_EXE;
readformat.dummy = CONT_CMD_NOP;
readformat.txsize = CONT_CMD_READ_BUTTON_TX;
readformat.rxsize = CONT_CMD_READ_BUTTON_RX;
@ -62,7 +62,7 @@ void func_dk64_boot_800074E0(void) //static void __osPackReadData(void)
readformat.button = -1;
readformat.stick_x = -1;
readformat.stick_y = -1;
for(i = 0; i < D_80014E01; i++){
for(i = 0; i < D_dk64_boot_80014E01; i++){
*(__OSContReadFormat*)ptr = readformat;
ptr += sizeof(__OSContReadFormat);
}

36
src/dk64_boot/io/controller.c
View File

@ -7,11 +7,11 @@
#define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
u32 D_800100D0 = 0; // __osContinitialized
extern OSPifRam D_80014DC0; // __osContPifRam
extern u8 D_80014E01; // __osMaxControllers
OSMesgQueue D_80014E28; // __osEepromTimerQ
OSMesg D_80014E40; // __osEepromTimerMsg
u32 D_dk64_boot_800100D0 = 0; // __osContinitialized
extern OSPifRam D_dk64_boot_80014DC0; // __osContPifRam
extern u8 D_dk64_boot_80014E01; // __osMaxControllers
OSMesgQueue D_dk64_boot_80014E28; // __osEepromTimerQ
OSMesg D_dk64_boot_80014E40; // __osEepromTimerMsg
s32 osContInit(OSMesgQueue *mq, u8 *bitpattern, OSContStatus *data)
{
@ -22,9 +22,9 @@ s32 osContInit(OSMesgQueue *mq, u8 *bitpattern, OSContStatus *data)
OSMesgQueue timerMesgQueue;
ret = 0;
if (D_800100D0)
if (D_dk64_boot_800100D0)
return ret;
D_800100D0 = TRUE;
D_dk64_boot_800100D0 = TRUE;
t = osGetTime();
if (t < HALF_A_SECOND)
{
@ -32,18 +32,18 @@ s32 osContInit(OSMesgQueue *mq, u8 *bitpattern, OSContStatus *data)
osSetTimer(&mytimer, HALF_A_SECOND - t, 0, &timerMesgQueue, &dummy);
osRecvMesg(&timerMesgQueue, &dummy, OS_MESG_BLOCK);
}
D_80014E01 = MAXCONTROLLERS;
D_dk64_boot_80014E01 = MAXCONTROLLERS;
__osPackRequestData(CONT_CMD_REQUEST_STATUS);
ret = __osSiRawStartDma(OS_WRITE, &D_80014DC0);
ret = __osSiRawStartDma(OS_WRITE, &D_dk64_boot_80014DC0);
osRecvMesg(mq, &dummy, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &D_80014DC0);
ret = __osSiRawStartDma(OS_READ, &D_dk64_boot_80014DC0);
osRecvMesg(mq, &dummy, OS_MESG_BLOCK);
__osContGetInitData(bitpattern, data);
__osContLastCmd = CONT_CMD_REQUEST_STATUS;
__osSiCreateAccessQueue();
osCreateMesgQueue(&D_80014E28, &D_80014E40, 1);
osCreateMesgQueue(&D_dk64_boot_80014E28, &D_dk64_boot_80014E40, 1);
return ret;
}
@ -54,8 +54,8 @@ void __osContGetInitData(u8 *pattern, OSContStatus *data)
int i;
u8 bits;
bits = 0;
ptr = (u8 *)&D_80014DC0;
for (i = 0; i < D_80014E01; i++, ptr += sizeof(__OSContRequesFormat), data++)
ptr = (u8 *)&D_dk64_boot_80014DC0;
for (i = 0; i < D_dk64_boot_80014E01; i++, ptr += sizeof(__OSContRequesFormat), data++)
{
requestformat = *(__OSContRequesFormat *)ptr;
data->errno = CHNL_ERR(requestformat);
@ -74,12 +74,12 @@ void __osPackRequestData(u8 cmd)
u8 *ptr;
__OSContRequesFormat requestformat;
int i;
for (i = 0; i < ARRLEN(D_80014DC0.ramarray); i++)
for (i = 0; i < ARRLEN(D_dk64_boot_80014DC0.ramarray); i++)
{
D_80014DC0.ramarray[i] = 0;
D_dk64_boot_80014DC0.ramarray[i] = 0;
}
D_80014DC0.pifstatus = CONT_CMD_EXE;
ptr = (u8 *)&D_80014DC0.ramarray;
D_dk64_boot_80014DC0.pifstatus = CONT_CMD_EXE;
ptr = (u8 *)&D_dk64_boot_80014DC0.ramarray;
requestformat.dummy = CONT_CMD_NOP;
requestformat.txsize = CONT_CMD_REQUEST_STATUS_TX;
requestformat.rxsize = CONT_CMD_REQUEST_STATUS_RX;
@ -89,7 +89,7 @@ void __osPackRequestData(u8 cmd)
requestformat.status = CONT_CMD_NOP;
requestformat.dummy1 = CONT_CMD_NOP;
for (i = 0; i < D_80014E01; i++)
for (i = 0; i < D_dk64_boot_80014E01; i++)
{
*(__OSContRequesFormat *)ptr = requestformat;
ptr += sizeof(__OSContRequesFormat);

12
src/dk64_boot/io/motor.c
View File

@ -3,7 +3,7 @@
#include "siint.h"
extern u8 __osContLastCmd;
extern OSPifRam D_80014E50[];
extern OSPifRam D_dk64_boot_80014E50[];
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/dk64_boot/io/motor/osMotorStartStop.s")
@ -16,21 +16,21 @@ s32 osMotorStartStop(OSPfs *pfs, int arg1)
u8 *ptr;
__OSContRamReadFormat *ramreadformat;
ramreadformat = (__OSContRamReadFormat *) D_80014E50[pfs->channel].ramarray;
ramreadformat = (__OSContRamReadFormat *) D_dk64_boot_80014E50[pfs->channel].ramarray;
if (!(pfs->status & 0x8))
return PFS_ERR_INVALID;
__osSiGetAccess();
D_80014E50[pfs->channel].pifstatus = 1;
D_dk64_boot_80014E50[pfs->channel].pifstatus = 1;
for (i = 0; i < 0x20; i++)
ramreadformat->data[i] = arg1;
__osContLastCmd = CONT_CMD_END;
__osSiRawStartDma(OS_WRITE, D_80014E50[pfs->channel].ramarray);
__osSiRawStartDma(OS_WRITE, D_dk64_boot_80014E50[pfs->channel].ramarray);
osRecvMesg(pfs->queue, NULL, OS_MESG_BLOCK);
__osSiRawStartDma(OS_READ, D_80014E50[pfs->channel].ramarray);
__osSiRawStartDma(OS_READ, D_dk64_boot_80014E50[pfs->channel].ramarray);
osRecvMesg(pfs->queue, NULL, OS_MESG_BLOCK);
ret = ramreadformat->rxsize & CHNL_ERR_MASK;
if (ret == 0) {
@ -116,7 +116,7 @@ s32 osMotorInit(OSMesgQueue *mq, OSPfs *pfs, int channel)
return PFS_ERR_DEVICE;
if (!(pfs->status & 0x8)) {
_MakeMotorData(channel, &D_80014E50[channel]);
_MakeMotorData(channel, &D_dk64_boot_80014E50[channel]);
}
pfs->status = 0x8;
return 0;

16
src/dk64_boot/io/pfsgetstatus.c
View File

@ -7,8 +7,8 @@
void __osPfsRequestOneChannel(int channel);
void __osPfsGetOneChannelData(int channel, OSContStatus *data);
extern OSPifRam D_800164F0; // __osPfsPifRam
extern u8 D_80010304;
extern OSPifRam D_dk64_boot_800164F0; // __osPfsPifRam
extern u8 D_dk64_boot_80010304;
#pragma GLOBAL_ASM("asm/nonmatchings/dk64_boot/io/pfsgetstatus/__osPfsGetStatus.s")
@ -19,12 +19,12 @@ s32 __osPfsGetStatus(OSMesgQueue *queue, int channel)
s32 ret;
OSMesg dummy;
OSContStatus data;
D_80010304 = 0xFA;
D_dk64_boot_80010304 = 0xFA;
ret = 0;
__osPfsRequestOneChannel(channel);
ret = __osSiRawStartDma(OS_WRITE, &D_800164F0);
ret = __osSiRawStartDma(OS_WRITE, &D_dk64_boot_800164F0);
osRecvMesg(queue, &dummy, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &D_800164F0);
ret = __osSiRawStartDma(OS_READ, &D_dk64_boot_800164F0);
osRecvMesg(queue, &dummy, OS_MESG_BLOCK);
__osPfsGetOneChannelData(channel, &data);
if (((data.status & CONT_CARD_ON) != 0) && ((data.status & CONT_CARD_PULL) != 0))
@ -47,8 +47,8 @@ void __osPfsRequestOneChannel(int channel)
int i;
__osContLastCmd = CONT_CMD_REQUEST_STATUS;
D_800164F0.pifstatus = CONT_CMD_EXE;
ptr = (u8 *)&D_800164F0;
D_dk64_boot_800164F0.pifstatus = CONT_CMD_EXE;
ptr = (u8 *)&D_dk64_boot_800164F0;
requestformat.txsize = CONT_CMD_REQUEST_STATUS_TX;
requestformat.rxsize = CONT_CMD_REQUEST_STATUS_RX;
@ -70,7 +70,7 @@ void __osPfsGetOneChannelData(int channel, OSContStatus *data)
u8 *ptr;
__OSContRequesFormatShort requestformat;
int i;
ptr = (u8*)&D_800164F0;
ptr = (u8*)&D_dk64_boot_800164F0;
for (i = 0; i < channel; i++)
ptr++;
requestformat = *(__OSContRequesFormatShort *)ptr;

26
src/dk64_boot/io/pfsisplug.c
View File

@ -5,9 +5,9 @@
#include "controller.h"
#include "siint.h"
extern OSPifRam D_80014DC0; // __osContPifRam
extern u8 D_80014E01; // __osMaxControllers
extern OSPifRam D_800164F0; // __osPfsPifRam
extern OSPifRam D_dk64_boot_80014DC0; // __osContPifRam
extern u8 D_dk64_boot_80014E01; // __osMaxControllers
extern OSPifRam D_dk64_boot_800164F0; // __osPfsPifRam
s32 osPfsIsPlug(OSMesgQueue *queue, u8 *pattern)
{
@ -25,12 +25,12 @@ s32 osPfsIsPlug(OSMesgQueue *queue, u8 *pattern)
while (TRUE)
{
__osPfsRequestData(CONT_CMD_REQUEST_STATUS);
ret = __osSiRawStartDma(OS_WRITE, &D_800164F0);
ret = __osSiRawStartDma(OS_WRITE, &D_dk64_boot_800164F0);
osRecvMesg(queue, &dummy, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &D_800164F0);
ret = __osSiRawStartDma(OS_READ, &D_dk64_boot_800164F0);
osRecvMesg(queue, &dummy, OS_MESG_BLOCK);
__osPfsGetInitData(&bitpattern, data);
for (channel = 0; channel < D_80014E01; channel++)
for (channel = 0; channel < D_dk64_boot_80014E01; channel++)
{
if ((data[channel].status & CONT_ADDR_CRC_ER) == 0)
{
@ -38,11 +38,11 @@ s32 osPfsIsPlug(OSMesgQueue *queue, u8 *pattern)
break;
}
}
if (D_80014E01 == channel)
if (D_dk64_boot_80014E01 == channel)
crc_error_cnt = 0;
if (crc_error_cnt < 1)
{
for (channel = 0; channel < D_80014E01; channel++)
for (channel = 0; channel < D_dk64_boot_80014E01; channel++)
{
if (data[channel].errno == 0 && (data[channel].status & CONT_CARD_ON) != 0)
bits |= 1 << channel;
@ -59,9 +59,9 @@ void __osPfsRequestData(u8 cmd)
u8 *ptr;
__OSContRequesFormat requestformat;
int i;
ptr = (u8 *)&D_800164F0;
ptr = (u8 *)&D_dk64_boot_800164F0;
__osContLastCmd = cmd;
D_800164F0.pifstatus = CONT_CMD_EXE;
D_dk64_boot_800164F0.pifstatus = CONT_CMD_EXE;
requestformat.dummy = CONT_CMD_NOP;
requestformat.txsize = CONT_CMD_REQUEST_STATUS_TX;
requestformat.rxsize = CONT_CMD_REQUEST_STATUS_RX;
@ -70,7 +70,7 @@ void __osPfsRequestData(u8 cmd)
requestformat.typel = CONT_CMD_NOP;
requestformat.status = CONT_CMD_NOP;
requestformat.dummy1 = CONT_CMD_NOP;
for (i = 0; i < D_80014E01; i++)
for (i = 0; i < D_dk64_boot_80014E01; i++)
{
*(__OSContRequesFormat *)ptr = requestformat;
ptr += sizeof(__OSContRequesFormat);
@ -85,8 +85,8 @@ void __osPfsGetInitData(u8 *pattern, OSContStatus *data)
int i;
u8 bits;
bits = 0;
ptr = (u8 *)&D_800164F0;
for (i = 0; i < D_80014E01; i++, ptr += sizeof(__OSContRequesFormat))
ptr = (u8 *)&D_dk64_boot_800164F0;
for (i = 0; i < D_dk64_boot_80014E01; i++, ptr += sizeof(__OSContRequesFormat))
{
requestformat = *(__OSContRequesFormat *)ptr;
data->errno = CHNL_ERR(requestformat);

4
src/dk64_boot/io/piacs.c
View File

@ -2,12 +2,12 @@
#include "functions.h"
extern s32 __osPiAccessQueueEnabled;
extern void *D_80016320;
extern void *D_dk64_boot_80016320;
extern OSMesgQueue __osPiAccessQueue;
void __osPiCreateAccessQueue(void) {
__osPiAccessQueueEnabled = TRUE;
osCreateMesgQueue(&__osPiAccessQueue, &D_80016320, 1);
osCreateMesgQueue(&__osPiAccessQueue, &D_dk64_boot_80016320, 1);
osSendMesg(&__osPiAccessQueue, NULL, 0);
}

18
src/dk64_boot/io/siacs.c
View File

@ -3,25 +3,25 @@
#define SI_Q_BUF_LEN 1
extern u32 D_800101E0; // __osSiAccessQueueEnabled
extern void *D_800162C0;
extern OSMesgQueue D_800162C8; // __osSiAccessQueue
extern u32 D_dk64_boot_800101E0; // __osSiAccessQueueEnabled
extern void *D_dk64_boot_800162C0;
extern OSMesgQueue D_dk64_boot_800162C8; // __osSiAccessQueue
void __osSiCreateAccessQueue(void) {
D_800101E0 = TRUE;
osCreateMesgQueue(&D_800162C8, &D_800162C0, SI_Q_BUF_LEN);
osSendMesg(&D_800162C8, NULL, OS_MESG_NOBLOCK);
D_dk64_boot_800101E0 = TRUE;
osCreateMesgQueue(&D_dk64_boot_800162C8, &D_dk64_boot_800162C0, SI_Q_BUF_LEN);
osSendMesg(&D_dk64_boot_800162C8, NULL, OS_MESG_NOBLOCK);
}
void __osSiGetAccess(void) {
OSMesg dummyMesg;
if (!D_800101E0) {
if (!D_dk64_boot_800101E0) {
__osSiCreateAccessQueue();
}
osRecvMesg(&D_800162C8, &dummyMesg, OS_MESG_BLOCK);
osRecvMesg(&D_dk64_boot_800162C8, &dummyMesg, OS_MESG_BLOCK);
}
void __osSiRelAccess(void) {
osSendMesg(&D_800162C8, NULL, OS_MESG_NOBLOCK);
osSendMesg(&D_dk64_boot_800162C8, NULL, OS_MESG_NOBLOCK);
}

12
src/dk64_boot/io/vi.c
View File

@ -2,9 +2,9 @@
#include "viint.h"
extern s32 osTvType;
extern OSViMode D_80010210;
extern OSViMode D_80010260;
extern OSViMode D_800102B0;
extern OSViMode D_dk64_boot_80010210;
extern OSViMode D_dk64_boot_80010260;
extern OSViMode D_dk64_boot_800102B0;
static __OSViContext vi[2] = {0};
__OSViContext *__osViCurr = &vi[0];
@ -20,15 +20,15 @@ void __osViInit(void)
__osViCurr->framep = (void*)K0BASE;
if (osTvType == OS_TV_TYPE_PAL)
{
__osViNext->modep = &D_80010210;
__osViNext->modep = &D_dk64_boot_80010210;
}
else if (osTvType == OS_TV_TYPE_MPAL)
{
__osViNext->modep = &D_80010260;
__osViNext->modep = &D_dk64_boot_80010260;
}
else
{
__osViNext->modep = &D_800102B0;
__osViNext->modep = &D_dk64_boot_800102B0;
}
__osViNext->state = VI_STATE_BLACK;
__osViNext->control = __osViNext->modep->comRegs.ctrl;