This commit is contained in:
Niko 2024-03-30 13:04:38 -07:00
parent 55bd08c094
commit cfac3e3284
12 changed files with 56 additions and 56 deletions

View File

@ -4272,10 +4272,10 @@ void FUN_80046b1c(undefined2 param_1,undefined2 param_2,undefined4 param_3,undef
}
// GhostData_Encode
// GhostData_EncodeByte
uint FUN_80046b60(int param_1)
{
// only called from GhostData_SaveProfile
// only called from GhostData_EncodeProfile
uint uVar1;
short sVar2;
@ -4300,10 +4300,10 @@ uint FUN_80046b60(int param_1)
}
// GhostData_Decode
// GhostData_DecodeByte
int FUN_80046bc0(byte param_1)
{
// only called from GhostData_LoadProfile
// only called from GhostData_DecodeProfile
if (param_1 == 0x2d) {
return 0x3e;
@ -4325,7 +4325,7 @@ int FUN_80046bc0(byte param_1)
// WARNING: Removing unreachable block (ram,0x80046ed4)
// WARNING: Globals starting with '_' overlap smaller symbols at the same address
// GhostData_SaveProfile
// GhostData_EncodeProfile
void FUN_80046c30(
uint param_1, // index to save (or load) to
ushort param_2, // character ID array
@ -4371,32 +4371,32 @@ void FUN_80046c30(
uVar12 = uVar11 | param_4 << 9;
uVar13 = uVar12 | param_1 << 0x1d;
// GhostData_Encode
// GhostData_EncodeByte
uVar3 = FUN_80046b60(uVar11 & 0x3f);
_DAT_80085a3c = CONCAT11(uVar3,DAT_80085a3c);
_DAT_80085a3c = _DAT_80085a3c & 0xffff0000 | (uint)_DAT_80085a3c;
// GhostData_Encode
// GhostData_EncodeByte
uVar3 = FUN_80046b60((uVar12 & 0xfc0) >> 6);
_DAT_80085a3c = CONCAT12(uVar3,_DAT_80085a3c);
_DAT_80085a3c = _DAT_80085a3c & 0xff000000 | (uint)_DAT_80085a3c;
// GhostData_Encode
// GhostData_EncodeByte
bVar4 = FUN_80046b60((uVar12 & 0x3f000) >> 0xc);
_DAT_80085a3c = _DAT_80085a3c & 0xffffff | (uint)bVar4 << 0x18;
bVar4 = FUN_80046b60((uVar12 & 0xfc0000) >> 0x12);
_DAT_80085a40 = _DAT_80085a40 & 0xffffff00 | (uint)bVar4;
// GhostData_Encode
// GhostData_EncodeByte
uVar3 = FUN_80046b60(uVar13 >> 0x18 & 0x3f);
_DAT_80085a40 = CONCAT11(uVar3,DAT_80085a40);
_DAT_80085a40 = _DAT_80085a40 & 0xffff0000 | (uint)_DAT_80085a40;
// GhostData_Encode
// GhostData_EncodeByte
uVar3 = FUN_80046b60(uVar13 >> 0x1e);
// loop counter
@ -4529,7 +4529,7 @@ void FUN_80046c30(
}
// GhostData_LoadProfile
// GhostData_DecodeProfile
void FUN_80047034(undefined4 *param_1,undefined4 *param_2)
{
@ -4546,7 +4546,7 @@ void FUN_80047034(undefined4 *param_1,undefined4 *param_2)
uint uVar11;
uint uVar12;
// GhostData_Decode
// GhostData_DecodeByte
uVar2 = FUN_80046bc0((uint)*(byte *)((int)param_2 + 0xd));
iVar3 = FUN_80046bc0((uint)*(byte *)((int)param_2 + 0xe));
iVar4 = FUN_80046bc0((uint)*(byte *)((int)param_2 + 0xf));
@ -5238,7 +5238,7 @@ void FUN_80047a58(void)
// If there are less than 7 ghosts loaded
if (iVar2 >> 0x10 < 7)
{
// GhostData_LoadProfile
// GhostData_DecodeProfile
FUN_80047034(&DAT_8009aa60 + (iVar2 >> 0x10) * 0x34);
// increment ghost counter
@ -6913,7 +6913,7 @@ LAB_800499e4:
uVar15 = *(undefined4 *)(*(int *)(PTR_DAT_8008d2ac + 0x24ec) + 0x514);
}
// GhostData_SaveProfile
// GhostData_EncodeProfile
FUN_80046c30(
// index highlighted by cursor
(int)*(short *)(param_1 + 0x1a),

View File

@ -804,10 +804,10 @@ int MENUBOX_BoolHidden(struct MenuBox* m);
//GhostData_NumGhostsForLEV()
//LoadSave_NextMemcardAction()
//GhostData_Encode()
//GhostData_Decode()
//GhostData_SaveProfile()
//GhostData_LoadProfile()
//GhostData_EncodeByte()
//GhostData_DecodeByte()
//GhostData_EncodeProfile()
//GhostData_DecodeProfile()
void LoadSave_StartMemcardAction(int action);
//LoadSave_StopMemcardAction()
//GhostData_ResetNumGhosts()

View File

@ -543,8 +543,8 @@ MENUBOX_Hide = 0x80047db4;
MENUBOX_BoolHidden = 0x80047dc8;
GhostData_NumGhostsForLEV = 0x80047ddc;
LoadSave_NextMemcardAction = 0x80047f08;
GhostData_Decode = 0x80047f4c;
GhostData_LoadProfile = 0x80047fbc;
GhostData_DecodeByte = 0x80047f4c;
GhostData_DecodeProfile = 0x80047fbc;
LoadSave_StopMemcardAction = 0x80048120;
GhostData_ResetNumGhosts = 0x80048198;
LoadFromCard_GameProgressAndOptions = 0x800481a4;

View File

@ -539,10 +539,10 @@ MENUBOX_Hide = 0x800467d4;
MENUBOX_BoolHidden = 0x800467e8;
GhostData_NumGhostsForLEV = 0x800467fc;
LoadSave_NextMemcardAction = 0x80046928;
GhostData_Encode = 0x8004696c;
GhostData_Decode = 0x800469cc;
GhostData_SaveProfile = 0x80046a3c;
GhostData_LoadProfile = 0x80046e18;
GhostData_EncodeByte = 0x8004696c;
GhostData_DecodeByte = 0x800469cc;
GhostData_EncodeProfile = 0x80046a3c;
GhostData_DecodeProfile = 0x80046e18;
LoadSave_StartMemcardAction = 0x80046f7c;
LoadSave_StopMemcardAction = 0x80046f90;
GhostData_ResetNumGhosts = 0x80047008;

View File

@ -551,10 +551,10 @@ MENUBOX_Hide = 0x800483d4;
MENUBOX_BoolHidden = 0x800483e8;
GhostData_NumGhostsForLEV = 0x800483fc;
LoadSave_NextMemcardAction = 0x80048528;
GhostData_Encode = 0x8004856c;
GhostData_Decode = 0x800485cc;
GhostData_SaveProfile = 0x8004863c;
GhostData_LoadProfile = 0x80048a40;
GhostData_EncodeByte = 0x8004856c;
GhostData_DecodeByte = 0x800485cc;
GhostData_EncodeProfile = 0x8004863c;
GhostData_DecodeProfile = 0x80048a40;
LoadSave_StartMemcardAction = 0x80048ba4;
LoadSave_StopMemcardAction = 0x80048bb8;
GhostData_ResetNumGhosts = 0x80048c30;

View File

@ -514,10 +514,10 @@ MENUBOX_Hide = 0x800452c4;
MENUBOX_BoolHidden = 0x800452d8;
GhostData_NumGhostsForLEV = 0x800452ec;
LoadSave_NextMemcardAction = 0x80045418;
GhostData_Encode = 0x8004545c;
GhostData_Decode = 0x800454bc;
GhostData_SaveProfile = 0x8004552c;
GhostData_LoadProfile = 0x80045924;
GhostData_EncodeByte = 0x8004545c;
GhostData_DecodeByte = 0x800454bc;
GhostData_EncodeProfile = 0x8004552c;
GhostData_DecodeProfile = 0x80045924;
LoadSave_StartMemcardAction = 0x80045a88;
LoadSave_StopMemcardAction = 0x80045a9c;
GhostData_ResetNumGhosts = 0x80045b14;

View File

@ -554,10 +554,10 @@ MENUBOX_Hide = 0x800469c8;
MENUBOX_BoolHidden = 0x800469dc;
GhostData_NumGhostsForLEV = 0x800469f0;
LoadSave_NextMemcardAction = 0x80046b1c;
GhostData_Encode = 0x80046b60;
GhostData_Decode = 0x80046bc0;
GhostData_SaveProfile = 0x80046c30;
GhostData_LoadProfile = 0x80047034;
GhostData_EncodeByte = 0x80046b60;
GhostData_DecodeByte = 0x80046bc0;
GhostData_EncodeProfile = 0x80046c30;
GhostData_DecodeProfile = 0x80047034;
LoadSave_StartMemcardAction = 0x80047198;
LoadSave_StopMemcardAction = 0x800471ac;
GhostData_ResetNumGhosts = 0x80047224;

View File

@ -731,10 +731,10 @@
// unknown 80047e7c
80047f08 LoadSave_NextMemcardAction // DCxDemo says it uses SLOTS, not just ghost
// no GhostData_Encode in this build
80047f4c GhostData_Decode
// no GhostData_SaveProfile in this build
80047fbc GhostData_LoadProfile
// no GhostData_EncodeByte in this build
80047f4c GhostData_DecodeByte
// no GhostData_EncodeProfile in this build
80047fbc GhostData_DecodeProfile
// no LoadSave_StartMemcardAction in this build
80048120 LoadSave_StopMemcardAction

View File

@ -720,10 +720,10 @@
// unknown 8004689c
80046928 LoadSave_NextMemcardAction // DCxDemo says it uses SLOTS, not just ghost
8004696c GhostData_Encode
800469cc GhostData_Decode
80046a3c GhostData_SaveProfile
80046e18 GhostData_LoadProfile
8004696c GhostData_EncodeByte
800469cc GhostData_DecodeByte
80046a3c GhostData_EncodeProfile
80046e18 GhostData_DecodeProfile
80046f7c LoadSave_StartMemcardAction // (not in japan trial)
80046f90 LoadSave_StopMemcardAction

View File

@ -735,10 +735,10 @@
// unknown 8004849c
80048528 LoadSave_NextMemcardAction // DCxDemo says it uses SLOTS, not just ghost
8004856c GhostData_Encode
800485cc GhostData_Decode
8004863c GhostData_SaveProfile
80048a40 GhostData_LoadProfile
8004856c GhostData_EncodeByte
800485cc GhostData_DecodeByte
8004863c GhostData_EncodeProfile
80048a40 GhostData_DecodeProfile
80048ba4 LoadSave_StartMemcardAction // (not in japan trial)
80048bb8 LoadSave_StopMemcardAction

View File

@ -720,10 +720,10 @@
// unknown 8004538c
80045418 LoadSave_NextMemcardAction // DCxDemo says it uses SLOTS, not just ghost
8004545c GhostData_Encode
800454bc GhostData_Decode
8004552c GhostData_SaveProfile
80045924 GhostData_LoadProfile
8004545c GhostData_EncodeByte
800454bc GhostData_DecodeByte
8004552c GhostData_EncodeProfile
80045924 GhostData_DecodeProfile
80045a88 LoadSave_StartMemcardAction // (not in japan trial)
80045a9c LoadSave_StopMemcardAction

View File

@ -675,10 +675,10 @@
// unknown 80046a90
80046b1c LoadSave_NextMemcardAction // DCxDemo says it uses SLOTS, not just ghost
80046b60 GhostData_Encode
80046bc0 GhostData_Decode
80046c30 GhostData_SaveProfile
80047034 GhostData_LoadProfile
80046b60 GhostData_EncodeByte
80046bc0 GhostData_DecodeByte
80046c30 GhostData_EncodeProfile
80047034 GhostData_DecodeProfile
80047198 LoadSave_StartMemcardAction // (not in japan trial)
800471ac LoadSave_StopMemcardAction