summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xinclude/ereader_helpers.h19
-rw-r--r--include/trainer_hill.h14
-rwxr-xr-xsrc/ereader_helpers.c52
-rwxr-xr-xsrc/ereader_screen.c6
-rw-r--r--src/trainer_hill.c13
5 files changed, 55 insertions, 49 deletions
diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index bcbb68d4f..2e77767aa 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -1,22 +1,23 @@
#ifndef GUARD_EREADER_HELPERS_H
#define GUARD_EREADER_HELPERS_H
+#include "trainer_hill.h"
+
struct Unk81D38FC
{
u8 unk0;
u8 filler_1[3];
u8 unk4[0x148];
u8 unk14C[0x124];
- int checksum;
+ u32 checksum;
};
struct EReaderTrainerHillSet
{
- u8 unk_0;
- u8 unk_1;
- u8 unk_2;
- u8 unk_3;
- int checksum;
+ u8 count;
+ u8 id;
+ u16 dummy;
+ u32 checksum;
struct Unk81D38FC unk_8[6];
u8 unk_ec0[40];
};
@@ -41,11 +42,11 @@ struct Unk81D3998
bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
bool32 ReadTrainerHillAndValidate(void);
-int sub_81D3D70(u8, u32, u32*, u32*);
+int EReaderHandleTransfer(u8, u32, u32*, u32*);
void sub_81D3F9C(void);
void sub_81D3FAC(void);
-void sub_81D41A0(void);
-void sub_81D41F4(void);
+void EReaderHelper_SaveRegsState(void);
+void EReaderHelper_RestoreRegsState(void);
void sub_81D4238(void);
#endif // GUARD_EREADER_HELPERS_H
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index e605ac654..1d1d2d5da 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -1,6 +1,20 @@
#ifndef 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;
void CallTrainerHillFunction(void);
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 11aaaafe7..e30307077 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -9,6 +9,7 @@
#include "sprite.h"
#include "task.h"
#include "util.h"
+#include "trainer_hill.h"
struct Unknown030012C8
{
@@ -38,7 +39,7 @@ static u16 gUnknown_030012F0;
static u16 gUnknown_030012F2;
static u16 gUnknown_030012F4;
-extern const u8 gUnknown_08625B6C[][0x148];
+extern const struct TrainerHillTrainer gUnknown_08625B6C[];
static u8 sub_81D38D4(void)
{
@@ -58,7 +59,7 @@ bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
{
u32 i;
u32 checksum;
- int var0 = buffer->unk_0;
+ int var0 = buffer->count;
if (var0 < 1 || var0 > 8)
return FALSE;
@@ -78,7 +79,7 @@ bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
{
u32 checksum;
- int var0 = buffer->unk_0;
+ int var0 = buffer->count;
if (var0 < 1 || var0 > 8)
return FALSE;
@@ -89,34 +90,37 @@ static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
return TRUE;
}
-static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *arg0, struct Unk81D3998 *buffer2)
+static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct Unk81D3998 *buffer2)
{
int i;
+ AGB_ASSERT_EX(ttdata->dummy == 0, "cereader_tool.c", 450);
+ AGB_ASSERT_EX(ttdata->id == 0, "cereader_tool.c", 452);
+
memset(buffer2, 0, 0x1000);
- buffer2->unk_000 = arg0->unk_0;
+ buffer2->unk_000 = ttdata->count;
buffer2->unk_001 = sub_81D38D4();
- buffer2->unk_002 = (arg0->unk_0 + 1) / 2;
+ buffer2->unk_002 = (ttdata->count + 1) / 2;
- for (i = 0; i < arg0->unk_0; i++)
+ for (i = 0; i < ttdata->count; i++)
{
if (!(i & 1))
{
- buffer2->unk_008[i / 2].unk_000[0] = arg0->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_004, arg0->unk_8[i].unk4, 0x148);
+ buffer2->unk_008[i / 2].unk_000[0] = ttdata->unk_8[i].unk0;
+ memcpy(buffer2->unk_008[i / 2].unk_294, ttdata->unk_8[i].unk14C, 0x124);
+ memcpy(buffer2->unk_008[i / 2].unk_004, ttdata->unk_8[i].unk4, 0x148);
}
else
{
- buffer2->unk_008[i / 2].unk_000[1] = arg0->unk_8[i].unk0;
- memcpy(buffer2->unk_008[i / 2].unk_14C, arg0->unk_8[i].unk4, 0x148);
+ buffer2->unk_008[i / 2].unk_000[1] = ttdata->unk_8[i].unk0;
+ memcpy(buffer2->unk_008[i / 2].unk_14C, ttdata->unk_8[i].unk4, 0x148);
}
}
if (i & 1)
{
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);
}
@@ -163,20 +167,20 @@ bool32 ReadTrainerHillAndValidate(void)
return result;
}
-static int unref_sub_81D3B54(int arg0, u32 *arg1)
+int EReader_Send(int arg0, u32 *arg1)
{
int result;
u16 var0;
int var1;
- sub_81D41A0();
+ EReaderHelper_SaveRegsState();
while (1)
{
sub_81D4170();
if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2;
- var1 = sub_81D3D70(1, arg0, arg1, NULL);
+ var1 = EReaderHandleTransfer(1, arg0, arg1, NULL);
gUnknown_030012E4 = var1;
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));
- sub_81D41F4();
+ EReaderHelper_RestoreRegsState();
return result;
}
-static int unref_sub_81D3BE8(u32 *arg0)
+int EReader_Recv(u32 *arg0)
{
int result;
u16 var0;
int var1;
- sub_81D41A0();
+ EReaderHelper_SaveRegsState();
while (1)
{
sub_81D4170();
if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2;
- var1 = sub_81D3D70(0, 0, NULL, arg0);
+ var1 = EReaderHandleTransfer(0, 0, NULL, arg0);
gUnknown_030012E4 = var1;
if ((gUnknown_030012E4 & 0x13) == 0x10)
{
@@ -245,7 +249,7 @@ static int unref_sub_81D3BE8(u32 *arg0)
}
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
- sub_81D41F4();
+ EReaderHelper_RestoreRegsState();
return result;
}
@@ -285,7 +289,7 @@ static void sub_81D3D34(void)
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])
{
@@ -519,7 +523,7 @@ static void sub_81D4170(void)
gUnknown_030012E0 = keysMask;
}
-void sub_81D41A0(void)
+void EReaderHelper_SaveRegsState(void)
{
gUnknown_030012EC = REG_IME;
gUnknown_030012EE = REG_IE;
@@ -528,7 +532,7 @@ void sub_81D41A0(void)
gUnknown_030012F4 = REG_RCNT;
}
-void sub_81D41F4(void)
+void EReaderHelper_RestoreRegsState(void)
{
REG_IME = gUnknown_030012EC;
REG_IE = gUnknown_030012EE;
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index 98f0d9b8c..13e964224 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -49,7 +49,7 @@ static void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2)
REG_IME = 0;
gIntrTable[1] = sub_81D3FAC;
gIntrTable[2] = sub_81D3F9C;
- sub_81D41A0();
+ EReaderHelper_SaveRegsState();
sub_81D4238();
REG_IE |= INTR_FLAG_VCOUNT;
REG_IME = backupIME;
@@ -63,7 +63,7 @@ static void sub_81D4DB8(struct Unk03006370 *arg0)
volatile u16 backupIME = REG_IME;
REG_IME = 0;
sub_81D4238();
- sub_81D41F4();
+ EReaderHelper_RestoreRegsState();
RestoreSerialTimer3IntrHandlers();
REG_IME = backupIME;
}
@@ -71,7 +71,7 @@ static void sub_81D4DB8(struct Unk03006370 *arg0)
static u8 sub_81D4DE8(struct Unk03006370 *arg0)
{
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)
var0 = 1;
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 77c8fcb53..7eff0d394 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -38,7 +38,6 @@
#define HILL_TAG_UNIQUE 2
#define HILL_TAG_EXPERT 3
-#define HILL_TRAINER_NAME_LENGTH 11
#define HILL_MAX_TIME 215999 // 60 * 60 * 60 - 1
struct TrHillRoomTrainers
@@ -47,18 +46,6 @@ struct TrHillRoomTrainers
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
{
u8 unk0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 20:10:01 +0000