From 8c09deee827efd0863d4990867f887400f1745a1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 13 Jul 2017 15:43:03 -0500 Subject: decompile stuff --- include/global.h | 4 +++- include/record_mixing.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 0f5bcde6d..fd28b306f 100644 --- a/include/global.h +++ b/include/global.h @@ -531,7 +531,9 @@ struct GabbyAndTyData struct RecordMixing_UnknownStructSub { - u8 data[0x38]; + u32 unk0; + u8 data[0x34]; + //u8 data[0x38]; }; struct RecordMixing_UnknownStruct diff --git a/include/record_mixing.h b/include/record_mixing.h index 103f5ad64..036bb469e 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -23,11 +23,11 @@ void sub_80B9A88(u8 *a); void sub_80B9B1C(u8 *a, size_t size, u8 index); void sub_80B9B70(u8 *a, size_t size, u8 index); u8 sub_80B9BBC(u16 *a); -void sub_80B9BC4(struct RecordMixing_UnknownStruct *, size_t, u8 [][2], u8, u8); +void sub_80B9BC4(u8 *, size_t, u8 *, u8 d, u8 e); u8 sub_80B9C4C(u8 *a); // ASM -void sub_80B9C6C(struct RecordMixing_UnknownStruct *, u32, u8, void *); +void sub_80B9C6C(u8 *, u32, u8, void *); void sub_80B9F3C(void *, u8); void sub_80BA00C(u8); -- cgit v1.2.3 From 5f5c80818653e135e5cda11ce430bde7cbcd62c1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 13 Jul 2017 23:55:40 -0500 Subject: finish decompiling record_mixing --- include/flags.h | 1 + include/record_mixing.h | 2 +- include/save.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/flags.h b/include/flags.h index 0e408a833..26a129ea2 100644 --- a/include/flags.h +++ b/include/flags.h @@ -50,6 +50,7 @@ #define SYS_BRAILLE_STRENGTH 0x850 #define SYS_BRAILLE_WAIT 0x851 #define SYS_BRAILLE_FLY 0x852 +#define SYS_HAS_EON_TICKET 0x853 #define SYS_TV_LATI 0x85D diff --git a/include/record_mixing.h b/include/record_mixing.h index 036bb469e..e0a56d4b0 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -28,7 +28,7 @@ u8 sub_80B9C4C(u8 *a); // ASM void sub_80B9C6C(u8 *, u32, u8, void *); -void sub_80B9F3C(void *, u8); +void sub_80B9F3C(u16 *, u8); void sub_80BA00C(u8); #endif // GUARD_RECORD_MIXING_H diff --git a/include/save.h b/include/save.h index 3feaa1f3d..6c47c6f60 100644 --- a/include/save.h +++ b/include/save.h @@ -74,7 +74,7 @@ bool8 sub_8125DA8(void); u8 sub_8125DDC(void); u8 sub_8125E04(void); u8 sub_8125E2C(void); -u8 sub_8125E6C(void); +bool8 sub_8125E6C(void); u8 sub_8125EC8(u8 a1); bool8 unref_sub_8125F4C(struct UnkSaveSection *a1); u8 unref_sub_8125FA0(void); -- cgit v1.2.3 From 2b39d8f7d763311c69a31dab366f696626c01d36 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 14 Jul 2017 01:48:30 -0500 Subject: clean up a bit --- include/record_mixing.h | 6 +++--- include/vars.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/record_mixing.h b/include/record_mixing.h index e0a56d4b0..ca60b04a7 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -14,8 +14,8 @@ void Task_RecordMixing_CopyReceiveBuffer(u8 taskId); void sub_80B99B4(u8 taskId); void Task_RecordMixing_ReceivePacket(u8 taskId); void Task_RecordMixing_SendPacket_SwitchToReceive(u8 taskId); -void *LoadPtrFromTaskData(u16 *ptr); -void StorePtrInTaskData(void *ptr, u16 *data); +void *LoadPtrFromTaskData(u16 *); +void StorePtrInTaskData(void *, u16 *); u8 GetMultiplayerId_(void); u16 *GetPlayerRecvBuffer(u8 player); void sub_80B9A78(void); @@ -23,7 +23,7 @@ void sub_80B9A88(u8 *a); void sub_80B9B1C(u8 *a, size_t size, u8 index); void sub_80B9B70(u8 *a, size_t size, u8 index); u8 sub_80B9BBC(u16 *a); -void sub_80B9BC4(u8 *, size_t, u8 *, u8 d, u8 e); +void sub_80B9BC4(u8 *, size_t, u8[][2], u8 d, u8 e); u8 sub_80B9C4C(u8 *a); // ASM diff --git a/include/vars.h b/include/vars.h index e08f344d4..efbb462a4 100755 --- a/include/vars.h +++ b/include/vars.h @@ -1,6 +1,7 @@ #ifndef GUARD_VARS_H #define GUARD_VARS_H +#define VAR_0x4000 0x4000 #define VAR_0x4001 0x4001 #define VAR_0x4002 0x4002 #define VAR_0x4003 0x4003 -- cgit v1.2.3