Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-27 06:50:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Decompile NP3 func_801D0B40 (#847)

Browse Source 
Thanks for the help on Discord, resolves #718.
This commit is contained in:
ser-pounce 2023-12-15 10:04:14 +01:00 committed by GitHub
parent df00eb8a49
commit b04d5046c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/entity.h
View File

@ -357,6 +357,13 @@ typedef struct {
/* 0x84 */ s32 elevatorTarget;
} ET_Elevator;
typedef struct {
/* 0x7C */ s32 pad[8];
/* 0x84 */ s16 unk84;
/* 0x86 */ s16 unk86;
/* 0x88 */ s16* unk88;
} ET_801D0B40;
typedef struct {
/* 0x7C */ struct Primitive* prim;
/* 0x80 */ char pad_80[0xC];
@ -654,6 +661,7 @@ typedef union {
/* 0x7C */ ET_CastleDoor castleDoor;
/* 0x7C */ ET_DeathSkySwirl deathSkySwirl;
/* 0x7C */ ET_Elevator elevator;
/* 0x7C */ ET_801D0B40 et_801D0B40;
/* 0x7C */ ET_801D1BB8 et_801D1BB8;
/* 0x7C */ ET_801D0B78 et_801D0B78;
/* 0x7C */ ET_WaterEffects waterEffects;

8
src/st/np3/4E69C.c
View File

@ -266,7 +266,13 @@ void func_801D0A00(s16* arg0) {
}
}
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4E69C", func_801D0B40);
void func_801D0B40(void) {
s16* unk88 = g_CurrentEntity[15].ext.et_801D0B40.unk88;
g_CurrentEntity[15].ext.et_801D0B40.unk84 = unk88[0x4E] - 0x600;
unk88 = g_CurrentEntity[16].ext.et_801D0B40.unk88;
g_CurrentEntity[16].ext.et_801D0B40.unk84 = unk88[0x4E] - 0x600;
}
s32 func_801D0B78(void) {
s32 ret;