Game-Decompilation/Quest
1
0
Fork 0
mirror of https://github.com/Mallos31/Quest.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update some symbols

Browse Source
This commit is contained in:
Mallos31 2023-06-30 17:07:22 -04:00
parent 739578082b
commit 9af019fda8
5 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osint.h
View File

@ -1,5 +1,6 @@
#ifndef _OSINT_H
#define _OSINT_H
#ifndef _OSINT_H_
#define _OSINT_H_
#include <os_internal.h>
typedef struct __OSEventState
{

24
src/15440.c
View File

@ -59,30 +59,6 @@ extern u16 D_8004CD74[];
extern unk15b50s D_80086F18[];
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_80014840.s")
/*!TODO extremely poor match. Needs work to make sense.*/
#ifdef NON_MATCHING
void func_80014840(void)
{
s16 *new_var2;
s32 new_var3;
unk15b50s *var_v1;
new_var2 = &D_80087170;
var_v1 = D_80086F18; new_var2 = &D_80087170;
new_var3 = 0;
do {
var_v1->unk4 = 0;
var_v1++;
} while (((u32) var_v1) < ((u32) new_var2));
D_80087170 = new_var3;
D_80087188 = 0;
D_800871A0 = 0;
D_800871B8 = 0;
D_80086F10 = 0;
}
#endif
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_80014890.s")

41
src/23740.c
View File

@ -1,7 +1,48 @@
#include "common.h"
typedef struct {
/*0x00*/ Vec3f pos;
/*0x0C*/ f32 yrot;
/*0x10*/ f32 zrot;
/*0x14*/ f32 xrot;
/*0x18*/ Vec3f scale;
/*0x24*/ f32 unk24;
/*0x28*/ f32 unk28;
/*0x2C*/ f32 unk2C;
/*0x30*/ s16 unk30; //maybe padding.
/*0x32*/ u16 frameNum;
/*0x34*/ Vec3f nextPos;
/*0x40*/ f32 nextYRot;
/*0x44*/ f32 nextZRot;
/*0x48*/ f32 nextXRot;
/*0x4C*/ Vec3f nextScale;
/*0x58*/ f32 unk58;
/*0x5C*/ f32 unk5C;
/*0x60*/ f32 unk60;
/*0x64*/ s16 unk64;
/*0x66*/ u16 nextFrameNum;
}LimbKeyframe;
typedef struct {
LimbKeyframe* unk0;
u16 unk4;
u16 unk6;
f32 unk8;
f32 unkC;
f32 unk10;
s8 unk14;
s8 unk15;
u8 unk16;
char unk17; //unread?
s32 unk18;
char unk1C[4];
}unk22b40s;
void func_80022F60(f32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
#pragma GLOBAL_ASM("asm/nonmatchings/23740/func_80022B40.s")
//#pragma GLOBAL_ASM("asm/nonmatchings/23740/func_80022F60.s")
void func_80022F60(f32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4)
{

16
src/hud.c
View File

@ -86,10 +86,10 @@ extern temp2 D_8007BD30[];
extern s32 D_8008C644;
extern Gfx D_803A8B90[];
extern u8 D_8007BAA4;
extern u8 D_8007BAA5;
extern u8 D_8007BAA6;
extern u8 D_8007BAA7;
extern u8 gFireSpirits;
extern u8 gEarthSpirits;
extern u8 gWaterSpirits;
extern u8 gWindSpirits;
extern s32 D_8008C650; //number of lines to cover from left to right (HUD)
extern s32 D_8008C654; //number of lines to cover from top to bottom (HUD)
@ -417,10 +417,10 @@ void func_8001F3DC(unk1f3dcTEST* arg0) { //sBrianAction
gDPLoadTLUTCmd(gMasterGfxPos++, G_TX_LOADTILE, 255);
gDPPipeSync(gMasterGfxPos++);
func_80020D4C(5U, 0x9D, 0x6C, (s32) D_8007BAA4); //fire
func_80020D4C(5U, 0x8B, 0x7C, (s32) D_8007BAA5); //earth
func_80020D4C(5U, 0x9D, 0x8B, (s32) D_8007BAA6); //water
func_80020D4C(5U, 0xAF, 0x7C, (s32) D_8007BAA7); //wind
func_80020D4C(5U, 0x9D, 0x6C, (s32) gFireSpirits); //fire
func_80020D4C(5U, 0x8B, 0x7C, (s32) gEarthSpirits); //earth
func_80020D4C(5U, 0x9D, 0x8B, (s32) gWaterSpirits); //water
func_80020D4C(5U, 0xAF, 0x7C, (s32) gWindSpirits); //wind
if ((D_80092876 & U_CBUTTONS) && (arg0->unk10->unk24 < 0x32)) {
arg0->unk10->unk24++;

7
symbol_addrs.us.txt
View File

@ -372,6 +372,8 @@ gCheckItemUsableFuncs = 0x8004D480;
gUseItemFuncs = 0x8004D490;
dlScreenDimRectangle = 0x8004D4F0;
gPlayerBaseData = 0x80053D04;
osClockRate = 0x8006F400;
__osPiTable = 0x8006F43C;
@ -385,6 +387,11 @@ __osViCurr = 0x80070A80;
__osViNext = 0x80070A84;
gGameMode = 0x8007b2e0;
gMasterGfxPos = 0x8007B2FC;
gPlayerData = 0x8007BA80;
gFireSpirits = 0x8007BAA4;
gEarthSpirits = 0x8007BAA5;
gWaterSpirits = 0x8007BAA6;
gWindSpirits = 0x8007BAA7;
gPlayerPos = 0x8007BACC;
gDoorAnimData = 0x80084E60;