Matched game/chrman

config/GMPE01_00/symbols.txt

@@ -5079,10 +5079,14 @@ lbl_80130705 = .data:0x80130705; // type:object size:0x93
 lbl_80130798 = .data:0x80130798; // type:object size:0x30
 effectDataTbl = .data:0x801307C8; // type:object size:0x60 scope:local
 charDirTbl = .data:0x80130828; // type:object size:0x60 scope:local
-effectParam = .data:0x80130888; // type:object size:0x110 scope:local
+effectDustParam = .data:0x80130888; // type:object size:0x38 scope:local
-lbl_801309A0 = .data:0x801309A0; // type:object size:0x20
+effectDotParam = .data:0x801308C0; // type:object size:0x38 scope:local
-lbl_801309C0 = .data:0x801309C0; // type:object size:0x20
+effectStarParam = .data:0x801308F8; // type:object size:0x38 scope:local
-lbl_801309E0 = .data:0x801309E0; // type:object size:0x10
+effectWarnParam = .data:0x80130930; // type:object size:0x38 scope:local
+effectSmokeParam = .data:0x80130968; // type:object size:0x38 scope:local
+lbl_801309A0 = .data:0x801309A0; // type:object size:0x20 scope:local
+lbl_801309C0 = .data:0x801309C0; // type:object size:0x20 scope:local
+lbl_801309E0 = .data:0x801309E0; // type:object size:0x10 scope:local
 jumptable_801309F0 = .data:0x801309F0; // type:object size:0x1E8 scope:local
 voiceParam = .data:0x80130BD8; // type:object size:0x40 scope:local
 lbl_80130C18 = .data:0x80130C18; // type:object size:0xE data:string
@@ -5122,17 +5126,22 @@ lbl_80130F0E = .data:0x80130F0E; // type:object size:0x12
 hookNameTbl = .data:0x80130F20; // type:object size:0xA0 scope:local
 modelParticleParam = .data:0x80130FC0; // type:object size:0x38 scope:local
 coinParticleParam = .data:0x80130FF8; // type:object size:0x38 scope:local
-lbl_80131030 = .data:0x80131030; // type:object size:0x38
+lbl_80131030 = .data:0x80131030; // type:object size:0x38 scope:local
-lbl_80131068 = .data:0x80131068; // type:object size:0x38
+lbl_80131068 = .data:0x80131068; // type:object size:0x38 scope:local
 lbl_801310A0 = .data:0x801310A0; // type:object size:0x1C
-lbl_801310BC = .data:0x801310BC; // type:object size:0x38
+lbl_801310BC = .data:0x801310BC; // type:object size:0x38 scope:local
-lbl_801310F4 = .data:0x801310F4; // type:object size:0x38
+lbl_801310F4 = .data:0x801310F4; // type:object size:0x38 scope:local
 lbl_8013112C = .data:0x8013112C; // type:object size:0x1A data:string
-lbl_80131146 = .data:0x80131146; // type:object size:0x12
+lbl_80131146 = .data:0x80131146; // type:object size:0x12 scope:local
-lbl_80131158 = .data:0x80131158; // type:object size:0x24
+lbl_80131158 = .data:0x80131158; // type:object size:0x12 scope:local
-lbl_8013117C = .data:0x8013117C; // type:object size:0x24
+lbl_8013116A = .data:0x8013116A; // type:object size:0x12 scope:local
-lbl_801311A0 = .data:0x801311A0; // type:object size:0x24
+lbl_8013117C = .data:0x8013117C; // type:object size:0x12 scope:local
-lbl_801311C4 = .data:0x801311C4; // type:object size:0x24
+lbl_8013118E = .data:0x8013118E; // type:object size:0xE scope:local
+lbl_8013119C = .data:0x8013119C; // type:object size:0xE scope:local
+lbl_801311AA = .data:0x801311AA; // type:object size:0xE scope:local
+lbl_801311B8 = .data:0x801311B8; // type:object size:0xE scope:local
+lbl_801311C6 = .data:0x801311C6; // type:object size:0xE scope:local
+lbl_801311D4 = .data:0x801311D4; // type:object size:0xE scope:local
 VolumeTable = .data:0x801311E8; // type:object size:0x100 scope:local
 lbl_801312E8 = .data:0x801312E8; // type:object size:0x4D
 lbl_80131335 = .data:0x80131335; // type:object size:0x1B
@@ -5540,8 +5549,8 @@ charInstance = .bss:0x80196EC0; // type:object size:0x640 scope:local
 effectMdl = .bss:0x80197500; // type:object size:0x10 scope:local data:2byte
 particleData = .bss:0x80197510; // type:object size:0x20 scope:local
 itemHookProcess = .bss:0x80197530; // type:object size:0x80 scope:local
-lbl_801975B0 = .bss:0x801975B0; // type:object size:0x10
+lbl_801975B0 = .bss:0x801975B0; // type:object size:0x10 scope:local
-lbl_801975C0 = .bss:0x801975C0; // type:object size:0x90
+lbl_801975C0 = .bss:0x801975C0; // type:object size:0x90 scope:local
 MapObject = .bss:0x80197650; // type:object size:0x40
 MapMT = .bss:0x80197690; // type:object size:0x30
 MapMTR = .bss:0x801976C0; // type:object size:0x30
@@ -5834,11 +5843,11 @@ lbl_801D35D8 = .sdata:0x801D35D8; // type:object size:0x8
 colorN$400 = .sdata:0x801D35E0; // type:object size:0x4 data:byte
 colorN$444 = .sdata:0x801D35E4; // type:object size:0x4 data:byte
 winPrio = .sdata:0x801D35E8; // type:object size:0x8 scope:local data:2byte
-lbl_801D35F0 = .sdata:0x801D35F0; // type:object size:0x8
+lbl_801D35F0 = .sdata:0x801D35F0; // type:object size:0x8 scope:local
-lbl_801D35F8 = .sdata:0x801D35F8; // type:object size:0x8
+lbl_801D35F8 = .sdata:0x801D35F8; // type:object size:0x8 scope:local
-lbl_801D3600 = .sdata:0x801D3600; // type:object size:0x8
+lbl_801D3600 = .sdata:0x801D3600; // type:object size:0x8 scope:local
-lbl_801D3608 = .sdata:0x801D3608; // type:object size:0x8
+lbl_801D3608 = .sdata:0x801D3608; // type:object size:0x8 scope:local
-lbl_801D3610 = .sdata:0x801D3610; // type:object size:0x8
+lbl_801D3610 = .sdata:0x801D3610; // type:object size:0x8 scope:local
 lbl_801D3618 = .sdata:0x801D3618; // type:object size:0x1
 lbl_801D3619 = .sdata:0x801D3619; // type:object size:0x5 data:string
 lbl_801D361E = .sdata:0x801D361E; // type:object size:0x5 data:string

configure.py

@@ -350,7 +350,7 @@ config.libs = [
             Object(Matching, "game/messdata.c"),
             Object(Matching, "game/card.c"),
             Object(Matching, "game/armem.c"),
-            Object(NonMatching, "game/chrman.c"),
+            Object(Matching, "game/chrman.c"),
             Object(NonMatching, "game/mapspace.c"),
             Object(Matching, "game/THPSimple.c"),
             Object(Matching, "game/THPDraw.c"),

include/game/chrman.h

@@ -0,0 +1,47 @@
+#ifndef _GAME_CHRMAN_H
+#define _GAME_CHRMAN_H
+
+#include "dolphin.h"
+
+void CharManInit(void);
+void *CharAMemPtrGet(s16 character);
+void CharARAMOpen(s16 character);
+void CharARAMClose(s16 character);
+void CharKill(s16 arg0);
+void CharKillAll(void);
+s16 CharModelCreate(s16 character, s16 lod);
+s16 CharModelMotionCreate(s16 character, s32 arg1);
+void CharModelMotionIndexSet(s16 character, s16 arg1, s32 arg2);
+void CharModelMotionKill(s16 character, u32 motion);
+void CharModelMotionDataClose(s16 character);
+void CharModelDataClose(s16 arg0);
+void CharModelKill(s16 character);
+void CharModelMotionSet(s16 character, s16 motion);
+void CharModelTexAnimSet(s16 character);
+char **CharModelTexNameGet(s16 arg0, s16 arg1);
+char *CharModelHookNameGet(s16 arg0, s16 arg1, s16 arg2);
+void CharModelMotionTimeSet(s16 character, float time);
+float CharModelMotionTimeGet(s16 character);
+float CharModelMotionMaxTimeGet(s16 character);
+s32 CharModelMotionEndCheck(s16 character);
+s16 CharModelMotionShiftIDGet(s16 character);
+void CharModelMotionShiftSet(s16 character, s16 motion, float time, float shift_time, u32 attr);
+float CharModelMotionShiftTimeGet(s16 character);
+void CharModelMotionSpeedSet(s16 character, float speed);
+void CharModelLayerSetAll(s16 arg0);
+void CharModelItemHookCreate(s16 character, char *arg1);
+void CharModelEffectCreate(s16 arg0, Vec *arg1);
+void CharModelCoinEffectCreate(s16 arg0, Vec *arg1);
+void fn_8004EC74(s16 character);
+void fn_8004EDA4(s16 arg0, Vec *arg1, Vec *arg2);
+void fn_8004F058(s16 character);
+void fn_8004F13C(s16 arg0, Vec *arg1, Vec *arg2);
+void CharModelLayerSetAll2(s16 arg0);
+void CharModelVoiceEnableSet(s16 character, s16 motion, s32 flag);
+void fn_8004F52C(s16 character, s32 arg1);
+void CharModelEffectEnableSet(s16 character, s32 arg1);
+s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
+s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2);
+void CharModelStepTypeSet(s16 character, s32 arg1);
+
+#endif

include/game/hsfanim.h

@@ -30,7 +30,8 @@ typedef struct particle_data {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ s16 unk_02;
     /* 0x04 */ float unk_04;
-    /* 0x08 */ char unk_08[0x18];
+    /* 0x08 */ char unk_08[0x14];
+    /* 0x1C */ void *unk_1C;
     /* 0x20 */ s16 unk_20;
     /* 0x22 */ s16 unk_22;
     /* 0x24 */ float unk_24;

include/game/hsfdraw.h

@@ -49,6 +49,8 @@ HsfObject *Hu3DObjDuplicate(HsfData *arg0, u32 arg1);
 void Hu3DModelObjDrawInit(void);
 void Hu3DModelObjDraw(s16 arg0, char *arg1, Mtx arg2);
 
+extern Vec PGMaxPos;
+extern Vec PGMinPos;
 extern u32 totalPolyCnt;
 extern u32 totalPolyCnted;
 extern u32 totalMatCnt;

include/unsplit.h

@@ -8,20 +8,5 @@ void MGSeqKillAll(void);
 void MGSeqPracticeInit(void);
 void CharMotionClose(s16 character);
 void CharModelClose(s16 character);
-void CharModelMotionDataClose(s16 character);
-void CharModelKill(s16 character);
-s16 CharModelCreate(s16 character, s16 lod);
-s16 CharModelMotionCreate(s16 character, s32 data_num);
-void CharModelMotionSet(s16 character, s16 motion);
-float CharModelMotionMaxTimeGet(s16 character);
-float CharModelMotionTimeGet(s16 character);
-void CharModelMotionShiftSet(s16 model, s16 motion, float time, float shift_time, u32 attr);
-void CharModelMotionTimeSet(s16 character, float time);
-void CharModelMotionSpeedSet(s16 character, float speed);
-void CharModelMotionKill(s16 character, s32 motion);
-void CharModelVoiceEnableSet(s16 character, s16 motion, s32 flag);
-void CharModelCoinEffectCreate(s16, Vec *);
-
-s32 CharModelMotionEndCheck(s16 character);
 
 #endif

src/REL/bootDll/main.c

@@ -1,5 +1,6 @@
 #include "game/gamework_data.h"
 #include "game/process.h"
+#include "game/chrman.h"
 #include "game/data.h"
 #include "game/sprite.h"
 #include "game/object.h"

src/REL/modeltestDll/main.c

@@ -1,5 +1,6 @@
 #include "math.h"
 #include "unsplit.h"
+#include "game/chrman.h"
 #include "game/object.h"
 #include "game/wipe.h"
 #include "game/pad.h"

src/REL/modeltestDll/modeltest00.c

@@ -1,5 +1,6 @@
 #include "math.h"
 #include "unsplit.h"
+#include "game/chrman.h"
 #include "game/wipe.h"
 #include "game/pad.h"
 

src/REL/w03Dll/mg_coin.c

@@ -1,4 +1,5 @@
 #include "dolphin.h"
+#include "game/chrman.h"
 #include "game/object.h"
 #include "REL/w03Dll.h"
 #include "board_unsplit.h"

src/game/board/boo.c

@@ -1,5 +1,6 @@
 #include "game/board/boo.h"
 #include "game/audio.h"
+#include "game/chrman.h"
 #include "game/gamework.h"
 #include "game/gamework_data.h"
 #include "game/hsfman.h"
@@ -92,7 +93,6 @@ typedef struct {
 } BallTakeCoinWork;
 
 void BoardSpaceCameraSet(u16);
-char *CharModelHookNameGet(s16, s32, s32);
 
 static void ComSetupStealPlayer(s32 arg0);
 static void ComSetStealPlayerInput(s32 arg0, s32 arg1);

src/game/board/item.c

@@ -1,5 +1,6 @@
 #include "game/board/item.h"
 #include "game/audio.h"
+#include "game/chrman.h"
 #include "game/gamework.h"
 #include "game/gamework_data.h"
 #include "game/hsfanim.h"
@@ -47,7 +48,6 @@ typedef struct {
 
 u32 frandmod(u32);
 void CharModelCreateParticle(s32, Vec*);
-void CharModelLayerSetAll(s32);
 void BoardBowserSuitInit(s32);
 s16 BoardBowserSuitPlayerModelGet(void);
 void fn_8004F578(s16, s32);

src/game/board/model.c

@@ -1,5 +1,6 @@
 #include "game/board/main.h"
 #include "game/board/model.h"
+#include "game/chrman.h"
 #include "game/hsfman.h"
 #include "game/hsfmotion.h"
 #include "game/memory.h"

src/game/board/player.c

@@ -1,4 +1,5 @@
 #include "game/board/player.h"
+#include "game/chrman.h"
 #include "game/objsub.h"
 #include "game/board/com.h"
 #include "game/board/roll.h"
@@ -35,9 +36,6 @@ extern void BoardModelAttrSet(s16, s32);
 extern void BoardModelAttrReset(s16, s32);
 //// #include "game/board/com.h"
 //// #include "game/board/overhead.h"
-//// #include "game/chrman.h"
-extern void CharModelDataClose(s16);
-extern void CharModelStepTypeSet(s16, s32);
 //// #include "game/board/pad.h"
 extern s8 HuPadStkX[4];
 extern s8 HuPadStkY[4];

src/game/board/ui.c

@@ -1,5 +1,6 @@
 #include "game/board/ui.h"
 #include "game/audio.h"
+#include "game/chrman.h"
 #include "game/data.h"
 #include "game/gamework.h"
 #include "game/gamework_data.h"
@@ -97,7 +98,6 @@ typedef struct {
 void BoardPlayerSparkSet(s32);
 void BoardBowserSuitMotionCreate(void);
 s16 BoardBowserSuitPlayerModelGet(void);
-void CharModelLayerSetAll(s32);
 
 static void KillAllBoardStatus(void);
 static void CreateBoardStatusSprite(s32 arg0, UnkUiStatusStruct *arg1);

src/game/objmain.c

@@ -1,4 +1,5 @@
 #include "game/audio.h"
+#include "game/chrman.h"
 #include "game/esprite.h"
 #include "game/hsfdraw.h"
 #include "game/hsfman.h"