summaryrefslogtreecommitdiff
path: root/src/data/union_room.h
diff options
context:
space:
mode:
authorLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
committerLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
commit554210c5e315e786ddc6eef888e9ff6065ad73f8 (patch)
tree66bb5065902fb10a4ad007e53cb61f90fd68e624 /src/data/union_room.h
parent63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff)
Removed trailing spaces in the most relevant files
Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.
Diffstat (limited to 'src/data/union_room.h')
-rw-r--r--src/data/union_room.h96
1 files changed, 48 insertions, 48 deletions
diff --git a/src/data/union_room.h b/src/data/union_room.h
index be7bfae71..902853ddb 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -54,14 +54,14 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
{
sText_1PlayerNeeded,
sText_2PlayerMode
- },
+ },
// 4 players required
{
sText_3PlayersNeeded,
sText_2PlayersNeeded,
sText_1PlayerNeeded,
sText_4PlayerMode
- },
+ },
// 2-5 players required
{
sText_1PlayerNeeded,
@@ -69,7 +69,7 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
sText_3PlayerMode,
sText_4PlayerMode,
sText_5PlayerMode
- },
+ },
// 3-5 players required
{
sText_2PlayersNeeded,
@@ -77,7 +77,7 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
sText_3PlayerMode,
sText_4PlayerMode,
sText_5PlayerMode
- },
+ },
// 2-4 players required
{
sText_1PlayerNeeded,
@@ -368,7 +368,7 @@ const u8 *const sBattleReactionTexts[GENDER_COUNT][4] = {
sText_UsedGoodMoveMale,
sText_BattleSurpriseMale,
sText_SwitchedMonsMale
- },
+ },
{
sText_YoureToughFemale,
sText_UsedGoodMoveFemale,
@@ -392,7 +392,7 @@ const u8 *const sChatReactionTexts[GENDER_COUNT][4] = {
sText_ThatsFunnyMale,
sText_RandomChatMale1,
sText_RandomChatMale2
- },
+ },
{
sText_LearnedSomethingFemale,
sText_ThatsFunnyFemale,
@@ -410,7 +410,7 @@ const u8 *const sTrainerCardReactionTexts[GENDER_COUNT][2] = {
{
sText_ShowedTrainerCardMale1,
sText_ShowedTrainerCardMale2
- },
+ },
{
sText_ShowedTrainerCardFemale1,
sText_ShowedTrainerCardFemale2
@@ -426,7 +426,7 @@ const u8 *const sTradeReactionTexts[GENDER_COUNT][4] = {
{
sText_MaleTraded1,
sText_MaleTraded2
- },
+ },
{
sText_FemaleTraded1,
sText_FemaleTraded2
@@ -485,7 +485,7 @@ ALIGNED(4) const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTEST!\nPl
ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
-static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] =
+static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] =
{
[LINK_GROUP_SINGLE_BATTLE] = sText_ChooseTrainerSingleBattle,
[LINK_GROUP_DOUBLE_BATTLE] = sText_ChooseTrainerDoubleBattle,
@@ -1016,29 +1016,29 @@ ALIGNED(4) const u8 sAcceptedActivityIds_BerryPicking[] = {ACTIVITY_BERRY_PIC
ALIGNED(4) const u8 sAcceptedActivityIds_WonderCard[] = {ACTIVITY_WONDER_CARD2, 0xff};
ALIGNED(4) const u8 sAcceptedActivityIds_WonderNews[] = {ACTIVITY_WONDER_NEWS2, 0xff};
ALIGNED(4) const u8 sAcceptedActivityIds_Resume[] = {
- IN_UNION_ROOM | ACTIVITY_NONE,
- IN_UNION_ROOM | ACTIVITY_BATTLE_SINGLE,
- IN_UNION_ROOM | ACTIVITY_TRADE,
- IN_UNION_ROOM | ACTIVITY_CHAT,
- IN_UNION_ROOM | ACTIVITY_CARD,
- IN_UNION_ROOM | ACTIVITY_ACCEPT,
- IN_UNION_ROOM | ACTIVITY_DECLINE,
- IN_UNION_ROOM | ACTIVITY_NPCTALK,
- IN_UNION_ROOM | ACTIVITY_PLYRTALK,
+ IN_UNION_ROOM | ACTIVITY_NONE,
+ IN_UNION_ROOM | ACTIVITY_BATTLE_SINGLE,
+ IN_UNION_ROOM | ACTIVITY_TRADE,
+ IN_UNION_ROOM | ACTIVITY_CHAT,
+ IN_UNION_ROOM | ACTIVITY_CARD,
+ IN_UNION_ROOM | ACTIVITY_ACCEPT,
+ IN_UNION_ROOM | ACTIVITY_DECLINE,
+ IN_UNION_ROOM | ACTIVITY_NPCTALK,
+ IN_UNION_ROOM | ACTIVITY_PLYRTALK,
0xff
};
ALIGNED(4) const u8 sAcceptedActivityIds_Init[] = {ACTIVITY_SEARCH, 0xff};
ALIGNED(4) const u8 sAcceptedActivityIds_Unk11[] = {
- ACTIVITY_BATTLE_SINGLE,
- ACTIVITY_BATTLE_DOUBLE,
- ACTIVITY_BATTLE_MULTI,
- ACTIVITY_TRADE,
- ACTIVITY_POKEMON_JUMP,
- ACTIVITY_BERRY_CRUSH,
- ACTIVITY_BERRY_PICK,
- ACTIVITY_WONDER_CARD2,
- ACTIVITY_WONDER_NEWS2,
- ACTIVITY_SPIN_TRADE,
+ ACTIVITY_BATTLE_SINGLE,
+ ACTIVITY_BATTLE_DOUBLE,
+ ACTIVITY_BATTLE_MULTI,
+ ACTIVITY_TRADE,
+ ACTIVITY_POKEMON_JUMP,
+ ACTIVITY_BERRY_CRUSH,
+ ACTIVITY_BERRY_PICK,
+ ACTIVITY_WONDER_CARD2,
+ ACTIVITY_WONDER_NEWS2,
+ ACTIVITY_SPIN_TRADE,
0xff
};
ALIGNED(4) const u8 sAcceptedActivityIds_RecordCorner[] = {ACTIVITY_RECORD_CORNER, 0xff};
@@ -1076,28 +1076,28 @@ const u8 *const sAcceptedActivityIds[NUM_LINK_GROUP_TYPES] = {
[LINK_GROUP_BATTLE_TOWER_OPEN] = sAcceptedActivityIds_BattleTowerOpen
};
-static const u8 sLinkGroupToURoomActivity[NUM_LINK_GROUP_TYPES + 2] =
+static const u8 sLinkGroupToURoomActivity[NUM_LINK_GROUP_TYPES + 2] =
{
- [LINK_GROUP_SINGLE_BATTLE] = ACTIVITY_BATTLE_SINGLE,
- [LINK_GROUP_DOUBLE_BATTLE] = ACTIVITY_BATTLE_DOUBLE,
- [LINK_GROUP_MULTI_BATTLE] = ACTIVITY_BATTLE_MULTI,
- [LINK_GROUP_TRADE] = ACTIVITY_TRADE,
- [LINK_GROUP_POKEMON_JUMP] = ACTIVITY_POKEMON_JUMP,
- [LINK_GROUP_BERRY_CRUSH] = ACTIVITY_BERRY_CRUSH,
- [LINK_GROUP_BERRY_PICKING] = ACTIVITY_BERRY_PICK,
+ [LINK_GROUP_SINGLE_BATTLE] = ACTIVITY_BATTLE_SINGLE,
+ [LINK_GROUP_DOUBLE_BATTLE] = ACTIVITY_BATTLE_DOUBLE,
+ [LINK_GROUP_MULTI_BATTLE] = ACTIVITY_BATTLE_MULTI,
+ [LINK_GROUP_TRADE] = ACTIVITY_TRADE,
+ [LINK_GROUP_POKEMON_JUMP] = ACTIVITY_POKEMON_JUMP,
+ [LINK_GROUP_BERRY_CRUSH] = ACTIVITY_BERRY_CRUSH,
+ [LINK_GROUP_BERRY_PICKING] = ACTIVITY_BERRY_PICK,
[LINK_GROUP_WONDER_CARD] = ACTIVITY_WONDER_CARD2,
- [LINK_GROUP_WONDER_NEWS] = ACTIVITY_WONDER_NEWS2,
- [LINK_GROUP_UNION_ROOM_RESUME] = ACTIVITY_NONE,
- [LINK_GROUP_UNION_ROOM_INIT] = ACTIVITY_NONE,
- [LINK_GROUP_UNK_11] = ACTIVITY_NONE,
- [LINK_GROUP_RECORD_CORNER] = ACTIVITY_RECORD_CORNER,
- [LINK_GROUP_BERRY_BLENDER] = ACTIVITY_BERRY_BLENDER,
- [LINK_GROUP_UNK_14] = ACTIVITY_NONE,
+ [LINK_GROUP_WONDER_NEWS] = ACTIVITY_WONDER_NEWS2,
+ [LINK_GROUP_UNION_ROOM_RESUME] = ACTIVITY_NONE,
+ [LINK_GROUP_UNION_ROOM_INIT] = ACTIVITY_NONE,
+ [LINK_GROUP_UNK_11] = ACTIVITY_NONE,
+ [LINK_GROUP_RECORD_CORNER] = ACTIVITY_RECORD_CORNER,
+ [LINK_GROUP_BERRY_BLENDER] = ACTIVITY_BERRY_BLENDER,
+ [LINK_GROUP_UNK_14] = ACTIVITY_NONE,
[LINK_GROUP_COOL_CONTEST] = ACTIVITY_CONTEST_COOL,
- [LINK_GROUP_BEAUTY_CONTEST] = ACTIVITY_CONTEST_BEAUTY,
- [LINK_GROUP_CUTE_CONTEST] = ACTIVITY_CONTEST_CUTE,
- [LINK_GROUP_SMART_CONTEST] = ACTIVITY_CONTEST_SMART,
- [LINK_GROUP_TOUGH_CONTEST] = ACTIVITY_CONTEST_TOUGH,
- [LINK_GROUP_BATTLE_TOWER] = ACTIVITY_BATTLE_TOWER,
+ [LINK_GROUP_BEAUTY_CONTEST] = ACTIVITY_CONTEST_BEAUTY,
+ [LINK_GROUP_CUTE_CONTEST] = ACTIVITY_CONTEST_CUTE,
+ [LINK_GROUP_SMART_CONTEST] = ACTIVITY_CONTEST_SMART,
+ [LINK_GROUP_TOUGH_CONTEST] = ACTIVITY_CONTEST_TOUGH,
+ [LINK_GROUP_BATTLE_TOWER] = ACTIVITY_BATTLE_TOWER,
[LINK_GROUP_BATTLE_TOWER_OPEN] = ACTIVITY_BATTLE_TOWER_OPEN
};