Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finished code_801031F0.c, guPosition.c, guLookAtHilite.c #84

Merged
merged 14 commits into from
Apr 22, 2020
Merged

Finished code_801031F0.c, guPosition.c, guLookAtHilite.c #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
22e050c
started microcode decomp
shawlucas Apr 19, 2020
f56cca3
Modified spec to fix error
shawlucas Apr 19, 2020
3fbca26
Merge branch 'master' of https://github.com/zeldaret/oot into microcode
shawlucas Apr 20, 2020
1ceeb8e
osContGetQuery OK
shawlucas Apr 21, 2020
83324b5
Merge branch 'microcode' of https://github.com/shawlucas/oot into mic…
shawlucas Apr 21, 2020
2ec1e3a
Decompiled guLookAtHilite.c
shawlucas Apr 21, 2020
4375f9d
guPosition.c OK
shawlucas Apr 21, 2020
b741e26
Fixed formatting
shawlucas Apr 21, 2020
53799e4
osViSetEvent.c OK
shawlucas Apr 21, 2020
f353641
Deleted unnecessary files
shawlucas Apr 21, 2020
8e20d7f
Merge branch 'master' of https://github.com/zeldaret/oot into ultra
shawlucas Apr 21, 2020
dc98da4
Made suggested changes, merged playblack.c
shawlucas Apr 21, 2020
b59904d
Removed line breaks from comments
shawlucas Apr 21, 2020
a5cc776
Removed argument listing
shawlucas Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
osContGetQuery OK
  • Loading branch information
@shawlucas
shawlucas committed Apr 21, 2020
commit 1ceeb8e5627667dfef4a0bba270f29188f1c5540
2 changes: 1 addition & 1 deletion asm/code_800FCD40.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ glabel func_800FCD40
/* B73F4C 800FCDAC 24060001 */ li $a2, 1
/* B73F50 800FCDB0 0C000CA0 */ jal osRecvMesg
/* B73F54 800FCDB4 AFA70024 */ sw $a3, 0x24($sp)
/* B73F58 800FCDB8 0C040CA3 */ jal func_8010328C
/* B73F58 800FCDB8 0C040CA3 */ jal osContGetQuery
/* B73F5C 800FCDBC 02002025 */ move $a0, $s0
/* B73F60 800FCDC0 8FA70024 */ lw $a3, 0x24($sp)
/* B73F64 800FCDC4 02001025 */ move $v0, $s0
Expand Down
11 changes: 0 additions & 11 deletions asm/non_matchings/code/code_801031F0/func_8010328C.s
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion include/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,7 @@ void guLookAtReflect(Mtx*, f32, f32, f32, f32, f32, f32, f32, f32, f32);
// ? func_80103010(?);
// ? func_801031F0(?);
// ? osContStartQuery(?);
// ? func_8010328C(?);
void osContGetQuery(OSContStatus* data);
// ? func_801032B0(?);
void func_80103A70(UNK_PTR, Gfx*, Hilite*, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32,
s32, s32);
Expand Down
2 changes: 1 addition & 1 deletion src/code/padmgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 15 additions & 1 deletion src/libultra_code/code_801031F0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_801031F0.s")

/**
* 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;
Expand All @@ -19,7 +24,16 @@ s32 osContStartQuery(OSMesgQueue* mq) {
return ret;
}

#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_8010328C.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);
}

#pragma GLOBAL_ASM("asm/non_matchings/code/code_801031F0/func_801032B0.s")

Expand Down