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

5 files changed, 14 insertions, 13 deletions

diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index 35be0e353..d0124a203 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -142,7 +142,7 @@ void IrqMgr_HandlePRENMI450(IrqMgr* this) {
 void IrqMgr_HandlePRENMI480(IrqMgr* this) {
     u32 ret;
     osSetTimer(&this->timer, OS_USEC_TO_CYCLES(20000), 0ull, &this->queue, (OSMesg)PRENMI500_MSG);
-    ret = func_801031F0(); // osAfterPreNMI
+    ret = osAfterPreNMI();
     if (ret) {
         osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret); // osAfterPreNMI returned %d !?
         osSetTimer(&this->timer, OS_USEC_TO_CYCLES(1000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG);
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 1f9daad36..745c058e4 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -300,7 +300,7 @@ void PadMgr_HandleRetraceMsg(PadMgr* padmgr) {
     PadMgr_ProcessInputs(padmgr);
     osContStartQuery(queue);
     osRecvMesg(queue, NULL, OS_MESG_BLOCK);
-    func_8010328C(padmgr);
+    osContGetQuery(padmgr);
     PadMgr_UnlockSerialMesgQueue(padmgr, queue);
 
     mask = 0;
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 89b7e3e52..149959ac5 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1320,8 +1320,9 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext*
     }
 
     func_800ABE74(correctedEyeX, eye->y, eye->z);
-    func_80103A70(&D_8015BBA8, lookAt, *hilite, correctedEyeX, eye->y, eye->z, object->x, object->y, object->z, 0.0f,
-                  1.0f, 0.0f, lightDir->x, lightDir->y, lightDir->z, lightDir->x, lightDir->y, lightDir->z, 0x10, 0x10);
+    guLookAtHilite(&D_8015BBA8, lookAt, *hilite, correctedEyeX, eye->y, eye->z, object->x, object->y, object->z, 0.0f,
+                   1.0f, 0.0f, lightDir->x, lightDir->y, lightDir->z, lightDir->x, lightDir->y, lightDir->z, 0x10,
+                   0x10);
 
     gSPLookAt(gfx++, lookAt);
     gDPSetHilite1Tile(gfx++, 1, *hilite, 0x10, 0x10);
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 73d502a06..0f6f01e20 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -26,7 +26,7 @@ void Sample_Draw(SampleContext* this) {
 
     if (1) {
         Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx));
-        func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42));
+        guPosition(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42));
         gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD);
     }
 
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 12a92eb33..613f66529 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -351,8 +351,8 @@ s32 func_800AAA9C(View* view) {
     }
 
     func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
-    func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
-                  view->unk_40.x, view->unk_40.y, view->unk_40.z);
+    guLookAtReflect(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
+                    view->unk_40.x, view->unk_40.y, view->unk_40.z);
 
     view->viewing = *viewing;
 
@@ -500,8 +500,8 @@ s32 func_800AB560(View* view) {
     }
 
     func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
-    func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
-                  view->unk_40.x, view->unk_40.y, view->unk_40.z);
+    guLookAtReflect(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
+                    view->unk_40.x, view->unk_40.y, view->unk_40.z);
 
     view->viewing = *viewing;
 
@@ -518,8 +518,8 @@ s32 func_800AB944(View* view) {
     Graph_OpenDisps(dispRefs, view->gfxCtx, "../z_view.c", 878);
 
     func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
-    func_80101E34(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y,
-                  view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z);
+    guLookAtReflect(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y,
+                    view->unk_34.z, view->unk_40.x, view->unk_40.y, view->unk_40.z);
 
     Graph_CloseDisps(dispRefs, view->gfxCtx, "../z_view.c", 886);
 
@@ -582,8 +582,8 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
         view->viewingPtr = viewing;
 
         func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
-        func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
-                      view->unk_40.x, view->unk_40.y, view->unk_40.z);
+        guLookAtReflect(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
+                        view->unk_40.x, view->unk_40.y, view->unk_40.z);
 
         view->viewing = *viewing;