summaryrefslogtreecommitdiff
path: root/src/libultra_code/code_801031F0.c
diff options
context:
space:
mode:
authorLucas Shaw <49287729+shawlucas@users.noreply.github.com>2020-04-22 10:20:49 -0700
committerGitHub <noreply@github.com>2020-04-22 13:20:49 -0400
commit3c440ef7f1172f49aba2618922cd401155392599 (patch)
tree9a5fdef4dcdadc9d472a4610196aa4cb7c8ebede /src/libultra_code/code_801031F0.c
parent06b731c494b44e71422231872750acc35445392c (diff)
Finished code_801031F0.c, guPosition.c, guLookAtHilite.c (#84)
* started microcode decomp * Modified spec to fix error * osContGetQuery OK * Decompiled guLookAtHilite.c * guPosition.c OK * Fixed formatting * osViSetEvent.c OK * Deleted unnecessary files * Made suggested changes, merged playblack.c * Removed line breaks from comments * Removed argument listing
Diffstat (limited to 'src/libultra_code/code_801031F0.c')
-rw-r--r--src/libultra_code/code_801031F0.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/libultra_code/code_801031F0.c b/src/libultra_code/code_801031F0.c
index 543256a82..3a5ba4f18 100644
--- a/src/libultra_code/code_801031F0.c
+++ b/src/libultra_code/code_801031F0.c
@@ -1,8 +1,15 @@
#include "libultra_internal.h"
#include <global.h>
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_801031F0.s")
+s32 osAfterPreNMI(void) {
+ return __osSpSetPc(0);
+}
+/**
+ * osContStartQuery:
+ * Starts to read the values for SI device status and type which are connected to the controller port and joyport
+ * connector.
+ **/
s32 osContStartQuery(OSMesgQueue* mq) {
s32 ret;
ret = 0;
@@ -19,8 +26,11 @@ s32 osContStartQuery(OSMesgQueue* mq) {
return ret;
}
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_8010328C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_801032B0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_80103A70.s")
+/**
+ * osContGetQuery:
+ * Returns the values from osContStartQuery to status. Both functions must be paired for use.
+ **/
+void osContGetQuery(OSContStatus* data) {
+ u8 pattern;
+ __osContGetInitData(&pattern, data);
+}