From bc67e3cc9bbbabea3b706ed940eb5313448a9038 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 26 Jan 2021 20:04:37 +1000 Subject: [PATCH] Decompile __osSpGetStatus --- ld/libfiles.inc | 2 +- src/include/lib/lib_51890.h | 8 -------- src/lib/lib_51890.c | 19 ------------------- src/lib/ultra/io/spgetstat.c | 6 ++++++ 4 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 src/include/lib/lib_51890.h delete mode 100644 src/lib/lib_51890.c create mode 100644 src/lib/ultra/io/spgetstat.c diff --git a/ld/libfiles.inc b/ld/libfiles.inc index 1db61fe83..2b4df9203 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -171,7 +171,7 @@ build/ROMID/lib/lib_50f20.o (section); \ build/ROMID/lib/lib_513b0.o (section); \ build/ROMID/lib/ultra/os/setcompare.o (section); \ - build/ROMID/lib/lib_51890.o (section); \ + build/ROMID/lib/ultra/io/spgetstat.o (section); \ build/ROMID/lib/ultra/os/resetglobalintmask.o (section); \ build/ROMID/lib/ultra/io/epirawwrite.o (section); \ build/ROMID/lib/ultra/io/epirawread.o (section); \ diff --git a/src/include/lib/lib_51890.h b/src/include/lib/lib_51890.h deleted file mode 100644 index a7de4ecf4..000000000 --- a/src/include/lib/lib_51890.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_51890_H -#define _IN_LIB_LIB_51890_H -#include -#include "types.h" - -u32 __osSpGetStatus(void); - -#endif diff --git a/src/lib/lib_51890.c b/src/lib/lib_51890.c deleted file mode 100644 index a55bc9933..000000000 --- a/src/lib/lib_51890.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" - -GLOBAL_ASM( -glabel __osSpGetStatus -/* 51890: 3c0ea404 */ lui $t6,0xa404 -/* 51894: 03e00008 */ jr $ra -/* 51898: 8dc20010 */ lw $v0,0x10($t6) -/* 5189c: 00000000 */ nop -); diff --git a/src/lib/ultra/io/spgetstat.c b/src/lib/ultra/io/spgetstat.c new file mode 100644 index 000000000..4e4722d4d --- /dev/null +++ b/src/lib/ultra/io/spgetstat.c @@ -0,0 +1,6 @@ +#include "libultra_internal.h" + +u32 __osSpGetStatus() +{ + return IO_READ(SP_STATUS_REG); +}