dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync link_rfu_3.c from Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-06-01 16:27:38 -04:00
parent 6580ac8739
commit c7e8b0857a
2 changed files with 357 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/link_rfu.h
+14 -11
View File
@@ -31,6 +31,9 @@
#define BACKUP_QUEUE_NUM_SLOTS 2 #define BACKUP_QUEUE_NUM_SLOTS 2
#define BACKUP_QUEUE_SLOT_LENGTH 14 #define BACKUP_QUEUE_SLOT_LENGTH 14
#define UNUSED_QUEUE_NUM_SLOTS 2
#define UNUSED_QUEUE_SLOT_LENGTH 256
#define RFU_PACKET_SIZE 6 #define RFU_PACKET_SIZE 6
#define RFU_STATUS_OK 0 #define RFU_STATUS_OK 0
@@ -57,7 +60,7 @@ struct GFtgtGnameSub
u16 language:4; u16 language:4;
u16 hasNews:1; u16 hasNews:1;
u16 hasCard:1; u16 hasCard:1;
u16 unk_00_6:1; u16 unknown:1;
u16 isChampion:1; u16 isChampion:1;
u16 hasNationalDex:1; u16 hasNationalDex:1;
u16 gameClear:1; u16 gameClear:1;
@@ -125,9 +128,9 @@ struct RfuBackupQueue
/* 0x1e */ vu8 count; /* 0x1e */ vu8 count;
}; };
struct UnkRfuStruct_Sub_Unused struct RfuUnusedQueue
{ {
/* 0x000 */ u8 slots[2][256]; /* 0x000 */ u8 slots[UNUSED_QUEUE_NUM_SLOTS][UNUSED_QUEUE_SLOT_LENGTH];
/* 0x200 */ vu8 recv_slot; /* 0x200 */ vu8 recv_slot;
/* 0x201 */ vu8 send_slot; /* 0x201 */ vu8 send_slot;
/* 0x202 */ vu8 count; /* 0x202 */ vu8 count;
@@ -246,17 +249,17 @@ void UpdateWirelessStatusIndicatorSprite(void);
void InitRFU(void); void InitRFU(void);
bool32 RfuHasErrored(void); bool32 RfuHasErrored(void);
void RfuRecvQueue_Reset(struct RfuRecvQueue *ptr); void RfuRecvQueue_Reset(struct RfuRecvQueue *queue);
void RfuSendQueue_Reset(struct RfuSendQueue *ptr); void RfuSendQueue_Reset(struct RfuSendQueue *queue);
void RfuSetStatus(u8 status, u16 msg); void RfuSetStatus(u8 status, u16 msg);
u8 RfuGetStatus(void); u8 RfuGetStatus(void);
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *q1, u8 *q2); void RfuRecvQueue_Enqueue(struct RfuRecvQueue *queue, u8 *src);
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *q1, u8 *q2); bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *queue, u8 *dest);
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *q1, u8 *q2); bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *queue, u8 *dest);
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *q1, const u8 *q2); void RfuBackupQueue_Enqueue(struct RfuBackupQueue *queue, const u8 *dest);
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue * a0, u8 *a1); bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue * queue, u8 *dest);
void RfuSendQueue_Enqueue(struct RfuSendQueue * a0, u8 *a1); void RfuSendQueue_Enqueue(struct RfuSendQueue * queue, u8 *src);
void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders); void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders);
void UpdateGameData_GroupLockedIn(bool8 started); void UpdateGameData_GroupLockedIn(bool8 started);
bool32 IsRfuSerialNumberValid(u32 serialNo); bool32 IsRfuSerialNumberValid(u32 serialNo);
src/link_rfu_3.c
+343 -197
View File
@@ -13,22 +13,83 @@ static const u16 gWirelessLinkIconPalette[] = INCBIN_U16("graphics/interface/wir
static const u32 gWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireless_link_icon.4bpp.lz"); static const u32 gWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireless_link_icon.4bpp.lz");
static const u8 sWireless_ASCIItoRSETable[] = { static const u8 sWireless_ASCIItoRSETable[] = {
0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, EOS,
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00, [' '] = CHAR_SPACE,
0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba, ['!'] = CHAR_EXCL_MARK,
0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00,
0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x00, 0x00, 0xb2, 0xf1, 0x00,
0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, ['-'] = CHAR_HYPHEN,
0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, ['.'] = CHAR_PERIOD,
0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, ['/'] = CHAR_SLASH,
0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, ['0'] = CHAR_0,
0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, ['1'] = CHAR_1,
0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, ['2'] = CHAR_2,
0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, ['3'] = CHAR_3,
0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32, ['4'] = CHAR_4,
['5'] = CHAR_5,
['6'] = CHAR_6,
['7'] = CHAR_7,
['8'] = CHAR_8,
['9'] = CHAR_9,
0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x00,
['A'] = CHAR_A,
['B'] = CHAR_B,
['C'] = CHAR_C,
['D'] = CHAR_D,
['E'] = CHAR_E,
['F'] = CHAR_F,
['G'] = CHAR_G,
['H'] = CHAR_H,
['I'] = CHAR_I,
['J'] = CHAR_J,
['K'] = CHAR_K,
['L'] = CHAR_L,
['M'] = CHAR_M,
['N'] = CHAR_N,
['O'] = CHAR_O,
['P'] = CHAR_P,
['Q'] = CHAR_Q,
['R'] = CHAR_R,
['S'] = CHAR_S,
['T'] = CHAR_T,
['U'] = CHAR_U,
['V'] = CHAR_V,
['W'] = CHAR_W,
['X'] = CHAR_X,
['Y'] = CHAR_Y,
['Z'] = CHAR_Z,
0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00,
['a'] = CHAR_a,
['b'] = CHAR_b,
['c'] = CHAR_c,
['d'] = CHAR_d,
['e'] = CHAR_e,
['f'] = CHAR_f,
['g'] = CHAR_g,
['h'] = CHAR_h,
['i'] = CHAR_i,
['j'] = CHAR_j,
['k'] = CHAR_k,
['l'] = CHAR_l,
['m'] = CHAR_m,
['n'] = CHAR_n,
['o'] = CHAR_o,
['p'] = CHAR_p,
['q'] = CHAR_q,
['r'] = CHAR_r,
['s'] = CHAR_s,
['t'] = CHAR_t,
['u'] = CHAR_u,
['v'] = CHAR_v,
['w'] = CHAR_w,
['x'] = CHAR_x,
['y'] = CHAR_y,
['z'] = CHAR_z,
0x2d, 0x2f, 0x30, 0x31, 0x32,
0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02, 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02,
0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
@@ -48,53 +109,118 @@ static const u8 sWireless_ASCIItoRSETable[] = {
}; };
static const u8 sWireless_RSEtoASCIITable[] = { static const u8 sWireless_RSEtoASCIITable[] = {
0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, [CHAR_SPACE] = ' ',
0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d,
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d,
0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4,
0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec,
0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0x7d,
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0x08,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x84,
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xa8,
0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xf3,
0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb,
0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0x04,
0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xaf,
0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5, [CHAR_0] = '0',
0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20, [CHAR_1] = '1',
0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45, [CHAR_2] = '2',
0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, [CHAR_3] = '3',
0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, [CHAR_4] = '4',
0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, [CHAR_5] = '5',
0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, [CHAR_6] = '6',
0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, [CHAR_7] = '7',
0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20, [CHAR_8] = '8',
0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20, [CHAR_9] = '9',
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 [CHAR_EXCL_MARK] = '!',
0xdf, 0xa1, 0xb0, 0xa5, 0xde, 0x24, 0x2a,
0xa2, 0xa3, 0x22, 0x23, 0x20, 0xa4, 0x20,
[CHAR_SLASH] = '/',
[CHAR_A] = 'A',
[CHAR_B] = 'B',
[CHAR_C] = 'C',
[CHAR_D] = 'D',
[CHAR_E] = 'E',
[CHAR_F] = 'F',
[CHAR_G] = 'G',
[CHAR_H] = 'H',
[CHAR_I] = 'I',
[CHAR_J] = 'J',
[CHAR_K] = 'K',
[CHAR_L] = 'L',
[CHAR_M] = 'M',
[CHAR_N] = 'N',
[CHAR_O] = 'O',
[CHAR_P] = 'P',
[CHAR_Q] = 'Q',
[CHAR_R] = 'R',
[CHAR_S] = 'S',
[CHAR_T] = 'T',
[CHAR_U] = 'U',
[CHAR_V] = 'V',
[CHAR_W] = 'W',
[CHAR_X] = 'X',
[CHAR_Y] = 'Y',
[CHAR_Z] = 'Z',
[CHAR_a] = 'a',
[CHAR_b] = 'b',
[CHAR_c] = 'c',
[CHAR_d] = 'd',
[CHAR_e] = 'e',
[CHAR_f] = 'f',
[CHAR_g] = 'g',
[CHAR_h] = 'h',
[CHAR_i] = 'i',
[CHAR_j] = 'j',
[CHAR_k] = 'k',
[CHAR_l] = 'l',
[CHAR_m] = 'm',
[CHAR_n] = 'n',
[CHAR_o] = 'o',
[CHAR_p] = 'p',
[CHAR_q] = 'q',
[CHAR_r] = 'r',
[CHAR_s] = 's',
[CHAR_t] = 't',
[CHAR_u] = 'u',
[CHAR_v] = 'v',
[CHAR_w] = 'w',
[CHAR_x] = 'x',
[CHAR_y] = 'y',
[CHAR_z] = 'z',
0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
[CHAR_DYNAMIC_PLACEHOLDER] = ' ',
[CHAR_KEYPAD_ICON] = ' ',
[CHAR_EXTRA_EMOJI] = ' ',
[CHAR_PROMPT_SCROLL] = ' ',
[CHAR_PROMPT_CLEAR] = ' ',
[EXT_CTRL_CODE_BEGIN] = ' ',
[PLACEHOLDER_BEGIN] = ' ',
[CHAR_NEWLINE] = ' ',
[EOS] = 0
}; };
static const struct OamData sWirelessStatusIndicatorOamData = static const struct OamData sWirelessStatusIndicatorOamData =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
.size = SPRITE_SIZE(16x16), .size = SPRITE_SIZE(16x16),
.tileNum = 0, .tileNum = 0,
.priority = 0, .priority = 0,
.paletteNum = 0, .paletteNum = 0,
}; };
static const union AnimCmd sWirelessStatusIndicatorAnim0[] = { static const union AnimCmd sWirelessStatusIndicatorAnim0[] = {
// 3 bars // 3 bars
@@ -154,265 +280,267 @@ static const struct SpritePalette sWirelessStatusIndicatorSpritePalette = {
}; };
static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = { static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = {
0xD431, .tileTag = 0xD431,
0xD432, .paletteTag = 0xD432,
&sWirelessStatusIndicatorOamData, .oam = &sWirelessStatusIndicatorOamData,
sWirelessStatusIndicatorAnims, .anims = sWirelessStatusIndicatorAnims,
NULL, .images = NULL,
gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
void RfuRecvQueue_Reset(struct RfuRecvQueue *ptr) // A bunch of FIFO queues
void RfuRecvQueue_Reset(struct RfuRecvQueue *queue)
{ {
s32 i; s32 i;
s32 j; s32 j;
for (i = 0; i < 20; i++) for (i = 0; i < RECV_QUEUE_NUM_SLOTS; i++)
{ {
for (j = 0; j < 70; j++) for (j = 0; j < RECV_QUEUE_SLOT_LENGTH; j++)
{ {
ptr->slots[i][j] = 0; queue->slots[i][j] = 0;
} }
} }
ptr->send_slot = 0; queue->send_slot = 0;
ptr->recv_slot = 0; queue->recv_slot = 0;
ptr->count = 0; queue->count = 0;
ptr->full = 0; queue->full = FALSE;
} }
void RfuSendQueue_Reset(struct RfuSendQueue *ptr) void RfuSendQueue_Reset(struct RfuSendQueue *queue)
{ {
s32 i; s32 i;
s32 j; s32 j;
for (i = 0; i < 40; i++) for (i = 0; i < SEND_QUEUE_NUM_SLOTS; i++)
{ {
for (j = 0; j < 14; j++) for (j = 0; j < SEND_QUEUE_SLOT_LENGTH; j++)
{ {
ptr->slots[i][j] = 0; queue->slots[i][j] = 0;
} }
} }
ptr->send_slot = 0; queue->send_slot = 0;
ptr->recv_slot = 0; queue->recv_slot = 0;
ptr->count = 0; queue->count = 0;
ptr->full = 0; queue->full = FALSE;
} }
static void RFU_queue_2_256_reset(struct UnkRfuStruct_Sub_Unused *ptr) static void RfuUnusedQueue_Reset(struct RfuUnusedQueue *queue)
{ {
s32 i; s32 i;
s32 j; s32 j;
for (i = 0; i < 2; i++) for (i = 0; i < UNUSED_QUEUE_NUM_SLOTS; i++)
{ {
for (j = 0; j < 256; j++) for (j = 0; j < UNUSED_QUEUE_SLOT_LENGTH; j++)
{ {
ptr->slots[i][j] = 0; queue->slots[i][j] = 0;
} }
} }
ptr->send_slot = 0; queue->send_slot = 0;
ptr->recv_slot = 0; queue->recv_slot = 0;
ptr->count = 0; queue->count = 0;
ptr->full = 0; queue->full = FALSE;
} }
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *q1, u8 *q2) void RfuRecvQueue_Enqueue(struct RfuRecvQueue *queue, u8 *src)
{ {
s32 i; s32 i;
u16 imeBak; u16 imeBak;
u8 count; u8 count;
if (q1->count < 20) if (queue->count < RECV_QUEUE_NUM_SLOTS)
{ {
imeBak = REG_IME; imeBak = REG_IME;
REG_IME = 0; REG_IME = 0;
count = 0; count = 0;
for (i = 0; i < 70; i += 14) for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i += RECV_QUEUE_SLOT_LENGTH / MAX_RFU_PLAYERS)
{ {
if (q2[i] == 0 && q2[i + 1] == 0) if (src[i] == 0 && src[i + 1] == 0)
{ {
count++; count++;
} }
} }
if (count != 5) if (count != MAX_RFU_PLAYERS)
{ {
for (i = 0; i < 70; i++) for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++)
{ {
q1->slots[q1->recv_slot][i] = q2[i]; queue->slots[queue->recv_slot][i] = src[i];
} }
q1->recv_slot++; queue->recv_slot++;
q1->recv_slot %= 20; queue->recv_slot %= RECV_QUEUE_NUM_SLOTS;
q1->count++; queue->count++;
for (i = 0; i < 70; i++) for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++)
{ {
q2[i] = 0; src[i] = 0;
} }
} }
REG_IME = imeBak; REG_IME = imeBak;
} }
else else
{ {
q1->full = 1; queue->full = TRUE;
} }
} }
void RfuSendQueue_Enqueue(struct RfuSendQueue *a0, u8 *a1) void RfuSendQueue_Enqueue(struct RfuSendQueue *queue, u8 *src)
{ {
s32 i; s32 i;
u16 imeBak; u16 imeBak;
if (a0->count < 40) if (queue->count < SEND_QUEUE_NUM_SLOTS)
{ {
imeBak = REG_IME; imeBak = REG_IME;
REG_IME = 0; REG_IME = 0;
for (i = 0; i < 14; i++) for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++)
{ {
if (a1[i] != 0) if (src[i] != 0)
{ {
break; break;
} }
} }
if (i != 14) if (i != SEND_QUEUE_SLOT_LENGTH)
{ {
for (i = 0; i < 14; i++) for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++)
{ {
a0->slots[a0->recv_slot][i] = a1[i]; queue->slots[queue->recv_slot][i] = src[i];
} }
a0->recv_slot++; queue->recv_slot++;
a0->recv_slot %= 40; queue->recv_slot %= SEND_QUEUE_NUM_SLOTS;
a0->count++; queue->count++;
for (i = 0; i < 14; i++) for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++)
{ {
a1[i] = 0; src[i] = 0;
} }
} }
REG_IME = imeBak; REG_IME = imeBak;
} }
else else
{ {
a0->full = 1; queue->full = TRUE;
} }
} }
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *a0, u8 *a1) bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *queue, u8 *dest)
{ {
u16 imeBak; u16 imeBak;
s32 i; s32 i;
imeBak = REG_IME; imeBak = REG_IME;
REG_IME = 0; REG_IME = 0;
if (a0->recv_slot == a0->send_slot || a0->full) if (queue->recv_slot == queue->send_slot || queue->full)
{ {
for (i = 0; i < 70; i++) for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++)
{ {
a1[i] = 0; dest[i] = 0;
} }
REG_IME = imeBak; REG_IME = imeBak;
return FALSE; return FALSE;
} }
for (i = 0; i < 70; i++) for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++)
{ {
a1[i] = a0->slots[a0->send_slot][i]; dest[i] = queue->slots[queue->send_slot][i];
} }
a0->send_slot++; queue->send_slot++;
a0->send_slot %= 20; queue->send_slot %= RECV_QUEUE_NUM_SLOTS;
a0->count--; queue->count--;
REG_IME = imeBak; REG_IME = imeBak;
return TRUE; return TRUE;
} }
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *q1, u8 *q2) bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *queue, u8 *dest)
{ {
s32 i; s32 i;
u16 imeBak; u16 imeBak;
if (q1->recv_slot == q1->send_slot || q1->full != 0) if (queue->recv_slot == queue->send_slot || queue->full)
{ {
return FALSE; return FALSE;
} }
imeBak = REG_IME; imeBak = REG_IME;
REG_IME = 0; REG_IME = 0;
for (i = 0; i < 14; i++) for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++)
{ {
q2[i] = q1->slots[q1->send_slot][i]; dest[i] = queue->slots[queue->send_slot][i];
} }
q1->send_slot++; queue->send_slot++;
q1->send_slot %= 40; queue->send_slot %= SEND_QUEUE_NUM_SLOTS;
q1->count--; queue->count--;
REG_IME = imeBak; REG_IME = imeBak;
return TRUE; return TRUE;
} }
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *q1, const u8 *q2) void RfuBackupQueue_Enqueue(struct RfuBackupQueue *queue, const u8 *dest)
{ {
s32 i; s32 i;
if (q2[1] == 0) if (dest[1] == 0)
{ {
RfuBackupQueue_Dequeue(q1, NULL); RfuBackupQueue_Dequeue(queue, NULL);
} }
else else
{ {
for (i = 0; i < 14; i++) for (i = 0; i < BACKUP_QUEUE_SLOT_LENGTH; i++)
{ {
q1->slots[q1->recv_slot][i] = q2[i]; queue->slots[queue->recv_slot][i] = dest[i];
} }
q1->recv_slot++; queue->recv_slot++;
q1->recv_slot %= 2; queue->recv_slot %= BACKUP_QUEUE_NUM_SLOTS;
if (q1->count < 2) if (queue->count < BACKUP_QUEUE_NUM_SLOTS)
{ {
q1->count++; queue->count++;
} }
else else
{ {
q1->send_slot = q1->recv_slot; queue->send_slot = queue->recv_slot;
} }
} }
} }
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *q1, u8 *q2) bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *queue, u8 *dest)
{ {
s32 i; s32 i;
if (q1->count == 0) if (queue->count == 0)
{ {
return FALSE; return FALSE;
} }
if (q2 != NULL) if (dest != NULL)
{ {
for (i = 0; i < 14; i++) for (i = 0; i < BACKUP_QUEUE_SLOT_LENGTH; i++)
{ {
q2[i] = q1->slots[q1->send_slot][i]; dest[i] = queue->slots[queue->send_slot][i];
} }
} }
q1->send_slot++; queue->send_slot++;
q1->send_slot %= 2; queue->send_slot %= BACKUP_QUEUE_NUM_SLOTS;
q1->count--; queue->count--;
return TRUE; return TRUE;
} }
static void RFU_queue_2_256_recv(struct UnkRfuStruct_Sub_Unused *queue, u8 *data) static void RfuUnusedQueue_Dequeue(struct RfuUnusedQueue *queue, u8 *dest)
{ {
s32 i; s32 i;
if (queue->count < 2) if (queue->count < UNUSED_QUEUE_NUM_SLOTS)
{ {
for (i = 0; i < 256; i++) for (i = 0; i < UNUSED_QUEUE_SLOT_LENGTH; i++)
{ {
queue->slots[queue->recv_slot][i] = data[i]; queue->slots[queue->recv_slot][i] = dest[i];
} }
queue->recv_slot++; queue->recv_slot++;
queue->recv_slot %= 2; queue->recv_slot %= UNUSED_QUEUE_NUM_SLOTS;
queue->count++; queue->count++;
} }
else else
{ {
queue->full = 1; queue->full = TRUE;
} }
} }
static bool8 RFU_queue_2_256_send(struct UnkRfuStruct_Sub_Unused *queue, u8 *send) static bool8 RfuUnusedQueue_Enqueue(struct RfuUnusedQueue *queue, u8 *dest)
{ {
s32 i; s32 i;
@@ -420,16 +548,17 @@ static bool8 RFU_queue_2_256_send(struct UnkRfuStruct_Sub_Unused *queue, u8 *sen
{ {
return FALSE; return FALSE;
} }
for (i = 0; i < 256; i++) for (i = 0; i < UNUSED_QUEUE_SLOT_LENGTH; i++)
{ {
send[i] = queue->slots[queue->send_slot][i]; dest[i] = queue->slots[queue->send_slot][i];
} }
queue->send_slot++; queue->send_slot++;
queue->send_slot %= 2; queue->send_slot %= UNUSED_QUEUE_NUM_SLOTS;
queue->count--; queue->count--;
return TRUE; return TRUE;
} }
UNUSED
static void sub_80FC9B8(u8 *q1, u8 mode) static void sub_80FC9B8(u8 *q1, u8 mode)
{ {
s32 i; s32 i;
@@ -476,26 +605,26 @@ static void sub_80FC9B8(u8 *q1, u8 mode)
} }
} }
static void PkmnStrToASCII(u8 *q1, const u8 *q2) static void PkmnStrToASCII(u8 *dest, const u8 *src)
{ {
s32 i; s32 i;
for (i = 0; q2[i] != EOS; i++) for (i = 0; src[i] != EOS; i++)
{ {
q1[i] = sWireless_RSEtoASCIITable[q2[i]]; dest[i] = sWireless_RSEtoASCIITable[src[i]];
} }
q1[i] = 0; dest[i] = 0;
} }
static void ASCIIToPkmnStr(u8 *q1, const u8 *q2) static void ASCIIToPkmnStr(u8 *dest, const u8 *src)
{ {
s32 i; s32 i;
for (i = 0; q2[i] != 0; i++) for (i = 0; src[i] != 0; i++)
{ {
q1[i] = sWireless_ASCIItoRSETable[q2[i]]; dest[i] = sWireless_ASCIItoRSETable[src[i]];
} }
q1[i] = EOS; dest[i] = EOS;
} }
static u8 GetConnectedChildStrength(u8 maxFlags) static u8 GetConnectedChildStrength(u8 maxFlags)
@@ -552,7 +681,7 @@ void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s
data->unk_00.version = GAME_VERSION; data->unk_00.version = GAME_VERSION;
data->unk_00.hasNews = FALSE; data->unk_00.hasNews = FALSE;
data->unk_00.hasCard = FALSE; data->unk_00.hasCard = FALSE;
data->unk_00.unk_00_6 = 0; data->unk_00.unknown = FALSE;
data->unk_00.isChampion = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS); data->unk_00.isChampion = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS);
data->unk_00.hasNationalDex = IsNationalPokedexEnabled(); data->unk_00.hasNationalDex = IsNationalPokedexEnabled();
data->unk_00.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR); data->unk_00.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR);
@@ -609,7 +738,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx) bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx)
{ {
bool8 retVal = FALSE; bool8 retVal = FALSE;
if (gRfuLinkStatus->partner[idx].serialNo == 0x7F7D) if (gRfuLinkStatus->partner[idx].serialNo == RFU_SERIAL_7F7D)
{ {
memcpy(gname, gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH); memcpy(gname, gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH); memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -629,37 +758,46 @@ void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname
memcpy(uname, gHostRFUtgtUnameBuffer, RFU_USER_NAME_LENGTH); memcpy(uname, gHostRFUtgtUnameBuffer, RFU_USER_NAME_LENGTH);
} }
#define sNextAnimNum data[0]
#define sSavedAnimNum data[1]
#define sCurrAnimNum data[2]
#define sFrameDelay data[3]
#define sFrameIdx data[4]
#define sTileStart data[6]
#define sValidator data[7]
#define STATUS_INDICATOR_ACTIVE 0x1234 // Used to validate active indicator
void CreateWirelessStatusIndicatorSprite(u8 x, u8 y) void CreateWirelessStatusIndicatorSprite(u8 x, u8 y)
{ {
u8 sprId; u8 sprId;
if (x == 0 && y == 0) if (x == 0 && y == 0)
{ {
x = 0xE7; x = 231;
y = 0x08; y = 8;
} }
if (gRfuLinkStatus->parentChild == MODE_PARENT) if (gRfuLinkStatus->parentChild == MODE_PARENT)
{ {
sprId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0); sprId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0);
gSprites[sprId].data[7] = 0x1234; gSprites[sprId].sValidator = STATUS_INDICATOR_ACTIVE;
gSprites[sprId].data[6] = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); gSprites[sprId].sTileStart = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag);
gSprites[sprId].invisible = TRUE; gSprites[sprId].invisible = TRUE;
gWirelessStatusIndicatorSpriteId = sprId; gWirelessStatusIndicatorSpriteId = sprId;
} }
else else
{ {
gWirelessStatusIndicatorSpriteId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0); gWirelessStatusIndicatorSpriteId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0);
gSprites[gWirelessStatusIndicatorSpriteId].data[7] = 0x1234; gSprites[gWirelessStatusIndicatorSpriteId].sValidator = STATUS_INDICATOR_ACTIVE;
gSprites[gWirelessStatusIndicatorSpriteId].data[6] = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); gSprites[gWirelessStatusIndicatorSpriteId].sTileStart = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag);
gSprites[gWirelessStatusIndicatorSpriteId].invisible = TRUE; gSprites[gWirelessStatusIndicatorSpriteId].invisible = TRUE;
} }
} }
void DestroyWirelessStatusIndicatorSprite(void) void DestroyWirelessStatusIndicatorSprite(void)
{ {
if (gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) if (gSprites[gWirelessStatusIndicatorSpriteId].sValidator == STATUS_INDICATOR_ACTIVE)
{ {
gSprites[gWirelessStatusIndicatorSpriteId].data[7] = 0; gSprites[gWirelessStatusIndicatorSpriteId].sValidator = 0;
DestroySprite(&gSprites[gWirelessStatusIndicatorSpriteId]); DestroySprite(&gSprites[gWirelessStatusIndicatorSpriteId]);
gMain.oamBuffer[125] = gDummyOamData; gMain.oamBuffer[125] = gDummyOamData;
CpuCopy16(&gDummyOamData, (struct OamData *)OAM + 125, sizeof(struct OamData)); CpuCopy16(&gDummyOamData, (struct OamData *)OAM + 125, sizeof(struct OamData));
@@ -693,17 +831,17 @@ static u8 GetParentSignalStrength(void)
static void SetAndRestartWirelessStatusIndicatorAnim(struct Sprite *sprite, s32 signalStrengthAnimNum) static void SetAndRestartWirelessStatusIndicatorAnim(struct Sprite *sprite, s32 signalStrengthAnimNum)
{ {
if (sprite->data[2] != signalStrengthAnimNum) if (sprite->sCurrAnimNum != signalStrengthAnimNum)
{ {
sprite->data[2] = signalStrengthAnimNum; sprite->sCurrAnimNum = signalStrengthAnimNum;
sprite->data[3] = 0; sprite->sFrameDelay = 0;
sprite->data[4] = 0; sprite->sFrameIdx = 0;
} }
} }
void UpdateWirelessStatusIndicatorSprite(void) void UpdateWirelessStatusIndicatorSprite(void)
{ {
if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].sValidator == STATUS_INDICATOR_ACTIVE)
{ {
struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId];
u8 signalStrength = RFU_LINK_ICON_LEVEL4_MAX; u8 signalStrength = RFU_LINK_ICON_LEVEL4_MAX;
@@ -724,55 +862,63 @@ void UpdateWirelessStatusIndicatorSprite(void)
} }
if (IsRfuRecoveringFromLinkLoss() == TRUE) if (IsRfuRecoveringFromLinkLoss() == TRUE)
{ {
sprite->data[0] = 4; sprite->sNextAnimNum = 4;
} }
else if (signalStrength <= RFU_LINK_ICON_LEVEL1_MAX) else if (signalStrength <= RFU_LINK_ICON_LEVEL1_MAX)
{ {
sprite->data[0] = 3; sprite->sNextAnimNum = 3;
} }
else if (signalStrength >= RFU_LINK_ICON_LEVEL2_MIN && signalStrength <= RFU_LINK_ICON_LEVEL2_MAX) else if (signalStrength >= RFU_LINK_ICON_LEVEL2_MIN && signalStrength <= RFU_LINK_ICON_LEVEL2_MAX)
{ {
sprite->data[0] = 2; sprite->sNextAnimNum = 2;
} }
else if (signalStrength >= RFU_LINK_ICON_LEVEL3_MIN && signalStrength <= RFU_LINK_ICON_LEVEL3_MAX) else if (signalStrength >= RFU_LINK_ICON_LEVEL3_MIN && signalStrength <= RFU_LINK_ICON_LEVEL3_MAX)
{ {
sprite->data[0] = 1; sprite->sNextAnimNum = 1;
} }
else if (signalStrength >= RFU_LINK_ICON_LEVEL4_MIN) else if (signalStrength >= RFU_LINK_ICON_LEVEL4_MIN)
{ {
sprite->data[0] = 0; sprite->sNextAnimNum = 0;
} }
if (sprite->data[0] != sprite->data[1]) if (sprite->sNextAnimNum != sprite->sSavedAnimNum)
{ {
SetAndRestartWirelessStatusIndicatorAnim(sprite, sprite->data[0]); SetAndRestartWirelessStatusIndicatorAnim(sprite, sprite->sNextAnimNum);
sprite->data[1] = sprite->data[0]; sprite->sSavedAnimNum = sprite->sNextAnimNum;
} }
if (sprite->anims[sprite->data[2]][sprite->data[4]].frame.duration < sprite->data[3]) if (sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].frame.duration < sprite->sFrameDelay)
{ {
sprite->data[4]++; sprite->sFrameIdx++;
sprite->data[3] = 0; sprite->sFrameDelay = 0;
if (sprite->anims[sprite->data[2]][sprite->data[4]].type == -2) if (sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].type == -2) // ANIMCMD_JUMP
{ {
sprite->data[4] = 0; sprite->sFrameIdx = 0;
} }
} }
else else
{ {
sprite->data[3]++; sprite->sFrameDelay++;
} }
gMain.oamBuffer[125] = sWirelessStatusIndicatorOamData; gMain.oamBuffer[125] = sWirelessStatusIndicatorOamData;
gMain.oamBuffer[125].x = sprite->pos1.x + sprite->centerToCornerVecX; gMain.oamBuffer[125].x = sprite->pos1.x + sprite->centerToCornerVecX;
gMain.oamBuffer[125].y = sprite->pos1.y + sprite->centerToCornerVecY; gMain.oamBuffer[125].y = sprite->pos1.y + sprite->centerToCornerVecY;
gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum; gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
gMain.oamBuffer[125].tileNum = sprite->data[6] + sprite->anims[sprite->data[2]][sprite->data[4]].frame.imageValue; gMain.oamBuffer[125].tileNum = sprite->sTileStart + sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].frame.imageValue;
CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData)); CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData));
if (RfuGetStatus() == 1) if (RfuGetStatus() == RFU_STATUS_FATAL_ERROR)
{ {
DestroyWirelessStatusIndicatorSprite(); DestroyWirelessStatusIndicatorSprite();
} }
} }
} }
#undef sNextAnimNum
#undef sSavedAnimNum
#undef sCurrAnimNum
#undef sFrameDelay
#undef sFrameIdx
#undef sTileStart
#undef sValidator
static void CopyTrainerRecord(struct TrainerNameRecord *dest, u32 trainerId, const u8 *name) static void CopyTrainerRecord(struct TrainerNameRecord *dest, u32 trainerId, const u8 *name)
{ {
int i; int i;