summaryrefslogtreecommitdiff
path: root/src/union_room.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-01-22 10:13:34 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-01-22 10:13:34 -0500
commit26716a87337370a56e59b206a4e7767384797235 (patch)
treeac486f967b5c625950147fcd83b184231dbb7c35 /src/union_room.c
parent9f9b4dd13dfdbb2367059df09a15ba877ecd84e7 (diff)
Split remaining union room data
Diffstat (limited to 'src/union_room.c')
-rw-r--r--src/union_room.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/union_room.c b/src/union_room.c
index 32635debd..02327e265 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -39,6 +39,7 @@
#include "union_room.h"
#include "union_room_chat.h"
#include "union_room_player_avatar.h"
+#include "union_room_message.h"
#include "constants/songs.h"
#include "constants/maps.h"
#include "constants/cable_club.h"
@@ -131,20 +132,20 @@ void sub_811BA78(void);
#include "data/union_room.h"
-// These are functions in Emmerald but inlined in FireRed
+// These are functions in Emerald but inlined in FireRed
-#define IntlConvPartnerUname7(dest, arg1) ({ \
- StringCopy7(dest, (arg1).unk.playerName); \
+#define IntlConvPartnerUname7(dest, arg1) ({ \
+ StringCopy7(dest, (arg1).unk.playerName); \
ConvertInternationalString(dest, (arg1).unk.field_0.unk_00.unk_00_0); \
})
-#define IntlConvPartnerUname(dest, arg1) ({ \
- StringCopy(dest, (arg1).unk.playerName); \
+#define IntlConvPartnerUname(dest, arg1) ({ \
+ StringCopy(dest, (arg1).unk.playerName); \
ConvertInternationalString(dest, (arg1).unk.field_0.unk_00.unk_00_0); \
})
#define CopyTrainerCardData(dest, src, _version) ({ \
- (dest) = *((struct TrainerCard * )(src)); \
+ (dest) = *((struct TrainerCard * )(src)); \
(dest).version = _version; \
})