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

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/REL/m407dll/effect.c
View file

@ -1,9 +1,10 @@
#include "src/REL/m407dll/m407dll.h"
#include "game/process.h"
#include "game/object.h"
#include "game/hsfmotion.h"
#include "game/hsfdraw.h"
#include "REL/m407dll.h"
typedef struct unkDominationData4 {
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04;
@ -28,11 +29,11 @@ omObjData* lbl_1_bss_37E0[100];
//data
s32 lbl_1_data_288[] = {
0x00260015,
0x00260016,
0x00260017,
0x00260018,
0x00260019
DATA_MAKE_NUM(DATADIR_M407, 0x15),
DATA_MAKE_NUM(DATADIR_M407, 0x16),
DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x18),
DATA_MAKE_NUM(DATADIR_M407, 0x19)
};
ObjFuncs lbl_1_data_29C[] = {
@ -143,7 +144,7 @@ void fn_1_46EC(omObjData* arg0) {
temp_r30->unk_00 = arg0->work[0];
temp_r30->unk_08 = arg0->work[1];
temp_r30->unk_1C = 0;
arg0->model[0] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_288[temp_r30->unk_08], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[0], 0x40000002);
Hu3DModelAttrSet(arg0->model[0], 1);