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

fix symbols

This commit is contained in:
Alejandro Javier Asenjo Nitti 2023-09-15 11:40:55 -03:00
parent 7239493432
commit 7f2e184f0f
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -62,6 +62,7 @@ define link
-Map $(BUILD_DIR)/$(1).map \
-T $(CONFIG_DIR)/ld/$(1).ld \
-T $(CONFIG_DIR)/symbols.txt \
-T $(CONFIG_DIR)/symbols.game.txt \
-T $(CONFIG_DIR)/undefined_syms.txt \
-T $(CONFIG_DIR)/undefined_syms_auto.$(1).txt \
-T $(CONFIG_DIR)/undefined_funcs_auto.$(1).txt
@ -123,13 +124,15 @@ expected: check
# Assembly extraction
extract: extract_ovlcr extract_ovlch extract_game
extract_game:
cat $(CONFIG_DIR)/symbols.txt $(CONFIG_DIR)/symbols.game.txt > $(CONFIG_DIR)/generated.symbols.txt
cat $(CONFIG_DIR)/symbols.txt $(CONFIG_DIR)/symbols.game.txt > $(CONFIG_DIR)/generated.symbols.game.txt
$(SPLAT) $(CONFIG_DIR)/splat.game.yaml
extract_ovl%:
cat $(CONFIG_DIR)/symbols.txt $(CONFIG_DIR)/symbols.ovl$*.txt > $(CONFIG_DIR)/generated.symbols.ovl$*.txt
$(SPLAT) $(CONFIG_DIR)/splat.ovl$*.yaml
$(CONFIG_DIR)/generated.symbols.%.txt:
clean:
git clean -fdx asm/

1
config/symbols.game.txt
View File

@ -0,0 +1 @@
DestroyFragments = 0x800585B8;

2
src/game/800.c
View File

@ -879,7 +879,7 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_800580B8);
INCLUDE_ASM("asm/game/nonmatchings/800", func_80058344);
INCLUDE_ASM("asm/game/nonmatchings/800", func_800585B8);
INCLUDE_ASM("asm/game/nonmatchings/800", DestroyFragments);
INCLUDE_ASM("asm/game/nonmatchings/800", func_80058614);

8
src/ovl/ch/B0.c
View File

@ -22,7 +22,7 @@ void BoulderDestroy(void) {
Boulder* temp_s0 = (Boulder*)g_CurrentEntity->unk90;
if (temp_s0->unk40 != NULL) {
func_800585B8(temp_s0->unk40);
DestroyFragments(temp_s0->unk40);
}
func_8002BA9C(temp_s0->unk44);
@ -52,15 +52,15 @@ void GargoyleInit(void) {
func_80047FC8();
AddrCopy(g_CurrentEntity->unk74->unk8->unk14[0]->cv, D_80014F78);
func_80046D74(1, 1);
gargoyle->unk0 = 0;
gargoyle->fragments = 0;
gargoyle->unk8 = -1;
}
void GargoyleDestroy(void) {
Gargoyle* gargoyle = (Gargoyle*)g_CurrentEntity->unk90;
if (gargoyle->unk0 != 0) {
func_800585B8(gargoyle->unk0);
if (gargoyle->fragments != 0) {
DestroyFragments(gargoyle->fragments);
}
if (gargoyle->unk8 != -1) {

4
src/ovl/ch/ch.h
View File

@ -11,7 +11,7 @@ typedef struct Boulder {
} Boulder;
typedef struct Gargoyle {
/* 0x00 */ s32 unk0;
/* 0x00 */ s32 fragments;
/* 0x04 */ char pad_4[0x4];
/* 0x08 */ s32 unk8;
} Gargoyle;
@ -21,7 +21,7 @@ extern CVECTOR D_80014F78;
extern void func_8002BA9C(s32);
extern void func_8004847C(void*, void*);
extern s32 func_80058344(s32);
extern void func_800585B8(s32);
extern void DestroyFragments(s32);
extern void func_8006820C(s32, s32);
#endif