Merge pull request #398 from gamemasterplc/main

Fully match m401dll/main_ex.c
This commit is contained in:
Liam Coleman 2024-08-11 10:20:37 -05:00 committed by GitHub
commit c76e13678f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions

View file

@ -826,7 +826,7 @@ config.libs = [
objects={ objects={
Object(Matching, "REL/executor.c"), Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m401Dll/main.c"), Object(Matching, "REL/m401Dll/main.c"),
Object(NonMatching, "REL/m401Dll/main_ex.c"), Object(Matching, "REL/m401Dll/main_ex.c"),
}, },
), ),
Rel( Rel(

View file

@ -201,9 +201,8 @@ omObjData *fn_2_10A88(Vec *arg0, s16 arg1)
} }
temp_r27->unk10 = 3; temp_r27->unk10 = 3;
temp_r27->unk12 = temp_r24; temp_r27->unk12 = temp_r24;
// I am not table to force arg1 to get reloaded without deleting code or serious temporary register allocation issues temp_r27->unk18 = arg1;
(void)arg1; switch (arg1) {
switch ((temp_r27->unk18 = arg1)) {
case 1: case 1:
Hu3DModelPosSet(temp_r31->unk10, arg0->x, arg0->y, lbl_2_bss_60.z + arg0->z); Hu3DModelPosSet(temp_r31->unk10, arg0->x, arg0->y, lbl_2_bss_60.z + arg0->z);