through sub_815E1F0

This commit is contained in:
PikalaxALT
2019-01-05 17:08:30 -05:00
parent 3a4f44ef36
commit 4b459cd460
11 changed files with 225 additions and 355 deletions
+1 -1
View File
@@ -287,7 +287,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey)
int i;
for(i = 0; i < 4; i++)
ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i][1], encryptionKey);
ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i].unk4, encryptionKey);
sub_8054F38(encryptionKey);
ApplyNewEncryptionKeyToBagItems_(encryptionKey);
+81 -2
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "main.h"
#include "task.h"
#include "constants/flags.h"
#include "constants/vars.h"
#include "malloc.h"
@@ -11,6 +12,10 @@
#include "cereader_tool.h"
#include "easy_chat.h"
#include "text.h"
#include "battle_setup.h"
#include "battle_transition.h"
#include "battle.h"
#include "battle_2.h"
#include "overworld.h"
struct UnkStruct_8479D34
@@ -28,7 +33,6 @@ struct UnkSubstruct_203F458_000C_004
/* 0x000 */ u8 unk_000[11];
/* 0x00B */ u8 unk_00B;
/* 0x00C */ u8 unk_00C;
/* 0x00D */ u8 unk_00D;
/* 0x00E */ u16 unk_00E[6];
/* 0x01A */ u16 unk_01A[6];
/* 0x026 */ u16 unk_026[6];
@@ -122,6 +126,7 @@ void sub_815E8CC(void);
void sub_815E908(void);
void sub_815E948(void);
void sub_815E9C8(void);
void sub_815E9FC(void);
void sub_815EC0C(void);
extern const struct UnkStruct_8479D34 gUnknown_8479D34[15];
@@ -280,7 +285,7 @@ void sub_815DA54(void)
gUnknown_203F45C->unk_3C = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
gUnknown_203F45C->unk_3D = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[r10].unk_00B;
gUnknown_203F45C->unk_3E = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[r10].unk_00C;
SetVBlankCounter1Ptr(gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx]);
SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
sub_815DD2C();
}
@@ -692,3 +697,77 @@ void sub_815DF54(void)
"_0815E064: .4byte gStringVar4");
}
#endif // NONMATCHING
void sub_815E068(u8 battleType, u8 facilityClass)
{
u16 r5 = FALSE;
s32 r4;
switch (battleType)
{
case 0:
case 2:
for (r4 = 0; r4 < NELEMS(gUnknown_8479ED8); r4++)
{
if (gUnknown_8479ED8[r4].unk1 == facilityClass)
break;
}
if (r4 != NELEMS(gUnknown_8479ED8))
r5 = gUnknown_8479ED8[r4].unk2;
break;
case 1:
for (r4 = 0; r4 < NELEMS(gUnknown_847A024); r4++)
{
if (gUnknown_847A024[r4].unk2 == facilityClass)
break;
}
if (r4 != NELEMS(gUnknown_847A024))
{
if (VarGet(VAR_0x4003))
r5 = gUnknown_847A024[r4].unk4;
else
r5 = gUnknown_847A024[r4].unk3;
}
break;
}
gUnknown_20370DC = gUnknown_20370DA;
gUnknown_20370DA = r5;
}
void sub_815E114(void)
{
SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
}
void sub_815E124(u8 taskId)
{
if (sub_80D08F8() == TRUE)
{
gMain.savedCallback = sub_815E114;
sub_80563F0();
SetMainCallback2(sub_800FD9C);
DestroyTask(taskId);
}
}
void sub_815E160(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY;
if (gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002 == 1)
gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
gTrainerBattleOpponent_A = 0;
sub_815E9FC();
CreateTask(sub_815E124, 1);
PlayMapChosenOrBattleBGM(0);
sub_80D08B8(sub_8080060());
}
void sub_815E1C0(void)
{
if (!gSpecialVar_0x8005)
gSpecialVar_Result = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
}
void sub_815E1F0(void)
{
gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8++;
}