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

Finish union_room_chat_display

Browse Source
This commit is contained in:
PikalaxALT
2020-01-25 13:35:34 -05:00
parent f249df41e3
commit c0b05784d6
13 changed files with 654 additions and 1729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/union_room_chat.c
+4 -11
View File
@@ -13,18 +13,11 @@
#include "scanline_effect.h"
#include "strings.h"
#include "task.h"
#include "union_room_chat.h"
#include "union_room_chat_display.h"
#include "data_8479668.h"
#include "constants/songs.h"
enum
{
UNION_ROOM_KB_PAGE_UPPER,
UNION_ROOM_KB_PAGE_LOWER,
UNION_ROOM_KB_PAGE_EMOJI,
UNION_ROOM_KB_PAGE_COUNT
};
struct UnionRoomChat
{
u8 filler0[0x4];
@@ -147,7 +140,7 @@ const u8 gUnknown_845A8AC[] = {
CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE
};
const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT][UNION_ROOM_KB_ROW_COUNT] = {
const u8 *const gUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT][UNION_ROOM_KB_ROW_COUNT] = {
[UNION_ROOM_KB_PAGE_UPPER] = {
gText_UnionRoomChatKeyboard_ABCDE,
gText_UnionRoomChatKeyboard_FGHIJ,
@@ -951,7 +944,7 @@ void sub_81292D8(void)
if (gUnknown_203B0E0->currentPage != UNION_ROOM_KB_PAGE_COUNT)
{
charsStr = sUnionRoomKeyboardText[gUnknown_203B0E0->currentPage][gUnknown_203B0E0->currentRow];
charsStr = gUnionRoomKeyboardText[gUnknown_203B0E0->currentPage][gUnknown_203B0E0->currentRow];
for (i = 0; i < gUnknown_203B0E0->unk11; i++)
{
if (*charsStr == CHAR_EXTRA_EMOJI)
@@ -1265,7 +1258,7 @@ u8 *sub_81297C4(void)
return gUnknown_203B0E0->unk39;
}
u8 sub_81297D0(void)
u16 sub_81297D0(void)
{
return gUnknown_203B0E0->unk16;
}