kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #326 from gamemasterplc/main

Browse source 
Figure out nonmatchings in m404dll
This commit is contained in:
Liam Coleman 2024-05-28 20:00:31 -05:00 • committed by GitHub
commit 81340bc541
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

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

25
src/REL/m404Dll/main.c
View file

@ -1309,10 +1309,7 @@ void fn_1_5E74(AnimData *arg0, u16 arg1, u16 arg2, u16 arg3)
break;
}
var_r28 = (arg0->bmp->sizeX / var_r30) * ((arg2 / var_r29) << 5);
var_r31 = ((u8 *)arg0->bmp->data) + (var_r28 + ((arg0->bmp->pixSize * ((arg2 % var_r29) * 8)) / 8));
var_r31 += (arg1 % 8 * arg0->bmp->pixSize) / 8;
var_r31 += (arg1 / var_r30) << 5;
var_r31 = (void *)(((arg1/var_r30)*32)+(((arg1%8)*arg0->bmp->pixSize)/8)+(((arg0->bmp->sizeX / var_r30) * ((arg2 / var_r29) << 5))+((u32)arg0->bmp->data)+((arg0->bmp->pixSize * ((arg2 % var_r29) * 8)) / 8)));
switch (arg0->bmp->pixSize) {
case 4:
@ -1333,7 +1330,7 @@ void fn_1_5E74(AnimData *arg0, u16 arg1, u16 arg2, u16 arg3)
}
}
u16 fn_1_607C(AnimData *anim, u16 arg1, u16 arg2)
u16 fn_1_607C(AnimData *arg0, u16 arg1, u16 arg2)
{
u16 var_r31;
u16 var_r30;
@ -1343,8 +1340,8 @@ u16 fn_1_607C(AnimData *anim, u16 arg1, u16 arg2)
u32 temp_r6;
u8 temp_r0;
u8 temp_r0_3;
switch (anim->bmp->pixSize) {
switch (arg0->bmp->pixSize) {
case 4:
var_r31 = lbl_1_data_9F4[0];
var_r30 = lbl_1_data_9F4[1];
@ -1358,10 +1355,16 @@ u16 fn_1_607C(AnimData *anim, u16 arg1, u16 arg2)
var_r30 = lbl_1_data_9F4[5];
break;
}
var_r29 = ((u8 *)anim->bmp->data) + ((arg1 / var_r31) << 5) + (arg1 % 8 * anim->bmp->pixSize) / 8
+ (((anim->bmp->sizeX / var_r31) * ((arg2 / var_r30) << 5)) + ((anim->bmp->pixSize * ((arg2 % var_r30) * 8)) / 8));
switch (anim->bmp->pixSize) {
var_r29 = (void *)(((arg1/var_r31)*32)+(((arg1%8)*arg0->bmp->pixSize)/8)+(((arg0->bmp->sizeX / var_r31) * ((arg2 / var_r30) << 5))+((u32)arg0->bmp->data)+((arg0->bmp->pixSize * ((arg2 % var_r30) * 8)) / 8)));
(void)var_r31;
(void)var_r31;
(void)var_r31;
(void)var_r30;
(void)var_r30;
(void)var_r30;
switch (arg0->bmp->pixSize) {
case 4:
if ((arg1 & 1) == 0) {
var_r28 = *var_r29 >> 4;