atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #635 from huderlem/union_room_chat

Browse source 
Union room chat
This commit is contained in:
huderlem 2019-03-29 22:33:32 -05:00 committed by GitHub
commit 8184688330
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 2680 additions and 5829 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5772
asm/union_room_chat.s
View file

File diff suppressed because it is too large Load diff

2
charmap.txt
View file

@ -424,7 +424,7 @@ PLAY_SE = FC 10
CLEAR = FC 11
SKIP = FC 12
CLEAR_TO = FC 13
UNKNOWN_14 = FC 14
MIN_LETTER_SPACING = FC 14
JPN = FC 15
ENG = FC 16
PAUSE_MUSIC = FC 17

50
data/union_room_chat.s
View file

@ -3,23 +3,6 @@
.section .rodata
.align 2
gUnknown_082F2A7C:: @ 82F2A7C
.4byte sub_801DFAC
.4byte sub_801E030
.4byte sub_801E120
.4byte sub_801E240
.4byte sub_801E764
.4byte sub_801E838
.4byte sub_801E460
.4byte sub_801E5C4
.4byte sub_801E668
.4byte sub_801E978
.align 2
gUnknown_082F2AA4:: @ 82F2AA4
.byte 0x09, 0x09, 0x09, 0x09
.align 2
gUnknown_082F2AA8:: @ 82F2AA8
.byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
@ -57,36 +40,9 @@ gUnknown_082F2AA8:: @ 82F2AA8
.align 2
gUnknown_082F2BA8:: @ 82F2BA8
.4byte gUnknown_0862B9F9
.4byte gUnknown_0862B9FF
.4byte gUnknown_0862BA05
.4byte gUnknown_0862BA0B
.4byte gUnknown_0862BA11
.4byte gUnknown_0862BA17
.4byte gUnknown_0862BA1D
.4byte gUnknown_0862BA23
.4byte gUnknown_0862BA29
.4byte gUnknown_0862BA2F
.4byte gUnknown_0862BA35
.4byte gUnknown_0862BA3B
.4byte gUnknown_0862BA41
.4byte gUnknown_0862BA47
.4byte gUnknown_0862BA4D
.4byte gUnknown_0862BA53
.4byte gUnknown_0862BA59
.4byte gUnknown_0862BA5F
.4byte gUnknown_0862BA65
.4byte gUnknown_0862BA6B
.4byte gUnknown_0862BA79
.4byte gUnknown_0862BA84
.4byte gUnknown_0862BA8F
.4byte gUnknown_0862BA9A
.4byte gUnknown_0862BAA3
.4byte gUnknown_0862BAAE
.4byte gUnknown_0862BAB9
.4byte gUnknown_0862BAC4
.4byte gUnknown_0862BACF
.4byte gUnknown_0862BADA
.4byte gUnknown_0862B9F9, gUnknown_0862B9FF, gUnknown_0862BA05, gUnknown_0862BA0B, gUnknown_0862BA11, gUnknown_0862BA17, gUnknown_0862BA1D, gUnknown_0862BA23, gUnknown_0862BA29, gUnknown_0862BA2F
.4byte gUnknown_0862BA35, gUnknown_0862BA3B, gUnknown_0862BA41, gUnknown_0862BA47, gUnknown_0862BA4D, gUnknown_0862BA53, gUnknown_0862BA59, gUnknown_0862BA5F, gUnknown_0862BA65, gUnknown_0862BA6B
.4byte gUnknown_0862BA79, gUnknown_0862BA84, gUnknown_0862BA8F, gUnknown_0862BA9A, gUnknown_0862BAA3, gUnknown_0862BAAE, gUnknown_0862BAB9, gUnknown_0862BAC4, gUnknown_0862BACF, gUnknown_0862BADA
.align 2
gUnknown_082F2C20:: @ 82F2C20

3
include/global.h
View file

@ -962,7 +962,8 @@ struct SaveBlock1
/*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
/*0x3B58*/ LilycoveLady lilycoveLady;
/*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
/*0x3C88*/ u8 unk3C88[11][20];
/*0x3C88*/ u8 unk3C88[10][21];
/*0x3D5A*/ u8 filler3D5A[0xA];
/*0x3D64*/ struct SaveTrainerHill trainerHill;
/*0x3D70*/ struct WaldaPhrase waldaPhrase;
// sizeof: 0x3D88

9
include/graphics.h
View file

@ -4908,4 +4908,13 @@ extern const u16 gEasyChatRightWindow_Pal[];
// Use Pokeblock
extern const u32 gUsePokeblockCondition_Gfx[];
// Union Room Chat
extern const u16 gUnknown_08DD4BB0[];
extern const u16 gUnknown_08DD4BD0[];
extern const u32 gUnknown_08DD4BF0[];
extern const u32 gUnknown_08DD4C4C[];
extern const u16 gLinkMiscMenu_Pal[];
extern const u32 gLinkMiscMenu_Gfx[];
extern const u32 gLinkMiscMenu_Tilemap[];
#endif //GUARD_GRAPHICS_H

1
include/link.h
View file

@ -236,7 +236,6 @@ u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENG
void LinkVSync(void);
void Timer3Intr(void);
void SerialCB(void);
u8 GetLinkPlayerCount(void);
bool32 InUnionRoom(void);
void sub_800E0E8(void);
bool8 IsLinkTaskFinished(void);

4
include/link_rfu.h
View file

@ -284,5 +284,9 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
s32 sub_800E87C(u8 idx);
void sub_8011BA4(void);
void sub_8010198(void);
bool32 sub_8011A9C(void);
void sub_80104B0(void);
void sub_8011A50(void);
void sub_80110B8(u32 a0);
#endif //GUARD_LINK_RFU_H

1
include/menu.h
View file

@ -99,5 +99,6 @@ void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile);
void sub_8198314(void);
void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram);
void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
#endif // GUARD_MENU_H

14
include/strings.h
View file

@ -2592,4 +2592,18 @@ extern const u8 gUnknown_085EE154[];
// Berry Powder Menu
extern const u8 gText_Powder[];
// Union Room Chat
extern const u8 gText_F700JoinedChat[];
extern const u8 gText_F700LeftChat[];
extern const u8 gText_Hello[];
extern const u8 gText_Pokemon2[];
extern const u8 gText_Trade[];
extern const u8 gText_Battle[];
extern const u8 gText_Lets[];
extern const u8 gText_Ok[];
extern const u8 gText_Sorry[];
extern const u8 gText_YayUnkF9F9[];
extern const u8 gText_ThankYou[];
extern const u8 gText_ByeBye[];
#endif // GUARD_STRINGS_H

2
include/text.h
View file

@ -99,6 +99,8 @@
//
#define EXT_CTRL_CODE_CLEAR 0x11
//
#define EXT_CTRL_CODE_CLEAR_TO 0x13
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
#define EXT_CTRL_CODE_JPN 0x15
#define EXT_CTRL_CODE_ENG 0x16

7
include/union_room_chat.h Executable file
View file

@ -0,0 +1,7 @@
#ifndef GUARD_UNION_ROOM_CHAT_H
#define GUARD_UNION_ROOM_CHAT_H
void sub_801DD98(void);
void copy_strings_to_sav1(void);
#endif // GUARD_UNION_ROOM_CHAT_H

3
ld_script.txt
View file

@ -62,7 +62,7 @@ SECTIONS {
asm/mevent_server_ish.o(.text);
asm/mevent_server_helpers.o(.text);
src/mevent_news.o(.text);
asm/union_room_chat.o(.text);
src/union_room_chat.o(.text);
asm/berry_crush.o(.text);
src/berry_powder.o(.text);
asm/dodrio_berry_picking.o(.text);
@ -412,6 +412,7 @@ SECTIONS {
src/mevent2.o(.rodata);
src/mevent_801BAAC.o(.rodata);
data/mevent_server.o(.rodata);
src/union_room_chat.o(.rodata);
data/union_room_chat.o(.rodata);
data/berry_crush.o(.rodata);
data/berry_powder.o(.rodata);

2
src/link_rfu.c
View file

@ -4729,7 +4729,7 @@ bool32 sub_8011A80(void)
return FALSE;
}
u8 sub_8011A9C(void)
bool32 sub_8011A9C(void)
{
return gUnknown_03005000.unk_ce8;
}

3
src/new_game.c
View file

@ -43,9 +43,8 @@
#include "field_specials.h"
#include "berry_powder.h"
#include "mevent.h"
#include "union_room_chat.h"
extern void copy_strings_to_sav1(void);
extern void ResetPokeJumpResults(void);
extern const u8 EventScript_ResetAllMapFlags[];

4
src/text.c
View file

@ -1601,7 +1601,7 @@ u16 RenderText(struct TextPrinter *textPrinter)
textPrinter->printerTemplate.currentX = *textPrinter->printerTemplate.currentChar + textPrinter->printerTemplate.x;
textPrinter->printerTemplate.currentChar++;
return 2;
case 19:
case EXT_CTRL_CODE_CLEAR_TO:
{
widthHelper = *textPrinter->printerTemplate.currentChar;
widthHelper += textPrinter->printerTemplate.x;
@ -1615,7 +1615,7 @@ u16 RenderText(struct TextPrinter *textPrinter)
}
}
return 2;
case 20:
case EXT_CTRL_CODE_MIN_LETTER_SPACING:
textPrinter->minLetterSpacing = *textPrinter->printerTemplate.currentChar++;
return 2;
case EXT_CTRL_CODE_JPN:

2
src/union_room.c
View file

@ -35,6 +35,7 @@
#include "field_screen_effect.h"
#include "script_pokemon_util_80F87D8.h"
#include "mevent.h"
#include "union_room_chat.h"
struct UnkStruct_Shared
{
@ -231,7 +232,6 @@ bool32 sub_8017678(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1);
u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId);
void sub_801807C(struct TradeUnkStruct *arg0);
void sub_801AC54(void);
void sub_801DD98(void);
void sub_802A9A8(u8 monId, MainCallback callback);
void sub_802493C(u8 monId, MainCallback callback);
void sub_8020C70(MainCallback callback);

2630
src/union_room_chat.c Executable file
View file

File diff suppressed because it is too large Load diff