Decompile match_call.c

This commit is contained in:
Marcus Huderle
2019-01-02 19:07:47 -06:00
committed by huderlem
parent f8c708a82a
commit e1092028ec
17 changed files with 6430 additions and 7164 deletions
+2 -2
View File
@@ -32,7 +32,7 @@
#include "constants/maps.h"
#include "constants/songs.h"
extern bool32 sub_8196034(void);
extern bool32 TryStartMatchCall(void);
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
@@ -600,7 +600,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(SSTidalCorridor_EventScript_23C050);
return TRUE;
}
if (sub_8196034())
if (TryStartMatchCall())
return TRUE;
return FALSE;
}
+4 -4
View File
@@ -5,8 +5,8 @@
#include "task.h"
#include "text.h"
extern bool32 sub_8196094(void);
extern void sub_8196080(u8*);
extern bool32 IsMatchCallTaskActive(void);
extern void StartMatchCallFromScript(u8*);
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
@@ -68,7 +68,7 @@ bool8 ShowFieldMessage(u8 *str)
void sub_8098214(u8 taskId)
{
if (!sub_8196094())
if (!IsMatchCallTaskActive())
{
sFieldMessageBoxMode = 0;
DestroyTask(taskId);
@@ -81,7 +81,7 @@ bool8 sub_8098238(u8 *str)
return FALSE;
StringExpandPlaceholders(gStringVar4, str);
CreateTask(sub_8098214, 0);
sub_8196080(str);
StartMatchCallFromScript(str);
sFieldMessageBoxMode = 2;
return TRUE;
}
Regular → Executable
+1968 -1226
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -46,7 +46,7 @@ extern void NewGameInitPCItems(void);
extern void ClearDecorationInventories(void);
extern void ResetFanClub(void);
extern void copy_strings_to_sav1(void);
extern void sub_8195E10(void);
extern void InitMatchCallCounters(void);
extern void sub_801AFD8(void);
extern void sub_800E5AC(void);
extern void sub_81D54BC(void);
@@ -209,7 +209,7 @@ void NewGameInitData(void)
SetLilycoveLady();
ResetAllApprenticeData();
ClearRankingHallRecords();
sub_8195E10();
InitMatchCallCounters();
sub_801AFD8();
sub_800E5AC();
sub_81D54BC();
+2 -2
View File
@@ -127,7 +127,7 @@ extern void ExecuteTruckSequence(void);
extern void sub_80A0A38(void);
extern void WriteFlashScanlineEffectBuffer(u8);
extern void sub_81AA2F8(void);
extern void sub_8195E10(void);
extern void InitMatchCallCounters(void);
extern void sub_80EDB44(void);
extern void sub_81D64C0(void);
extern void InitFieldMessageBox(void);
@@ -1777,7 +1777,7 @@ void CB2_ContinueSavedGame(void)
PlayTimeCounter_Start();
ScriptContext1_Init();
ScriptContext2_Disable();
sub_8195E10();
InitMatchCallCounters();
if (UseContinueGameWarp() == TRUE)
{
ClearContinueGameWarpStatus();
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -340,7 +340,7 @@ u32 RtcGetMinuteCount(void)
return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute;
}
u16 RtcGetLocalDayCount(void)
u32 RtcGetLocalDayCount(void)
{
return RtcGetDayCount(&sRtc);
}