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

Fix match with latest maspsx and update it (#1381)

Browse Source 
See commit messages for details.
This commit is contained in:
Tuomas Tynkkynen 2024-07-06 21:29:17 +03:00 committed by GitHub
parent 2791aea1a4
commit e73000308d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dra/7A4D0.c
View File

@ -96,7 +96,7 @@ void func_8011A4D0(void) {
} else if (entity->entityId < 0xE0) {
// Objects D0-DF
entity->pfnUpdate =
((PfnEntityUpdate*)FAMILIAR_PTR)[entity->entityId - 0xD0];
((PfnEntityUpdate*)&D_80170000)[entity->entityId - 0xD0];
} else if (entity->entityId == 0xEF || entity->entityId == 0xFF ||
entity->entityId == 0xED || entity->entityId == 0xFD) {
entity->pfnUpdate = g_DraEntityTbl[1];
@ -105,11 +105,11 @@ void func_8011A4D0(void) {
} else if (entity->entityId >= 0xF0) {
// Objects F0-FC
entity->pfnUpdate =
((PfnEntityUpdate*)WEAPON1_PTR)[entity->entityId - 0xF0];
((PfnEntityUpdate*)&D_8017D000)[entity->entityId - 0xF0];
} else {
// Objects E0-EC
entity->pfnUpdate =
((PfnEntityUpdate*)WEAPON0_PTR)[entity->entityId - 0xE0];
((PfnEntityUpdate*)&D_8017A000)[entity->entityId - 0xE0];
}
}
if ((temp_s2 == 0) || (entity->flags & FLAG_UNK_10000)) {
@ -181,7 +181,7 @@ void func_8011A870(void) {
if (entity->step == 0) {
if (entity->entityId >= 0xD0 && entity->entityId < 0xE0) {
entity->pfnUpdate =
((PfnEntityUpdate*)FAMILIAR_PTR)[entity->entityId - 0xD0];
((PfnEntityUpdate*)&D_80170000)[entity->entityId - 0xD0];
} else {
continue;
}

2
tools/maspsx

@ -1 +1 @@
Subproject commit db2947b7097bcac5ba04029ced62f4456bef08bc
Subproject commit 4d623c96c50916d06012f0e23fd899fd50164cfb