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

Match m442dll

Browse source
This commit is contained in:
gamemasterplc 2024-07-09 19:46:56 -05:00
parent 8c20f8bdc2
commit 75dca46d4c
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.py
View file

@ -1155,8 +1155,8 @@ config.libs = [
"m442Dll", "m442Dll",
objects={ objects={
Object(Matching, "REL/executor.c"), Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m442Dll/main.c"), Object(Matching, "REL/m442Dll/main.c"),
Object(NonMatching, "REL/m442Dll/score.c"), Object(Matching, "REL/m442Dll/score.c"),
}, },
), ),
Rel( Rel(

2
include/game/sprite.h
View file

@ -127,7 +127,9 @@ void AnimDebug(AnimData *anim);
void HuSprDispInit(void); void HuSprDispInit(void);
void HuSprDisp(HuSprite *sprite); void HuSprDisp(HuSprite *sprite);
#ifndef HUSPR_USE_OLD_DEFS
void HuSprTexLoad(AnimData *anim, s16 bmp, s16 slot, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter filter); void HuSprTexLoad(AnimData *anim, s16 bmp, s16 slot, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter filter);
#endif
void HuSprExecLayerSet(s16 draw_no, s16 layer); void HuSprExecLayerSet(s16 draw_no, s16 layer);
#endif #endif

8
src/REL/m442Dll/main.c
View file

@ -1,4 +1,4 @@
#define HUSPR_USE_OLD_DEFS
#include "ext_math.h" #include "ext_math.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
@ -190,8 +190,8 @@ omObjData *lbl_1_bss_11F3C;
omObjData *lbl_1_bss_11F38; omObjData *lbl_1_bss_11F38;
s32 lbl_1_bss_11F34; s32 lbl_1_bss_11F34;
u32 lbl_1_bss_11F30; u32 lbl_1_bss_11F30;
s32 lbl_1_bss_11F2C[4]; // TODO overlap s32 lbl_1_bss_11F2C[1];
s32 lbl_1_bss_11F28[4]; // TODO overlap s32 lbl_1_bss_11F28[1];
s32 lbl_1_bss_11F24; s32 lbl_1_bss_11F24;
s32 lbl_1_bss_11F20; s32 lbl_1_bss_11F20;
s16 lbl_1_bss_11F1C; s16 lbl_1_bss_11F1C;
@ -1544,7 +1544,7 @@ void fn_1_485C(ModelData *model, Mtx mtx)
} }
} }
GXDrawDone(); GXDrawDone();
fn_1_8520(&lbl_1_bss_C05C[0], 1); // TODO fn_1_8520(&lbl_1_bss_C05C[0], 1);
} }
GXColor lbl_1_data_1F0 = { 0xFF, 0xFF, 0xFF, 0x40 }; GXColor lbl_1_data_1F0 = { 0xFF, 0xFF, 0xFF, 0x40 };

36
src/REL/m442Dll/score.c
View file

@ -13,8 +13,8 @@ typedef void (*M442ScoreFunc)(void);
M442ScoreFunc lbl_1_data_268[3] = { fn_1_970C, fn_1_9784, fn_1_980C }; M442ScoreFunc lbl_1_data_268[3] = { fn_1_970C, fn_1_9784, fn_1_980C };
omObjData *lbl_1_bss_11F48;
Process *lbl_1_bss_11F4C; Process *lbl_1_bss_11F4C;
omObjData *lbl_1_bss_11F48;
typedef struct M442ScoreWork { typedef struct M442ScoreWork {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
@ -103,25 +103,23 @@ s32 fn_1_9520(s32 arg0)
void fn_1_9550(omObjData *arg0) void fn_1_9550(omObjData *arg0)
{ {
s16 var_r31; s16 temp_r31;
M442ScoreWork *var_r30; M442ScoreWork* temp_r30;
var_r30 = lbl_1_bss_11F48->data; temp_r30 = lbl_1_bss_11F48->data;
lbl_1_data_268[var_r30->unk_00](); lbl_1_data_268[temp_r30->unk_00]();
temp_r31 = temp_r30->unk_08;
var_r31 = var_r30->unk_08; espBankSet(temp_r30->unk_0C[0], temp_r31 / 100);
espBankSet(var_r30->unk_0C[0], var_r31 / 100); temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
var_r31 %= 100; espBankSet(temp_r30->unk_0C[1], (temp_r31 / 10));
espBankSet(var_r30->unk_0C[1], var_r31 / 10); temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
var_r31 %= 10; espBankSet(temp_r30->unk_0C[2], temp_r31);
espBankSet(var_r30->unk_0C[2], var_r31); temp_r31 = temp_r30->unk_0A;
espBankSet(temp_r30->unk_0C[3], (temp_r31 / 100));
var_r31 = var_r30->unk_0A; temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
espBankSet(var_r30->unk_0C[3], var_r31 / 100); espBankSet(temp_r30->unk_0C[4], (temp_r31 / 10));
var_r31 %= 100; temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
espBankSet(var_r30->unk_0C[4], var_r31 / 10); espBankSet(temp_r30->unk_0C[5], temp_r31);
var_r31 %= 10;
espBankSet(var_r30->unk_0C[5], var_r31);
} }
void fn_1_970C(void) void fn_1_970C(void)