Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-10 10:46:00 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename a bunch of functions from Events_ to VsSeeker_

Browse Source
This commit is contained in:
Fexty12573
2024-06-05 22:53:56 +02:00
parent 9d8d51548e
commit cc2a514faf
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/unk_0206AFE0.h
View File

@@ -12,11 +12,11 @@ u16 sub_0206B064(VarsFlags * param0);
u16 sub_0206B08C(VarsFlags * param0);
u16 sub_0206B0B4(VarsFlags * param0);
BOOL sub_0206B0C4(VarsFlags * param0, u16 param1);
void Events_ResetVsSeeker(VarsFlags * param0);
u16 Events_GetVsSeekerBattery(VarsFlags * param0);
BOOL Events_SetVsSeekerBattery(VarsFlags * param0, u16 param1);
u16 Events_GetVsSeekerActiveStepCount(VarsFlags * param0);
BOOL Events_SetVsSeekerActiveStepCount(VarsFlags * param0, u16 param1);
void VsSeeker_Reset(VarsFlags * param0);
u16 VsSeeker_GetBattery(VarsFlags * param0);
BOOL VsSeeker_SetBattery(VarsFlags * param0, u16 param1);
u16 VsSeeker_GetActiveStepCount(VarsFlags * param0);
BOOL VsSeeker_SetActiveStepCount(VarsFlags * param0, u16 param1);
void sub_0206B144(VarsFlags * param0, int param1);
BOOL sub_0206B16C(VarsFlags * param0, int param1);
void sub_0206B1B0(VarsFlags * param0, int param1);

4
src/field_map_change.c
View File

@@ -258,7 +258,7 @@ void FieldMapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp)
FieldSystem_InitFlagsOnMapChange(fieldSystem);
}
Events_ResetVsSeeker(SaveData_GetVarsFlags(fieldSystem->saveData));
VsSeeker_Reset(SaveData_GetVarsFlags(fieldSystem->saveData));
if (!noWarp) {
sub_020559DC(fieldSystem);
@@ -314,7 +314,7 @@ void FieldMapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSystem, BO
FieldSystem_InitFlagsOnMapChange(fieldSystem);
}
Events_ResetVsSeeker(SaveData_GetVarsFlags(fieldSystem->saveData));
VsSeeker_Reset(SaveData_GetVarsFlags(fieldSystem->saveData));
if (!param1) {
sub_020559DC(fieldSystem);

16
src/overlay005/vs_seeker.c
View File

@@ -426,7 +426,7 @@ static BOOL VsSeeker_ExecuteTask(TaskManager *taskMan)
case VS_SEEKER_STATE_START:
vsSeeker->playerStateTask = Player_SetStateVsSeeker(vsSeeker->fieldSystem);
Sound_PlayEffect(SEQ_SE_DP_VS_SEEKER_BEEP);
Events_SetVsSeekerBattery(vsSeeker->events, 0);
VsSeeker_SetBattery(vsSeeker->events, 0);
VsSeekerSystem_SetState(vsSeeker, VS_SEEKER_STATE_WAIT_FOR_PLAYER_ANIM);
break;
case VS_SEEKER_STATE_WAIT_FOR_PLAYER_ANIM:
@@ -453,7 +453,7 @@ static BOOL VsSeeker_ExecuteTask(TaskManager *taskMan)
}
break;
case VS_SEEKER_STATE_NO_BATTERY:
missingBattery = (VS_SEEKER_MAX_BATTERY - Events_GetVsSeekerBattery(vsSeeker->events));
missingBattery = (VS_SEEKER_MAX_BATTERY - VsSeeker_GetBattery(vsSeeker->events));
if ((missingBattery / 10) == 0) {
numDigits = 1;
@@ -484,7 +484,7 @@ static void VsSeekerSystem_SetState(VsSeekerSystem *vsSeeker, enum VsSeekerState
static enum VsSeekerUsability VsSeekerSystem_CheckUsability(VsSeekerSystem *vsSeeker)
{
if (Events_GetVsSeekerBattery(vsSeeker->events) == VS_SEEKER_MAX_BATTERY) {
if (VsSeeker_GetBattery(vsSeeker->events) == VS_SEEKER_MAX_BATTERY) {
if (vsSeeker->numVisibleTrainers == 0) {
return VS_SEEKER_USABILITY_NO_TRAINERS;
}
@@ -573,24 +573,24 @@ static BOOL VsSeeker_IsMoveCodeHidden(u32 moveCode)
BOOL VsSeeker_UpdateStepCount(FieldSystem *fieldSystem)
{
VarsFlags *events = SaveData_GetVarsFlags(fieldSystem->saveData);
u16 battery = Events_GetVsSeekerBattery(events);
u16 activeStepCount = Events_GetVsSeekerActiveStepCount(events);
u16 battery = VsSeeker_GetBattery(events);
u16 activeStepCount = VsSeeker_GetActiveStepCount(events);
if (sub_0207D688(sub_0207D990(fieldSystem->saveData), 443, 1, 4) == 1) {
if (battery < 100) {
battery++;
Events_SetVsSeekerBattery(events, battery);
VsSeeker_SetBattery(events, battery);
}
}
if (VsSeeker_GetUsedFlag(events) == TRUE) {
if (activeStepCount < VS_SEEKER_MAX_NUM_ACTIVE_STEPS) {
activeStepCount++;
Events_SetVsSeekerActiveStepCount(events, activeStepCount);
VsSeeker_SetActiveStepCount(events, activeStepCount);
}
if (activeStepCount == VS_SEEKER_MAX_NUM_ACTIVE_STEPS) {
Events_ResetVsSeeker(events);
VsSeeker_Reset(events);
VsSeeker_ClearRematchMoveCode(fieldSystem);
}
}

13
src/unk_0206AFE0.c
View File

@@ -114,29 +114,28 @@ BOOL sub_0206B0C4 (VarsFlags * param0, u16 param1)
return sub_0206AFE0(param0, (5 + (((0 + 0x4000) + 32) + 16)), param1);
}
void Events_ResetVsSeeker (VarsFlags * param0)
void VsSeeker_Reset(VarsFlags * param0)
{
VsSeeker_ClearUsedFlag(param0);
Events_SetVsSeekerActiveStepCount(param0, 0);
return;
VsSeeker_SetActiveStepCount(param0, 0);
}
u16 Events_GetVsSeekerBattery (VarsFlags * param0)
u16 VsSeeker_GetBattery(VarsFlags * param0)
{
return sub_0206B010(param0, (3 + (((0 + 0x4000) + 32) + 16)));
}
BOOL Events_SetVsSeekerBattery (VarsFlags * param0, u16 param1)
BOOL VsSeeker_SetBattery(VarsFlags * param0, u16 param1)
{
return sub_0206AFE0(param0, (3 + (((0 + 0x4000) + 32) + 16)), param1);
}
u16 Events_GetVsSeekerActiveStepCount (VarsFlags * param0)
u16 VsSeeker_GetActiveStepCount(VarsFlags * param0)
{
return sub_0206B010(param0, (4 + (((0 + 0x4000) + 32) + 16)));
}
BOOL Events_SetVsSeekerActiveStepCount (VarsFlags * param0, u16 param1)
BOOL VsSeeker_SetActiveStepCount(VarsFlags * param0, u16 param1)
{
return sub_0206AFE0(param0, (4 + (((0 + 0x4000) + 32) + 16)), param1);
}