Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactor of ereader_helpers.c

This commit is contained in:
PikalaxALT 2019-09-02 21:37:52 -04:00 committed by huderlem
parent de02805388
commit 8d910465f8
5 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/ereader_helpers.h
View File

@ -1,22 +1,23 @@
#ifndef GUARD_EREADER_HELPERS_H #ifndef GUARD_EREADER_HELPERS_H
#define GUARD_EREADER_HELPERS_H #define GUARD_EREADER_HELPERS_H
#include "trainer_hill.h"
struct Unk81D38FC struct Unk81D38FC
{ {
u8 unk0; u8 unk0;
u8 filler_1[3]; u8 filler_1[3];
u8 unk4[0x148]; u8 unk4[0x148];
u8 unk14C[0x124]; u8 unk14C[0x124];
int checksum; u32 checksum;
}; };
struct EReaderTrainerHillSet struct EReaderTrainerHillSet
{ {
u8 unk_0; u8 count;
u8 unk_1; u8 id;
u8 unk_2; u16 dummy;
u8 unk_3; u32 checksum;
int checksum;
struct Unk81D38FC unk_8[6]; struct Unk81D38FC unk_8[6];
u8 unk_ec0[40]; u8 unk_ec0[40];
}; };
@ -41,11 +42,11 @@ struct Unk81D3998
bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer); bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0); bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
bool32 ReadTrainerHillAndValidate(void); bool32 ReadTrainerHillAndValidate(void);
int sub_81D3D70(u8, u32, u32*, u32*); int EReaderHandleTransfer(u8, u32, u32*, u32*);
void sub_81D3F9C(void); void sub_81D3F9C(void);
void sub_81D3FAC(void); void sub_81D3FAC(void);
void sub_81D41A0(void); void EReaderHelper_SaveRegsState(void);
void sub_81D41F4(void); void EReaderHelper_RestoreRegsState(void);
void sub_81D4238(void); void sub_81D4238(void);
#endif // GUARD_EREADER_HELPERS_H #endif // GUARD_EREADER_HELPERS_H

14
include/trainer_hill.h
View File

@ -1,6 +1,20 @@
#ifndef GUARD_TRAINER_HILL_H #ifndef GUARD_TRAINER_HILL_H
#define GUARD_TRAINER_HILL_H #define GUARD_TRAINER_HILL_H
#define HILL_TRAINER_NAME_LENGTH 11
struct TrainerHillTrainer
{
u8 name[HILL_TRAINER_NAME_LENGTH];
u8 facilityClass;
u32 unused;
u16 speechBefore[6];
u16 speechWin[6];
u16 speechLose[6];
u16 speechAfter[6];
struct BattleTowerPokemon mons[PARTY_SIZE];
};
extern u32 *gTrainerHillVBlankCounter; extern u32 *gTrainerHillVBlankCounter;
void CallTrainerHillFunction(void); void CallTrainerHillFunction(void);

56
src/ereader_helpers.c
View File

@ -9,6 +9,7 @@
#include "sprite.h" #include "sprite.h"
#include "task.h" #include "task.h"
#include "util.h" #include "util.h"
#include "trainer_hill.h"
struct Unknown030012C8 struct Unknown030012C8
{ {
@ -38,7 +39,7 @@ static u16 gUnknown_030012F0;
static u16 gUnknown_030012F2; static u16 gUnknown_030012F2;
static u16 gUnknown_030012F4; static u16 gUnknown_030012F4;
extern const u8 gUnknown_08625B6C[][0x148]; extern const struct TrainerHillTrainer gUnknown_08625B6C[];
static u8 sub_81D38D4(void) static u8 sub_81D38D4(void)
{ {
@ -58,7 +59,7 @@ bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
{ {
u32 i; u32 i;
u32 checksum; u32 checksum;
int var0 = buffer->unk_0; int var0 = buffer->count;
if (var0 < 1 || var0 > 8) if (var0 < 1 || var0 > 8)
return FALSE; return FALSE;
@ -78,7 +79,7 @@ bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer) static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
{ {
u32 checksum; u32 checksum;
int var0 = buffer->unk_0; int var0 = buffer->count;
if (var0 < 1 || var0 > 8) if (var0 < 1 || var0 > 8)
return FALSE; return FALSE;
@ -89,34 +90,37 @@ static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
return TRUE; return TRUE;
} }
static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *arg0, struct Unk81D3998 *buffer2) static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct Unk81D3998 *buffer2)
{ {
int i; int i;
memset(buffer2, 0, 0x1000); AGB_ASSERT_EX(ttdata->dummy == 0, "cereader_tool.c", 450);
buffer2->unk_000 = arg0->unk_0; AGB_ASSERT_EX(ttdata->id == 0, "cereader_tool.c", 452);
buffer2->unk_001 = sub_81D38D4();
buffer2->unk_002 = (arg0->unk_0 + 1) / 2;
for (i = 0; i < arg0->unk_0; i++) memset(buffer2, 0, 0x1000);
buffer2->unk_000 = ttdata->count;
buffer2->unk_001 = sub_81D38D4();
buffer2->unk_002 = (ttdata->count + 1) / 2;
for (i = 0; i < ttdata->count; i++)
{ {
if (!(i & 1)) if (!(i & 1))
{ {
buffer2->unk_008[i / 2].unk_000[0] = arg0->unk_8[i].unk0; buffer2->unk_008[i / 2].unk_000[0] = ttdata->unk_8[i].unk0;
memcpy(buffer2->unk_008[i / 2].unk_294, arg0->unk_8[i].unk14C, 0x124); memcpy(buffer2->unk_008[i / 2].unk_294, ttdata->unk_8[i].unk14C, 0x124);
memcpy(buffer2->unk_008[i / 2].unk_004, arg0->unk_8[i].unk4, 0x148); memcpy(buffer2->unk_008[i / 2].unk_004, ttdata->unk_8[i].unk4, 0x148);
} }
else else
{ {
buffer2->unk_008[i / 2].unk_000[1] = arg0->unk_8[i].unk0; buffer2->unk_008[i / 2].unk_000[1] = ttdata->unk_8[i].unk0;
memcpy(buffer2->unk_008[i / 2].unk_14C, arg0->unk_8[i].unk4, 0x148); memcpy(buffer2->unk_008[i / 2].unk_14C, ttdata->unk_8[i].unk4, 0x148);
} }
} }
if (i & 1) if (i & 1)
{ {
u8 * dest = buffer2->unk_008[i / 2].unk_14C; u8 * dest = buffer2->unk_008[i / 2].unk_14C;
const u8 (* src)[0x148] = gUnknown_08625B6C; const u8 (* src)[0x148] = (const u8 (*)[0x148])gUnknown_08625B6C;
memcpy(dest, src[i / 2], 0x148); memcpy(dest, src[i / 2], 0x148);
} }
@ -163,20 +167,20 @@ bool32 ReadTrainerHillAndValidate(void)
return result; return result;
} }
static int unref_sub_81D3B54(int arg0, u32 *arg1) int EReader_Send(int arg0, u32 *arg1)
{ {
int result; int result;
u16 var0; u16 var0;
int var1; int var1;
sub_81D41A0(); EReaderHelper_SaveRegsState();
while (1) while (1)
{ {
sub_81D4170(); sub_81D4170();
if (gUnknown_030012E2 & 2) if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2; gShouldAdvanceLinkState = 2;
var1 = sub_81D3D70(1, arg0, arg1, NULL); var1 = EReaderHandleTransfer(1, arg0, arg1, NULL);
gUnknown_030012E4 = var1; gUnknown_030012E4 = var1;
if ((gUnknown_030012E4 & 0x13) == 0x10) if ((gUnknown_030012E4 & 0x13) == 0x10)
{ {
@ -202,24 +206,24 @@ static int unref_sub_81D3B54(int arg0, u32 *arg1)
} }
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
sub_81D41F4(); EReaderHelper_RestoreRegsState();
return result; return result;
} }
static int unref_sub_81D3BE8(u32 *arg0) int EReader_Recv(u32 *arg0)
{ {
int result; int result;
u16 var0; u16 var0;
int var1; int var1;
sub_81D41A0(); EReaderHelper_SaveRegsState();
while (1) while (1)
{ {
sub_81D4170(); sub_81D4170();
if (gUnknown_030012E2 & 2) if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2; gShouldAdvanceLinkState = 2;
var1 = sub_81D3D70(0, 0, NULL, arg0); var1 = EReaderHandleTransfer(0, 0, NULL, arg0);
gUnknown_030012E4 = var1; gUnknown_030012E4 = var1;
if ((gUnknown_030012E4 & 0x13) == 0x10) if ((gUnknown_030012E4 & 0x13) == 0x10)
{ {
@ -245,7 +249,7 @@ static int unref_sub_81D3BE8(u32 *arg0)
} }
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
sub_81D41F4(); EReaderHelper_RestoreRegsState();
return result; return result;
} }
@ -285,7 +289,7 @@ static void sub_81D3D34(void)
gUnknown_030012E8 = 0; gUnknown_030012E8 = 0;
} }
int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3) int EReaderHandleTransfer(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3)
{ {
switch (gUnknown_030012C8.unk0[1]) switch (gUnknown_030012C8.unk0[1])
{ {
@ -519,7 +523,7 @@ static void sub_81D4170(void)
gUnknown_030012E0 = keysMask; gUnknown_030012E0 = keysMask;
} }
void sub_81D41A0(void) void EReaderHelper_SaveRegsState(void)
{ {
gUnknown_030012EC = REG_IME; gUnknown_030012EC = REG_IME;
gUnknown_030012EE = REG_IE; gUnknown_030012EE = REG_IE;
@ -528,7 +532,7 @@ void sub_81D41A0(void)
gUnknown_030012F4 = REG_RCNT; gUnknown_030012F4 = REG_RCNT;
} }
void sub_81D41F4(void) void EReaderHelper_RestoreRegsState(void)
{ {
REG_IME = gUnknown_030012EC; REG_IME = gUnknown_030012EC;
REG_IE = gUnknown_030012EE; REG_IE = gUnknown_030012EE;

6
src/ereader_screen.c
View File

@ -49,7 +49,7 @@ static void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2)
REG_IME = 0; REG_IME = 0;
gIntrTable[1] = sub_81D3FAC; gIntrTable[1] = sub_81D3FAC;
gIntrTable[2] = sub_81D3F9C; gIntrTable[2] = sub_81D3F9C;
sub_81D41A0(); EReaderHelper_SaveRegsState();
sub_81D4238(); sub_81D4238();
REG_IE |= INTR_FLAG_VCOUNT; REG_IE |= INTR_FLAG_VCOUNT;
REG_IME = backupIME; REG_IME = backupIME;
@ -63,7 +63,7 @@ static void sub_81D4DB8(struct Unk03006370 *arg0)
volatile u16 backupIME = REG_IME; volatile u16 backupIME = REG_IME;
REG_IME = 0; REG_IME = 0;
sub_81D4238(); sub_81D4238();
sub_81D41F4(); EReaderHelper_RestoreRegsState();
RestoreSerialTimer3IntrHandlers(); RestoreSerialTimer3IntrHandlers();
REG_IME = backupIME; REG_IME = backupIME;
} }
@ -71,7 +71,7 @@ static void sub_81D4DB8(struct Unk03006370 *arg0)
static u8 sub_81D4DE8(struct Unk03006370 *arg0) static u8 sub_81D4DE8(struct Unk03006370 *arg0)
{ {
u8 var0 = 0; u8 var0 = 0;
arg0->unk0 = sub_81D3D70(1, arg0->unk4, arg0->unk8, NULL); arg0->unk0 = EReaderHandleTransfer(1, arg0->unk4, arg0->unk8, NULL);
if ((arg0->unk0 & 0x13) == 0x10) if ((arg0->unk0 & 0x13) == 0x10)
var0 = 1; var0 = 1;

13
src/trainer_hill.c
View File

@ -38,7 +38,6 @@
#define HILL_TAG_UNIQUE 2 #define HILL_TAG_UNIQUE 2
#define HILL_TAG_EXPERT 3 #define HILL_TAG_EXPERT 3
#define HILL_TRAINER_NAME_LENGTH 11
#define HILL_MAX_TIME 215999 // 60 * 60 * 60 - 1 #define HILL_MAX_TIME 215999 // 60 * 60 * 60 - 1
struct TrHillRoomTrainers struct TrHillRoomTrainers
@ -47,18 +46,6 @@ struct TrHillRoomTrainers
u8 facilityClass[2]; u8 facilityClass[2];
}; };
struct TrainerHillTrainer
{
u8 name[HILL_TRAINER_NAME_LENGTH];
u8 facilityClass;
u32 unused;
u16 speechBefore[6];
u16 speechWin[6];
u16 speechLose[6];
u16 speechAfter[6];
struct BattleTowerPokemon mons[PARTY_SIZE];
};
struct TrHillFloor struct TrHillFloor
{ {
u8 unk0; u8 unk0;