diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 7158a671c..c94eda680 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -47,7 +47,7 @@ build/ROMID/lib/str.o (section); \ build/ROMID/lib/ultra/libc/sprintf.o (section); \ build/ROMID/lib/pimgr.o (section); \ - build/ROMID/lib/lib_13750.o (section); \ + build/ROMID/lib/videbug.o (section); \ build/ROMID/lib/debughud.o (section); \ build/ROMID/lib/base.o (section); \ build/ROMID/lib/joy.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index db294824d..4acfa4b97 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -45,7 +45,7 @@ build/ROMID/lib/str.o (section); \ build/ROMID/lib/ultra/libc/sprintf.o (section); \ build/ROMID/lib/pimgr.o (section); \ - build/ROMID/lib/lib_13750.o (section); \ + build/ROMID/lib/videbug.o (section); \ build/ROMID/lib/debughud.o (section); \ build/ROMID/lib/base.o (section); \ build/ROMID/lib/joy.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 442f282bb..9073b41a0 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -45,7 +45,7 @@ build/ROMID/lib/str.o (section); \ build/ROMID/lib/ultra/libc/sprintf.o (section); \ build/ROMID/lib/pimgr.o (section); \ - build/ROMID/lib/lib_13750.o (section); \ + build/ROMID/lib/videbug.o (section); \ build/ROMID/lib/debughud.o (section); \ build/ROMID/lib/base.o (section); \ build/ROMID/lib/joy.o (section); \ diff --git a/src/include/lib/lib_13750.h b/src/include/lib/lib_13750.h deleted file mode 100644 index 7ce8893d7..000000000 --- a/src/include/lib/lib_13750.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _IN_LIB_LIB_13750_H -#define _IN_LIB_LIB_13750_H -#include -#include "data.h" -#include "types.h" - -void func00013750(void); -void func00013758(void); - -#endif diff --git a/src/include/lib/videbug.h b/src/include/lib/videbug.h new file mode 100644 index 000000000..67393b42d --- /dev/null +++ b/src/include/lib/videbug.h @@ -0,0 +1,10 @@ +#ifndef _IN_LIB_VIDEBUG_H +#define _IN_LIB_VIDEBUG_H +#include +#include "data.h" +#include "types.h" + +void videbugInit(void); +void videbugCreateMesgQueue(void); + +#endif diff --git a/src/lib/boot.c b/src/lib/boot.c index 9bcb0171a..af69de51c 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -596,7 +596,7 @@ void bootCreateSchedThread(void) void bootPhase2(void *arg) { bootCreateIdleThread(); - func00013750(); + videbugInit(); pimgrCreate(); bootCreateRmonThread(); diff --git a/src/lib/lib_13750.c b/src/lib/lib_13750.c deleted file mode 100644 index f2067fd3f..000000000 --- a/src/lib/lib_13750.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "lib/lib_13750.h" -#include "data.h" -#include "types.h" - -OSMesg var80099a20[8]; -OSMesgQueue var80099a40; - -void func00013750(void) -{ - // empty -} - -void func00013758(void) -{ - osCreateMesgQueue(&var80099a40, var80099a20, 8); -} diff --git a/src/lib/main.c b/src/lib/main.c index 2ecb25189..6651b8e0c 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -309,7 +309,7 @@ glabel mainInit /* d28c: 00000000 */ nop /* d290: 0c0049e7 */ jal memaInit /* d294: 00000000 */ nop -/* d298: 0c004d3a */ jal func00013758 +/* d298: 0c004d3a */ jal videbugCreateMesgQueue /* d29c: 00000000 */ nop /* d2a0: 0c002668 */ jal viConfigureForLogos /* d2a4: 00000000 */ nop @@ -712,7 +712,7 @@ glabel mainInit /* d54c: 00000000 */ nop /* d550: 0c004a83 */ jal memaInit /* d554: 00000000 */ nop -/* d558: 0c004dd6 */ jal func00013758 +/* d558: 0c004dd6 */ jal videbugCreateMesgQueue /* d55c: 00000000 */ nop /* d560: 0c0026ac */ jal viConfigureForLogos /* d564: 00000000 */ nop @@ -1109,7 +1109,7 @@ glabel mainInit /* dab4: 00000000 */ sll $zero,$zero,0x0 /* dab8: 0c004beb */ jal memaInit /* dabc: 00000000 */ sll $zero,$zero,0x0 -/* dac0: 0c004fea */ jal func00013758 +/* dac0: 0c004fea */ jal videbugCreateMesgQueue /* dac4: 00000000 */ sll $zero,$zero,0x0 /* dac8: 0c002714 */ jal viConfigureForLogos /* dacc: 00000000 */ sll $zero,$zero,0x0 @@ -1500,7 +1500,7 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400"; // gvarsInit(); // memp000121e0(); // memaInit(); -// func00013758(); +// videbugCreateMesgQueue(); // viConfigureForLogos(); // var8005d9b0 = rmonIsDisabled(); // joySystemInit(); diff --git a/src/lib/videbug.c b/src/lib/videbug.c new file mode 100644 index 000000000..329917740 --- /dev/null +++ b/src/lib/videbug.c @@ -0,0 +1,19 @@ +#include +#include "constants.h" +#include "bss.h" +#include "data.h" +#include "types.h" +#include "lib/videbug.h" + +OSMesg g_ViDebugMesgs[8]; +OSMesgQueue g_ViDebugMesgQueue; + +void videbugInit(void) +{ + // empty +} + +void videbugCreateMesgQueue(void) +{ + osCreateMesgQueue(&g_ViDebugMesgQueue, g_ViDebugMesgs, ARRAYCOUNT(g_ViDebugMesgs)); +}