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

complete m438Dll/map.c (#534)

Browse source 
* get halfway through m424/ball

* get halfway through m424/ball

* get halfway through m424/ball

* complete m424/ball

* fix merge errors

* Revert "complete m424/ball"

This reverts commit acbc3196c5.

* fix up ball, start claw

* get halfway through m424/ball

* complete m424/ball

* Revert "complete m424/ball"

This reverts commit acbc3196c5.

* fix up ball, start claw

* complete m424Dll

* fix m424, begin m438/map

* Start m438/map

* complete m438/map

* fix m424
This commit is contained in:
CreateSource 2025-01-15 19:59:55 -05:00 • committed by GitHub
parent ef9659fef2
commit f6ca7da943
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 756 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/REL/m424Dll/claw.c
View file

@ -1,5 +1,6 @@
#include "REL/m424Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
@ -7,8 +8,6 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/pad.h"
#include "math.h"
// STRUCT
typedef struct _M424DllClawStruct {
@ -67,8 +66,8 @@ typedef struct _M424DllClawStruct3 {
} M424DllClawStruct3; // sizeof 0x8
// BSS
Process *lbl_1_bss_6DC;
omObjData *lbl_1_bss_6D8;
Process* lbl_1_bss_6DC;
omObjData* lbl_1_bss_6D8;
s32 lbl_1_bss_6D0[2];
s32 lbl_1_bss_6CC;
s32 lbl_1_bss_6C8;
@ -179,7 +178,7 @@ void fn_1_94D0(omObjData *arg0)
}
var_r31->unk184 = -1;
var_r31->unk30 = lbl_1_data_30C;
for (var_r29 = 0; var_r29 < 0xC; var_r29++) {
var_r31->unk3C[var_r29] = lbl_1_data_30C;
var_r31->unkCC[var_r29] = lbl_1_data_30C;

2
src/REL/m424Dll/main.c
View file

@ -273,7 +273,7 @@ void fn_1_41C(omObjData* object) {
void fn_1_EE0(omObjData* object) {
if (WipeStatGet() == 0) {
Hu3DBGColorSet(0U, 0U, 0U);
Hu3DBGColorSet(0, 0, 0);
fn_1_1B8C();
fn_1_2880();
fn_1_94A4();