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

Label variables in objsub.c

Browse source 
Also improved variable names
This commit is contained in:
gamemasterplc 2024-01-27 20:26:04 -06:00
parent 80f41518ee
commit 8a91c4bc79
3 changed files with 56 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
config/GMPE01_00/symbols.txt
View file

@ -5556,9 +5556,9 @@ SimpleControl = .bss:0x80197AC0; // type:object size:0x19C
SoundBuffer = .bss:0x80197C60; // type:object size:0x500 scope:local align:32 SoundBuffer = .bss:0x80197C60; // type:object size:0x500 scope:local align:32
WorkBuffer = .bss:0x80198160; // type:object size:0x40 scope:local align:32 WorkBuffer = .bss:0x80198160; // type:object size:0x40 scope:local align:32
THPFileName = .bss:0x801981A0; // type:object size:0x40 scope:local THPFileName = .bss:0x801981A0; // type:object size:0x40 scope:local
GWGameStatBackup = .bss:0x801981E0; // type:object size:0x118 mgGameStatBackup = .bss:0x801981E0; // type:object size:0x118
lbl_801982F8 = .bss:0x801982F8; // type:object size:0x100 mgIndexList = .bss:0x801982F8; // type:object size:0x100
lbl_801983F8 = .bss:0x801983F8; // type:object size:0x18 mgTicTacToeGrid = .bss:0x801983F8; // type:object size:0x12
_Sys_Flag = .bss:0x80198410; // type:object size:0x10 _Sys_Flag = .bss:0x80198410; // type:object size:0x10
curFileInfo = .bss:0x80198420; // type:object size:0x20 curFileInfo = .bss:0x80198420; // type:object size:0x20
saveBuf = .bss:0x80198440; // type:object size:0x4000 align:32 saveBuf = .bss:0x80198440; // type:object size:0x4000 align:32
@ -6310,14 +6310,15 @@ decodeThread = .sbss:0x801D3E68; // type:object size:0x4 scope:local data:4byte
decodeStackP = .sbss:0x801D3E6C; // type:object size:0x4 scope:local data:4byte decodeStackP = .sbss:0x801D3E6C; // type:object size:0x4 scope:local data:4byte
decodeRate = .sbss:0x801D3E70; // type:object size:0x4 scope:local data:4byte decodeRate = .sbss:0x801D3E70; // type:object size:0x4 scope:local data:4byte
audioTrack = .sbss:0x801D3E74; // type:object size:0x8 scope:local data:4byte audioTrack = .sbss:0x801D3E74; // type:object size:0x8 scope:local data:4byte
lbl_801D3E80 = .sbss:0x801D3E80; // type:object size:0x4 mgBoardHostEnableF = .sbss:0x801D3E80; // type:object size:0x1
lbl_801D3E84 = .sbss:0x801D3E84; // type:object size:0x4 mgInstExitEnableF = .sbss:0x801D3E84; // type:object size:0x4
lbl_801D3E88 = .sbss:0x801D3E88; // type:object size:0x4 data:4byte mgPracticeEnableF = .sbss:0x801D3E88; // type:object size:0x4 data:4byte
lbl_801D3E8C = .sbss:0x801D3E8C; // type:object size:0x4 data:4byte mgQuitExtraF = .sbss:0x801D3E8C; // type:object size:0x4 data:4byte
lbl_801D3E90 = .sbss:0x801D3E90; // type:object size:0x4 mgRecordExtra = .sbss:0x801D3E90; // type:object size:0x4
lbl_801D3E94 = .sbss:0x801D3E94; // type:object size:0x4 lbl_801D3E94 = .sbss:0x801D3E94; // type:object size:0x1
lbl_801D3E98 = .sbss:0x801D3E98; // type:object size:0x8 mgBattleStarMax = .sbss:0x801D3E96; // type:object size:0x2
lbl_801D3EA0 = .sbss:0x801D3EA0; // type:object size:0x8 mgBattleStar = .sbss:0x801D3E98; // type:object size:0x8
mgTypeCurr = .sbss:0x801D3EA0; // type:object size:0x2 data:2byte
curSlotNo = .sbss:0x801D3EA8; // type:object size:0x2 data:2byte curSlotNo = .sbss:0x801D3EA8; // type:object size:0x2 data:2byte
curBoxNo = .sbss:0x801D3EAA; // type:object size:0x1 data:byte curBoxNo = .sbss:0x801D3EAA; // type:object size:0x1 data:byte
saveExecF = .sbss:0x801D3EAC; // type:object size:0x4 saveExecF = .sbss:0x801D3EAC; // type:object size:0x4

20
include/game/objsub.h
View file

@ -3,6 +3,7 @@
#include "dolphin.h" #include "dolphin.h"
#include "game/process.h" #include "game/process.h"
#include "game/gamework_data.h"
typedef struct mg_info { typedef struct mg_info {
u16 ovl; u16 ovl;
@ -24,7 +25,24 @@ typedef struct mg_info {
} MgInfo; } MgInfo;
s16 omGetMGIndex(s16 overlay); s16 omGetMGIndex(s16 overlay);
void omGameSysInit(Process* process); void omGameSysInit(Process *objman);
void omVibrate(s16 player_cfg_index, s16 duration, s16 off, s16 on); void omVibrate(s16 player_cfg_index, s16 duration, s16 off, s16 on);
extern s16 mgTypeCurr;
extern s16 mgBattleStar[4];
extern s16 mgBattleStarMax;
extern u8 lbl_801D3E94;
extern s32 mgRecordExtra;
extern s32 mgQuitExtraF;
extern s32 mgPracticeEnableF;
extern s32 mgInstExitEnableF;
extern u8 mgBoardHostEnableF;
extern s16 mgTicTacToeGrid[3][3];
extern u8 mgIndexList[256];
extern GameStat mgGameStatBackup;
extern MgInfo mgInfoTbl[];
#endif #endif

50
src/game/objsub.c
View file

@ -1201,7 +1201,7 @@ MgInfo mgInfoTbl[] = {
0, // advice_mess 0, // advice_mess
}, },
{ {
65535, // ovl 0xFFFF, // ovl
0, // type 0, // type
0, // flag 0, // flag
65280, // unk_4 65280, // unk_4
@ -1223,41 +1223,41 @@ MgInfo mgInfoTbl[] = {
void MGSeqPracticeExitCheck(omObjData*); void MGSeqPracticeExitCheck(omObjData*);
s64 lbl_801D3EA0; s16 mgTypeCurr;
s64 lbl_801D3E98; s16 mgBattleStar[4];
s32 lbl_801D3E94; s16 mgBattleStarMax;
s32 lbl_801D3E90; u8 lbl_801D3E94;
s32 lbl_801D3E8C; s32 mgRecordExtra;
s32 lbl_801D3E88; s32 mgQuitExtraF;
s32 lbl_801D3E84; s32 mgPracticeEnableF;
s32 lbl_801D3E80; s32 mgInstExitEnableF;
u8 mgBoardHostEnableF;
u8 lbl_801983F8[0x18]; s16 mgTicTacToeGrid[3][3];
u8 lbl_801982F8[0x100]; u8 mgIndexList[256];
u8 GWGameStatBackup[0x118]; GameStat mgGameStatBackup;
s16 omGetMGIndex(s16 overlay) { s16 omGetMGIndex(s16 overlay) {
s32 i; s32 i;
MgInfo* current_info; MgInfo *info;
current_info = (MgInfo*)&mgInfoTbl; info = mgInfoTbl;
for (i = 0; current_info->ovl != 0xffff; i++) { for (i = 0; info->ovl != 0xFFFF; i++) {
if (current_info->ovl == overlay) { if (info->ovl == overlay) {
return i; return i;
} }
info++;
current_info++;
} }
return -1; return -1;
} }
void omGameSysInit(Process* process) { void omGameSysInit(Process *objman) {
s32 i; s32 i;
omObjData* obj; omObjData* obj;
omSystemKeyCheckSetup(process); omSystemKeyCheckSetup(objman);
Hu3DCameraScissorSet(1, 0, 0, 0x280, 0x1E0); Hu3DCameraScissorSet(1, 0, 0, 0x280, 0x1E0);
omSysPauseEnable(0); omSysPauseEnable(0);
@ -1269,16 +1269,16 @@ void omGameSysInit(Process* process) {
GWPlayer[i].unk_26 = 0; GWPlayer[i].unk_26 = 0;
} }
if (lbl_801D3E88 != 0) { if (mgPracticeEnableF != 0) {
obj = omAddObjEx(process, 0x7FDC, 0, 0, -1, MGSeqPracticeExitCheck); obj = omAddObjEx(objman, 0x7FDC, 0, 0, -1, MGSeqPracticeExitCheck);
omSetStatBit(obj, 0xA0U); omSetStatBit(obj, 0xA0U);
} }
} }
void omVibrate(s16 player_cfg_index, s16 duration, s16 off, s16 on) { void omVibrate(s16 player, s16 duration, s16 off, s16 on) {
s32 rumble = GWGameStat.rumble; s32 rumble = GWGameStat.rumble;
if (rumble != 0 && GWPlayerCfg[player_cfg_index].iscom == 0) { if (rumble != 0 && GWPlayerCfg[player].iscom == 0) {
HuPadRumbleSet(GWPlayerCfg[player_cfg_index].pad_idx, duration, off, on); HuPadRumbleSet(GWPlayerCfg[player].pad_idx, duration, off, on);
} }
} }