From 6ed7d8866a0344849be5031db6d62a9213ecdcda Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Fri, 24 Sep 2021 15:22:53 -0400 Subject: [PATCH] Moved unknown_0CE200 to the OS folder, and deleted the unicode character as it was causing compile issues all of a sudden --- lib/src/{ => os}/unknown_0CE200.c | 16 ++++++++-------- lib/src/{ => os}/unknown_0CE8A0.c | 0 tools/python/generate_ld.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename lib/src/{ => os}/unknown_0CE200.c (83%) rename lib/src/{ => os}/unknown_0CE8A0.c (100%) diff --git a/lib/src/unknown_0CE200.c b/lib/src/os/unknown_0CE200.c similarity index 83% rename from lib/src/unknown_0CE200.c rename to lib/src/os/unknown_0CE200.c index 1abaa3a1..1027d2b3 100644 --- a/lib/src/unknown_0CE200.c +++ b/lib/src/os/unknown_0CE200.c @@ -4,21 +4,21 @@ #include "types.h" #include "macros.h" #include "libultra_internal.h" -#include "../src/memory.h" +#include "src/memory.h" s32 D_800E38D0 = 0; // Ok, so I completely gave up on the rest of these bss variables. // This is probably not the right place for them, but we can always -// fix that later. ¯\_(ツ)_/¯ +// fix that later. s32 D_8012CE20[2]; s32 D_8012CE28[6]; s32 __osEepPifRam[15]; s32 D_8012CE7C; //__osEepPifRam.pifstatus -s32 viThread[172]; -s32 viEventQueue[6]; -s32 viEventBuf[6]; +s32 viThread[172]; +s32 viEventQueue[6]; +s32 viEventBuf[6]; s32 viRetraceMsg[6]; s32 viCounterMsg[6]; u16 retrace; //Used in viMgrMain, but it's supposed to be static in that function @@ -26,15 +26,15 @@ u16 D_8012D192; s32 D_8012D194[2]; s32 D_8012D1A0[16]; s32 D_8012D1E0[2]; -s32 piAccessQueue[6]; +s32 piAccessQueue[6]; OSTimer D_8012D200; OSTime __osCurrentTime; s32 __osBaseCounter; s32 __osViIntrCount; u32 __osTimerCounter; u32 D_8012D234[2]; -s32 D_8012D240[108]; -MemoryPoolSlot *gMainMemoryPool; +s32 D_8012D240[108]; +MemoryPoolSlot *gMainMemoryPool; GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiCreateAccessQueue.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiGetAccess.s") diff --git a/lib/src/unknown_0CE8A0.c b/lib/src/os/unknown_0CE8A0.c similarity index 100% rename from lib/src/unknown_0CE8A0.c rename to lib/src/os/unknown_0CE8A0.c diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 0b8c87d4..d07d56ff 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -31,7 +31,7 @@ BSS_LIB_ORDER_FILES = [ BUILD_DIR + '/lib/src/os/osViMgr.o', BUILD_DIR + '/lib/src/os/osSetEventMesg.o', BUILD_DIR + '/lib/src/os/unknown_0CD820.o', - BUILD_DIR + '/lib/src/unknown_0CE200.o' + BUILD_DIR + '/lib/src/os/unknown_0CE200.o' ] class GenerateLD: