mirror
/
medievil-decomp
mirror of https://github.com/MediEvilDecompilation/medievil-decomp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

func_80014348 (#34)

This commit is contained in:
Allison Mackenzie 2023-09-26 19:32:19 -05:00 committed by GitHub
parent 479c11d93f
commit c810b297a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -154,7 +154,7 @@ check:
expected: check
mkdir -p expected/build
rm -rf expected/build/
cp -r build/expected/build/
cp -r build/ expected/build/
# Assembly extraction

8
include/unkstruct.h
View File

@ -71,10 +71,4 @@ typedef struct unkStruct_800F191C {
/* 0x05 */ s8 unk5;
} unkStruct_800F191C;
typedef struct unkStruct_800145B0 {
/* 0x00 */ char pad_0[0x10];
/* 0x10 */ s32 unk10;
/* 0x14 */ s32 unk14;
} unkStruct_800145B0;
#endif
#endif

10
src/ovl/landmap/1D8.c
View File

@ -36,7 +36,15 @@ INCLUDE_ASM("asm/ovl/landmap/nonmatchings/1D8", func_80013BB8);
INCLUDE_ASM("asm/ovl/landmap/nonmatchings/1D8", func_80013FB8);
INCLUDE_ASM("asm/ovl/landmap/nonmatchings/1D8", func_80014348);
void func_80014348(void) {
s32 temp0;
s32 temp1;
temp0 = D_80014F98->unkA96E;
D_80014F98->unkAB10->unk84 = (temp0 - D_80014F98->unk0) - 12;
temp1 = D_80014F98->unkA972;
D_80014F98->unkAB10->unk86 = (temp1 - D_80014F98->unk4) - 8;
}
INCLUDE_ASM("asm/ovl/landmap/nonmatchings/1D8", func_80014394);

25
src/ovl/landmap/landmap.h
View File

@ -3,7 +3,30 @@
#include "game.h"
typedef struct unkStruct_landmap {
/* 0x00 */ s16 unk0;
/* 0x02 */ s16 unk2;
/* 0x04 */ s16 unk4;
/* 0x06 */ s16 unk6;
/* 0x08 */ s16 unk8;
/* 0x0A */ char pad_A[0x06];
/* 0x10 */ s32 unk10;
/* 0x14 */ s32 unk14;
/* 0x18 */ char pad_18[0xA956];
/* 0xA96E */ s16 unkA96E;
/* 0xA970 */ s16 unkA970;
/* 0xA972 */ s16 unkA972;
/* 0xA974 */ char pad_A976[0x19C];
/* 0xAB10 */ struct unkStruct_SP_landmap_unkAB10* unkAB10;
} unkStruct_landmap;
typedef struct unkStruct_SP_landmap_unkAB10 {
/* 0x00 */ char pad_0[0x84];
/* 0x84 */ s16 unk84;
/* 0x86 */ s16 unk86;
} unkStruct_SP_landmap_unkAB10;
extern void func_8004E7B0(s32, s32, s32);
extern unkStruct_800145B0* D_80014F98;
extern unkStruct_landmap* D_80014F98;
#endif