dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokenav-decomp-again

Browse Source
This commit is contained in:
Phlosioneer
2019-03-15 01:19:00 -04:00
parent 2e789dbbdc 8e1537fb57
commit 31ded7cc6f
667 changed files with 22667 additions and 26103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apprentice.c
+2 -2
View File
@@ -1619,7 +1619,7 @@ static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height)
static void RemoveAndHideWindow(u8 windowId)
{
sub_8198070(windowId, TRUE);
ClearStdWindowAndFrameToTransparent(windowId, TRUE);
RemoveWindow(windowId);
}
@@ -1826,7 +1826,7 @@ static void Script_PrintMessage(void)
FreezeEventObjects();
sub_808B864();
sub_808BCF4();
NewMenuHelpers_DrawDialogueFrame(0, 1);
DrawDialogueFrame(0, 1);
PrintMessage();
}
src/battle_anim_effects_2.c
+3 -6
View File
@@ -16,9 +16,6 @@
#include "constants/rgb.h"
#include "constants/songs.h"
extern void sub_8108C94(struct Sprite *);
extern void sub_810310C(u8, struct Sprite *);
void sub_8103448(struct Sprite *);
void sub_8103498(struct Sprite *);
void sub_810358C(struct Sprite *);
@@ -1417,7 +1414,7 @@ static void AnimTask_WithdrawStep(u8 taskId)
}
}
// Animates a "zap of energy" used in KINESIS.
// Animates a "zap of energy" used in KINESIS.
// arg 0: x pixel offset
// arg 1: y pixel offset
// arg 2: vertical flip
@@ -1592,7 +1589,7 @@ void sub_8103AA4(struct Sprite *sprite)
sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0));
sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0));
sprite->callback = sub_8103A00;
}
}
}
static void sub_8103BE4(u8 taskId)
@@ -3470,7 +3467,7 @@ void AnimOrbitFast(struct Sprite *sprite)
static void AnimOrbitFastStep(struct Sprite *sprite)
{
if ((u16)(sprite->data[1] - 64) < 128)
if (sprite->data[1] >= 64 && sprite->data[1] <= 191)
sprite->subpriority = sprite->data[7] + 1;
else
sprite->subpriority = sprite->data[7] - 1;
src/battle_anim_effects_3.c
-3
View File
@@ -24,9 +24,6 @@
#include "constants/species.h"
#include "constants/weather.h"
extern u8 sub_807521C(s16 x, s16 y, u8 a3);
extern void sub_810E2C8(struct Sprite *);
extern const struct SpriteTemplate gUnknown_08593114;
extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
src/battle_controller_link_opponent.c
+5 -7
View File
@@ -16,6 +16,7 @@
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "string_util.h"
@@ -26,15 +27,12 @@
#include "constants/battle_anim.h"
#include "constants/songs.h"
#include "constants/trainers.h"
#include "recorded_battle.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
extern u16 sub_8068B48(void);
// this file's functions
static void LinkOpponentHandleGetMonData(void);
static void LinkOpponentHandleGetRawMonData(void);
@@ -92,7 +90,7 @@ static void LinkOpponentHandleBattleAnimation(void);
static void LinkOpponentHandleLinkStandbyMsg(void);
static void LinkOpponentHandleResetActionMoveSelection(void);
static void LinkOpponentHandleCmd55(void);
static void nullsub_92(void);
static void LinkOpponentCmdEnd(void);
static void LinkOpponentBufferRunCommand(void);
static void LinkOpponentBufferExecCompleted(void);
@@ -164,7 +162,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkOpponentHandleLinkStandbyMsg,
LinkOpponentHandleResetActionMoveSelection,
LinkOpponentHandleCmd55,
nullsub_92
LinkOpponentCmdEnd
};
static void nullsub_28(void)
@@ -1857,6 +1855,6 @@ static void LinkOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_92(void)
static void LinkOpponentCmdEnd(void)
{
}
src/battle_controller_link_partner.c
+7 -8
View File
@@ -16,6 +16,7 @@
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "string_util.h"
@@ -26,13 +27,11 @@
#include "constants/battle_anim.h"
#include "constants/songs.h"
#include "constants/trainers.h"
#include "recorded_battle.h"
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
// this file's functions
static void LinkPartnerHandleGetMonData(void);
static void LinkPartnerHandleGetRawMonData(void);
@@ -90,7 +89,7 @@ static void LinkPartnerHandleBattleAnimation(void);
static void LinkPartnerHandleLinkStandbyMsg(void);
static void LinkPartnerHandleResetActionMoveSelection(void);
static void LinkPartnerHandleCmd55(void);
static void nullsub_113(void);
static void LinkPartnerCmdEnd(void);
static void LinkPartnerBufferRunCommand(void);
static void LinkPartnerBufferExecCompleted(void);
@@ -161,10 +160,10 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkPartnerHandleLinkStandbyMsg,
LinkPartnerHandleResetActionMoveSelection,
LinkPartnerHandleCmd55,
nullsub_113
LinkPartnerCmdEnd
};
static void nullsub_112(void)
static void SpriteCB_Null2(void)
{
}
@@ -1564,7 +1563,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
gBattlerControllerFuncs[gActiveBattler] = nullsub_112;
gBattlerControllerFuncs[gActiveBattler] = SpriteCB_Null2;
}
static void sub_814DCCC(u8 taskId)
@@ -1687,6 +1686,6 @@ static void LinkPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_113(void)
static void LinkPartnerCmdEnd(void)
{
}
src/battle_controller_opponent.c
+4 -6
View File
@@ -32,14 +32,12 @@
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/trainers.h"
#include "trainer_hill.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId);
// this file's functions
static void OpponentHandleGetMonData(void);
static void OpponentHandleGetRawMonData(void);
@@ -97,7 +95,7 @@ static void OpponentHandleBattleAnimation(void);
static void OpponentHandleLinkStandbyMsg(void);
static void OpponentHandleResetActionMoveSelection(void);
static void OpponentHandleCmd55(void);
static void nullsub_91(void);
static void OpponentCmdEnd(void);
static void OpponentBufferRunCommand(void);
static void OpponentBufferExecCompleted(void);
@@ -169,7 +167,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
OpponentHandleLinkStandbyMsg,
OpponentHandleResetActionMoveSelection,
OpponentHandleCmd55,
nullsub_91
OpponentCmdEnd
};
// unknown unused data
@@ -2003,6 +2001,6 @@ static void OpponentHandleCmd55(void)
OpponentBufferExecCompleted();
}
static void nullsub_91(void)
static void OpponentCmdEnd(void)
{
}
src/battle_controller_player.c
+3 -7
View File
@@ -39,10 +39,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81AABB0(void);
extern void sub_81851A8(u8 *);
// this file's functions
static void PlayerHandleGetMonData(void);
static void PlayerHandleSetMonData(void);
@@ -99,7 +95,7 @@ static void PlayerHandleBattleAnimation(void);
static void PlayerHandleLinkStandbyMsg(void);
static void PlayerHandleResetActionMoveSelection(void);
static void PlayerHandleCmd55(void);
static void nullsub_22(void);
static void PlayerCmdEnd(void);
static void PlayerBufferRunCommand(void);
static void HandleInputChooseTarget(void);
@@ -186,7 +182,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerHandleLinkStandbyMsg,
PlayerHandleResetActionMoveSelection,
PlayerHandleCmd55,
nullsub_22
PlayerCmdEnd
};
static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT};
@@ -3105,6 +3101,6 @@ static void PlayerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_22(void)
static void PlayerCmdEnd(void)
{
}
src/battle_controller_player_partner.c
+3 -6
View File
@@ -30,9 +30,6 @@
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_81358F4(void);
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
// this file's functions
static void PlayerPartnerHandleGetMonData(void);
static void PlayerPartnerHandleGetRawMonData(void);
@@ -90,7 +87,7 @@ static void PlayerPartnerHandleBattleAnimation(void);
static void PlayerPartnerHandleLinkStandbyMsg(void);
static void PlayerPartnerHandleResetActionMoveSelection(void);
static void PlayerPartnerHandleCmd55(void);
static void nullsub_128(void);
static void PlayerPartnerCmdEnd(void);
static void PlayerPartnerBufferRunCommand(void);
static void PlayerPartnerBufferExecCompleted(void);
@@ -167,7 +164,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerPartnerHandleLinkStandbyMsg,
PlayerPartnerHandleResetActionMoveSelection,
PlayerPartnerHandleCmd55,
nullsub_128
PlayerPartnerCmdEnd
};
// unknown unused data
@@ -1928,6 +1925,6 @@ static void PlayerPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_128(void)
static void PlayerPartnerCmdEnd(void)
{
}
src/battle_controller_recorded_opponent.c
+3 -6
View File
@@ -33,9 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern u16 sub_8068B48(void);
// this file's functions
static void RecordedOpponentHandleGetMonData(void);
static void RecordedOpponentHandleGetRawMonData(void);
@@ -93,7 +90,7 @@ static void RecordedOpponentHandleBattleAnimation(void);
static void RecordedOpponentHandleLinkStandbyMsg(void);
static void RecordedOpponentHandleResetActionMoveSelection(void);
static void RecordedOpponentHandleCmd55(void);
static void nullsub_119(void);
static void RecordedOpponentCmdEnd(void);
static void RecordedOpponentBufferRunCommand(void);
static void RecordedOpponentBufferExecCompleted(void);
@@ -165,7 +162,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
RecordedOpponentHandleLinkStandbyMsg,
RecordedOpponentHandleResetActionMoveSelection,
RecordedOpponentHandleCmd55,
nullsub_119
RecordedOpponentCmdEnd
};
static void nullsub_70(void)
@@ -1791,6 +1788,6 @@ static void RecordedOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_119(void)
static void RecordedOpponentCmdEnd(void)
{
}
src/battle_controller_recorded_player.c
+3 -5
View File
@@ -30,8 +30,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
// this file's functions
static void RecordedPlayerHandleGetMonData(void);
static void RecordedPlayerHandleGetRawMonData(void);
@@ -89,7 +87,7 @@ static void RecordedPlayerHandleBattleAnimation(void);
static void RecordedPlayerHandleLinkStandbyMsg(void);
static void RecordedPlayerHandleResetActionMoveSelection(void);
static void RecordedPlayerHandleCmd55(void);
static void nullsub_121(void);
static void RecordedPlayerCmdEnd(void);
static void RecordedPlayerBufferRunCommand(void);
static void RecordedPlayerBufferExecCompleted(void);
@@ -160,7 +158,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
RecordedPlayerHandleLinkStandbyMsg,
RecordedPlayerHandleResetActionMoveSelection,
RecordedPlayerHandleCmd55,
nullsub_121
RecordedPlayerCmdEnd
};
static void nullsub_120(void)
@@ -1808,6 +1806,6 @@ static void RecordedPlayerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_121(void)
static void RecordedPlayerCmdEnd(void)
{
}
src/battle_controller_safari.c
+4 -6
View File
@@ -25,8 +25,6 @@
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_81358F4(void);
// this file's functions
static void SafariHandleGetMonData(void);
static void SafariHandleGetRawMonData(void);
@@ -84,7 +82,7 @@ static void SafariHandleBattleAnimation(void);
static void SafariHandleLinkStandbyMsg(void);
static void SafariHandleResetActionMoveSelection(void);
static void SafariHandleCmd55(void);
static void nullsub_115(void);
static void SafariCmdEnd(void);
static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void);
@@ -148,10 +146,10 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection,
SafariHandleCmd55,
nullsub_115
SafariCmdEnd
};
static void nullsub_114(void)
static void SpriteCB_Null4(void)
{
}
@@ -688,6 +686,6 @@ static void SafariHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_81595E4;
}
static void nullsub_115(void)
static void SafariCmdEnd(void)
{
}
src/battle_controller_wally.c
+4 -6
View File
@@ -33,8 +33,6 @@
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
// this file's functions
static void WallyHandleGetMonData(void);
static void WallyHandleGetRawMonData(void);
@@ -92,7 +90,7 @@ static void WallyHandleBattleAnimation(void);
static void WallyHandleLinkStandbyMsg(void);
static void WallyHandleResetActionMoveSelection(void);
static void WallyHandleCmd55(void);
static void nullsub_118(void);
static void WallyCmdEnd(void);
static void WallyBufferRunCommand(void);
static void WallyBufferExecCompleted(void);
@@ -161,10 +159,10 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
WallyHandleLinkStandbyMsg,
WallyHandleResetActionMoveSelection,
WallyHandleCmd55,
nullsub_118
WallyCmdEnd
};
static void nullsub_117(void)
static void SpriteCB_Null7(void)
{
}
@@ -1559,6 +1557,6 @@ static void WallyHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_118(void)
static void WallyCmdEnd(void)
{
}
src/battle_controllers.c
+1 -1
View File
@@ -767,7 +767,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
{
if (IsLinkMaster())
{
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].data[11]++;
}
else
src/battle_dome.c
+1 -1
View File
@@ -3794,7 +3794,7 @@ static void sub_8190CD4(u8 taskId)
for (i = windowId; i < windowId + 9; i++)
{
CopyWindowToVram(i, 2);
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
}
gTasks[taskId].data[0] = 3;
break;
src/battle_factory_screen.c
+27 -27
View File
@@ -1183,7 +1183,7 @@ static void CB2_InitSelectScreen(void)
break;
case 5:
if (sFactorySelectScreen->fromSummaryScreen == TRUE)
sFactorySelectScreen->cursorPos = gUnknown_0203CF20;
sFactorySelectScreen->cursorPos = gLastViewedMonIndex;
Select_InitMonsData();
Select_InitAllSprites();
if (sFactorySelectScreen->fromSummaryScreen == TRUE)
@@ -1741,7 +1741,7 @@ static void Select_CopyMonsToPlayerParty(void)
{
gPlayerParty[i] = sFactorySelectScreen->mons[j].monData;
gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId;
gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i].box, MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL);
break;
@@ -1786,14 +1786,14 @@ static void sub_819B958(u8 windowId)
{
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId);
}
static void Select_PrintRentalPkmnString(void)
{
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL);
CopyWindowToVram(0, 3);
}
@@ -1804,7 +1804,7 @@ static void Select_PrintMonSpecies(void)
u8 x;
u8 monId = sFactorySelectScreen->cursorPos;
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL);
StringCopy(gStringVar4, gSpeciesNames[species]);
x = GetStringRightAlignXOffset(1, gStringVar4, 86);
@@ -1816,7 +1816,7 @@ static void Select_PrintSelectMonString(void)
{
const u8 *str = NULL;
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
if (sFactorySelectScreen->selectingMonsState == 1)
str = gText_SelectFirstPkmn;
else if (sFactorySelectScreen->selectingMonsState == 2)
@@ -1832,7 +1832,7 @@ static void Select_PrintSelectMonString(void)
static void Select_PrintCantSelectSameMon(void)
{
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL);
CopyWindowToVram(2, 2);
}
@@ -1842,7 +1842,7 @@ static void Select_PrintMenuOptions(void)
u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId;
PutWindowTilemap(3);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
AddTextPrinterParameterized3(3, 1, 7, 1, gUnknown_08610476, 0, gText_Summary);
if (selectedId != 0)
AddTextPrinterParameterized3(3, 1, 7, 17, gUnknown_08610476, 0, gText_Deselect);
@@ -1856,7 +1856,7 @@ static void Select_PrintMenuOptions(void)
static void Select_PrintYesNoOptions(void)
{
PutWindowTilemap(4);
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610476, 0, gText_Yes2);
AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610476, 0, gText_No2);
CopyWindowToVram(4, 3);
@@ -1924,7 +1924,7 @@ static void Select_PrintMonCategory(void)
if (monId < SELECTABLE_MONS_COUNT)
{
PutWindowTilemap(5);
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL);
CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text);
x = GetStringRightAlignXOffset(1, text, 0x76);
@@ -2873,7 +2873,7 @@ static void sub_819D588(u8 taskId)
case 3:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
if (sFactorySwapScreen->inEnemyScreen == TRUE)
{
@@ -3002,7 +3002,7 @@ static void sub_819D770(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 6:
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
gTasks[taskId].data[0]++;
break;
@@ -3172,7 +3172,7 @@ static void CB2_InitSwapScreen(void)
break;
case 5:
if (sFactorySwapScreen->fromSummaryScreen == TRUE)
sFactorySwapScreen->cursorPos = gUnknown_0203CF20;
sFactorySwapScreen->cursorPos = gLastViewedMonIndex;
gMain.state++;
break;
case 6:
@@ -3546,7 +3546,7 @@ static void sub_819EA64(u8 windowId)
{
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId);
}
@@ -3554,14 +3554,14 @@ static void sub_819EA64(u8 windowId)
static void sub_819EAC0(void)
{
PutWindowTilemap(1);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
CopyWindowToVram(1, 2);
}
static void sub_819EADC(void)
{
PutWindowTilemap(7);
FillWindowPixelBuffer(7, 0);
FillWindowPixelBuffer(7, PIXEL_FILL(0));
CopyWindowToVram(7, 2);
}
@@ -3569,13 +3569,13 @@ static void sub_819EAF8(void)
{
sub_819EAC0();
PutWindowTilemap(5);
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
}
static void Swap_PrintPkmnSwap(void)
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL);
CopyWindowToVram(0, 3);
}
@@ -3585,7 +3585,7 @@ static void Swap_PrintMonSpecies(void)
u16 species;
u8 x;
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
if (sFactorySwapScreen->cursorPos > 2)
{
CopyWindowToVram(1, 2);
@@ -3606,7 +3606,7 @@ static void Swap_PrintMonSpecies(void)
static void Swap_PrintOnInfoWindow(const u8 *str)
{
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL);
CopyWindowToVram(2, 2);
}
@@ -3614,7 +3614,7 @@ static void Swap_PrintOnInfoWindow(const u8 *str)
static void Swap_PrintMenuOptions(void)
{
PutWindowTilemap(3);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
AddTextPrinterParameterized3(3, 1, 15, 1, gUnknown_08610922, 0, gText_Summary2);
AddTextPrinterParameterized3(3, 1, 15, 17, gUnknown_08610922, 0, gText_Swap);
AddTextPrinterParameterized3(3, 1, 15, 33, gUnknown_08610922, 0, gText_Rechoose);
@@ -3624,7 +3624,7 @@ static void Swap_PrintMenuOptions(void)
static void Swap_PrintYesNoOptions(void)
{
PutWindowTilemap(4);
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610922, 0, gText_Yes3);
AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610922, 0, gText_No3);
CopyWindowToVram(4, 3);
@@ -3638,7 +3638,7 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId)
static void Swap_PrintActionStrings(void)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
switch (sFactorySwapScreen->inEnemyScreen)
{
case TRUE:
@@ -3652,7 +3652,7 @@ static void Swap_PrintActionStrings(void)
static void Swap_PrintActionStrings2(void)
{
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
switch (sFactorySwapScreen->inEnemyScreen)
{
case TRUE:
@@ -3693,7 +3693,7 @@ static void Swap_PrintMonSpecies2(void)
LoadPalette(pal, 0xF0, 0xA);
PutWindowTilemap(7);
FillWindowPixelBuffer(7, 0);
FillWindowPixelBuffer(7, PIXEL_FILL(0));
if (sFactorySwapScreen->cursorPos > 2)
{
CopyWindowToVram(7, 3);
@@ -3745,7 +3745,7 @@ static void Swap_PrintMonCategory(void)
u8 x;
u8 monId = sFactorySwapScreen->cursorPos;
FillWindowPixelBuffer(8, 0);
FillWindowPixelBuffer(8, PIXEL_FILL(0));
if (monId > 2)
{
CopyWindowToVram(8, 2);
@@ -3940,7 +3940,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId)
case 2:
if (sFactorySwapScreen->unk30 != TRUE)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
gTasks[taskId].data[0]++;
}
src/battle_interface.c
+83 -82
View File
@@ -35,125 +35,126 @@ struct TestingBar
};
enum
{
HEALTHBOX_GFX_0,
HEALTHBOX_GFX_1,
HEALTHBOX_GFX_2,
HEALTHBOX_GFX_HP_BAR_GREEN,
HEALTHBOX_GFX_4,
HEALTHBOX_GFX_5,
HEALTHBOX_GFX_6,
HEALTHBOX_GFX_7,
HEALTHBOX_GFX_8,
HEALTHBOX_GFX_9,
HEALTHBOX_GFX_10,
HEALTHBOX_GFX_11,
HEALTHBOX_GFX_12,
HEALTHBOX_GFX_13,
HEALTHBOX_GFX_14,
HEALTHBOX_GFX_15,
HEALTHBOX_GFX_16,
HEALTHBOX_GFX_17,
HEALTHBOX_GFX_18,
HEALTHBOX_GFX_19,
HEALTHBOX_GFX_20,
HEALTHBOX_GFX_STATUS_PSN_BATTLER0,
HEALTHBOX_GFX_22,
HEALTHBOX_GFX_23,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER0,
{ // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c
// These are indexes into the tables, which are filled with 8x8 square pixel data.
HEALTHBOX_GFX_0, //hp bar [black section]
HEALTHBOX_GFX_1, //hp bar "H"
HEALTHBOX_GFX_2, //hp bar "P"
HEALTHBOX_GFX_HP_BAR_GREEN, //hp bar [0 pixels]
HEALTHBOX_GFX_4, //hp bar [1 pixels]
HEALTHBOX_GFX_5, //hp bar [2 pixels]
HEALTHBOX_GFX_6, //hp bar [3 pixels]
HEALTHBOX_GFX_7, //hp bar [4 pixels]
HEALTHBOX_GFX_8, //hp bar [5 pixels]
HEALTHBOX_GFX_9, //hp bar [6 pixels]
HEALTHBOX_GFX_10, //hp bar [7 pixels]
HEALTHBOX_GFX_11, //hp bar [8 pixels]
HEALTHBOX_GFX_12, //exp bar [0 pixels]
HEALTHBOX_GFX_13, //exp bar [1 pixels]
HEALTHBOX_GFX_14, //exp bar [2 pixels]
HEALTHBOX_GFX_15, //exp bar [3 pixels]
HEALTHBOX_GFX_16, //exp bar [4 pixels]
HEALTHBOX_GFX_17, //exp bar [5 pixels]
HEALTHBOX_GFX_18, //exp bar [6 pixels]
HEALTHBOX_GFX_19, //exp bar [7 pixels]
HEALTHBOX_GFX_20, //exp bar [8 pixels]
HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status psn "(P"
HEALTHBOX_GFX_22, //status psn "SN"
HEALTHBOX_GFX_23, //status psn "|)""
HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status prz
HEALTHBOX_GFX_25,
HEALTHBOX_GFX_26,
HEALTHBOX_GFX_STATUS_SLP_BATTLER0,
HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status slp
HEALTHBOX_GFX_28,
HEALTHBOX_GFX_29,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER0,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status frz
HEALTHBOX_GFX_31,
HEALTHBOX_GFX_32,
HEALTHBOX_GFX_STATUS_BRN_BATTLER0,
HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status brn
HEALTHBOX_GFX_34,
HEALTHBOX_GFX_35,
HEALTHBOX_GFX_36,
HEALTHBOX_GFX_37,
HEALTHBOX_GFX_38,
HEALTHBOX_GFX_39,
HEALTHBOX_GFX_40,
HEALTHBOX_GFX_41,
HEALTHBOX_GFX_42,
HEALTHBOX_GFX_43,
HEALTHBOX_GFX_44,
HEALTHBOX_GFX_45,
HEALTHBOX_GFX_46,
HEALTHBOX_GFX_HP_BAR_YELLOW,
HEALTHBOX_GFX_48,
HEALTHBOX_GFX_49,
HEALTHBOX_GFX_50,
HEALTHBOX_GFX_51,
HEALTHBOX_GFX_52,
HEALTHBOX_GFX_53,
HEALTHBOX_GFX_54,
HEALTHBOX_GFX_55,
HEALTHBOX_GFX_HP_BAR_RED,
HEALTHBOX_GFX_57,
HEALTHBOX_GFX_58,
HEALTHBOX_GFX_59,
HEALTHBOX_GFX_60,
HEALTHBOX_GFX_61,
HEALTHBOX_GFX_62,
HEALTHBOX_GFX_63,
HEALTHBOX_GFX_64,
HEALTHBOX_GFX_65,
HEALTHBOX_GFX_66,
HEALTHBOX_GFX_67,
HEALTHBOX_GFX_68,
HEALTHBOX_GFX_69,
HEALTHBOX_GFX_70,
HEALTHBOX_GFX_STATUS_PSN_BATTLER1,
HEALTHBOX_GFX_36, //misc [Black section]
HEALTHBOX_GFX_37, //misc [Black section]
HEALTHBOX_GFX_38, //misc [Black section]
HEALTHBOX_GFX_39, //misc [Blank Health Window?]
HEALTHBOX_GFX_40, //misc [Blank Health Window?]
HEALTHBOX_GFX_41, //misc [Blank Health Window?]
HEALTHBOX_GFX_42, //misc [Blank Health Window?]
HEALTHBOX_GFX_43, //misc [Top of Health Window?]
HEALTHBOX_GFX_44, //misc [Top of Health Window?]
HEALTHBOX_GFX_45, //misc [Top of Health Window?]
HEALTHBOX_GFX_46, //misc [Blank Health Window?]
HEALTHBOX_GFX_HP_BAR_YELLOW, //hp bar yellow [0 pixels]
HEALTHBOX_GFX_48, //hp bar yellow [1 pixels]
HEALTHBOX_GFX_49, //hp bar yellow [2 pixels]
HEALTHBOX_GFX_50, //hp bar yellow [3 pixels]
HEALTHBOX_GFX_51, //hp bar yellow [4 pixels]
HEALTHBOX_GFX_52, //hp bar yellow [5 pixels]
HEALTHBOX_GFX_53, //hp bar yellow [6 pixels]
HEALTHBOX_GFX_54, //hp bar yellow [7 pixels]
HEALTHBOX_GFX_55, //hp bar yellow [8 pixels]
HEALTHBOX_GFX_HP_BAR_RED, //hp bar red [0 pixels]
HEALTHBOX_GFX_57, //hp bar red [1 pixels]
HEALTHBOX_GFX_58, //hp bar red [2 pixels]
HEALTHBOX_GFX_59, //hp bar red [3 pixels]
HEALTHBOX_GFX_60, //hp bar red [4 pixels]
HEALTHBOX_GFX_61, //hp bar red [5 pixels]
HEALTHBOX_GFX_62, //hp bar red [6 pixels]
HEALTHBOX_GFX_63, //hp bar red [7 pixels]
HEALTHBOX_GFX_64, //hp bar red [8 pixels]
HEALTHBOX_GFX_65, //hp bar frame end
HEALTHBOX_GFX_66, //status ball [full]
HEALTHBOX_GFX_67, //status ball [empty]
HEALTHBOX_GFX_68, //status ball [fainted]
HEALTHBOX_GFX_69, //status ball [statused]
HEALTHBOX_GFX_70, //status ball [unused extra]
HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN"
HEALTHBOX_GFX_72,
HEALTHBOX_GFX_73,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER1,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2 "PRZ"
HEALTHBOX_GFX_75,
HEALTHBOX_GFX_76,
HEALTHBOX_GFX_STATUS_SLP_BATTLER1,
HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2 "SLP"
HEALTHBOX_GFX_78,
HEALTHBOX_GFX_79,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER1,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2 "FRZ"
HEALTHBOX_GFX_81,
HEALTHBOX_GFX_82,
HEALTHBOX_GFX_STATUS_BRN_BATTLER1,
HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2 "BRN"
HEALTHBOX_GFX_84,
HEALTHBOX_GFX_85,
HEALTHBOX_GFX_STATUS_PSN_BATTLER2,
HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3 "PSN"
HEALTHBOX_GFX_87,
HEALTHBOX_GFX_88,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER2,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3 "PRZ"
HEALTHBOX_GFX_90,
HEALTHBOX_GFX_91,
HEALTHBOX_GFX_STATUS_SLP_BATTLER2,
HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3 "SLP"
HEALTHBOX_GFX_93,
HEALTHBOX_GFX_94,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER2,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3 "FRZ"
HEALTHBOX_GFX_96,
HEALTHBOX_GFX_97,
HEALTHBOX_GFX_STATUS_BRN_BATTLER2,
HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3 "BRN"
HEALTHBOX_GFX_99,
HEALTHBOX_GFX_100,
HEALTHBOX_GFX_STATUS_PSN_BATTLER3,
HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4 "PSN"
HEALTHBOX_GFX_102,
HEALTHBOX_GFX_103,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER3,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4 "PRZ"
HEALTHBOX_GFX_105,
HEALTHBOX_GFX_106,
HEALTHBOX_GFX_STATUS_SLP_BATTLER3,
HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4 "SLP"
HEALTHBOX_GFX_108,
HEALTHBOX_GFX_109,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER3,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4 "FRZ"
HEALTHBOX_GFX_111,
HEALTHBOX_GFX_112,
HEALTHBOX_GFX_STATUS_BRN_BATTLER3,
HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN"
HEALTHBOX_GFX_114,
HEALTHBOX_GFX_115,
HEALTHBOX_GFX_116,
HEALTHBOX_GFX_117,
HEALTHBOX_GFX_116, //unknown_D12FEC
HEALTHBOX_GFX_117, //unknown_D1300C
};
extern const u8 *const gNatureNamePointers[];
@@ -2578,7 +2579,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
struct WindowTemplate winTemplate = sHealthboxWindowTemplate;
winId = AddWindow(&winTemplate);
FillWindowPixelBuffer(winId, (bgColor << 4) | (bgColor));
FillWindowPixelBuffer(winId, PIXEL_FILL(bgColor));
color[0] = bgColor;
color[1] = 1;
src/battle_main.c
+2 -4
View File
@@ -57,6 +57,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "cable_club.h"
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
@@ -69,9 +70,6 @@ extern const u8 *const gBattlescriptsForRunningByItem[];
extern const u8 *const gBattlescriptsForUsingItem[];
extern const u8 *const gBattlescriptsForSafariActions[];
// functions
extern void sub_80B3AF8(u8 taskId); // cable club
// this file's functions
static void CB2_InitBattleInternal(void);
static void CB2_PreInitMultiBattle(void);
@@ -3279,7 +3277,7 @@ void FaintClearSetData(void)
gProtectStructs[gActiveBattler].targetNotAffected = 0;
gProtectStructs[gActiveBattler].chargingTurn = 0;
gProtectStructs[gActiveBattler].fleeFlag = 0;
gProtectStructs[gActiveBattler].usedImprisionedMove = 0;
gProtectStructs[gActiveBattler].usedImprisonedMove = 0;
gProtectStructs[gActiveBattler].loveImmobility = 0;
gProtectStructs[gActiveBattler].usedDisabledMove = 0;
gProtectStructs[gActiveBattler].usedTauntedMove = 0;
src/battle_message.c
+47 -47
View File
@@ -1357,7 +1357,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
{
// The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c
{ // 0 Standard battle message
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1369,7 +1369,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 1 "What will (pokemon) do?"
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 1,
.y = 1,
@@ -1381,7 +1381,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 2 "Fight/Pokemon/Bag/Run"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1393,7 +1393,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 3 Top left move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1405,7 +1405,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 4 Top right move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1417,7 +1417,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 5 Bottom left move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1429,7 +1429,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 6 Bottom right move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1441,7 +1441,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 7 "PP"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1453,7 +1453,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 11,
},
{ // 8
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1465,7 +1465,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 9 PP remaining
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 2,
.y = 1,
@@ -1477,7 +1477,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 11,
},
{ // 10 "type"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1489,7 +1489,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 11 "switch which?"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1501,7 +1501,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 12 "gText_BattleYesNoChoice"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1513,7 +1513,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 13
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1525,7 +1525,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 14
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = 32,
.y = 1,
@@ -1537,7 +1537,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 2,
},
{ // 15
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1549,7 +1549,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 16
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1561,7 +1561,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 17
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1573,7 +1573,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 18
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1585,7 +1585,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 19
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1597,7 +1597,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 20
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1609,7 +1609,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 21
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1621,7 +1621,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 22
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1633,7 +1633,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 23
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0x0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1649,7 +1649,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
{
{ // 0
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1661,7 +1661,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 6,
},
{ // 1
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 1,
.y = 1,
@@ -1673,7 +1673,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 6,
},
{ // 2
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1685,7 +1685,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 3
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1697,7 +1697,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 4
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1709,7 +1709,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 5
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1721,7 +1721,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 6
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1733,7 +1733,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 7
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1745,7 +1745,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 11,
},
{ // 8
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1757,7 +1757,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 9
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 2,
.y = 1,
@@ -1769,7 +1769,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 11,
},
{ // 10
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1781,7 +1781,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 11
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1793,7 +1793,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 12
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1805,7 +1805,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 13
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1817,7 +1817,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 14
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = 32,
.y = 1,
@@ -1829,7 +1829,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 2,
},
{ // 15
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1841,7 +1841,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 16
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1853,7 +1853,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 17
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1865,7 +1865,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 18
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1877,7 +1877,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 19
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1889,7 +1889,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 20
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1901,7 +1901,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 21
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1913,7 +1913,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 22
.fillValue = 0x11,
.fillValue = PIXEL_FILL(0x1),
.fontId = 1,
.x = 0,
.y = 1,
src/battle_pyramid.c
+3 -3
View File
@@ -1267,7 +1267,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx
{
for (x = 0; x < 32; x++)
{
if ((map[x] & 0x3FF) == FLOOR_EXIT_METATILE)
if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE)
{
x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x;
y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y;
@@ -1568,7 +1568,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
{
for (x = 0; x < mapLayout->width; x++)
{
if ((layoutMap[x] & 0x3FF) != FLOOR_EXIT_METATILE)
if ((layoutMap[x] & METATILE_ID_MASK) != FLOOR_EXIT_METATILE)
{
map[x] = layoutMap[x];
}
@@ -1590,7 +1590,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
layoutMap += mapLayout->width;
}
}
mapheader_run_script_with_tag_x1();
RunOnLoadMapScript();
free(floorLayoutOffsets);
}
src/battle_pyramid_bag.c
+17 -16
View File
@@ -651,7 +651,7 @@ static void PrintItemDescription(s32 listMenuId)
StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1);
desc = gStringVar4;
}
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, desc, 3, 0, 0, 1, 0, 0);
}
@@ -804,7 +804,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1)
static void sub_81C5AB8(u8 y, u8 arg1)
{
if (arg1 == 0xFF)
FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
FillWindowPixelRect(0, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
else
PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
}
@@ -911,7 +911,7 @@ static void sub_81C5D20(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
if (gPyramidBagResources->menuActionsCount == 1)
sub_81C5EAC(sub_81C6D24(0));
@@ -1048,7 +1048,7 @@ static void BagAction_UseOnField(u8 taskId)
else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL)
{
sub_81C61A8();
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
schedule_bg_copy_tilemap_to_vram(0);
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
}
@@ -1086,7 +1086,7 @@ static void BagAction_Toss(u8 taskId)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C6404();
gTasks[taskId].func = sub_81C64B4;
@@ -1100,7 +1100,7 @@ static void sub_81C6350(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C6DAC(taskId, &sYesNoTossFuncions);
}
@@ -1146,7 +1146,7 @@ static void sub_81C64B4(u8 taskId)
else if (gMain.newKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
sub_8198070(3, 0);
ClearStdWindowAndFrameToTransparent(3, 0);
ClearWindowTilemap(3);
schedule_bg_copy_tilemap_to_vram(1);
sub_81C6350(taskId);
@@ -1154,7 +1154,7 @@ static void sub_81C64B4(u8 taskId)
else if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
sub_8198070(3, 0);
ClearStdWindowAndFrameToTransparent(3, 0);
ClearWindowTilemap(3);
schedule_bg_copy_tilemap_to_vram(1);
DontTossItem(taskId);
@@ -1168,7 +1168,7 @@ static void TossItem(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
gTasks[taskId].func = sub_81C65CC;
}
@@ -1265,7 +1265,7 @@ static void Task_BeginItemSwap(u8 taskId)
ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1);
CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][data[1]], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C5A98(data[0], 1);
sub_81C704C(data[1]);
@@ -1395,7 +1395,7 @@ static void sub_81C6BD8(void)
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
for (i = 0; i < 5; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
PutWindowTilemap(0);
PutWindowTilemap(1);
@@ -1415,7 +1415,7 @@ static void PrintOnWindow_Font7(u8 windowId, const u8 *src, u8 x, u8 y, u8 lette
static void sub_81C6CEC(u8 windowId)
{
SetWindowBorderStyle(windowId, 0, 1, 0xE);
DrawStdFrameWithCustomTileAndPalette(windowId, 0, 1, 0xE);
schedule_bg_copy_tilemap_to_vram(1);
}
@@ -1430,7 +1430,7 @@ static u8 sub_81C6D24(u8 windowArrayId)
if (*windowId == 0xFF)
{
*windowId = AddWindow(&gUnknown_0861F350[windowArrayId]);
SetWindowBorderStyle(*windowId, FALSE, 1, 0xE);
DrawStdFrameWithCustomTileAndPalette(*windowId, FALSE, 1, 0xE);
schedule_bg_copy_tilemap_to_vram(1);
}
return *windowId;
@@ -1441,7 +1441,7 @@ static void sub_81C6D6C(u8 windowArrayId)
u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
if (*windowId != 0xFF)
{
sub_8198070(*windowId, FALSE);
ClearStdWindowAndFrameToTransparent(*windowId, FALSE);
ClearWindowTilemap(*windowId);
RemoveWindow(*windowId);
schedule_bg_copy_tilemap_to_vram(1);
@@ -1456,14 +1456,15 @@ static void sub_81C6DAC(u8 taskId, const struct YesNoFuncTable *yesNoTable)
void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId))
{
FillWindowPixelBuffer(2, 0x11);
FillWindowPixelBuffer(2, PIXEL_FILL(1));
DisplayMessageAndContinueTask(taskId, 2, 0xA, 0xD, 1, GetPlayerTextSpeedDelay(), str, callback);
schedule_bg_copy_tilemap_to_vram(1);
}
static void sub_81C6E1C(void)
{
sub_8197DF8(2, FALSE);
ClearDialogWindowAndFrameToTransparent(2, FALSE);
// This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it.
ClearWindowTilemap(2);
schedule_bg_copy_tilemap_to_vram(1);
}
src/battle_records.c
+5 -6
View File
@@ -21,8 +21,7 @@
#include "alloc.h"
#include "gpu_regs.h"
#include "constants/game_stat.h"
extern void PrintOnTrainerHillRecordsWindow(void); // pokenav.s
#include "trainer_hill.h"
// this file's functions
static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
@@ -320,8 +319,8 @@ void ShowLinkBattleRecords(void)
s32 i, x;
gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults);
x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
@@ -342,7 +341,7 @@ void ShowLinkBattleRecords(void)
void RemoveRecordsWindow(void)
{
sub_819746C(gRecordsWindowId, FALSE);
ClearStdWindowAndFrame(gRecordsWindowId, FALSE);
RemoveWindow(gRecordsWindowId);
}
@@ -383,7 +382,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId)
static void RemoveTrainerHillRecordsWindow(u8 windowId)
{
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
ClearWindowTilemap(windowId);
CopyWindowToVram(windowId, 2);
RemoveWindow(windowId);
src/battle_script_commands.c
+5 -7
View File
@@ -48,6 +48,7 @@
#include "battle_pyramid.h"
#include "field_specials.h"
#include "pokemon_summary_screen.h"
#include "pokenav.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -55,9 +56,6 @@ extern const u8* const gBattleScriptsForMoveEffects[];
// functions
extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
extern u8 sub_813B21C(void);
#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
@@ -297,7 +295,7 @@ static void atkD7_setyawn(void);
static void atkD8_setdamagetohealthdifference(void);
static void atkD9_scaledamagebyhealthratio(void);
static void atkDA_tryswapabilities(void);
static void atkDB_tryimprision(void);
static void atkDB_tryimprison(void);
static void atkDC_trysetgrudge(void);
static void atkDD_weightdamagecalculation(void);
static void atkDE_asistattackselect(void);
@@ -549,7 +547,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
atkD8_setdamagetohealthdifference,
atkD9_scaledamagebyhealthratio,
atkDA_tryswapabilities,
atkDB_tryimprision,
atkDB_tryimprison,
atkDC_trysetgrudge,
atkDD_weightdamagecalculation,
atkDE_asistattackselect,
@@ -9611,7 +9609,7 @@ static void atkDA_tryswapabilities(void) // skill swap
}
}
static void atkDB_tryimprision(void)
static void atkDB_tryimprison(void)
{
if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS))
{
@@ -9622,7 +9620,7 @@ static void atkDB_tryimprision(void)
u8 battlerId, sideAttacker;
sideAttacker = GetBattlerSide(gBattlerAttacker);
PressurePPLoseOnUsingImprision(gBattlerAttacker);
PressurePPLoseOnUsingImprison(gBattlerAttacker);
for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
{
if (sideAttacker != GetBattlerSide(battlerId))
src/battle_setup.c
+2 -5
View File
@@ -44,6 +44,7 @@
#include "mirage_tower.h"
#include "constants/map_types.h"
#include "constants/battle_frontier.h"
#include "field_screen_effect.h"
enum
{
@@ -62,10 +63,6 @@ struct TrainerBattleParameter
u8 ptrType;
};
extern void ClearPoisonStepCounter(void);
extern void sub_808BCF4(void);
extern void sub_80AF6F0(void);
// this file's functions
static void DoBattlePikeWildBattle(void);
static void DoSafariBattle(void);
@@ -641,7 +638,7 @@ u8 BattleSetup_GetTerrainId(void)
return BATTLE_TERRAIN_BUILDING;
case MAP_TYPE_UNDERWATER:
return BATTLE_TERRAIN_UNDERWATER;
case MAP_TYPE_6:
case MAP_TYPE_OCEAN_ROUTE:
if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
return BATTLE_TERRAIN_WATER;
return BATTLE_TERRAIN_PLAIN;
src/battle_tent.c
+1 -1
View File
@@ -269,7 +269,7 @@ static void sub_81B9E88(void)
DoBattleFactorySwapScreen();
}
bool8 sub_81B9E94(void)
bool8 InSlateportBattleTent(void)
{
return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
&& (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);
src/battle_tower.c
+7 -7
View File
@@ -51,7 +51,7 @@ static void AwardBattleTowerRibbons(void);
static void SaveBattleTowerProgress(void);
static void sub_8163914(void);
static void nullsub_61(void);
static void nullsub_116(void);
static void SpriteCB_Null6(void);
static void sub_81642A0(void);
static void sub_8164828(void);
static void sub_8164B74(void);
@@ -1061,7 +1061,7 @@ static void (* const gUnknown_085DF96C[])(void) =
SaveBattleTowerProgress,
sub_8163914,
nullsub_61,
nullsub_116,
SpriteCB_Null6,
sub_81642A0,
sub_8164828,
sub_8164B74,
@@ -2401,9 +2401,9 @@ static void sub_8163EE4(void)
for (i = 0; i < 6; i++)
{
playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i];
playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i];
playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i];
playerRecord->speechLost[i] = gSaveBlock1Ptr->easyChatBattleLost[i];
}
for (i = 0; i < 4; i++)
@@ -2437,7 +2437,7 @@ static void nullsub_61(void)
}
static void nullsub_116(void)
static void SpriteCB_Null6(void)
{
}
@@ -3059,7 +3059,7 @@ static void FillEReaderTrainerWithPlayerData(void)
j = 7;
for (i = 0; i < 6; i++)
{
ereaderTrainer->greeting[i] = gSaveBlock1Ptr->unk2BBC[i];
ereaderTrainer->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
ereaderTrainer->farewellPlayerLost[i] = j;
ereaderTrainer->farewellPlayerWon[i] = j + 6;
j++;
src/battle_util.c
+15 -15
View File
@@ -106,10 +106,10 @@ void PressurePPLose(u8 target, u8 attacker, u16 move)
}
}
void PressurePPLoseOnUsingImprision(u8 attacker)
void PressurePPLoseOnUsingImprison(u8 attacker)
{
int i, j;
int imprisionPos = 4;
int imprisonPos = 4;
u8 atkSide = GetBattlerSide(attacker);
for (i = 0; i < gBattlersCount; i++)
@@ -123,19 +123,19 @@ void PressurePPLoseOnUsingImprision(u8 attacker)
}
if (j != MAX_MON_MOVES)
{
imprisionPos = j;
imprisonPos = j;
if (gBattleMons[attacker].pp[j] != 0)
gBattleMons[attacker].pp[j]--;
}
}
}
if (imprisionPos != 4
if (imprisonPos != 4
&& !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisionPos]))
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisonPos]))
{
gActiveBattler = attacker;
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisonPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisonPos]);
MarkBattlerForControllerExec(gActiveBattler);
}
}
@@ -224,7 +224,7 @@ bool8 WasUnableToUseMove(u8 battler)
{
if (gProtectStructs[battler].prlzImmobility
|| gProtectStructs[battler].targetNotAffected
|| gProtectStructs[battler].usedImprisionedMove
|| gProtectStructs[battler].usedImprisonedMove
|| gProtectStructs[battler].loveImmobility
|| gProtectStructs[battler].usedDisabledMove
|| gProtectStructs[battler].usedTauntedMove
@@ -365,12 +365,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace;
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMoveInPalace;
gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMove;
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMove;
limitations++;
}
}
@@ -438,7 +438,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
unusableMoves |= gBitTable[i];
if (gDisableStructs[battlerId].tauntTimer && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0)
unusableMoves |= gBitTable[i];
if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISION)
if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISON)
unusableMoves |= gBitTable[i];
if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
unusableMoves |= gBitTable[i];
@@ -469,7 +469,7 @@ bool8 AreAllMovesUnusable(void)
u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
{
s32 i;
u8 imprisionedMoves = 0;
u8 imprisonedMoves = 0;
u8 battlerSide = GetBattlerSide(battlerId);
for (i = 0; i < gBattlersCount; i++)
@@ -483,11 +483,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
break;
}
if (j < MAX_MON_MOVES)
imprisionedMoves++;
imprisonedMoves++;
}
}
return imprisionedMoves;
return imprisonedMoves;
}
enum
@@ -1466,7 +1466,7 @@ u8 AtkCanceller_UnableToUseMove(void)
case CANCELLER_IMPRISONED: // imprisoned
if (GetImprisonedMovesCount(gBattlerAttacker, gCurrentMove))
{
gProtectStructs[gBattlerAttacker].usedImprisionedMove = 1;
gProtectStructs[gBattlerAttacker].usedImprisonedMove = 1;
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
@@ -1526,7 +1526,7 @@ u8 AtkCanceller_UnableToUseMove(void)
}
else
{
BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack);
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
gProtectStructs[gBattlerAttacker].loveImmobility = 1;
CancelMultiTurnMoves(gBattlerAttacker);
src/berry.c
+2 -4
View File
@@ -11,11 +11,9 @@
#include "text.h"
#include "constants/event_object_movement_constants.h"
#include "constants/items.h"
#include "event_object_movement.h"
extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
extern void CB2_ChooseBerry(void);
extern bool8 IsBerryTreeSparkling(u8, u8, u8);
extern const u8 BerryTreeScript[];
src/berry_blender.c
+12 -20
View File
@@ -34,6 +34,8 @@
#include "battle_records.h"
#include "graphics.h"
#include "new_game.h"
#include "save.h"
#include "link.h"
#define BLENDER_SCORE_BEST 0
#define BLENDER_SCORE_GOOD 1
@@ -140,16 +142,6 @@ extern const u8 gText_Space[];
extern const u8 gText_BlenderMaxSpeedRecord[];
extern const u8 gText_234Players[];
extern void sub_800A418(void);
extern u8 sub_800A9D8(void);
extern void sub_81AABF0(void (*callback)(void));
extern void sub_800B4C0(void);
extern void ClearLinkCallback(void);
extern void sub_8009F8C(void);
extern void sub_8153430(void);
extern bool8 sub_8153474(void);
extern void sub_80EECEC(void);
// this file's functions
static void BerryBlender_SetBackgroundsPos(void);
static void sub_8080EA4(u8 taskId);
@@ -945,7 +937,7 @@ static void InitBerryBlenderWindows(void)
DeactivateAllTextPrinters();
for (i = 0; i < 5; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
sub_81978B0(0xE0);
@@ -1251,7 +1243,7 @@ static void sub_8080018(void)
case 10:
if (++sBerryBlenderData->framesToWait > 20)
{
sub_8197DF8(4, TRUE);
ClearDialogWindowAndFrameToTransparent(4, TRUE);
if (GetBlockReceivedStatus() == sub_800A9D8())
{
for (i = 0; i < GetLinkPlayerCount(); i++)
@@ -2600,7 +2592,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
}
break;
case 2:
sub_8153430();
FullSaveGame();
sBerryBlenderData->field_1A0++;
sBerryBlenderData->framesToWait = 0;
break;
@@ -2614,7 +2606,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
case 4:
if (IsLinkTaskFinished())
{
if (sub_8153474())
if (CheckSaveFile())
{
sBerryBlenderData->field_1A0 = 5;
}
@@ -3325,7 +3317,7 @@ static bool8 Blender_PrintBlendingResults(void)
sBerryBlenderData->mainState++;
break;
case 5:
sub_8198070(5, 1);
ClearStdWindowAndFrameToTransparent(5, 1);
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
{
@@ -3466,7 +3458,7 @@ static bool8 Blender_PrintBlendingRanking(void)
}
break;
case 3:
SetWindowBorderStyle(5, 0, 1, 0xD);
DrawStdFrameWithCustomTileAndPalette(5, 0, 1, 0xD);
xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 0xA8);
Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SPEED_FF, 0);
@@ -3537,8 +3529,8 @@ void ShowBerryBlenderRecordWindow(void)
winTemplate = sBlenderRecordWindowTemplate;
gRecordsWindowId = AddWindow(&winTemplate);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, 0);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90);
AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL);
@@ -3647,7 +3639,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
if (caseId != 3)
{
FillWindowPixelBuffer(windowId, txtColor[0] | (txtColor[0] << 4));
FillWindowPixelBuffer(windowId, PIXEL_FILL(txtColor[0]));
}
AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string);
@@ -3658,7 +3650,7 @@ static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)
switch (*textState)
{
case 0:
sub_8197B1C(4, FALSE, 0x14, 0xF);
DrawDialogFrameWithCustomTileAndPalette(4, FALSE, 0x14, 0xF);
Blender_AddTextPrinter(4, string, 0, 1, textSpeed, 0);
PutWindowTilemap(4);
CopyWindowToVram(4, 3);
src/berry_fix_program.c
+4 -4
View File
@@ -226,9 +226,9 @@ static void berry_fix_gpu_set(void)
DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(0, 0xAA);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
FillWindowPixelBuffer(3, PIXEL_FILL(0));
FillWindowPixelBuffer(0, PIXEL_FILL(0xA));
width = GetStringWidth(0, sUnknown_08617E9B, 0);
left = (0x78 - width) / 2;
@@ -273,7 +273,7 @@ static int berry_fix_text_update(int checkval)
static void berry_fix_text_print(int scene)
{
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
FillWindowPixelBuffer(1, 0xAA);
FillWindowPixelBuffer(1, PIXEL_FILL(0xA));
AddTextPrinterParameterized3(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]);
PutWindowTilemap(1);
CopyWindowToVram(1, 2);
src/berry_tag_screen.c
+7 -7
View File
@@ -381,7 +381,7 @@ static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s
static void AddBerryTagTextToBg0(void)
{
memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
FillWindowPixelBuffer(WIN_BERRY_TAG, 0xFF);
FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_FILL(15));
PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1);
PutWindowTilemap(WIN_BERRY_TAG);
schedule_bg_copy_tilemap_to_vram(0);
@@ -598,7 +598,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0])
{
case 0x30:
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
break;
case 0x40:
PrintBerryNumberAndName();
@@ -608,7 +608,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite();
break;
case 0x60:
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
break;
case 0x70:
PrintBerrySize();
@@ -620,7 +620,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity();
break;
case 0xA0:
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
break;
case 0xB0:
PrintBerryDescription1();
@@ -635,7 +635,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0])
{
case 0x30:
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
break;
case 0x40:
PrintBerryDescription2();
@@ -647,7 +647,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity();
break;
case 0x70:
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
break;
case 0x80:
PrintBerryFirmness();
@@ -660,7 +660,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite();
break;
case 0xB0:
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
break;
case 0xC0:
PrintBerryNumberAndName();
src/bg.c
+2 -2
View File
@@ -1056,7 +1056,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
for (x16 = x; x16 < (x + width); x16++)
{
CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK);
}
}
break;
@@ -1067,7 +1067,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
for (x16 = x; x16 < (x + width); x16++)
{
((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK);
}
}
break;
src/bike.c
-6
View File
@@ -14,12 +14,6 @@
extern bool8 gBikeCyclingChallenge;
extern u8 gBikeCollisions;
extern u8 sub_808B980(u8 direction);
extern u8 sub_808B9BC(u8 direction);
extern u8 sub_808B9A4(u8 direction);
extern u8 sub_808C1B4(u8 direction);
extern u8 sub_808B9D4(u8 direction);
// this file's functions
static void MovePlayerOnMachBike(u8, u16, u16);
static u8 GetMachBikeTransition(u8 *);
src/cable_car.c
+4 -4
View File
@@ -358,7 +358,7 @@ static void CleanupCableCar(void)
HideBg(3);
sub_8150B6C(0);
gSpriteCoordOffsetX = 0;
sub_80AB130(WEATHER_NONE);
SetCurrentAndNextWeatherNoDelay(WEATHER_NONE);
for (i = 0; i < 20; i++)
gWeatherPtr->sprites.s2.ashSprites[i] = NULL;
@@ -394,7 +394,7 @@ static void sub_81503E4(u8 taskId)
case 0:
if (sCableCar->timer == sCableCar->unk4)
{
ChangeWeather(sCableCar->weather);
SetNextWeather(sCableCar->weather);
sCableCar->state = 1;
}
break;
@@ -798,7 +798,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 99;
sCableCar->weather = WEATHER_ASH;
sCableCar->unk4 = 0x15e;
sub_80AB130(WEATHER_SUNNY);
SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY);
break;
case 1:
CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17);
@@ -822,7 +822,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 0x41;
sCableCar->weather = WEATHER_SUNNY;
sCableCar->unk4 = 0x109;
sub_80AB130(WEATHER_ASH);
SetCurrentAndNextWeatherNoDelay(WEATHER_ASH);
break;
}
for (i = 0; i < 9; i++)
src/cable_club.c
+27 -20
View File
@@ -92,7 +92,9 @@ static void sub_80B23B0(u16 windowId, u32 value)
static void sub_80B241C(u16 windowId)
{
sub_819746C(windowId, FALSE);
// Following this call with a copy-to-vram with mode 3 is identical to
// calling ClearStdWindowAndFrame(windowId, TRUE).
ClearStdWindowAndFrame(windowId, FALSE);
CopyWindowToVram(windowId, 3);
}
@@ -282,7 +284,7 @@ static void sub_80B2804(u8 taskId)
if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
{
if (sub_800AA48() != GetLinkPlayerCount_2())
if (GetSavedPlayerCount() != GetLinkPlayerCount_2())
{
ShowFieldAutoScrollMessage(gText_ConfirmLinkWhenPlayersReady);
gTasks[taskId].func = sub_80B270C;
@@ -295,7 +297,7 @@ static void sub_80B2804(u8 taskId)
else if (gMain.heldKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].func = sub_80B28A8;
}
}
@@ -310,7 +312,7 @@ static void sub_80B28A8(u8 taskId)
|| sub_80B2D6C(taskId) == TRUE)
return;
if (GetLinkPlayerCount_2() != sub_800AA48())
if (GetLinkPlayerCount_2() != GetSavedPlayerCount())
{
gTasks[taskId].func = sub_80B2D2C;
}
@@ -352,7 +354,7 @@ static void sub_80B2918(u8 taskId)
else
{
gFieldLinkPlayerCount = GetLinkPlayerCount_2();
gUnknown_03005DB4 = GetMultiplayerId();
gLocalLinkPlayerId = GetMultiplayerId();
sub_800AA04(gFieldLinkPlayerCount);
card = (struct TrainerCard *)gBlockSendBuffer;
TrainerCard_GenerateCardForPlayer(card);
@@ -399,7 +401,7 @@ static void sub_80B2A08(u8 taskId)
else
{
gFieldLinkPlayerCount = GetLinkPlayerCount_2();
gUnknown_03005DB4 = GetMultiplayerId();
gLocalLinkPlayerId = GetMultiplayerId();
sub_800AA04(gFieldLinkPlayerCount);
card = (struct TrainerCard *)gBlockSendBuffer;
TrainerCard_GenerateCardForPlayer(card);
@@ -764,9 +766,9 @@ static void sub_80B3194(u8 taskId)
static void sub_80B31E8(u8 taskId)
{
if (sub_800AA48() == GetLinkPlayerCount_2())
if (GetSavedPlayerCount() == GetLinkPlayerCount_2())
{
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].func = sub_80B3220;
}
}
@@ -972,7 +974,7 @@ void sub_80B360C(void)
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2)
{
UpdatePlayerLinkBattleRecords(gUnknown_03005DB4 ^ 1);
UpdatePlayerLinkBattleRecords(gLocalLinkPlayerId ^ 1);
if (gWirelessCommType)
{
switch (gBattleOutcome)
@@ -993,13 +995,13 @@ void sub_80B360C(void)
}
else
{
gMain.savedCallback = c2_8056854;
gMain.savedCallback = CB2_ReturnToFieldFromMultiplayer;
}
SetMainCallback2(sub_80A0514);
}
void sub_80B36EC(void)
void CleanupLinkRoomState(void)
{
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9)
{
@@ -1009,9 +1011,9 @@ void sub_80B36EC(void)
SetWarpDestinationToDynamicWarp(0x7F);
}
void sub_80B371C(void)
void ExitLinkRoom(void)
{
sub_80872B0();
QueueExitLinkRoomKey();
}
static void sub_80B3728(u8 taskId)
@@ -1028,7 +1030,7 @@ static void sub_80B3728(u8 taskId)
if (IsFieldMessageBoxHidden())
{
sub_8087288();
sub_8009628(gSpecialVar_0x8005);
SetLocalLinkPlayerId(gSpecialVar_0x8005);
task->data[0] = 2;
}
break;
@@ -1130,7 +1132,8 @@ static void sub_80B3894(u8 taskId)
}
}
void sub_80B3924(void)
// Note: VAR_0x8005 is set to the ID of the trade seat.
void PlayerEnteredTradeSeat(void)
{
if (gWirelessCommType != 0)
{
@@ -1152,7 +1155,8 @@ void nullsub_37(void)
}
void sub_80B3968(void)
// Note: VAR_0x8005 is set to the ID of the player spot.
void ColosseumPlayerSpotTriggered(void)
{
gLinkType = 0x2211;
@@ -1166,6 +1170,7 @@ void sub_80B3968(void)
}
}
// This function is never called.
static void sub_80B39A4(void)
{
u8 taskId = CreateTask(sub_80B3728, 80);
@@ -1177,14 +1182,16 @@ void sp02A_crash_sound(void)
ShowTrainerCardInLink(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
bool32 sub_80B39D4(u8 linkPlayerIndex)
// Returns FALSE if the player has no stars. Returns TRUE otherwise, and puts the name of the
// color into gStringVar2.
bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex)
{
u32 trainerCardColorIndex;
gSpecialVar_0x8006 = linkPlayerIndex;
StringCopy(gStringVar1, gLinkPlayers[linkPlayerIndex].name);
trainerCardColorIndex = sub_80C4904(linkPlayerIndex);
trainerCardColorIndex = GetTrainerCardStars(linkPlayerIndex);
if (trainerCardColorIndex == 0)
return FALSE;
@@ -1263,13 +1270,13 @@ void sub_80B3AF8(u8 taskId)
}
break;
case 2:
if (GetLinkPlayerCount_2() >= sub_800AA48())
if (GetLinkPlayerCount_2() >= GetSavedPlayerCount())
{
if (IsLinkMaster())
{
if (++data[1] > 30)
{
sub_800A620();
CheckShouldAdvanceLinkState();
data[0]++;
}
}
src/clear_save_data_screen.c
+3 -3
View File
@@ -79,7 +79,7 @@ void CB2_InitClearSaveDataScreen(void)
static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
{
SetWindowBorderStyle(0, 0, 2, 14);
DrawStdFrameWithCustomTileAndPalette(0, 0, 2, 14);
AddTextPrinterParameterized(0, 1, gText_ClearAllSaveData, 0, 1, 0, 0);
CreateYesNoMenu(sClearSaveYesNo, 2, 14, 1);
gTasks[taskId].func = Task_ClearSaveDataScreenYesNoChoice;
@@ -90,7 +90,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
case 0:
FillWindowPixelBuffer(0, 17);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, 1, gText_ClearingData, 0, 1, 0, 0);
gTasks[taskId].func = Task_ClearSaveData;
break;
@@ -203,7 +203,7 @@ static void InitClearSaveDataScreenWindows(void)
{
InitWindows(sClearSaveTextWindow);
DeactivateAllTextPrinters();
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadWindowGfx(0, 0, 2, 224);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
}
src/coins.c
+3 -3
View File
@@ -27,15 +27,15 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
struct WindowTemplate template;
SetWindowTemplateFields(&template, 0, x, y, 8, 2, 0xF, 0x141);
sCoinsWindowId = AddWindow(&template);
FillWindowPixelBuffer(sCoinsWindowId, 0);
FillWindowPixelBuffer(sCoinsWindowId, PIXEL_FILL(0));
PutWindowTilemap(sCoinsWindowId);
SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x214, 0xE);
DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x214, 0xE);
PrintCoinsString(coinAmount);
}
void HideCoinsWindow(void)
{
sub_819746C(sCoinsWindowId, TRUE);
ClearStdWindowAndFrame(sCoinsWindowId, TRUE);
RemoveWindow(sCoinsWindowId);
}
src/contest.c
+7 -9
View File
@@ -45,8 +45,6 @@
#include "constants/rgb.h"
#include "contest_ai.h"
extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c
// This file's functions.
static void sub_80D782C(void);
static void sub_80D7C7C(u8 taskId);
@@ -819,7 +817,7 @@ static void sub_80D8490(u8 taskId)
}
r5 = StringCopy(r5, gMoveNames[move]);
FillWindowPixelBuffer(i + 5, 0);
FillWindowPixelBuffer(i + 5, PIXEL_FILL(0));
Contest_PrintTextToBg0WindowAt(i + 5, sp8, 5, 1, 7);
}
@@ -941,7 +939,7 @@ static void sub_80D895C(u8 taskId)
for (i = 0; i < 4; i++)
{
FillWindowPixelBuffer(5 + i, 0);
FillWindowPixelBuffer(5 + i, PIXEL_FILL(0));
PutWindowTilemap(5 + i);
CopyWindowToVram(5 + i, 2);
}
@@ -2258,7 +2256,7 @@ static void sub_80DAEA4(void)
for (i = 0; i < 4; i++)
{
FillWindowPixelBuffer(gUnknown_02039F26[i], 0);
FillWindowPixelBuffer(gUnknown_02039F26[i], PIXEL_FILL(0));
sub_80DAF04(i);
sub_80DAF88(i);
}
@@ -2478,7 +2476,7 @@ static void prints_contest_move_description(u16 a)
ContestBG_FillBoxWithTile(0, 0x5036, 0x15, 0x20, 0x08, 0x01, 0x11);
ContestBG_FillBoxWithTile(0, 0x5014, 0x15, 0x20, numHearts, 0x01, 0x11);
FillWindowPixelBuffer(10, 0);
FillWindowPixelBuffer(10, PIXEL_FILL(0));
Contest_PrintTextToBg0WindowStd(10, gContestEffectDescriptionPointers[gContestMoves[a].effect]);
Contest_PrintTextToBg0WindowStd(9, gText_Slash);
}
@@ -2621,7 +2619,7 @@ static void sub_80DB884(void)
static void sub_80DB89C(void)
{
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
CopyWindowToVram(4, 2);
Contest_SetBgCopyFlags(0);
}
@@ -3456,7 +3454,7 @@ static void sub_80DCD48(void)
break;
default:
for (i = 0; i < 4; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
for (i = 0; i < 4; i++)
{
value = sContestantStatus[i].unk4;
@@ -5038,7 +5036,7 @@ static void sub_80DF750(void)
return;
for (i = 0; i < 4; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
if (gHeap[0x1A000] == 2)
{
src/contest_link_80F57C4.c
+5 -6
View File
@@ -39,6 +39,7 @@
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/vars.h"
#include "contest.h"
struct ContestLinkUnk0
{
@@ -99,8 +100,6 @@ extern const struct SpriteSheet gUnknown_0858D810[];
extern const struct SpritePalette gUnknown_0858D850;
extern const struct SpriteTemplate gSpriteTemplate_858D860;
extern void sub_81D9DE4(u8);
static void sub_80F6A9C(void);
static void sub_80F71C8(void);
u8 sub_80F7310(u8, u8);
@@ -372,12 +371,12 @@ static void sub_80F5CE4(u8 taskId)
sub_80DEDA8(0xFE);
gUnknown_02039F5C = 1;
gUnknown_02039F5D = sub_80DEFA8(0xFE, 0);
var = VarGet(VAR_0x4086);
VarSet(VAR_0x4086, 0);
var = VarGet(VAR_LINK_CONTEST_ROOM_STATE);
VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0);
SetContinueGameWarpStatusToDynamicWarp();
TrySavingData(SAVE_LINK);
ClearContinueGameWarpStatus2();
VarSet(VAR_0x4086, var);
VarSet(VAR_LINK_CONTEST_ROOM_STATE, var);
gTasks[taskId].data[0]++;
break;
case 1:
@@ -935,7 +934,7 @@ static void sub_80F6AE8(void)
// windowTemplate.width = 30;
// windowTemplate.height = 2;
// windowId = AddWindow(&windowTemplate);
// FillWindowPixelBuffer(windowId, 0x11);
// FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
// origWidth = GetStringWidth(1, text, 0) + 9;
// strWidth = origWidth;
// if (strWidth < 0)
src/contest_painting.c
+1 -1
View File
@@ -279,7 +279,7 @@ static void InitContestPaintingWindow(void)
SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC);
DeactivateAllTextPrinters();
FillWindowPixelBuffer(gContestPaintingWindowId, 0);
FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_FILL(0));
PutWindowTilemap(gContestPaintingWindowId);
CopyWindowToVram(gContestPaintingWindowId, 3);
ShowBg(1);
src/credits.c
+1 -1
View File
@@ -1592,7 +1592,7 @@ static void sub_8175DA0(u8 taskIdB)
case 5:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
CopyWindowToVram(0, 2);
gTasks[taskIdB].data[TDB_0] = 2;
}
src/data/easy_chat/easy_chat_group_actions.h
Executable
+471
View File
@@ -0,0 +1,471 @@
const u8 gEasyChatWord_Meets[] = _("MEETS");
const u8 gEasyChatWord_Concede[] = _("CONCEDE");
const u8 gEasyChatWord_Give[] = _("GIVE");
const u8 gEasyChatWord_Gives[] = _("GIVES");
const u8 gEasyChatWord_Played[] = _("PLAYED");
const u8 gEasyChatWord_Plays[] = _("PLAYS");
const u8 gEasyChatWord_Collect[] = _("COLLECT");
const u8 gEasyChatWord_Walking[] = _("WALKING");
const u8 gEasyChatWord_Walks[] = _("WALKS");
const u8 gEasyChatWord_Says[] = _("SAYS");
const u8 gEasyChatWord_Went[] = _("WENT");
const u8 gEasyChatWord_Said[] = _("SAID");
const u8 gEasyChatWord_WakeUp[] = _("WAKE UP");
const u8 gEasyChatWord_WakesUp[] = _("WAKES UP");
const u8 gEasyChatWord_Angers[] = _("ANGERS");
const u8 gEasyChatWord_Teach[] = _("TEACH");
const u8 gEasyChatWord_Teaches[] = _("TEACHES");
const u8 gEasyChatWord_Please[] = _("PLEASE");
const u8 gEasyChatWord_Learn[] = _("LEARN");
const u8 gEasyChatWord_Change[] = _("CHANGE");
const u8 gEasyChatWord_Story[] = _("STORY");
const u8 gEasyChatWord_Trust[] = _("TRUST");
const u8 gEasyChatWord_Lavish[] = _("LAVISH");
const u8 gEasyChatWord_Listens[] = _("LISTENS");
const u8 gEasyChatWord_Hearing[] = _("HEARING");
const u8 gEasyChatWord_Trains[] = _("TRAINS");
const u8 gEasyChatWord_Choose[] = _("CHOOSE");
const u8 gEasyChatWord_Come[] = _("COME");
const u8 gEasyChatWord_Came[] = _("CAME");
const u8 gEasyChatWord_Search[] = _("SEARCH");
const u8 gEasyChatWord_Make[] = _("MAKE");
const u8 gEasyChatWord_Cause[] = _("CAUSE");
const u8 gEasyChatWord_Know[] = _("KNOW");
const u8 gEasyChatWord_Knows[] = _("KNOWS");
const u8 gEasyChatWord_Refuse[] = _("REFUSE");
const u8 gEasyChatWord_Stores[] = _("STORES");
const u8 gEasyChatWord_Brag[] = _("BRAG");
const u8 gEasyChatWord_Ignorant[] = _("IGNORANT");
const u8 gEasyChatWord_Thinks[] = _("THINKS");
const u8 gEasyChatWord_Believe[] = _("BELIEVE");
const u8 gEasyChatWord_Slide[] = _("SLIDE");
const u8 gEasyChatWord_Eats[] = _("EATS");
const u8 gEasyChatWord_Use[] = _("USE");
const u8 gEasyChatWord_Uses[] = _("USES");
const u8 gEasyChatWord_Using[] = _("USING");
const u8 gEasyChatWord_Couldnt[] = _("COULDN'T");
const u8 gEasyChatWord_Capable[] = _("CAPABLE");
const u8 gEasyChatWord_Disappear[] = _("DISAPPEAR");
const u8 gEasyChatWord_Appear[] = _("APPEAR");
const u8 gEasyChatWord_Throw[] = _("THROW");
const u8 gEasyChatWord_Worry[] = _("WORRY");
const u8 gEasyChatWord_Slept[] = _("SLEPT");
const u8 gEasyChatWord_Sleep[] = _("SLEEP");
const u8 gEasyChatWord_Release[] = _("RELEASE");
const u8 gEasyChatWord_Drinks[] = _("DRINKS");
const u8 gEasyChatWord_Runs[] = _("RUNS");
const u8 gEasyChatWord_Run[] = _("RUN");
const u8 gEasyChatWord_Works[] = _("WORKS");
const u8 gEasyChatWord_Working[] = _("WORKING");
const u8 gEasyChatWord_Talking[] = _("TALKING");
const u8 gEasyChatWord_Talk[] = _("TALK");
const u8 gEasyChatWord_Sink[] = _("SINK");
const u8 gEasyChatWord_Smack[] = _("SMACK");
const u8 gEasyChatWord_Pretend[] = _("PRETEND");
const u8 gEasyChatWord_Praise[] = _("PRAISE");
const u8 gEasyChatWord_Overdo[] = _("OVERDO");
const u8 gEasyChatWord_Show[] = _("SHOW");
const u8 gEasyChatWord_Looks[] = _("LOOKS");
const u8 gEasyChatWord_Sees[] = _("SEES");
const u8 gEasyChatWord_Seek[] = _("SEEK");
const u8 gEasyChatWord_Own[] = _("OWN");
const u8 gEasyChatWord_Take[] = _("TAKE");
const u8 gEasyChatWord_Allow[] = _("ALLOW");
const u8 gEasyChatWord_Forget[] = _("FORGET");
const u8 gEasyChatWord_Forgets[] = _("FORGETS");
const u8 gEasyChatWord_Appears[] = _("APPEARS");
const u8 gEasyChatWord_Faint[] = _("FAINT");
const u8 gEasyChatWord_Fainted[] = _("FAINTED");
const struct EasyChatWordInfo gEasyChatGroup_Actions[] = {
{
.text = gEasyChatWord_Meets,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Concede,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Give,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gives,
.alphabeticalOrder = 75,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Played,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plays,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Collect,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walking,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walks,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Says,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Went,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Said,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WakeUp,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WakesUp,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Angers,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teach,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teaches,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Please,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Learn,
.alphabeticalOrder = 76,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Change,
.alphabeticalOrder = 77,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Story,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trust,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lavish,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Listens,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hearing,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trains,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Choose,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Come,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Came,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Search,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Make,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cause,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Know,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Knows,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Refuse,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stores,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Brag,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ignorant,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thinks,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Believe,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slide,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eats,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Use,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Uses,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Using,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Couldnt,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Capable,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappear,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appear,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Throw,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Worry,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slept,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sleep,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Release,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drinks,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Runs,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Run,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Works,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Working,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talking,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talk,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sink,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smack,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pretend,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Praise,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overdo,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Show,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Looks,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sees,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seek,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Own,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Take,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Allow,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forget,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forgets,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appears,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Faint,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fainted,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_adjectives.h
Executable
+219
View File
@@ -0,0 +1,219 @@
const u8 gEasyChatWord_Wandering[] = _("WANDERING");
const u8 gEasyChatWord_Rickety[] = _("RICKETY");
const u8 gEasyChatWord_RockSolid[] = _("ROCK-SOLID");
const u8 gEasyChatWord_Hungry[] = _("HUNGRY");
const u8 gEasyChatWord_Tight[] = _("TIGHT");
const u8 gEasyChatWord_Ticklish[] = _("TICKLISH");
const u8 gEasyChatWord_Twirling[] = _("TWIRLING");
const u8 gEasyChatWord_Spiraling[] = _("SPIRALING");
const u8 gEasyChatWord_Thirsty[] = _("THIRSTY");
const u8 gEasyChatWord_Lolling[] = _("LOLLING");
const u8 gEasyChatWord_Silky[] = _("SILKY");
const u8 gEasyChatWord_Sadly[] = _("SADLY");
const u8 gEasyChatWord_Hopeless[] = _("HOPELESS");
const u8 gEasyChatWord_Useless[] = _("USELESS");
const u8 gEasyChatWord_Drooling[] = _("DROOLING");
const u8 gEasyChatWord_Exciting[] = _("EXCITING");
const u8 gEasyChatWord_Thick[] = _("THICK");
const u8 gEasyChatWord_Smooth[] = _("SMOOTH");
const u8 gEasyChatWord_Slimy[] = _("SLIMY");
const u8 gEasyChatWord_Thin[] = _("THIN");
const u8 gEasyChatWord_Break[] = _("BREAK");
const u8 gEasyChatWord_Voracious[] = _("VORACIOUS");
const u8 gEasyChatWord_Scatter[] = _("SCATTER");
const u8 gEasyChatWord_Awesome[] = _("AWESOME");
const u8 gEasyChatWord_Wimpy[] = _("WIMPY");
const u8 gEasyChatWord_Wobbly[] = _("WOBBLY");
const u8 gEasyChatWord_Shaky[] = _("SHAKY");
const u8 gEasyChatWord_Ripped[] = _("RIPPED");
const u8 gEasyChatWord_Shredded[] = _("SHREDDED");
const u8 gEasyChatWord_Increasing[] = _("INCREASING");
const u8 gEasyChatWord_Yet[] = _("YET");
const u8 gEasyChatWord_Destroyed[] = _("DESTROYED");
const u8 gEasyChatWord_Fiery[] = _("FIERY");
const u8 gEasyChatWord_LoveyDovey[] = _("LOVEY-DOVEY");
const u8 gEasyChatWord_Happily[] = _("HAPPILY");
const u8 gEasyChatWord_Anticipation[] = _("ANTICIPATION");
const struct EasyChatWordInfo gEasyChatGroup_Adjectives[] = {
{
.text = gEasyChatWord_Wandering,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rickety,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RockSolid,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hungry,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tight,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ticklish,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Twirling,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spiraling,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thirsty,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lolling,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Silky,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sadly,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hopeless,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Useless,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drooling,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Exciting,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thick,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smooth,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slimy,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thin,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Break,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Voracious,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Scatter,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awesome,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wimpy,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wobbly,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shaky,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ripped,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shredded,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Increasing,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yet,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Destroyed,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fiery,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LoveyDovey,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happily,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anticipation,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_battle.h
Executable
+381
View File
@@ -0,0 +1,381 @@
const u8 gEasyChatWord_MatchUp[] = _("MATCH UP");
const u8 gEasyChatWord_Go[] = _("GO");
const u8 gEasyChatWord_No1[] = _("NO. 1");
const u8 gEasyChatWord_Decide[] = _("DECIDE");
const u8 gEasyChatWord_LetMeWin[] = _("LET ME WIN");
const u8 gEasyChatWord_Wins[] = _("WINS");
const u8 gEasyChatWord_Win[] = _("WIN");
const u8 gEasyChatWord_Won[] = _("WON");
const u8 gEasyChatWord_IfIWin[] = _("IF I WIN");
const u8 gEasyChatWord_WhenIWin[] = _("WHEN I WIN");
const u8 gEasyChatWord_CantWin[] = _("CAN'T WIN");
const u8 gEasyChatWord_CanWin[] = _("CAN WIN");
const u8 gEasyChatWord_NoMatch[] = _("NO MATCH");
const u8 gEasyChatWord_Spirit[] = _("SPIRIT");
const u8 gEasyChatWord_Decided[] = _("DECIDED");
const u8 gEasyChatWord_TrumpCard[] = _("TRUMP CARD");
const u8 gEasyChatWord_TakeThat[] = _("TAKE THAT");
const u8 gEasyChatWord_ComeOn[] = _("COME ON");
const u8 gEasyChatWord_Attack[] = _("ATTACK");
const u8 gEasyChatWord_Surrender[] = _("SURRENDER");
const u8 gEasyChatWord_Gutsy[] = _("GUTSY");
const u8 gEasyChatWord_Talent[] = _("TALENT");
const u8 gEasyChatWord_Strategy[] = _("STRATEGY");
const u8 gEasyChatWord_Smite[] = _("SMITE");
const u8 gEasyChatWord_Match[] = _("MATCH");
const u8 gEasyChatWord_Victory[] = _("VICTORY");
const u8 gEasyChatWord_Offensive[] = _("OFFENSIVE");
const u8 gEasyChatWord_Sense[] = _("SENSE");
const u8 gEasyChatWord_Versus[] = _("VERSUS");
const u8 gEasyChatWord_Fights[] = _("FIGHTS");
const u8 gEasyChatWord_Power[] = _("POWER");
const u8 gEasyChatWord_Challenge[] = _("CHALLENGE");
const u8 gEasyChatWord_Strong[] = _("STRONG");
const u8 gEasyChatWord_TooStrong[] = _("TOO STRONG");
const u8 gEasyChatWord_GoEasy[] = _("GO EASY");
const u8 gEasyChatWord_Foe[] = _("FOE");
const u8 gEasyChatWord_Genius[] = _("GENIUS");
const u8 gEasyChatWord_Legend[] = _("LEGEND");
const u8 gEasyChatWord_Escape[] = _("ESCAPE");
const u8 gEasyChatWord_Aim[] = _("AIM");
const u8 gEasyChatWord_Battle[] = _("BATTLE");
const u8 gEasyChatWord_Fight[] = _("FIGHT");
const u8 gEasyChatWord_Resuscitate[] = _("RESUSCITATE");
const u8 gEasyChatWord_Points[] = _("POINTS");
const u8 gEasyChatWord_Serious[] = _("SERIOUS");
const u8 gEasyChatWord_GiveUp[] = _("GIVE UP");
const u8 gEasyChatWord_Loss[] = _("LOSS");
const u8 gEasyChatWord_IfILose[] = _("IF I LOSE");
const u8 gEasyChatWord_Lost[] = _("LOST");
const u8 gEasyChatWord_Lose[] = _("LOSE");
const u8 gEasyChatWord_Guard[] = _("GUARD");
const u8 gEasyChatWord_Partner[] = _("PARTNER");
const u8 gEasyChatWord_Reject[] = _("REJECT");
const u8 gEasyChatWord_Accept[] = _("ACCEPT");
const u8 gEasyChatWord_Invincible[] = _("INVINCIBLE");
const u8 gEasyChatWord_Received[] = _("RECEIVED");
const u8 gEasyChatWord_Easy[] = _("EASY");
const u8 gEasyChatWord_Weak[] = _("WEAK");
const u8 gEasyChatWord_TooWeak[] = _("TOO WEAK");
const u8 gEasyChatWord_Pushover[] = _("PUSHOVER");
const u8 gEasyChatWord_Leader[] = _("LEADER");
const u8 gEasyChatWord_Rule[] = _("RULE");
const u8 gEasyChatWord_Move[] = _("MOVE");
const struct EasyChatWordInfo gEasyChatGroup_Battle[] = {
{
.text = gEasyChatWord_MatchUp,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Go,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_No1,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Decide,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LetMeWin,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wins,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Win,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Won,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IfIWin,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhenIWin,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CantWin,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CanWin,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NoMatch,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spirit,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Decided,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TrumpCard,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TakeThat,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ComeOn,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Attack,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Surrender,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gutsy,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talent,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Strategy,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smite,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Match,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Victory,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Offensive,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sense,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Versus,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fights,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Power,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Challenge,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Strong,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooStrong,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoEasy,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Foe,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Genius,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Legend,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Escape,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aim,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Battle,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fight,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Resuscitate,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Points,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Serious,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GiveUp,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Loss,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IfILose,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lost,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lose,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Guard,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Partner,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Reject,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Accept,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Invincible,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Received,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Easy,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weak,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooWeak,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pushover,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Leader,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rule,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Move,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_conditions.h
Executable
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Hot[] = _("HOT");
const u8 gEasyChatWord_Exists[] = _("EXISTS");
const u8 gEasyChatWord_Excess[] = _("EXCESS");
const u8 gEasyChatWord_Approved[] = _("APPROVED");
const u8 gEasyChatWord_Has[] = _("HAS");
const u8 gEasyChatWord_Good[] = _("GOOD");
const u8 gEasyChatWord_Less[] = _("LESS");
const u8 gEasyChatWord_Momentum[] = _("MOMENTUM");
const u8 gEasyChatWord_Going[] = _("GOING");
const u8 gEasyChatWord_Weird[] = _("WEIRD");
const u8 gEasyChatWord_Busy[] = _("BUSY");
const u8 gEasyChatWord_Together[] = _("TOGETHER");
const u8 gEasyChatWord_Full[] = _("FULL");
const u8 gEasyChatWord_Absent[] = _("ABSENT");
const u8 gEasyChatWord_Being[] = _("BEING");
const u8 gEasyChatWord_Need[] = _("NEED");
const u8 gEasyChatWord_Tasty[] = _("TASTY");
const u8 gEasyChatWord_Skilled[] = _("SKILLED");
const u8 gEasyChatWord_Noisy[] = _("NOISY");
const u8 gEasyChatWord_Big[] = _("BIG");
const u8 gEasyChatWord_Late[] = _("LATE");
const u8 gEasyChatWord_Close[] = _("CLOSE");
const u8 gEasyChatWord_Docile[] = _("DOCILE");
const u8 gEasyChatWord_Amusing[] = _("AMUSING");
const u8 gEasyChatWord_Entertaining[] = _("ENTERTAINING");
const u8 gEasyChatWord_Perfection[] = _("PERFECTION");
const u8 gEasyChatWord_Pretty[] = _("PRETTY");
const u8 gEasyChatWord_Healthy[] = _("HEALTHY");
const u8 gEasyChatWord_Excellent[] = _("EXCELLENT");
const u8 gEasyChatWord_UpsideDown[] = _("UPSIDE DOWN");
const u8 gEasyChatWord_Cold[] = _("COLD");
const u8 gEasyChatWord_Refreshing[] = _("REFRESHING");
const u8 gEasyChatWord_Unavoidable[] = _("UNAVOIDABLE");
const u8 gEasyChatWord_Much[] = _("MUCH");
const u8 gEasyChatWord_Overwhelming[] = _("OVERWHELMING");
const u8 gEasyChatWord_Fabulous[] = _("FABULOUS");
const u8 gEasyChatWord_Else[] = _("ELSE");
const u8 gEasyChatWord_Expensive[] = _("EXPENSIVE");
const u8 gEasyChatWord_Correct[] = _("CORRECT");
const u8 gEasyChatWord_Impossible[] = _("IMPOSSIBLE");
const u8 gEasyChatWord_Small[] = _("SMALL");
const u8 gEasyChatWord_Different[] = _("DIFFERENT");
const u8 gEasyChatWord_Tired[] = _("TIRED");
const u8 gEasyChatWord_Skill[] = _("SKILL");
const u8 gEasyChatWord_Top[] = _("TOP");
const u8 gEasyChatWord_NonStop[] = _("NON-STOP");
const u8 gEasyChatWord_Preposterous[] = _("PREPOSTEROUS");
const u8 gEasyChatWord_None[] = _("NONE");
const u8 gEasyChatWord_Nothing[] = _("NOTHING");
const u8 gEasyChatWord_Natural[] = _("NATURAL");
const u8 gEasyChatWord_Becomes[] = _("BECOMES");
const u8 gEasyChatWord_Lukewarm[] = _("LUKEWARM");
const u8 gEasyChatWord_Fast[] = _("FAST");
const u8 gEasyChatWord_Low[] = _("LOW");
const u8 gEasyChatWord_Awful[] = _("AWFUL");
const u8 gEasyChatWord_Alone[] = _("ALONE");
const u8 gEasyChatWord_Bored[] = _("BORED");
const u8 gEasyChatWord_Secret[] = _("SECRET");
const u8 gEasyChatWord_Mystery[] = _("MYSTERY");
const u8 gEasyChatWord_Lacks[] = _("LACKS");
const u8 gEasyChatWord_Best[] = _("BEST");
const u8 gEasyChatWord_Lousy[] = _("LOUSY");
const u8 gEasyChatWord_Mistake[] = _("MISTAKE");
const u8 gEasyChatWord_Kind[] = _("KIND");
const u8 gEasyChatWord_Well[] = _("WELL");
const u8 gEasyChatWord_Weakened[] = _("WEAKENED");
const u8 gEasyChatWord_Simple[] = _("SIMPLE");
const u8 gEasyChatWord_Seems[] = _("SEEMS");
const u8 gEasyChatWord_Badly[] = _("BADLY");
const struct EasyChatWordInfo gEasyChatGroup_Conditions[] = {
{
.text = gEasyChatWord_Hot,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Exists,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excess,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Approved,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Has,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Good,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Less,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Momentum,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Going,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weird,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Busy,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Together,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Full,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Absent,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Being,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Need,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tasty,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Skilled,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Noisy,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Big,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Late,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Close,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Docile,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Amusing,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Entertaining,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Perfection,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pretty,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Healthy,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excellent,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UpsideDown,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cold,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Refreshing,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Unavoidable,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Much,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overwhelming,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fabulous,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Else,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Expensive,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Correct,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Impossible,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Small,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Different,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tired,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Skill,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Top,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NonStop,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Preposterous,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_None,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nothing,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Natural,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Becomes,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lukewarm,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fast,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Low,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awful,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Alone,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bored,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Secret,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mystery,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lacks,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Best,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lousy,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mistake,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kind,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Well,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weakened,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Simple,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seems,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Badly,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_endings.h
Executable
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Will[] = _("WILL");
const u8 gEasyChatWord_WillBeHere[] = _("WILL BE HERE");
const u8 gEasyChatWord_Or[] = _("OR");
const u8 gEasyChatWord_Times[] = _("TIMES");
const u8 gEasyChatWord_Wonder[] = _("WONDER");
const u8 gEasyChatWord_IsItQues[] = _("IS IT?");
const u8 gEasyChatWord_Be[] = _("BE");
const u8 gEasyChatWord_Gimme[] = _("GIMME");
const u8 gEasyChatWord_Could[] = _("COULD");
const u8 gEasyChatWord_LikelyTo[] = _("LIKELY TO");
const u8 gEasyChatWord_Would[] = _("WOULD");
const u8 gEasyChatWord_Is[] = _("IS");
const u8 gEasyChatWord_IsntItQues[] = _("ISN'T IT?");
const u8 gEasyChatWord_Lets[] = _("LET'S");
const u8 gEasyChatWord_Other[] = _("OTHER");
const u8 gEasyChatWord_Are[] = _("ARE");
const u8 gEasyChatWord_Was[] = _("WAS");
const u8 gEasyChatWord_Were[] = _("WERE");
const u8 gEasyChatWord_Those[] = _("THOSE");
const u8 gEasyChatWord_Isnt[] = _("ISN'T");
const u8 gEasyChatWord_Wont[] = _("WON'T");
const u8 gEasyChatWord_Cant[] = _("CAN'T");
const u8 gEasyChatWord_Can[] = _("CAN");
const u8 gEasyChatWord_Dont[] = _("DON'T");
const u8 gEasyChatWord_Do[] = _("DO");
const u8 gEasyChatWord_Does[] = _("DOES");
const u8 gEasyChatWord_Whom[] = _("WHOM");
const u8 gEasyChatWord_Which[] = _("WHICH");
const u8 gEasyChatWord_Wasnt[] = _("WASN'T");
const u8 gEasyChatWord_Werent[] = _("WEREN'T");
const u8 gEasyChatWord_Have[] = _("HAVE");
const u8 gEasyChatWord_Havent[] = _("HAVEN'T");
const u8 gEasyChatWord_A[] = _("A");
const u8 gEasyChatWord_An[] = _("AN");
const u8 gEasyChatWord_Not[] = _("NOT");
const u8 gEasyChatWord_There[] = _("THERE");
const u8 gEasyChatWord_OkQues[] = _("OK?");
const u8 gEasyChatWord_So[] = _("SO");
const u8 gEasyChatWord_Maybe[] = _("MAYBE");
const u8 gEasyChatWord_About[] = _("ABOUT");
const u8 gEasyChatWord_Over[] = _("OVER");
const u8 gEasyChatWord_It[] = _("IT");
const u8 gEasyChatWord_All[] = _("ALL");
const u8 gEasyChatWord_For[] = _("FOR");
const u8 gEasyChatWord_On[] = _("ON");
const u8 gEasyChatWord_Off[] = _("OFF");
const u8 gEasyChatWord_As[] = _("AS");
const u8 gEasyChatWord_To[] = _("TO");
const u8 gEasyChatWord_With[] = _("WITH");
const u8 gEasyChatWord_Better[] = _("BETTER");
const u8 gEasyChatWord_Ever[] = _("EVER");
const u8 gEasyChatWord_Since[] = _("SINCE");
const u8 gEasyChatWord_Of[] = _("OF");
const u8 gEasyChatWord_BelongsTo[] = _("BELONGS TO");
const u8 gEasyChatWord_At[] = _("AT");
const u8 gEasyChatWord_In[] = _("IN");
const u8 gEasyChatWord_Out[] = _("OUT");
const u8 gEasyChatWord_Too[] = _("TOO");
const u8 gEasyChatWord_Like[] = _("LIKE");
const u8 gEasyChatWord_Did[] = _("DID");
const u8 gEasyChatWord_Didnt[] = _("DIDN'T");
const u8 gEasyChatWord_Doesnt[] = _("DOESN'T");
const u8 gEasyChatWord_Without[] = _("WITHOUT");
const u8 gEasyChatWord_After[] = _("AFTER");
const u8 gEasyChatWord_Before[] = _("BEFORE");
const u8 gEasyChatWord_While[] = _("WHILE");
const u8 gEasyChatWord_Than[] = _("THAN");
const u8 gEasyChatWord_Once[] = _("ONCE");
const u8 gEasyChatWord_Anywhere[] = _("ANYWHERE");
const struct EasyChatWordInfo gEasyChatGroup_Endings[] = {
{
.text = gEasyChatWord_Will,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WillBeHere,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Or,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Times,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wonder,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IsItQues,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Be,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gimme,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Could,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LikelyTo,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Would,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Is,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IsntItQues,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lets,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Other,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Are,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Was,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Were,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Those,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Isnt,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wont,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cant,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Can,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dont,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Do,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Does,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whom,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Which,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wasnt,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Werent,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Have,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Havent,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_A,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_An,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Not,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_There,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OkQues,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_So,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Maybe,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_About,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Over,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_It,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_All,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_For,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_On,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Off,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_As,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_To,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_With,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Better,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ever,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Since,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Of,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BelongsTo,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_At,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_In,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Out,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Too,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Like,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Did,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Didnt,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Doesnt,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Without,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_After,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Before,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_While,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Than,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Once,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anywhere,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_events.h
Executable
+177
View File
@@ -0,0 +1,177 @@
const u8 gEasyChatWord_Appeal[] = _("APPEAL");
const u8 gEasyChatWord_Events[] = _("EVENTS");
const u8 gEasyChatWord_StayAtHome[] = _("STAY-AT-HOME");
const u8 gEasyChatWord_Berry[] = _("BERRY");
const u8 gEasyChatWord_Contest[] = _("CONTEST");
const u8 gEasyChatWord_Mc[] = _("MC");
const u8 gEasyChatWord_Judge[] = _("JUDGE");
const u8 gEasyChatWord_Super[] = _("SUPER");
const u8 gEasyChatWord_Stage[] = _("STAGE");
const u8 gEasyChatWord_HallOfFame[] = _("HALL OF FAME");
const u8 gEasyChatWord_Evolution[] = _("EVOLUTION");
const u8 gEasyChatWord_Hyper[] = _("HYPER");
const u8 gEasyChatWord_BattleTower[] = _("BATTLE TOWER");
const u8 gEasyChatWord_Leaders[] = _("LEADERS");
const u8 gEasyChatWord_BattleRoom[] = _("BATTLE ROOM");
const u8 gEasyChatWord_Hidden[] = _("HIDDEN");
const u8 gEasyChatWord_SecretBase[] = _("SECRET BASE");
const u8 gEasyChatWord_Blend[] = _("BLEND");
const u8 gEasyChatWord_POKEBLOCK[] = _("{POKEBLOCK}");
const u8 gEasyChatWord_Master[] = _("MASTER");
const u8 gEasyChatWord_Rank[] = _("RANK");
const u8 gEasyChatWord_Ribbon[] = _("RIBBON");
const u8 gEasyChatWord_Crush[] = _("CRUSH");
const u8 gEasyChatWord_Direct[] = _("DIRECT");
const u8 gEasyChatWord_Tower[] = _("TOWER");
const u8 gEasyChatWord_Union[] = _("UNION");
const u8 gEasyChatWord_Room[] = _("ROOM");
const u8 gEasyChatWord_Wireless[] = _("WIRELESS");
const u8 gEasyChatWord_Frontier[] = _("FRONTIER");
const struct EasyChatWordInfo gEasyChatGroup_Events[] = {
{
.text = gEasyChatWord_Appeal,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Events,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_StayAtHome,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Berry,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Contest,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mc,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Judge,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Super,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stage,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HallOfFame,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Evolution,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hyper,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleTower,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Leaders,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleRoom,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hidden,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SecretBase,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Blend,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_POKEBLOCK,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Master,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rank,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ribbon,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Crush,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Direct,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tower,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Union,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Room,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wireless,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Frontier,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_feelings.h
Executable
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Meet[] = _("MEET");
const u8 gEasyChatWord_Play[] = _("PLAY");
const u8 gEasyChatWord_Hurried[] = _("HURRIED");
const u8 gEasyChatWord_Goes[] = _("GOES");
const u8 gEasyChatWord_Giddy[] = _("GIDDY");
const u8 gEasyChatWord_Happy[] = _("HAPPY");
const u8 gEasyChatWord_Happiness[] = _("HAPPINESS");
const u8 gEasyChatWord_Excite[] = _("EXCITE");
const u8 gEasyChatWord_Important[] = _("IMPORTANT");
const u8 gEasyChatWord_Funny[] = _("FUNNY");
const u8 gEasyChatWord_Got[] = _("GOT");
const u8 gEasyChatWord_GoHome[] = _("GO HOME");
const u8 gEasyChatWord_Disappointed[] = _("DISAPPOINTED");
const u8 gEasyChatWord_Disappoints[] = _("DISAPPOINTS");
const u8 gEasyChatWord_Sad[] = _("SAD");
const u8 gEasyChatWord_Try[] = _("TRY");
const u8 gEasyChatWord_Tries[] = _("TRIES");
const u8 gEasyChatWord_Hears[] = _("HEARS");
const u8 gEasyChatWord_Think[] = _("THINK");
const u8 gEasyChatWord_Hear[] = _("HEAR");
const u8 gEasyChatWord_Wants[] = _("WANTS");
const u8 gEasyChatWord_Misheard[] = _("MISHEARD");
const u8 gEasyChatWord_Dislike[] = _("DISLIKE");
const u8 gEasyChatWord_Angry[] = _("ANGRY");
const u8 gEasyChatWord_Anger[] = _("ANGER");
const u8 gEasyChatWord_Scary[] = _("SCARY");
const u8 gEasyChatWord_Lonesome[] = _("LONESOME");
const u8 gEasyChatWord_Disappoint[] = _("DISAPPOINT");
const u8 gEasyChatWord_Joy[] = _("JOY");
const u8 gEasyChatWord_Gets[] = _("GETS");
const u8 gEasyChatWord_Never[] = _("NEVER");
const u8 gEasyChatWord_Darn[] = _("DARN");
const u8 gEasyChatWord_Downcast[] = _("DOWNCAST");
const u8 gEasyChatWord_Incredible[] = _("INCREDIBLE");
const u8 gEasyChatWord_Likes[] = _("LIKES");
const u8 gEasyChatWord_Dislikes[] = _("DISLIKES");
const u8 gEasyChatWord_Boring[] = _("BORING");
const u8 gEasyChatWord_Care[] = _("CARE");
const u8 gEasyChatWord_Cares[] = _("CARES");
const u8 gEasyChatWord_AllRight[] = _("ALL RIGHT");
const u8 gEasyChatWord_Adore[] = _("ADORE");
const u8 gEasyChatWord_Disaster[] = _("DISASTER");
const u8 gEasyChatWord_Enjoy[] = _("ENJOY");
const u8 gEasyChatWord_Enjoys[] = _("ENJOYS");
const u8 gEasyChatWord_Eat[] = _("EAT");
const u8 gEasyChatWord_Lacking[] = _("LACKING");
const u8 gEasyChatWord_Bad[] = _("BAD");
const u8 gEasyChatWord_Hard[] = _("HARD");
const u8 gEasyChatWord_Terrible[] = _("TERRIBLE");
const u8 gEasyChatWord_Should[] = _("SHOULD");
const u8 gEasyChatWord_Nice[] = _("NICE");
const u8 gEasyChatWord_Drink[] = _("DRINK");
const u8 gEasyChatWord_Surprise[] = _("SURPRISE");
const u8 gEasyChatWord_Fear[] = _("FEAR");
const u8 gEasyChatWord_Want[] = _("WANT");
const u8 gEasyChatWord_Wait[] = _("WAIT");
const u8 gEasyChatWord_Satisfied[] = _("SATISFIED");
const u8 gEasyChatWord_See[] = _("SEE");
const u8 gEasyChatWord_Rare[] = _("RARE");
const u8 gEasyChatWord_Negative[] = _("NEGATIVE");
const u8 gEasyChatWord_Done[] = _("DONE");
const u8 gEasyChatWord_Danger[] = _("DANGER");
const u8 gEasyChatWord_Defeated[] = _("DEFEATED");
const u8 gEasyChatWord_Beat[] = _("BEAT");
const u8 gEasyChatWord_Great[] = _("GREAT");
const u8 gEasyChatWord_Romantic[] = _("ROMANTIC");
const u8 gEasyChatWord_Question[] = _("QUESTION");
const u8 gEasyChatWord_Understand[] = _("UNDERSTAND");
const u8 gEasyChatWord_Understands[] = _("UNDERSTANDS");
const struct EasyChatWordInfo gEasyChatGroup_Feelings[] = {
{
.text = gEasyChatWord_Meet,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Play,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hurried,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Goes,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Giddy,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happy,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happiness,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excite,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Important,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Funny,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Got,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoHome,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappointed,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappoints,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sad,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Try,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tries,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hears,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Think,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hear,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wants,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Misheard,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dislike,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Angry,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anger,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Scary,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lonesome,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappoint,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Joy,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gets,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Never,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Darn,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Downcast,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Incredible,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Likes,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dislikes,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Boring,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Care,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cares,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AllRight,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adore,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disaster,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enjoy,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enjoys,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eat,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lacking,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bad,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hard,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Terrible,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Should,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nice,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drink,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Surprise,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fear,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Want,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wait,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Satisfied,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_See,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rare,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Negative,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Done,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Danger,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Defeated,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beat,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Great,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Romantic,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Question,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understand,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understands,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_greetings.h
Executable
+255
View File
@@ -0,0 +1,255 @@
const u8 gEasyChatWord_Thanks[] = _("THANKS");
const u8 gEasyChatWord_Yes[] = _("YES");
const u8 gEasyChatWord_HereGoes[] = _("HERE GOES");
const u8 gEasyChatWord_HereICome[] = _("HERE I COME");
const u8 gEasyChatWord_HereItIs[] = _("HERE IT IS");
const u8 gEasyChatWord_Yeah[] = _("YEAH");
const u8 gEasyChatWord_Welcome[] = _("WELCOME");
const u8 gEasyChatWord_Oi[] = _("OI");
const u8 gEasyChatWord_HowDo[] = _("HOW DO");
const u8 gEasyChatWord_Congrats[] = _("CONGRATS");
const u8 gEasyChatWord_GiveMe[] = _("GIVE ME");
const u8 gEasyChatWord_Sorry[] = _("SORRY");
const u8 gEasyChatWord_Apologize[] = _("APOLOGIZE");
const u8 gEasyChatWord_Forgive[] = _("FORGIVE");
const u8 gEasyChatWord_HeyThere[] = _("HEY, THERE");
const u8 gEasyChatWord_Hello[] = _("HELLO");
const u8 gEasyChatWord_GoodBye[] = _("GOOD-BYE");
const u8 gEasyChatWord_ThankYou[] = _("THANK YOU");
const u8 gEasyChatWord_IveArrived[] = _("I'VE ARRIVED");
const u8 gEasyChatWord_Pardon[] = _("PARDON");
const u8 gEasyChatWord_Excuse[] = _("EXCUSE");
const u8 gEasyChatWord_SeeYa[] = _("SEE YA");
const u8 gEasyChatWord_ExcuseMe[] = _("EXCUSE ME");
const u8 gEasyChatWord_WellThen[] = _("WELL, THEN");
const u8 gEasyChatWord_GoAhead[] = _("GO AHEAD");
const u8 gEasyChatWord_Appreciate[] = _("APPRECIATE");
const u8 gEasyChatWord_HeyQues[] = _("HEY?");
const u8 gEasyChatWord_WhatsUpQues[] = _("WHAT'S UP?");
const u8 gEasyChatWord_HuhQues[] = _("HUH?");
const u8 gEasyChatWord_No[] = _("NO");
const u8 gEasyChatWord_Hi[] = _("HI");
const u8 gEasyChatWord_YeahYeah[] = _("YEAH, YEAH");
const u8 gEasyChatWord_ByeBye[] = _("BYE-BYE");
const u8 gEasyChatWord_MeetYou[] = _("MEET YOU");
const u8 gEasyChatWord_Hey[] = _("HEY");
const u8 gEasyChatWord_Smell[] = _("SMELL");
const u8 gEasyChatWord_Listening[] = _("LISTENING");
const u8 gEasyChatWord_HooHah[] = _("HOO-HAH");
const u8 gEasyChatWord_Yahoo[] = _("YAHOO");
const u8 gEasyChatWord_Yo[] = _("YO");
const u8 gEasyChatWord_ComeOver[] = _("COME OVER");
const u8 gEasyChatWord_CountOn[] = _("COUNT ON");
const struct EasyChatWordInfo gEasyChatGroup_Greetings[] = {
{
.text = gEasyChatWord_Thanks,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yes,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereGoes,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereICome,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereItIs,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yeah,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Welcome,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oi,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HowDo,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Congrats,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GiveMe,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sorry,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Apologize,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forgive,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HeyThere,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hello,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoodBye,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThankYou,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IveArrived,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pardon,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excuse,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SeeYa,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ExcuseMe,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WellThen,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoAhead,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appreciate,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HeyQues,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhatsUpQues,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HuhQues,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_No,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hi,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YeahYeah,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ByeBye,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MeetYou,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hey,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smell,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Listening,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HooHah,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yahoo,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yo,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ComeOver,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CountOn,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_hobbies.h
Executable
+327
View File
@@ -0,0 +1,327 @@
const u8 gEasyChatWord_Idol[] = _("IDOL");
const u8 gEasyChatWord_Anime[] = _("ANIME");
const u8 gEasyChatWord_Song[] = _("SONG");
const u8 gEasyChatWord_Movie[] = _("MOVIE");
const u8 gEasyChatWord_Sweets[] = _("SWEETS");
const u8 gEasyChatWord_Chat[] = _("CHAT");
const u8 gEasyChatWord_ChildsPlay[] = _("CHILD'S PLAY");
const u8 gEasyChatWord_Toys[] = _("TOYS");
const u8 gEasyChatWord_Music[] = _("MUSIC");
const u8 gEasyChatWord_Cards[] = _("CARDS");
const u8 gEasyChatWord_Shopping[] = _("SHOPPING");
const u8 gEasyChatWord_Camera[] = _("CAMERA");
const u8 gEasyChatWord_Viewing[] = _("VIEWING");
const u8 gEasyChatWord_Spectator[] = _("SPECTATOR");
const u8 gEasyChatWord_Gourmet[] = _("GOURMET");
const u8 gEasyChatWord_Game[] = _("GAME");
const u8 gEasyChatWord_Rpg[] = _("RPG");
const u8 gEasyChatWord_Collection[] = _("COLLECTION");
const u8 gEasyChatWord_Complete[] = _("COMPLETE");
const u8 gEasyChatWord_Magazine[] = _("MAGAZINE");
const u8 gEasyChatWord_Walk[] = _("WALK");
const u8 gEasyChatWord_Bike[] = _("BIKE");
const u8 gEasyChatWord_Hobby[] = _("HOBBY");
const u8 gEasyChatWord_Sports[] = _("SPORTS");
const u8 gEasyChatWord_Software[] = _("SOFTWARE");
const u8 gEasyChatWord_Songs[] = _("SONGS");
const u8 gEasyChatWord_Diet[] = _("DIET");
const u8 gEasyChatWord_Treasure[] = _("TREASURE");
const u8 gEasyChatWord_Travel[] = _("TRAVEL");
const u8 gEasyChatWord_Dance[] = _("DANCE");
const u8 gEasyChatWord_Channel[] = _("CHANNEL");
const u8 gEasyChatWord_Making[] = _("MAKING");
const u8 gEasyChatWord_Fishing[] = _("FISHING");
const u8 gEasyChatWord_Date[] = _("DATE");
const u8 gEasyChatWord_Design[] = _("DESIGN");
const u8 gEasyChatWord_Locomotive[] = _("LOCOMOTIVE");
const u8 gEasyChatWord_PlushDoll[] = _("PLUSH DOLL");
const u8 gEasyChatWord_Pc[] = _("PC");
const u8 gEasyChatWord_Flowers[] = _("FLOWERS");
const u8 gEasyChatWord_Hero[] = _("HERO");
const u8 gEasyChatWord_Nap[] = _("NAP");
const u8 gEasyChatWord_Heroine[] = _("HEROINE");
const u8 gEasyChatWord_Fashion[] = _("FASHION");
const u8 gEasyChatWord_Adventure[] = _("ADVENTURE");
const u8 gEasyChatWord_Board[] = _("BOARD");
const u8 gEasyChatWord_Ball[] = _("BALL");
const u8 gEasyChatWord_Book[] = _("BOOK");
const u8 gEasyChatWord_Festival[] = _("FESTIVAL");
const u8 gEasyChatWord_Comics[] = _("COMICS");
const u8 gEasyChatWord_Holiday[] = _("HOLIDAY");
const u8 gEasyChatWord_Plans[] = _("PLANS");
const u8 gEasyChatWord_Trendy[] = _("TRENDY");
const u8 gEasyChatWord_Vacation[] = _("VACATION");
const u8 gEasyChatWord_Look[] = _("LOOK");
const struct EasyChatWordInfo gEasyChatGroup_Hobbies[] = {
{
.text = gEasyChatWord_Idol,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anime,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Song,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Movie,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sweets,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Chat,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ChildsPlay,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Toys,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Music,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cards,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shopping,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Camera,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Viewing,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spectator,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gourmet,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Game,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rpg,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Collection,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Complete,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Magazine,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walk,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bike,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hobby,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sports,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Software,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Songs,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Diet,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Treasure,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Travel,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dance,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Channel,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Making,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fishing,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Date,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Design,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Locomotive,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PlushDoll,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pc,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flowers,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hero,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nap,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heroine,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fashion,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adventure,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Board,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ball,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Book,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Festival,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Comics,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Holiday,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plans,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trendy,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Vacation,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Look,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_lifestyle.h
Executable
+273
View File
@@ -0,0 +1,273 @@
const u8 gEasyChatWord_Chores[] = _("CHORES");
const u8 gEasyChatWord_Home[] = _("HOME");
const u8 gEasyChatWord_Money[] = _("MONEY");
const u8 gEasyChatWord_Allowance[] = _("ALLOWANCE");
const u8 gEasyChatWord_Bath[] = _("BATH");
const u8 gEasyChatWord_Conversation[] = _("CONVERSATION");
const u8 gEasyChatWord_School[] = _("SCHOOL");
const u8 gEasyChatWord_Commemorate[] = _("COMMEMORATE");
const u8 gEasyChatWord_Habit[] = _("HABIT");
const u8 gEasyChatWord_Group[] = _("GROUP");
const u8 gEasyChatWord_Word[] = _("WORD");
const u8 gEasyChatWord_Store[] = _("STORE");
const u8 gEasyChatWord_Service[] = _("SERVICE");
const u8 gEasyChatWord_Work[] = _("WORK");
const u8 gEasyChatWord_System[] = _("SYSTEM");
const u8 gEasyChatWord_Train[] = _("TRAIN");
const u8 gEasyChatWord_Class[] = _("CLASS");
const u8 gEasyChatWord_Lessons[] = _("LESSONS");
const u8 gEasyChatWord_Information[] = _("INFORMATION");
const u8 gEasyChatWord_Living[] = _("LIVING");
const u8 gEasyChatWord_Teacher[] = _("TEACHER");
const u8 gEasyChatWord_Tournament[] = _("TOURNAMENT");
const u8 gEasyChatWord_Letter[] = _("LETTER");
const u8 gEasyChatWord_Event[] = _("EVENT");
const u8 gEasyChatWord_Digital[] = _("DIGITAL");
const u8 gEasyChatWord_Test[] = _("TEST");
const u8 gEasyChatWord_DeptStore[] = _("DEPT. STORE");
const u8 gEasyChatWord_Television[] = _("TELEVISION");
const u8 gEasyChatWord_Phone[] = _("PHONE");
const u8 gEasyChatWord_Item[] = _("ITEM");
const u8 gEasyChatWord_Name[] = _("NAME");
const u8 gEasyChatWord_News[] = _("NEWS");
const u8 gEasyChatWord_Popular[] = _("POPULAR");
const u8 gEasyChatWord_Party[] = _("PARTY");
const u8 gEasyChatWord_Study[] = _("STUDY");
const u8 gEasyChatWord_Machine[] = _("MACHINE");
const u8 gEasyChatWord_Mail[] = _("MAIL");
const u8 gEasyChatWord_Message[] = _("MESSAGE");
const u8 gEasyChatWord_Promise[] = _("PROMISE");
const u8 gEasyChatWord_Dream[] = _("DREAM");
const u8 gEasyChatWord_Kindergarten[] = _("KINDERGARTEN");
const u8 gEasyChatWord_Life[] = _("LIFE");
const u8 gEasyChatWord_Radio[] = _("RADIO");
const u8 gEasyChatWord_Rental[] = _("RENTAL");
const u8 gEasyChatWord_World[] = _("WORLD");
const struct EasyChatWordInfo gEasyChatGroup_Lifestyle[] = {
{
.text = gEasyChatWord_Chores,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Home,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Money,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Allowance,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bath,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Conversation,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_School,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Commemorate,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Habit,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Group,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Word,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Store,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Service,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Work,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_System,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Train,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Class,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lessons,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Information,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Living,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teacher,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tournament,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Letter,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Event,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Digital,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Test,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_DeptStore,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Television,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Phone,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Item,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Name,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_News,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Popular,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Party,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Study,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Machine,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mail,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Message,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Promise,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dream,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kindergarten,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Life,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Radio,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rental,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_World,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_misc.h
Executable
+255
View File
@@ -0,0 +1,255 @@
const u8 gEasyChatWord_Highs[] = _("HIGHS");
const u8 gEasyChatWord_Lows[] = _("LOWS");
const u8 gEasyChatWord_Um[] = _("UM");
const u8 gEasyChatWord_Rear[] = _("REAR");
const u8 gEasyChatWord_Things[] = _("THINGS");
const u8 gEasyChatWord_Thing[] = _("THING");
const u8 gEasyChatWord_Below[] = _("BELOW");
const u8 gEasyChatWord_Above[] = _("ABOVE");
const u8 gEasyChatWord_Back[] = _("BACK");
const u8 gEasyChatWord_High[] = _("HIGH");
const u8 gEasyChatWord_Here[] = _("HERE");
const u8 gEasyChatWord_Inside[] = _("INSIDE");
const u8 gEasyChatWord_Outside[] = _("OUTSIDE");
const u8 gEasyChatWord_Beside[] = _("BESIDE");
const u8 gEasyChatWord_ThisIsItExcl[] = _("THIS IS IT!");
const u8 gEasyChatWord_This[] = _("THIS");
const u8 gEasyChatWord_Every[] = _("EVERY");
const u8 gEasyChatWord_These[] = _("THESE");
const u8 gEasyChatWord_TheseWere[] = _("THESE WERE");
const u8 gEasyChatWord_Down[] = _("DOWN");
const u8 gEasyChatWord_That[] = _("THAT");
const u8 gEasyChatWord_ThoseAre[] = _("THOSE ARE");
const u8 gEasyChatWord_ThoseWere[] = _("THOSE WERE");
const u8 gEasyChatWord_ThatsItExcl[] = _("THAT'S IT!");
const u8 gEasyChatWord_Am[] = _("AM");
const u8 gEasyChatWord_ThatWas[] = _("THAT WAS");
const u8 gEasyChatWord_Front[] = _("FRONT");
const u8 gEasyChatWord_Up[] = _("UP");
const u8 gEasyChatWord_Choice[] = _("CHOICE");
const u8 gEasyChatWord_Far[] = _("FAR");
const u8 gEasyChatWord_Away[] = _("AWAY");
const u8 gEasyChatWord_Near[] = _("NEAR");
const u8 gEasyChatWord_Where[] = _("WHERE");
const u8 gEasyChatWord_When[] = _("WHEN");
const u8 gEasyChatWord_What[] = _("WHAT");
const u8 gEasyChatWord_Deep[] = _("DEEP");
const u8 gEasyChatWord_Shallow[] = _("SHALLOW");
const u8 gEasyChatWord_Why[] = _("WHY");
const u8 gEasyChatWord_Confused[] = _("CONFUSED");
const u8 gEasyChatWord_Opposite[] = _("OPPOSITE");
const u8 gEasyChatWord_Left[] = _("LEFT");
const u8 gEasyChatWord_Right[] = _("RIGHT");
const struct EasyChatWordInfo gEasyChatGroup_Misc[] = {
{
.text = gEasyChatWord_Highs,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lows,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Um,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rear,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Things,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thing,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Below,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Above,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Back,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_High,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Here,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Inside,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Outside,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beside,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThisIsItExcl,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_This,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Every,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_These,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TheseWere,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Down,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_That,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThoseAre,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThoseWere,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThatsItExcl,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Am,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThatWas,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Front,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Up,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Choice,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Far,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Away,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Near,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Where,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_When,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_What,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Deep,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shallow,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Why,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Confused,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Opposite,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Left,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Right,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_move_1.h
Executable
+158
View File
@@ -0,0 +1,158 @@
#include "constants/moves.h"
const u16 gEasyChatGroup_Move1[] = {
MOVE_ABSORB,
MOVE_AEROBLAST,
MOVE_AGILITY,
MOVE_AIR_CUTTER,
MOVE_ANCIENT_POWER,
MOVE_AROMATHERAPY,
MOVE_ASTONISH,
MOVE_AURORA_BEAM,
MOVE_BIDE,
MOVE_BIND,
MOVE_BITE,
MOVE_BRICK_BREAK,
MOVE_BUBBLE,
MOVE_CHARGE,
MOVE_CHARM,
MOVE_CLAMP,
MOVE_CONFUSE_RAY,
MOVE_CONSTRICT,
MOVE_COSMIC_POWER,
MOVE_COUNTER,
MOVE_CRABHAMMER,
MOVE_CROSS_CHOP,
MOVE_CRUNCH,
MOVE_CUT,
MOVE_DIG,
MOVE_DISABLE,
MOVE_DOUBLE_TEAM,
MOVE_DOUBLE_EDGE,
MOVE_DOUBLE_SLAP,
MOVE_EARTHQUAKE,
MOVE_ENCORE,
MOVE_ENDEAVOR,
MOVE_ENDURE,
MOVE_EXTRASENSORY,
MOVE_EXTREME_SPEED,
MOVE_FACADE,
MOVE_FAKE_TEARS,
MOVE_FISSURE,
MOVE_FLAIL,
MOVE_FLAME_WHEEL,
MOVE_FLAMETHROWER,
MOVE_FLATTER,
MOVE_FLY,
MOVE_FOCUS_ENERGY,
MOVE_FOCUS_PUNCH,
MOVE_FOLLOW_ME,
MOVE_GIGA_DRAIN,
MOVE_GRASS_WHISTLE,
MOVE_GROWTH,
MOVE_GRUDGE,
MOVE_GUST,
MOVE_HAIL,
MOVE_HARDEN,
MOVE_HAZE,
MOVE_HEADBUTT,
MOVE_HEAL_BELL,
MOVE_HYPNOSIS,
MOVE_ICE_BALL,
MOVE_ICY_WIND,
MOVE_IRON_TAIL,
MOVE_KARATE_CHOP,
MOVE_KINESIS,
MOVE_LEECH_LIFE,
MOVE_LICK,
MOVE_LOVELY_KISS,
MOVE_LOW_KICK,
MOVE_MEAN_LOOK,
MOVE_MEMENTO,
MOVE_METAL_SOUND,
MOVE_METEOR_MASH,
MOVE_MIND_READER,
MOVE_MIRROR_MOVE,
MOVE_MIST,
MOVE_MORNING_SUN,
MOVE_NATURE_POWER,
MOVE_NIGHTMARE,
MOVE_OCTAZOOKA,
MOVE_ODOR_SLEUTH,
MOVE_OUTRAGE,
MOVE_OVERHEAT,
MOVE_PAIN_SPLIT,
MOVE_POWDER_SNOW,
MOVE_PSYBEAM,
MOVE_PSYCH_UP,
MOVE_PSYCHIC,
MOVE_PSYCHO_BOOST,
MOVE_PSYWAVE,
MOVE_PURSUIT,
MOVE_RAGE,
MOVE_RAIN_DANCE,
MOVE_RAPID_SPIN,
MOVE_RAZOR_WIND,
MOVE_RECOVER,
MOVE_RETURN,
MOVE_REVERSAL,
MOVE_ROCK_SLIDE,
MOVE_ROCK_SMASH,
MOVE_ROCK_THROW,
MOVE_ROCK_TOMB,
MOVE_ROLLOUT,
MOVE_SACRED_FIRE,
MOVE_SAFEGUARD,
MOVE_SAND_TOMB,
MOVE_SAND_ATTACK,
MOVE_SANDSTORM,
MOVE_SCARY_FACE,
MOVE_SCREECH,
MOVE_SELF_DESTRUCT,
MOVE_SHADOW_BALL,
MOVE_SHADOW_PUNCH,
MOVE_SHARPEN,
MOVE_SHEER_COLD,
MOVE_SIGNAL_BEAM,
MOVE_SILVER_WIND,
MOVE_SING,
MOVE_SKETCH,
MOVE_SKILL_SWAP,
MOVE_SKY_ATTACK,
MOVE_SKY_UPPERCUT,
MOVE_SLASH,
MOVE_SMELLING_SALT,
MOVE_SMOG,
MOVE_SMOKESCREEN,
MOVE_SNORE,
MOVE_SOLAR_BEAM,
MOVE_SONIC_BOOM,
MOVE_SPARK,
MOVE_SPIDER_WEB,
MOVE_SPITE,
MOVE_SPORE,
MOVE_STRENGTH,
MOVE_STRING_SHOT,
MOVE_STUN_SPORE,
MOVE_SUBMISSION,
MOVE_SUPER_FANG,
MOVE_SWAGGER,
MOVE_SWEET_SCENT,
MOVE_SWIFT,
MOVE_SYNTHESIS,
MOVE_TAIL_WHIP,
MOVE_THRASH,
MOVE_THUNDER,
MOVE_THUNDERBOLT,
MOVE_THUNDER_PUNCH,
MOVE_TICKLE,
MOVE_TORMENT,
MOVE_UPROAR,
MOVE_VITAL_THROW,
MOVE_WATER_SPOUT,
MOVE_WEATHER_BALL,
MOVE_WHIRLPOOL,
MOVE_WILL_O_WISP,
MOVE_WITHDRAW,
MOVE_YAWN,
};
src/data/easy_chat/easy_chat_group_move_2.h
Executable
+204
View File
@@ -0,0 +1,204 @@
#include "constants/moves.h"
const u16 gEasyChatGroup_Move2[] = {
MOVE_ACID,
MOVE_ACID_ARMOR,
MOVE_AERIAL_ACE,
MOVE_AMNESIA,
MOVE_ARM_THRUST,
MOVE_ASSIST,
MOVE_ATTRACT,
MOVE_BARRAGE,
MOVE_BARRIER,
MOVE_BATON_PASS,
MOVE_BEAT_UP,
MOVE_BELLY_DRUM,
MOVE_BLAST_BURN,
MOVE_BLAZE_KICK,
MOVE_BLIZZARD,
MOVE_BLOCK,
MOVE_BODY_SLAM,
MOVE_BONE_CLUB,
MOVE_BONE_RUSH,
MOVE_BONEMERANG,
MOVE_BOUNCE,
MOVE_BUBBLE_BEAM,
MOVE_BULK_UP,
MOVE_BULLET_SEED,
MOVE_CALM_MIND,
MOVE_CAMOUFLAGE,
MOVE_COMET_PUNCH,
MOVE_CONFUSION,
MOVE_CONVERSION,
MOVE_CONVERSION_2,
MOVE_COTTON_SPORE,
MOVE_COVET,
MOVE_CRUSH_CLAW,
MOVE_CURSE,
MOVE_DEFENSE_CURL,
MOVE_DESTINY_BOND,
MOVE_DETECT,
MOVE_DIVE,
MOVE_DIZZY_PUNCH,
MOVE_DOOM_DESIRE,
MOVE_DOUBLE_KICK,
MOVE_DRAGON_CLAW,
MOVE_DRAGON_DANCE,
MOVE_DRAGON_RAGE,
MOVE_DRAGON_BREATH,
MOVE_DREAM_EATER,
MOVE_DRILL_PECK,
MOVE_DYNAMIC_PUNCH,
MOVE_EGG_BOMB,
MOVE_EMBER,
MOVE_ERUPTION,
MOVE_EXPLOSION,
MOVE_FAINT_ATTACK,
MOVE_FAKE_OUT,
MOVE_FALSE_SWIPE,
MOVE_FEATHER_DANCE,
MOVE_FIRE_BLAST,
MOVE_FIRE_PUNCH,
MOVE_FIRE_SPIN,
MOVE_FLASH,
MOVE_FORESIGHT,
MOVE_FRENZY_PLANT,
MOVE_FRUSTRATION,
MOVE_FURY_ATTACK,
MOVE_FURY_CUTTER,
MOVE_FURY_SWIPES,
MOVE_FUTURE_SIGHT,
MOVE_GLARE,
MOVE_GROWL,
MOVE_GUILLOTINE,
MOVE_HEAT_WAVE,
MOVE_HELPING_HAND,
MOVE_HI_JUMP_KICK,
MOVE_HIDDEN_POWER,
MOVE_HORN_ATTACK,
MOVE_HORN_DRILL,
MOVE_HOWL,
MOVE_HYDRO_CANNON,
MOVE_HYDRO_PUMP,
MOVE_HYPER_BEAM,
MOVE_HYPER_FANG,
MOVE_HYPER_VOICE,
MOVE_ICE_BEAM,
MOVE_ICE_PUNCH,
MOVE_ICICLE_SPEAR,
MOVE_IMPRISON,
MOVE_INGRAIN,
MOVE_IRON_DEFENSE,
MOVE_JUMP_KICK,
MOVE_KNOCK_OFF,
MOVE_LEAF_BLADE,
MOVE_LEECH_SEED,
MOVE_LEER,
MOVE_LIGHT_SCREEN,
MOVE_LOCK_ON,
MOVE_LUSTER_PURGE,
MOVE_MACH_PUNCH,
MOVE_MAGIC_COAT,
MOVE_MAGICAL_LEAF,
MOVE_MAGNITUDE,
MOVE_MEDITATE,
MOVE_MEGA_DRAIN,
MOVE_MEGA_KICK,
MOVE_MEGA_PUNCH,
MOVE_MEGAHORN,
MOVE_METAL_CLAW,
MOVE_METRONOME,
MOVE_MILK_DRINK,
MOVE_MIMIC,
MOVE_MINIMIZE,
MOVE_MIRROR_COAT,
MOVE_MIST_BALL,
MOVE_MOONLIGHT,
MOVE_MUD_SHOT,
MOVE_MUD_SPORT,
MOVE_MUD_SLAP,
MOVE_MUDDY_WATER,
MOVE_NEEDLE_ARM,
MOVE_NIGHT_SHADE,
MOVE_PAY_DAY,
MOVE_PECK,
MOVE_PERISH_SONG,
MOVE_PETAL_DANCE,
MOVE_PIN_MISSILE,
MOVE_POISON_FANG,
MOVE_POISON_GAS,
MOVE_POISON_STING,
MOVE_POISON_TAIL,
MOVE_POISON_POWDER,
MOVE_POUND,
MOVE_PRESENT,
MOVE_PROTECT,
MOVE_QUICK_ATTACK,
MOVE_RAZOR_LEAF,
MOVE_RECYCLE,
MOVE_REFLECT,
MOVE_REFRESH,
MOVE_REST,
MOVE_REVENGE,
MOVE_ROAR,
MOVE_ROCK_BLAST,
MOVE_ROLE_PLAY,
MOVE_ROLLING_KICK,
MOVE_SCRATCH,
MOVE_SECRET_POWER,
MOVE_SEISMIC_TOSS,
MOVE_SHOCK_WAVE,
MOVE_SKULL_BASH,
MOVE_SLACK_OFF,
MOVE_SLAM,
MOVE_SLEEP_POWDER,
MOVE_SLEEP_TALK,
MOVE_SLUDGE,
MOVE_SLUDGE_BOMB,
MOVE_SNATCH,
MOVE_SOFT_BOILED,
MOVE_SPIKE_CANNON,
MOVE_SPIKES,
MOVE_SPIT_UP,
MOVE_SPLASH,
MOVE_STEEL_WING,
MOVE_STOCKPILE,
MOVE_STOMP,
MOVE_STRUGGLE,
MOVE_SUBSTITUTE,
MOVE_SUNNY_DAY,
MOVE_SUPERPOWER,
MOVE_SUPERSONIC,
MOVE_SURF,
MOVE_SWALLOW,
MOVE_SWEET_KISS,
MOVE_SWORDS_DANCE,
MOVE_TACKLE,
MOVE_TAIL_GLOW,
MOVE_TAKE_DOWN,
MOVE_TAUNT,
MOVE_TEETER_DANCE,
MOVE_TELEPORT,
MOVE_THIEF,
MOVE_THUNDER_WAVE,
MOVE_THUNDER_SHOCK,
MOVE_TOXIC,
MOVE_TRANSFORM,
MOVE_TRI_ATTACK,
MOVE_TRICK,
MOVE_TRIPLE_KICK,
MOVE_TWINEEDLE,
MOVE_TWISTER,
MOVE_VICE_GRIP,
MOVE_VINE_WHIP,
MOVE_VOLT_TACKLE,
MOVE_WATER_GUN,
MOVE_WATER_PULSE,
MOVE_WATER_SPORT,
MOVE_WATERFALL,
MOVE_WHIRLWIND,
MOVE_WING_ATTACK,
MOVE_WISH,
MOVE_WRAP,
MOVE_ZAP_CANNON,
};
src/data/easy_chat/easy_chat_group_people.h
Executable
+453
View File
@@ -0,0 +1,453 @@
const u8 gEasyChatWord_Opponent[] = _("OPPONENT");
const u8 gEasyChatWord_I[] = _("I");
const u8 gEasyChatWord_You[] = _("YOU");
const u8 gEasyChatWord_Yours[] = _("YOURS");
const u8 gEasyChatWord_Son[] = _("SON");
const u8 gEasyChatWord_Your[] = _("YOUR");
const u8 gEasyChatWord_Youre[] = _("YOU'RE");
const u8 gEasyChatWord_Youve[] = _("YOU'VE");
const u8 gEasyChatWord_Mother[] = _("MOTHER");
const u8 gEasyChatWord_Grandfather[] = _("GRANDFATHER");
const u8 gEasyChatWord_Uncle[] = _("UNCLE");
const u8 gEasyChatWord_Father[] = _("FATHER");
const u8 gEasyChatWord_Boy[] = _("BOY");
const u8 gEasyChatWord_Adult[] = _("ADULT");
const u8 gEasyChatWord_Brother[] = _("BROTHER");
const u8 gEasyChatWord_Sister[] = _("SISTER");
const u8 gEasyChatWord_Grandmother[] = _("GRANDMOTHER");
const u8 gEasyChatWord_Aunt[] = _("AUNT");
const u8 gEasyChatWord_Parent[] = _("PARENT");
const u8 gEasyChatWord_Man[] = _("MAN");
const u8 gEasyChatWord_Me[] = _("ME");
const u8 gEasyChatWord_Girl[] = _("GIRL");
const u8 gEasyChatWord_Babe[] = _("BABE");
const u8 gEasyChatWord_Family[] = _("FAMILY");
const u8 gEasyChatWord_Her[] = _("HER");
const u8 gEasyChatWord_Him[] = _("HIM");
const u8 gEasyChatWord_He[] = _("HE");
const u8 gEasyChatWord_Place[] = _("PLACE");
const u8 gEasyChatWord_Daughter[] = _("DAUGHTER");
const u8 gEasyChatWord_His[] = _("HIS");
const u8 gEasyChatWord_Hes[] = _("HE'S");
const u8 gEasyChatWord_Arent[] = _("AREN'T");
const u8 gEasyChatWord_Siblings[] = _("SIBLINGS");
const u8 gEasyChatWord_Kid[] = _("KID");
const u8 gEasyChatWord_Children[] = _("CHILDREN");
const u8 gEasyChatWord_Mr[] = _("MR.");
const u8 gEasyChatWord_Mrs[] = _("MRS.");
const u8 gEasyChatWord_Myself[] = _("MYSELF");
const u8 gEasyChatWord_IWas[] = _("I WAS");
const u8 gEasyChatWord_ToMe[] = _("TO ME");
const u8 gEasyChatWord_My[] = _("MY");
const u8 gEasyChatWord_IAm[] = _("I AM");
const u8 gEasyChatWord_Ive[] = _("I'VE");
const u8 gEasyChatWord_Who[] = _("WHO");
const u8 gEasyChatWord_Someone[] = _("SOMEONE");
const u8 gEasyChatWord_WhoWas[] = _("WHO WAS");
const u8 gEasyChatWord_ToWhom[] = _("TO WHOM");
const u8 gEasyChatWord_Whose[] = _("WHOSE");
const u8 gEasyChatWord_WhoIs[] = _("WHO IS");
const u8 gEasyChatWord_Its[] = _("IT'S");
const u8 gEasyChatWord_Lady[] = _("LADY");
const u8 gEasyChatWord_Friend[] = _("FRIEND");
const u8 gEasyChatWord_Ally[] = _("ALLY");
const u8 gEasyChatWord_Person[] = _("PERSON");
const u8 gEasyChatWord_Dude[] = _("DUDE");
const u8 gEasyChatWord_They[] = _("THEY");
const u8 gEasyChatWord_TheyWere[] = _("THEY WERE");
const u8 gEasyChatWord_ToThem[] = _("TO THEM");
const u8 gEasyChatWord_Their[] = _("THEIR");
const u8 gEasyChatWord_Theyre[] = _("THEY'RE");
const u8 gEasyChatWord_Theyve[] = _("THEY'VE");
const u8 gEasyChatWord_We[] = _("WE");
const u8 gEasyChatWord_Been[] = _("BEEN");
const u8 gEasyChatWord_ToUs[] = _("TO US");
const u8 gEasyChatWord_Our[] = _("OUR");
const u8 gEasyChatWord_WeAre[] = _("WE'RE");
const u8 gEasyChatWord_Rival[] = _("RIVAL");
const u8 gEasyChatWord_Weve[] = _("WE'VE");
const u8 gEasyChatWord_Woman[] = _("WOMAN");
const u8 gEasyChatWord_She[] = _("SHE");
const u8 gEasyChatWord_SheWas[] = _("SHE WAS");
const u8 gEasyChatWord_ToHer[] = _("TO HER");
const u8 gEasyChatWord_Hers[] = _("HERS");
const u8 gEasyChatWord_SheIs[] = _("SHE IS");
const u8 gEasyChatWord_Some[] = _("SOME");
const struct EasyChatWordInfo gEasyChatGroup_People[] = {
{
.text = gEasyChatWord_Opponent,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_I,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_You,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yours,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Son,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Your,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Youre,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Youve,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mother,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grandfather,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Uncle,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Father,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Boy,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adult,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Brother,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sister,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grandmother,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aunt,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Parent,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Man,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Me,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Girl,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Babe,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Family,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Her,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Him,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_He,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Place,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daughter,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_His,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hes,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Arent,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Siblings,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kid,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Children,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mr,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mrs,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Myself,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IWas,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToMe,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_My,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IAm,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ive,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Who,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Someone,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhoWas,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToWhom,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whose,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhoIs,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Its,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lady,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Friend,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ally,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Person,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dude,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_They,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TheyWere,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToThem,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Their,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Theyre,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Theyve,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_We,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Been,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToUs,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Our,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WeAre,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rival,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weve,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Woman,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_She,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SheWas,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToHer,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hers,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SheIs,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Some,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_pokemon.h
Executable
+206
View File
@@ -0,0 +1,206 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon[] = {
SPECIES_ABRA,
SPECIES_ABSOL,
SPECIES_AGGRON,
SPECIES_ALAKAZAM,
SPECIES_ALTARIA,
SPECIES_ANORITH,
SPECIES_ARMALDO,
SPECIES_ARON,
SPECIES_AZUMARILL,
SPECIES_AZURILL,
SPECIES_BAGON,
SPECIES_BALTOY,
SPECIES_BANETTE,
SPECIES_BARBOACH,
SPECIES_BEAUTIFLY,
SPECIES_BELDUM,
SPECIES_BELLOSSOM,
SPECIES_BLAZIKEN,
SPECIES_BRELOOM,
SPECIES_CACNEA,
SPECIES_CACTURNE,
SPECIES_CAMERUPT,
SPECIES_CARVANHA,
SPECIES_CASCOON,
SPECIES_CASTFORM,
SPECIES_CHIMECHO,
SPECIES_CHINCHOU,
SPECIES_CLAMPERL,
SPECIES_CLAYDOL,
SPECIES_COMBUSKEN,
SPECIES_CORPHISH,
SPECIES_CORSOLA,
SPECIES_CRADILY,
SPECIES_CRAWDAUNT,
SPECIES_CROBAT,
SPECIES_DELCATTY,
SPECIES_DEOXYS,
SPECIES_DODRIO,
SPECIES_DODUO,
SPECIES_DONPHAN,
SPECIES_DUSCLOPS,
SPECIES_DUSKULL,
SPECIES_DUSTOX,
SPECIES_ELECTRIKE,
SPECIES_ELECTRODE,
SPECIES_EXPLOUD,
SPECIES_FEEBAS,
SPECIES_FLYGON,
SPECIES_GARDEVOIR,
SPECIES_GEODUDE,
SPECIES_GIRAFARIG,
SPECIES_GLALIE,
SPECIES_GLOOM,
SPECIES_GOLBAT,
SPECIES_GOLDEEN,
SPECIES_GOLDUCK,
SPECIES_GOLEM,
SPECIES_GOREBYSS,
SPECIES_GRAVELER,
SPECIES_GRIMER,
SPECIES_GROUDON,
SPECIES_GROVYLE,
SPECIES_GRUMPIG,
SPECIES_GULPIN,
SPECIES_GYARADOS,
SPECIES_HARIYAMA,
SPECIES_HERACROSS,
SPECIES_HORSEA,
SPECIES_HUNTAIL,
SPECIES_IGGLYBUFF,
SPECIES_ILLUMISE,
SPECIES_JIGGLYPUFF,
SPECIES_JIRACHI,
SPECIES_KADABRA,
SPECIES_KECLEON,
SPECIES_KINGDRA,
SPECIES_KIRLIA,
SPECIES_KOFFING,
SPECIES_KYOGRE,
SPECIES_LAIRON,
SPECIES_LANTURN,
SPECIES_LATIAS,
SPECIES_LATIOS,
SPECIES_LILEEP,
SPECIES_LINOONE,
SPECIES_LOMBRE,
SPECIES_LOTAD,
SPECIES_LOUDRED,
SPECIES_LUDICOLO,
SPECIES_LUNATONE,
SPECIES_LUVDISC,
SPECIES_MACHAMP,
SPECIES_MACHOKE,
SPECIES_MACHOP,
SPECIES_MAGCARGO,
SPECIES_MAGIKARP,
SPECIES_MAGNEMITE,
SPECIES_MAGNETON,
SPECIES_MAKUHITA,
SPECIES_MANECTRIC,
SPECIES_MARILL,
SPECIES_MARSHTOMP,
SPECIES_MASQUERAIN,
SPECIES_MAWILE,
SPECIES_MEDICHAM,
SPECIES_MEDITITE,
SPECIES_METAGROSS,
SPECIES_METANG,
SPECIES_MIGHTYENA,
SPECIES_MILOTIC,
SPECIES_MINUN,
SPECIES_MUDKIP,
SPECIES_MUK,
SPECIES_NATU,
SPECIES_NINCADA,
SPECIES_NINETALES,
SPECIES_NINJASK,
SPECIES_NOSEPASS,
SPECIES_NUMEL,
SPECIES_NUZLEAF,
SPECIES_ODDISH,
SPECIES_PELIPPER,
SPECIES_PHANPY,
SPECIES_PICHU,
SPECIES_PIKACHU,
SPECIES_PINSIR,
SPECIES_PLUSLE,
SPECIES_POOCHYENA,
SPECIES_PSYDUCK,
SPECIES_RAICHU,
SPECIES_RALTS,
SPECIES_RAYQUAZA,
SPECIES_REGICE,
SPECIES_REGIROCK,
SPECIES_REGISTEEL,
SPECIES_RELICANTH,
SPECIES_RHYDON,
SPECIES_RHYHORN,
SPECIES_ROSELIA,
SPECIES_SABLEYE,
SPECIES_SALAMENCE,
SPECIES_SANDSHREW,
SPECIES_SANDSLASH,
SPECIES_SCEPTILE,
SPECIES_SEADRA,
SPECIES_SEAKING,
SPECIES_SEALEO,
SPECIES_SEEDOT,
SPECIES_SEVIPER,
SPECIES_SHARPEDO,
SPECIES_SHEDINJA,
SPECIES_SHELGON,
SPECIES_SHIFTRY,
SPECIES_SHROOMISH,
SPECIES_SHUPPET,
SPECIES_SILCOON,
SPECIES_SKARMORY,
SPECIES_SKITTY,
SPECIES_SLAKING,
SPECIES_SLAKOTH,
SPECIES_SLUGMA,
SPECIES_SNORUNT,
SPECIES_SOLROCK,
SPECIES_SPHEAL,
SPECIES_SPINDA,
SPECIES_SPOINK,
SPECIES_STARMIE,
SPECIES_STARYU,
SPECIES_SURSKIT,
SPECIES_SWABLU,
SPECIES_SWALOT,
SPECIES_SWAMPERT,
SPECIES_SWELLOW,
SPECIES_TAILLOW,
SPECIES_TENTACOOL,
SPECIES_TENTACRUEL,
SPECIES_TORCHIC,
SPECIES_TORKOAL,
SPECIES_TRAPINCH,
SPECIES_TREECKO,
SPECIES_TROPIUS,
SPECIES_VIBRAVA,
SPECIES_VIGOROTH,
SPECIES_VILEPLUME,
SPECIES_VOLBEAT,
SPECIES_VOLTORB,
SPECIES_VULPIX,
SPECIES_WAILMER,
SPECIES_WAILORD,
SPECIES_WALREIN,
SPECIES_WEEZING,
SPECIES_WHISCASH,
SPECIES_WHISMUR,
SPECIES_WIGGLYTUFF,
SPECIES_WINGULL,
SPECIES_WOBBUFFET,
SPECIES_WURMPLE,
SPECIES_WYNAUT,
SPECIES_XATU,
SPECIES_ZANGOOSE,
SPECIES_ZIGZAGOON,
SPECIES_ZUBAT,
};
src/data/easy_chat/easy_chat_group_pokemon2.h
Executable
+255
View File
@@ -0,0 +1,255 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon2[] = {
SPECIES_ABRA,
SPECIES_AERODACTYL,
SPECIES_AIPOM,
SPECIES_ALAKAZAM,
SPECIES_AMPHAROS,
SPECIES_ARBOK,
SPECIES_ARCANINE,
SPECIES_ARIADOS,
SPECIES_ARTICUNO,
SPECIES_AZUMARILL,
SPECIES_BAYLEEF,
SPECIES_BEEDRILL,
SPECIES_BELLOSSOM,
SPECIES_BELLSPROUT,
SPECIES_BLASTOISE,
SPECIES_BLISSEY,
SPECIES_BULBASAUR,
SPECIES_BUTTERFREE,
SPECIES_CATERPIE,
SPECIES_CELEBI,
SPECIES_CHANSEY,
SPECIES_CHARIZARD,
SPECIES_CHARMANDER,
SPECIES_CHARMELEON,
SPECIES_CHIKORITA,
SPECIES_CHINCHOU,
SPECIES_CLEFABLE,
SPECIES_CLEFAIRY,
SPECIES_CLEFFA,
SPECIES_CLOYSTER,
SPECIES_CORSOLA,
SPECIES_CROBAT,
SPECIES_CROCONAW,
SPECIES_CUBONE,
SPECIES_CYNDAQUIL,
SPECIES_DELIBIRD,
SPECIES_DEWGONG,
SPECIES_DIGLETT,
SPECIES_DITTO,
SPECIES_DODRIO,
SPECIES_DODUO,
SPECIES_DONPHAN,
SPECIES_DRAGONAIR,
SPECIES_DRAGONITE,
SPECIES_DRATINI,
SPECIES_DROWZEE,
SPECIES_DUGTRIO,
SPECIES_DUNSPARCE,
SPECIES_EEVEE,
SPECIES_EKANS,
SPECIES_ELECTABUZZ,
SPECIES_ELECTRODE,
SPECIES_ELEKID,
SPECIES_ENTEI,
SPECIES_ESPEON,
SPECIES_EXEGGCUTE,
SPECIES_EXEGGUTOR,
SPECIES_FARFETCHD,
SPECIES_FEAROW,
SPECIES_FERALIGATR,
SPECIES_FLAAFFY,
SPECIES_FLAREON,
SPECIES_FORRETRESS,
SPECIES_FURRET,
SPECIES_GASTLY,
SPECIES_GENGAR,
SPECIES_GEODUDE,
SPECIES_GIRAFARIG,
SPECIES_GLIGAR,
SPECIES_GLOOM,
SPECIES_GOLBAT,
SPECIES_GOLDEEN,
SPECIES_GOLDUCK,
SPECIES_GOLEM,
SPECIES_GRANBULL,
SPECIES_GRAVELER,
SPECIES_GRIMER,
SPECIES_GROWLITHE,
SPECIES_GYARADOS,
SPECIES_HAUNTER,
SPECIES_HERACROSS,
SPECIES_HITMONCHAN,
SPECIES_HITMONLEE,
SPECIES_HITMONTOP,
SPECIES_HO_OH,
SPECIES_HOOTHOOT,
SPECIES_HOPPIP,
SPECIES_HORSEA,
SPECIES_HOUNDOOM,
SPECIES_HOUNDOUR,
SPECIES_HYPNO,
SPECIES_IGGLYBUFF,
SPECIES_IVYSAUR,
SPECIES_JIGGLYPUFF,
SPECIES_JOLTEON,
SPECIES_JUMPLUFF,
SPECIES_JYNX,
SPECIES_KABUTO,
SPECIES_KABUTOPS,
SPECIES_KADABRA,
SPECIES_KAKUNA,
SPECIES_KANGASKHAN,
SPECIES_KINGDRA,
SPECIES_KINGLER,
SPECIES_KOFFING,
SPECIES_KRABBY,
SPECIES_LANTURN,
SPECIES_LAPRAS,
SPECIES_LARVITAR,
SPECIES_LEDIAN,
SPECIES_LEDYBA,
SPECIES_LICKITUNG,
SPECIES_LUGIA,
SPECIES_MACHAMP,
SPECIES_MACHOKE,
SPECIES_MACHOP,
SPECIES_MAGBY,
SPECIES_MAGCARGO,
SPECIES_MAGIKARP,
SPECIES_MAGMAR,
SPECIES_MAGNEMITE,
SPECIES_MAGNETON,
SPECIES_MANKEY,
SPECIES_MANTINE,
SPECIES_MAREEP,
SPECIES_MARILL,
SPECIES_MAROWAK,
SPECIES_MEGANIUM,
SPECIES_MEOWTH,
SPECIES_METAPOD,
SPECIES_MEW,
SPECIES_MEWTWO,
SPECIES_MILTANK,
SPECIES_MISDREAVUS,
SPECIES_MOLTRES,
SPECIES_MR_MIME,
SPECIES_MUK,
SPECIES_MURKROW,
SPECIES_NATU,
SPECIES_NIDOKING,
SPECIES_NIDOQUEEN,
SPECIES_NIDORAN_F,
SPECIES_NIDORAN_M,
SPECIES_NIDORINA,
SPECIES_NIDORINO,
SPECIES_NINETALES,
SPECIES_NOCTOWL,
SPECIES_OCTILLERY,
SPECIES_ODDISH,
SPECIES_OMANYTE,
SPECIES_OMASTAR,
SPECIES_ONIX,
SPECIES_PARAS,
SPECIES_PARASECT,
SPECIES_PERSIAN,
SPECIES_PHANPY,
SPECIES_PICHU,
SPECIES_PIDGEOT,
SPECIES_PIDGEOTTO,
SPECIES_PIDGEY,
SPECIES_PIKACHU,
SPECIES_PILOSWINE,
SPECIES_PINECO,
SPECIES_PINSIR,
SPECIES_POLITOED,
SPECIES_POLIWAG,
SPECIES_POLIWHIRL,
SPECIES_POLIWRATH,
SPECIES_PONYTA,
SPECIES_PORYGON,
SPECIES_PORYGON2,
SPECIES_PRIMEAPE,
SPECIES_PSYDUCK,
SPECIES_PUPITAR,
SPECIES_QUAGSIRE,
SPECIES_QUILAVA,
SPECIES_QWILFISH,
SPECIES_RAICHU,
SPECIES_RAIKOU,
SPECIES_RAPIDASH,
SPECIES_RATICATE,
SPECIES_RATTATA,
SPECIES_REMORAID,
SPECIES_RHYDON,
SPECIES_RHYHORN,
SPECIES_SANDSHREW,
SPECIES_SANDSLASH,
SPECIES_SCIZOR,
SPECIES_SCYTHER,
SPECIES_SEADRA,
SPECIES_SEAKING,
SPECIES_SEEL,
SPECIES_SENTRET,
SPECIES_SHELLDER,
SPECIES_SHUCKLE,
SPECIES_SKARMORY,
SPECIES_SKIPLOOM,
SPECIES_SLOWBRO,
SPECIES_SLOWKING,
SPECIES_SLOWPOKE,
SPECIES_SLUGMA,
SPECIES_SMEARGLE,
SPECIES_SMOOCHUM,
SPECIES_SNEASEL,
SPECIES_SNORLAX,
SPECIES_SNUBBULL,
SPECIES_SPEAROW,
SPECIES_SPINARAK,
SPECIES_SQUIRTLE,
SPECIES_STANTLER,
SPECIES_STARMIE,
SPECIES_STARYU,
SPECIES_STEELIX,
SPECIES_SUDOWOODO,
SPECIES_SUICUNE,
SPECIES_SUNFLORA,
SPECIES_SUNKERN,
SPECIES_SWINUB,
SPECIES_TANGELA,
SPECIES_TAUROS,
SPECIES_TEDDIURSA,
SPECIES_TENTACOOL,
SPECIES_TENTACRUEL,
SPECIES_TOGEPI,
SPECIES_TOGETIC,
SPECIES_TOTODILE,
SPECIES_TYPHLOSION,
SPECIES_TYRANITAR,
SPECIES_TYROGUE,
SPECIES_UMBREON,
SPECIES_UNOWN,
SPECIES_URSARING,
SPECIES_VAPOREON,
SPECIES_VENOMOTH,
SPECIES_VENONAT,
SPECIES_VENUSAUR,
SPECIES_VICTREEBEL,
SPECIES_VILEPLUME,
SPECIES_VOLTORB,
SPECIES_VULPIX,
SPECIES_WARTORTLE,
SPECIES_WEEDLE,
SPECIES_WEEPINBELL,
SPECIES_WEEZING,
SPECIES_WIGGLYTUFF,
SPECIES_WOBBUFFET,
SPECIES_WOOPER,
SPECIES_XATU,
SPECIES_YANMA,
SPECIES_ZAPDOS,
SPECIES_ZUBAT,
};
src/data/easy_chat/easy_chat_group_speech.h
Executable
+363
View File
@@ -0,0 +1,363 @@
const u8 gEasyChatWord_Listen[] = _("LISTEN");
const u8 gEasyChatWord_NotVery[] = _("NOT VERY");
const u8 gEasyChatWord_Mean[] = _("MEAN");
const u8 gEasyChatWord_Lie[] = _("LIE");
const u8 gEasyChatWord_Lay[] = _("LAY");
const u8 gEasyChatWord_Recommend[] = _("RECOMMEND");
const u8 gEasyChatWord_Nitwit[] = _("NITWIT");
const u8 gEasyChatWord_Quite[] = _("QUITE");
const u8 gEasyChatWord_From[] = _("FROM");
const u8 gEasyChatWord_Feeling[] = _("FEELING");
const u8 gEasyChatWord_But[] = _("BUT");
const u8 gEasyChatWord_However[] = _("HOWEVER");
const u8 gEasyChatWord_Case[] = _("CASE");
const u8 gEasyChatWord_The[] = _("THE");
const u8 gEasyChatWord_Miss[] = _("MISS");
const u8 gEasyChatWord_How[] = _("HOW");
const u8 gEasyChatWord_Hit[] = _("HIT");
const u8 gEasyChatWord_Enough[] = _("ENOUGH");
const u8 gEasyChatWord_ALot[] = _("A LOT");
const u8 gEasyChatWord_ALittle[] = _("A LITTLE");
const u8 gEasyChatWord_Absolutely[] = _("ABSOLUTELY");
const u8 gEasyChatWord_And[] = _("AND");
const u8 gEasyChatWord_Only[] = _("ONLY");
const u8 gEasyChatWord_Around[] = _("AROUND");
const u8 gEasyChatWord_Probably[] = _("PROBABLY");
const u8 gEasyChatWord_If[] = _("IF");
const u8 gEasyChatWord_Very[] = _("VERY");
const u8 gEasyChatWord_ATinyBit[] = _("A TINY BIT");
const u8 gEasyChatWord_Wild[] = _("WILD");
const u8 gEasyChatWord_Thats[] = _("THAT'S");
const u8 gEasyChatWord_Just[] = _("JUST");
const u8 gEasyChatWord_EvenSo[] = _("EVEN SO,");
const u8 gEasyChatWord_MustBe[] = _("MUST BE");
const u8 gEasyChatWord_Naturally[] = _("NATURALLY");
const u8 gEasyChatWord_ForNow[] = _("FOR NOW,");
const u8 gEasyChatWord_Understood[] = _("UNDERSTOOD");
const u8 gEasyChatWord_Joking[] = _("JOKING");
const u8 gEasyChatWord_Ready[] = _("READY");
const u8 gEasyChatWord_Something[] = _("SOMETHING");
const u8 gEasyChatWord_Somehow[] = _("SOMEHOW");
const u8 gEasyChatWord_Although[] = _("ALTHOUGH");
const u8 gEasyChatWord_Also[] = _("ALSO");
const u8 gEasyChatWord_Perfect[] = _("PERFECT");
const u8 gEasyChatWord_AsMuchAs[] = _("AS MUCH AS");
const u8 gEasyChatWord_Really[] = _("REALLY");
const u8 gEasyChatWord_Truly[] = _("TRULY");
const u8 gEasyChatWord_Seriously[] = _("SERIOUSLY");
const u8 gEasyChatWord_Totally[] = _("TOTALLY");
const u8 gEasyChatWord_Until[] = _("UNTIL");
const u8 gEasyChatWord_AsIf[] = _("AS IF");
const u8 gEasyChatWord_Mood[] = _("MOOD");
const u8 gEasyChatWord_Rather[] = _("RATHER");
const u8 gEasyChatWord_Awfully[] = _("AWFULLY");
const u8 gEasyChatWord_Mode[] = _("MODE");
const u8 gEasyChatWord_More[] = _("MORE");
const u8 gEasyChatWord_TooLate[] = _("TOO LATE");
const u8 gEasyChatWord_Finally[] = _("FINALLY");
const u8 gEasyChatWord_Any[] = _("ANY");
const u8 gEasyChatWord_Instead[] = _("INSTEAD");
const u8 gEasyChatWord_Fantastic[] = _("FANTASTIC");
const struct EasyChatWordInfo gEasyChatGroup_Speech[] = {
{
.text = gEasyChatWord_Listen,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NotVery,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mean,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lie,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lay,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Recommend,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nitwit,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Quite,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_From,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Feeling,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_But,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_However,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Case,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_The,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Miss,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_How,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hit,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enough,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ALot,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ALittle,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Absolutely,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_And,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Only,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Around,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Probably,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_If,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Very,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ATinyBit,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wild,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thats,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Just,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EvenSo,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MustBe,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Naturally,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ForNow,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understood,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Joking,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ready,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Something,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Somehow,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Although,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Also,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Perfect,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AsMuchAs,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Really,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Truly,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seriously,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Totally,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Until,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AsIf,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mood,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rather,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awfully,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mode,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_More,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooLate,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Finally,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Any,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Instead,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fantastic,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_status.h
Executable
+657
View File
@@ -0,0 +1,657 @@
const u8 gEasyChatWord_Dark[] = _("DARK");
const u8 gEasyChatWord_Stench[] = _("STENCH");
const u8 gEasyChatWord_ThickFat[] = _("THICK FAT");
const u8 gEasyChatWord_RainDish[] = _("RAIN DISH");
const u8 gEasyChatWord_Drizzle[] = _("DRIZZLE");
const u8 gEasyChatWord_ArenaTrap[] = _("ARENA TRAP");
const u8 gEasyChatWord_Intimidate[] = _("INTIMIDATE");
const u8 gEasyChatWord_RockHead[] = _("ROCK HEAD");
const u8 gEasyChatWord_Color[] = _("COLOR");
const u8 gEasyChatWord_AltColor[] = _("ALT. COLOR");
const u8 gEasyChatWord_Rock[] = _("ROCK");
const u8 gEasyChatWord_Beautiful[] = _("BEAUTIFUL");
const u8 gEasyChatWord_Beauty[] = _("BEAUTY");
const u8 gEasyChatWord_AirLock[] = _("AIR LOCK");
const u8 gEasyChatWord_Psychic[] = _("PSYCHIC");
const u8 gEasyChatWord_HyperCutter[] = _("HYPER CUTTER");
const u8 gEasyChatWord_Fighting[] = _("FIGHTING");
const u8 gEasyChatWord_ShadowTag[] = _("SHADOW TAG");
const u8 gEasyChatWord_Smart[] = _("SMART");
const u8 gEasyChatWord_Smartness[] = _("SMARTNESS");
const u8 gEasyChatWord_SpeedBoost[] = _("SPEED BOOST");
const u8 gEasyChatWord_Cool[] = _("COOL");
const u8 gEasyChatWord_Coolness[] = _("COOLNESS");
const u8 gEasyChatWord_BattleArmor[] = _("BATTLE ARMOR");
const u8 gEasyChatWord_Cute[] = _("CUTE");
const u8 gEasyChatWord_Cuteness[] = _("CUTENESS");
const u8 gEasyChatWord_Sturdy[] = _("STURDY");
const u8 gEasyChatWord_SuctionCups[] = _("SUCTION CUPS");
const u8 gEasyChatWord_Grass[] = _("GRASS");
const u8 gEasyChatWord_ClearBody[] = _("CLEAR BODY");
const u8 gEasyChatWord_Torrent[] = _("TORRENT");
const u8 gEasyChatWord_Ghost[] = _("GHOST");
const u8 gEasyChatWord_Ice[] = _("ICE");
const u8 gEasyChatWord_Guts[] = _("GUTS");
const u8 gEasyChatWord_RoughSkin[] = _("ROUGH SKIN");
const u8 gEasyChatWord_ShellArmor[] = _("SHELL ARMOR");
const u8 gEasyChatWord_NaturalCure[] = _("NATURAL CURE");
const u8 gEasyChatWord_Damp[] = _("DAMP");
const u8 gEasyChatWord_Ground[] = _("GROUND");
const u8 gEasyChatWord_Limber[] = _("LIMBER");
const u8 gEasyChatWord_MagnetPull[] = _("MAGNET PULL");
const u8 gEasyChatWord_WhiteSmoke[] = _("WHITE SMOKE");
const u8 gEasyChatWord_Synchronize[] = _("SYNCHRONIZE");
const u8 gEasyChatWord_Overgrow[] = _("OVERGROW");
const u8 gEasyChatWord_SwiftSwim[] = _("SWIFT SWIM");
const u8 gEasyChatWord_SandStream[] = _("SAND STREAM");
const u8 gEasyChatWord_SandVeil[] = _("SAND VEIL");
const u8 gEasyChatWord_KeenEye[] = _("KEEN EYE");
const u8 gEasyChatWord_InnerFocus[] = _("INNER FOCUS");
const u8 gEasyChatWord_Static[] = _("STATIC");
const u8 gEasyChatWord_Type[] = _("TYPE");
const u8 gEasyChatWord_Tough[] = _("TOUGH");
const u8 gEasyChatWord_Toughness[] = _("TOUGHNESS");
const u8 gEasyChatWord_ShedSkin[] = _("SHED SKIN");
const u8 gEasyChatWord_HugePower[] = _("HUGE POWER");
const u8 gEasyChatWord_VoltAbsorb[] = _("VOLT ABSORB");
const u8 gEasyChatWord_WaterAbsorb[] = _("WATER ABSORB");
const u8 gEasyChatWord_Electric[] = _("ELECTRIC");
const u8 gEasyChatWord_Forecast[] = _("FORECAST");
const u8 gEasyChatWord_SereneGrace[] = _("SERENE GRACE");
const u8 gEasyChatWord_Poison[] = _("POISON");
const u8 gEasyChatWord_PoisonPoint[] = _("POISON POINT");
const u8 gEasyChatWord_Dragon[] = _("DRAGON");
const u8 gEasyChatWord_Trace[] = _("TRACE");
const u8 gEasyChatWord_Oblivious[] = _("OBLIVIOUS");
const u8 gEasyChatWord_Truant[] = _("TRUANT");
const u8 gEasyChatWord_RunAway[] = _("RUN AWAY");
const u8 gEasyChatWord_StickyHold[] = _("STICKY HOLD");
const u8 gEasyChatWord_CloudNine[] = _("CLOUD NINE");
const u8 gEasyChatWord_Normal[] = _("NORMAL");
const u8 gEasyChatWord_Steel[] = _("STEEL");
const u8 gEasyChatWord_Illuminate[] = _("ILLUMINATE");
const u8 gEasyChatWord_EarlyBird[] = _("EARLY BIRD");
const u8 gEasyChatWord_Hustle[] = _("HUSTLE");
const u8 gEasyChatWord_Shine[] = _("SHINE");
const u8 gEasyChatWord_Flying[] = _("FLYING");
const u8 gEasyChatWord_Drought[] = _("DROUGHT");
const u8 gEasyChatWord_Lightningrod[] = _("LIGHTNINGROD");
const u8 gEasyChatWord_Compoundeyes[] = _("COMPOUNDEYES");
const u8 gEasyChatWord_MarvelScale[] = _("MARVEL SCALE");
const u8 gEasyChatWord_WonderGuard[] = _("WONDER GUARD");
const u8 gEasyChatWord_Insomnia[] = _("INSOMNIA");
const u8 gEasyChatWord_Levitate[] = _("LEVITATE");
const u8 gEasyChatWord_Plus[] = _("PLUS");
const u8 gEasyChatWord_Pressure[] = _("PRESSURE");
const u8 gEasyChatWord_LiquidOoze[] = _("LIQUID OOZE");
const u8 gEasyChatWord_ColorChange[] = _("COLOR CHANGE");
const u8 gEasyChatWord_Soundproof[] = _("SOUNDPROOF");
const u8 gEasyChatWord_EffectSpore[] = _("EFFECT SPORE");
const u8 gEasyChatWord_Pkrs[] = _("{PK}RS");
const u8 gEasyChatWord_Fire[] = _("FIRE");
const u8 gEasyChatWord_FlameBody[] = _("FLAME BODY");
const u8 gEasyChatWord_Minus[] = _("MINUS");
const u8 gEasyChatWord_OwnTempo[] = _("OWN TEMPO");
const u8 gEasyChatWord_MagmaArmor[] = _("MAGMA ARMOR");
const u8 gEasyChatWord_Water[] = _("WATER");
const u8 gEasyChatWord_WaterVeil[] = _("WATER VEIL");
const u8 gEasyChatWord_Bug[] = _("BUG");
const u8 gEasyChatWord_Swarm[] = _("SWARM");
const u8 gEasyChatWord_CuteCharm[] = _("CUTE CHARM");
const u8 gEasyChatWord_Immunity[] = _("IMMUNITY");
const u8 gEasyChatWord_Blaze[] = _("BLAZE");
const u8 gEasyChatWord_Pickup[] = _("PICKUP");
const u8 gEasyChatWord_Pattern[] = _("PATTERN");
const u8 gEasyChatWord_FlashFire[] = _("FLASH FIRE");
const u8 gEasyChatWord_VitalSpirit[] = _("VITAL SPIRIT");
const u8 gEasyChatWord_Chlorophyll[] = _("CHLOROPHYLL");
const u8 gEasyChatWord_PurePower[] = _("PURE POWER");
const u8 gEasyChatWord_ShieldDust[] = _("SHIELD DUST");
const struct EasyChatWordInfo gEasyChatGroup_Status[] = {
{
.text = gEasyChatWord_Dark,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stench,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThickFat,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RainDish,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drizzle,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ArenaTrap,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Intimidate,
.alphabeticalOrder = 101,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RockHead,
.alphabeticalOrder = 97,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Color,
.alphabeticalOrder = 106,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AltColor,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rock,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beautiful,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beauty,
.alphabeticalOrder = 86,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AirLock,
.alphabeticalOrder = 78,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Psychic,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HyperCutter,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fighting,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShadowTag,
.alphabeticalOrder = 99,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smart,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smartness,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SpeedBoost,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cool,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Coolness,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleArmor,
.alphabeticalOrder = 76,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cute,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cuteness,
.alphabeticalOrder = 88,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sturdy,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SuctionCups,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grass,
.alphabeticalOrder = 90,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ClearBody,
.alphabeticalOrder = 91,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Torrent,
.alphabeticalOrder = 104,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ghost,
.alphabeticalOrder = 75,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ice,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Guts,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RoughSkin,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShellArmor,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NaturalCure,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Damp,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ground,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Limber,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MagnetPull,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhiteSmoke,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Synchronize,
.alphabeticalOrder = 100,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overgrow,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SwiftSwim,
.alphabeticalOrder = 81,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SandStream,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SandVeil,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_KeenEye,
.alphabeticalOrder = 82,
.enabled = TRUE,
},
{
.text = gEasyChatWord_InnerFocus,
.alphabeticalOrder = 77,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Static,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Type,
.alphabeticalOrder = 85,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tough,
.alphabeticalOrder = 94,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Toughness,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShedSkin,
.alphabeticalOrder = 79,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HugePower,
.alphabeticalOrder = 92,
.enabled = TRUE,
},
{
.text = gEasyChatWord_VoltAbsorb,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WaterAbsorb,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Electric,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forecast,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SereneGrace,
.alphabeticalOrder = 93,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Poison,
.alphabeticalOrder = 103,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PoisonPoint,
.alphabeticalOrder = 102,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dragon,
.alphabeticalOrder = 89,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trace,
.alphabeticalOrder = 83,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oblivious,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Truant,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RunAway,
.alphabeticalOrder = 84,
.enabled = TRUE,
},
{
.text = gEasyChatWord_StickyHold,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CloudNine,
.alphabeticalOrder = 107,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Normal,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Steel,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Illuminate,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EarlyBird,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hustle,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shine,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flying,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drought,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lightningrod,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Compoundeyes,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MarvelScale,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WonderGuard,
.alphabeticalOrder = 108,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Insomnia,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Levitate,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plus,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pressure,
.alphabeticalOrder = 87,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LiquidOoze,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ColorChange,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Soundproof,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EffectSpore,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pkrs,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fire,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_FlameBody,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Minus,
.alphabeticalOrder = 98,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OwnTempo,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MagmaArmor,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Water,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WaterVeil,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bug,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Swarm,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CuteCharm,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Immunity,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Blaze,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pickup,
.alphabeticalOrder = 105,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pattern,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_FlashFire,
.alphabeticalOrder = 95,
.enabled = TRUE,
},
{
.text = gEasyChatWord_VitalSpirit,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Chlorophyll,
.alphabeticalOrder = 96,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PurePower,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShieldDust,
.alphabeticalOrder = 80,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_time.h
Executable
+273
View File
@@ -0,0 +1,273 @@
const u8 gEasyChatWord_Fall[] = _("FALL");
const u8 gEasyChatWord_Morning[] = _("MORNING");
const u8 gEasyChatWord_Tomorrow[] = _("TOMORROW");
const u8 gEasyChatWord_Last[] = _("LAST");
const u8 gEasyChatWord_Day[] = _("DAY");
const u8 gEasyChatWord_Sometime[] = _("SOMETIME");
const u8 gEasyChatWord_Always[] = _("ALWAYS");
const u8 gEasyChatWord_Current[] = _("CURRENT");
const u8 gEasyChatWord_Forever[] = _("FOREVER");
const u8 gEasyChatWord_Days[] = _("DAYS");
const u8 gEasyChatWord_End[] = _("END");
const u8 gEasyChatWord_Tuesday[] = _("TUESDAY");
const u8 gEasyChatWord_Yesterday[] = _("YESTERDAY");
const u8 gEasyChatWord_Today[] = _("TODAY");
const u8 gEasyChatWord_Friday[] = _("FRIDAY");
const u8 gEasyChatWord_Monday[] = _("MONDAY");
const u8 gEasyChatWord_Later[] = _("LATER");
const u8 gEasyChatWord_Earlier[] = _("EARLIER");
const u8 gEasyChatWord_Another[] = _("ANOTHER");
const u8 gEasyChatWord_Time[] = _("TIME");
const u8 gEasyChatWord_Finish[] = _("FINISH");
const u8 gEasyChatWord_Wednesday[] = _("WEDNESDAY");
const u8 gEasyChatWord_Soon[] = _("SOON");
const u8 gEasyChatWord_Start[] = _("START");
const u8 gEasyChatWord_Month[] = _("MONTH");
const u8 gEasyChatWord_Stop[] = _("STOP");
const u8 gEasyChatWord_Now[] = _("NOW");
const u8 gEasyChatWord_Final[] = _("FINAL");
const u8 gEasyChatWord_Next[] = _("NEXT");
const u8 gEasyChatWord_Age[] = _("AGE");
const u8 gEasyChatWord_Saturday[] = _("SATURDAY");
const u8 gEasyChatWord_Summer[] = _("SUMMER");
const u8 gEasyChatWord_Sunday[] = _("SUNDAY");
const u8 gEasyChatWord_Beginning[] = _("BEGINNING");
const u8 gEasyChatWord_Spring[] = _("SPRING");
const u8 gEasyChatWord_Daytime[] = _("DAYTIME");
const u8 gEasyChatWord_Winter[] = _("WINTER");
const u8 gEasyChatWord_Daily[] = _("DAILY");
const u8 gEasyChatWord_Olden[] = _("OLDEN");
const u8 gEasyChatWord_Almost[] = _("ALMOST");
const u8 gEasyChatWord_Nearly[] = _("NEARLY");
const u8 gEasyChatWord_Thursday[] = _("THURSDAY");
const u8 gEasyChatWord_Nighttime[] = _("NIGHTTIME");
const u8 gEasyChatWord_Night[] = _("NIGHT");
const u8 gEasyChatWord_Week[] = _("WEEK");
const struct EasyChatWordInfo gEasyChatGroup_Time[] = {
{
.text = gEasyChatWord_Fall,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Morning,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tomorrow,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Last,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Day,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sometime,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Always,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Current,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forever,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Days,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_End,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tuesday,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yesterday,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Today,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Friday,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Monday,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Later,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Earlier,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Another,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Time,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Finish,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wednesday,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Soon,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Start,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Month,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stop,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Now,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Final,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Next,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Age,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Saturday,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Summer,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sunday,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beginning,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spring,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daytime,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Winter,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daily,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Olden,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Almost,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nearly,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thursday,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nighttime,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Night,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Week,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_trainer.h
Executable
+165
View File
@@ -0,0 +1,165 @@
const u8 gEasyChatWord_IChooseYou[] = _("I CHOOSE YOU");
const u8 gEasyChatWord_Gotcha[] = _("GOTCHA");
const u8 gEasyChatWord_Trade[] = _("TRADE");
const u8 gEasyChatWord_Sapphire[] = _("SAPPHIRE");
const u8 gEasyChatWord_Evolve[] = _("EVOLVE");
const u8 gEasyChatWord_Encyclopedia[] = _("ENCYCLOPEDIA");
const u8 gEasyChatWord_Nature[] = _("NATURE");
const u8 gEasyChatWord_Center[] = _("CENTER");
const u8 gEasyChatWord_Egg[] = _("EGG");
const u8 gEasyChatWord_Link[] = _("LINK");
const u8 gEasyChatWord_SpAbility[] = _("SP. ABILITY");
const u8 gEasyChatWord_Trainer[] = _("TRAINER");
const u8 gEasyChatWord_Version[] = _("VERSION");
const u8 gEasyChatWord_Pokenav[] = _("POKéNAV");
const u8 gEasyChatWord_Pokemon[] = _("POKéMON");
const u8 gEasyChatWord_Get[] = _("GET");
const u8 gEasyChatWord_Pokedex[] = _("POKéDEX");
const u8 gEasyChatWord_Ruby[] = _("RUBY");
const u8 gEasyChatWord_Level[] = _("LEVEL");
const u8 gEasyChatWord_Red[] = _("RED");
const u8 gEasyChatWord_Green[] = _("GREEN");
const u8 gEasyChatWord_Bag[] = _("BAG");
const u8 gEasyChatWord_Flame[] = _("FLAME");
const u8 gEasyChatWord_Gold[] = _("GOLD");
const u8 gEasyChatWord_Leaf[] = _("LEAF");
const u8 gEasyChatWord_Silver[] = _("SILVER");
const u8 gEasyChatWord_Emerald[] = _("EMERALD");
const struct EasyChatWordInfo gEasyChatGroup_Trainer[] = {
{
.text = gEasyChatWord_IChooseYou,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gotcha,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trade,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sapphire,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Evolve,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Encyclopedia,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nature,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Center,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Egg,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Link,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SpAbility,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trainer,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Version,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokenav,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokemon,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Get,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokedex,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ruby,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Level,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Red,
.alphabeticalOrder = 19,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Green,
.alphabeticalOrder = 17,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Bag,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flame,
.alphabeticalOrder = 25,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Gold,
.alphabeticalOrder = 10,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Leaf,
.alphabeticalOrder = 2,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Silver,
.alphabeticalOrder = 11,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Emerald,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_trendy_saying.h
Executable
+201
View File
@@ -0,0 +1,201 @@
const u8 gEasyChatWord_KthxBye[] = _("KTHX, BYE.");
const u8 gEasyChatWord_YesSirExcl[] = _("YES, SIR!");
const u8 gEasyChatWord_AvantGarde[] = _("AVANT GARDE");
const u8 gEasyChatWord_Couple[] = _("COUPLE");
const u8 gEasyChatWord_MuchObliged[] = _("MUCH OBLIGED");
const u8 gEasyChatWord_YeehawExcl[] = _("YEEHAW!");
const u8 gEasyChatWord_Mega[] = _("MEGA");
const u8 gEasyChatWord_1HitKOExcl[] = _("1-HIT KO!");
const u8 gEasyChatWord_Destiny[] = _("DESTINY");
const u8 gEasyChatWord_Cancel[] = _("CANCEL");
const u8 gEasyChatWord_New[] = _("NEW");
const u8 gEasyChatWord_Flatten[] = _("FLATTEN");
const u8 gEasyChatWord_Kidding[] = _("KIDDING");
const u8 gEasyChatWord_Loser[] = _("LOSER");
const u8 gEasyChatWord_Losing[] = _("LOSING");
const u8 gEasyChatWord_Happening[] = _("HAPPENING");
const u8 gEasyChatWord_HipAnd[] = _("HIP AND");
const u8 gEasyChatWord_Shake[] = _("SHAKE");
const u8 gEasyChatWord_Shady[] = _("SHADY");
const u8 gEasyChatWord_Upbeat[] = _("UPBEAT");
const u8 gEasyChatWord_Modern[] = _("MODERN");
const u8 gEasyChatWord_SmellYa[] = _("SMELL YA");
const u8 gEasyChatWord_Bang[] = _("BANG");
const u8 gEasyChatWord_Knockout[] = _("KNOCKOUT");
const u8 gEasyChatWord_Hassle[] = _("HASSLE");
const u8 gEasyChatWord_Winner[] = _("WINNER");
const u8 gEasyChatWord_Fever[] = _("FEVER");
const u8 gEasyChatWord_Wannabe[] = _("WANNABE");
const u8 gEasyChatWord_Baby[] = _("BABY");
const u8 gEasyChatWord_Heart[] = _("HEART");
const u8 gEasyChatWord_Old[] = _("OLD");
const u8 gEasyChatWord_Young[] = _("YOUNG");
const u8 gEasyChatWord_Ugly[] = _("UGLY");
const struct EasyChatWordInfo gEasyChatGroup_TrendySaying[] = {
{
.text = gEasyChatWord_KthxBye,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YesSirExcl,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AvantGarde,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Couple,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MuchObliged,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YeehawExcl,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mega,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_1HitKOExcl,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Destiny,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cancel,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_New,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flatten,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kidding,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Loser,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Losing,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happening,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HipAnd,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shake,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shady,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Upbeat,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Modern,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SmellYa,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bang,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Knockout,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hassle,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Winner,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fever,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wannabe,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Baby,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heart,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Old,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Young,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ugly,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_group_voices.h
Executable
+381
View File
@@ -0,0 +1,381 @@
const u8 gEasyChatWord_Excl[] = _("!");
const u8 gEasyChatWord_ExclExcl[] = _("!!");
const u8 gEasyChatWord_QuesExcl[] = _("?!");
const u8 gEasyChatWord_Ques[] = _("?");
const u8 gEasyChatWord_Ellipsis[] = _("…");
const u8 gEasyChatWord_EllipsisExcl[] = _("…!");
const u8 gEasyChatWord_EllipsisEllipsisEllipsis[] = _("………");
const u8 gEasyChatWord_Dash[] = _("-");
const u8 gEasyChatWord_DashDashDash[] = _("- - -");
const u8 gEasyChatWord_UhOh[] = _("UH-OH");
const u8 gEasyChatWord_Waaah[] = _("WAAAH");
const u8 gEasyChatWord_Ahaha[] = _("AHAHA");
const u8 gEasyChatWord_OhQues[] = _("OH?");
const u8 gEasyChatWord_Nope[] = _("NOPE");
const u8 gEasyChatWord_Urgh[] = _("URGH");
const u8 gEasyChatWord_Hmm[] = _("HMM");
const u8 gEasyChatWord_Whoah[] = _("WHOAH");
const u8 gEasyChatWord_WroooaarExcl[] = _("WROOOAAR!");
const u8 gEasyChatWord_Wow[] = _("WOW");
const u8 gEasyChatWord_Giggle[] = _("GIGGLE");
const u8 gEasyChatWord_Sigh[] = _("SIGH");
const u8 gEasyChatWord_Unbelievable[] = _("UNBELIEVABLE");
const u8 gEasyChatWord_Cries[] = _("CRIES");
const u8 gEasyChatWord_Agree[] = _("AGREE");
const u8 gEasyChatWord_EhQues[] = _("EH?");
const u8 gEasyChatWord_Cry[] = _("CRY");
const u8 gEasyChatWord_Ehehe[] = _("EHEHE");
const u8 gEasyChatWord_OiOiOi[] = _("OI, OI, OI");
const u8 gEasyChatWord_OhYeah[] = _("OH, YEAH");
const u8 gEasyChatWord_Oh[] = _("OH");
const u8 gEasyChatWord_Oops[] = _("OOPS");
const u8 gEasyChatWord_Shocked[] = _("SHOCKED");
const u8 gEasyChatWord_Eek[] = _("EEK");
const u8 gEasyChatWord_Graaah[] = _("GRAAAH");
const u8 gEasyChatWord_Gwahahaha[] = _("GWAHAHAHA");
const u8 gEasyChatWord_Way[] = _("WAY");
const u8 gEasyChatWord_Tch[] = _("TCH");
const u8 gEasyChatWord_Hehe[] = _("HEHE");
const u8 gEasyChatWord_Hah[] = _("HAH");
const u8 gEasyChatWord_Yup[] = _("YUP");
const u8 gEasyChatWord_Hahaha[] = _("HAHAHA");
const u8 gEasyChatWord_Aiyeeh[] = _("AIYEEH");
const u8 gEasyChatWord_Hiyah[] = _("HIYAH");
const u8 gEasyChatWord_Fufufu[] = _("FUFUFU");
const u8 gEasyChatWord_Lol[] = _("LOL");
const u8 gEasyChatWord_Snort[] = _("SNORT");
const u8 gEasyChatWord_Humph[] = _("HUMPH");
const u8 gEasyChatWord_Hehehe[] = _("HEHEHE");
const u8 gEasyChatWord_Heh[] = _("HEH");
const u8 gEasyChatWord_Hohoho[] = _("HOHOHO");
const u8 gEasyChatWord_UhHuh[] = _("UH-HUH");
const u8 gEasyChatWord_OhDear[] = _("OH, DEAR");
const u8 gEasyChatWord_Arrgh[] = _("ARRGH");
const u8 gEasyChatWord_Mufufu[] = _("MUFUFU");
const u8 gEasyChatWord_Mmm[] = _("MMM");
const u8 gEasyChatWord_OhKay[] = _("OH-KAY");
const u8 gEasyChatWord_Okay[] = _("OKAY");
const u8 gEasyChatWord_Lalala[] = _("LALALA");
const u8 gEasyChatWord_Yay[] = _("YAY");
const u8 gEasyChatWord_Aww[] = _("AWW");
const u8 gEasyChatWord_Wowee[] = _("WOWEE");
const u8 gEasyChatWord_Gwah[] = _("GWAH");
const u8 gEasyChatWord_Wahahaha[] = _("WAHAHAHA");
const struct EasyChatWordInfo gEasyChatGroup_Voices[] = {
{
.text = gEasyChatWord_Excl,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ExclExcl,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_QuesExcl,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ques,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ellipsis,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EllipsisExcl,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EllipsisEllipsisEllipsis,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dash,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_DashDashDash,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UhOh,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Waaah,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ahaha,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhQues,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nope,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Urgh,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hmm,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whoah,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WroooaarExcl,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wow,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Giggle,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sigh,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Unbelievable,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cries,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Agree,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EhQues,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cry,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ehehe,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OiOiOi,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhYeah,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oh,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oops,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shocked,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eek,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Graaah,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gwahahaha,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Way,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tch,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hehe,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hah,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yup,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hahaha,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aiyeeh,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hiyah,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fufufu,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lol,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Snort,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Humph,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hehehe,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heh,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hohoho,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UhHuh,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhDear,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Arrgh,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mufufu,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mmm,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhKay,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Okay,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lalala,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yay,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aww,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wowee,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gwah,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wahahaha,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
};
src/data/easy_chat/easy_chat_groups.h
Executable
+137
View File
@@ -0,0 +1,137 @@
#include "easy_chat.h"
#include "easy_chat_group_pokemon.h"
#include "easy_chat_group_trainer.h"
#include "easy_chat_group_status.h"
#include "easy_chat_group_battle.h"
#include "easy_chat_group_greetings.h"
#include "easy_chat_group_people.h"
#include "easy_chat_group_voices.h"
#include "easy_chat_group_speech.h"
#include "easy_chat_group_endings.h"
#include "easy_chat_group_feelings.h"
#include "easy_chat_group_conditions.h"
#include "easy_chat_group_actions.h"
#include "easy_chat_group_lifestyle.h"
#include "easy_chat_group_hobbies.h"
#include "easy_chat_group_time.h"
#include "easy_chat_group_misc.h"
#include "easy_chat_group_adjectives.h"
#include "easy_chat_group_events.h"
#include "easy_chat_group_move_1.h"
#include "easy_chat_group_move_2.h"
#include "easy_chat_group_trendy_saying.h"
#include "easy_chat_group_pokemon2.h"
const struct EasyChatGroup gEasyChatGroups[] = {
{
.wordData = {.valueList = gEasyChatGroup_Pokemon},
.numWords = 202,
.numEnabledWords = 202,
},
{
.wordData = {.words = gEasyChatGroup_Trainer},
.numWords = 27,
.numEnabledWords = 21,
},
{
.wordData = {.words = gEasyChatGroup_Status},
.numWords = 109,
.numEnabledWords = 109,
},
{
.wordData = {.words = gEasyChatGroup_Battle},
.numWords = 63,
.numEnabledWords = 63,
},
{
.wordData = {.words = gEasyChatGroup_Greetings},
.numWords = 42,
.numEnabledWords = 42,
},
{
.wordData = {.words = gEasyChatGroup_People},
.numWords = 75,
.numEnabledWords = 75,
},
{
.wordData = {.words = gEasyChatGroup_Voices},
.numWords = 63,
.numEnabledWords = 63,
},
{
.wordData = {.words = gEasyChatGroup_Speech},
.numWords = 60,
.numEnabledWords = 60,
},
{
.wordData = {.words = gEasyChatGroup_Endings},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Feelings},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Conditions},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Actions},
.numWords = 78,
.numEnabledWords = 78,
},
{
.wordData = {.words = gEasyChatGroup_Lifestyle},
.numWords = 45,
.numEnabledWords = 45,
},
{
.wordData = {.words = gEasyChatGroup_Hobbies},
.numWords = 54,
.numEnabledWords = 54,
},
{
.wordData = {.words = gEasyChatGroup_Time},
.numWords = 45,
.numEnabledWords = 45,
},
{
.wordData = {.words = gEasyChatGroup_Misc},
.numWords = 42,
.numEnabledWords = 42,
},
{
.wordData = {.words = gEasyChatGroup_Adjectives},
.numWords = 36,
.numEnabledWords = 36,
},
{
.wordData = {.words = gEasyChatGroup_Events},
.numWords = 29,
.numEnabledWords = 29,
},
{
.wordData = {.valueList = gEasyChatGroup_Move1},
.numWords = 154,
.numEnabledWords = 154,
},
{
.wordData = {.valueList = gEasyChatGroup_Move2},
.numWords = 200,
.numEnabledWords = 200,
},
{
.wordData = {.words = gEasyChatGroup_TrendySaying},
.numWords = 33,
.numEnabledWords = 33,
},
{
.wordData = {.valueList = gEasyChatGroup_Pokemon2},
.numWords = 251,
.numEnabledWords = 251,
},
};
src/data/easy_chat/easy_chat_words_by_letter.h
Executable
+2750
View File
File diff suppressed because it is too large Load Diff
src/daycare.c
+3 -3
View File
@@ -1259,7 +1259,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
break;
}
DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE);
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -1268,7 +1268,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
{
gSpecialVar_Result = 2;
DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE);
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -1283,7 +1283,7 @@ void ShowDaycareLevelMenu(void)
u8 daycareMenuTaskId;
windowId = AddWindow(&sDaycareLevelMenuWindowTemplate);
NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
DrawStdWindowFrame(windowId, FALSE);
menuTemplate = sDaycareListMenuLevelTemplate;
menuTemplate.windowId = windowId;
src/decoration.c
+33 -33
View File
@@ -463,14 +463,14 @@ u8 sub_81269D4(u8 idx)
{
*winidx = AddWindow(&gUnknown_085A6B90[idx]);
}
SetWindowBorderStyle(*winidx, 0, 0x214, 0xe);
DrawStdFrameWithCustomTileAndPalette(*winidx, 0, 0x214, 0xe);
schedule_bg_copy_tilemap_to_vram(0);
return *winidx;
}
void sub_8126A58(u8 idx)
{
sub_8198070(sDecorMenuWindowIndices[idx], FALSE);
ClearStdWindowAndFrameToTransparent(sDecorMenuWindowIndices[idx], FALSE);
ClearWindowTilemap(sDecorMenuWindowIndices[idx]);
RemoveWindow(sDecorMenuWindowIndices[idx]);
schedule_bg_copy_tilemap_to_vram(0);
@@ -543,7 +543,7 @@ void sub_8126B80(u8 taskId)
void sub_8126C08(void)
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
}
@@ -572,7 +572,7 @@ void SecretBasePC_PutAway(u8 taskId)
else
{
sub_8126A58(0);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
FadeScreen(1, 0);
gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8129ABC;
@@ -617,7 +617,7 @@ void sub_8126DA4(u8 taskId)
void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
{
LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8126A58(0);
sub_8126DFC(taskId);
}
@@ -634,7 +634,7 @@ void sub_8126DFC(u8 taskId)
void sub_8126E44(u8 taskId)
{
FillWindowPixelBuffer(sDecorMenuWindowIndices[1], 0x11);
FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_FILL(1));
sub_8126E8C(taskId);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory);
gTasks[taskId].func = sub_8127088;
@@ -751,7 +751,7 @@ void sub_81270E8(u8 taskId)
void sub_8127180(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8126DFC(taskId);
}
@@ -771,7 +771,7 @@ void sub_81271CC(u8 taskId)
{
sub_8126A58(1);
sub_8126A88();
NewMenuHelpers_DrawDialogueFrame(0, 0);
DrawDialogueFrame(0, 0);
sub_8126C08();
gTasks[taskId].func = sub_8126B80;
}
@@ -779,7 +779,7 @@ void sub_81271CC(u8 taskId)
void sub_8127208(u8 taskId)
{
LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
gTasks[taskId].data[11] = 2;
sCurDecorationCategory = DECORCAT_DESK;
sub_8126DFC(taskId);
@@ -968,7 +968,7 @@ void sub_8127744(u32 a0)
const u8 *txt;
winidx = sDecorMenuWindowIndices[3];
FillWindowPixelBuffer(winidx, 0x11);
FillWindowPixelBuffer(winidx, PIXEL_FILL(1));
if (a0 >= sCurDecorCatCount)
{
txt = gText_GoBackPrevMenu;
@@ -1095,7 +1095,7 @@ void sub_8127A14(u8 taskId)
void sub_8127A30(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
gTasks[taskId].func = sub_8127A14;
}
@@ -1103,7 +1103,7 @@ void sub_8127A5C(u8 taskId)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_81269D4(1);
sub_8127620(taskId);
}
@@ -1158,7 +1158,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
u16 i;
u16 j;
u16 behavior;
u16 flags;
u16 impassableFlag;
u16 v0;
u16 v1;
s16 decLeft;
@@ -1173,11 +1173,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decor].tiles[i * decWidth + j]);
if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decor].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
{
flags = 0xc00;
impassableFlag = METATILE_COLLISION_MASK;
}
else
{
flags = 0x000;
impassableFlag = 0x000;
}
if (gDecorations[decor].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(decLeft, decBottom)) == TRUE)
{
@@ -1190,11 +1190,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j);
if (v1 != 0xFFFF)
{
MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1);
MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag | v1);
}
else
{
MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags);
MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag);
}
}
}
@@ -1254,7 +1254,7 @@ void sub_8127E18(void)
break;
}
}
VarSet(VAR_0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
gSpecialVar_0x8006 = sCurDecorMapX;
gSpecialVar_0x8007 = sCurDecorMapY;
@@ -1502,7 +1502,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
if (!sub_81284F4(behaviorAt, decoration))
{
return FALSE;
@@ -1527,7 +1527,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy))
{
return FALSE;
@@ -1547,7 +1547,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK;
if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt))
{
return FALSE;
@@ -1628,13 +1628,13 @@ void sub_8128950(u8 taskId)
void sub_81289D0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
}
void sub_81289F0(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8128AAC(taskId);
if (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].permission != DECORPERM_SOLID_MAT)
{
@@ -1693,13 +1693,13 @@ void sub_8128AAC(u8 taskId)
void sub_8128B80(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
}
void sub_8128BA0(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8128BBC(taskId);
}
@@ -1887,7 +1887,7 @@ void sub_8128E18(u8 taskId)
void sub_8128FD8(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gTasks[taskId].data[10] = 0;
gTasks[taskId].func = sub_8128E18;
@@ -2251,7 +2251,7 @@ void sub_81298EC(u8 taskId)
if (!gPaletteFade.active) {
DrawWholeMapView();
ScriptContext1_SetupScript(EventScript_275D2E);
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gTasks[taskId].data[2] = 2;
}
break;
@@ -2343,7 +2343,7 @@ void sub_8129ABC(u8 taskId)
void sub_8129B34(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C;
@@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId)
void sub_812A1A0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
}
@@ -2601,13 +2601,13 @@ void sub_812A1C0(u8 taskId)
void sub_812A1F0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
}
void sub_812A210(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_812A22C(taskId);
}
@@ -2671,7 +2671,7 @@ void sub_812A334(void)
u8 taskId;
pal_fill_black();
NewMenuHelpers_DrawDialogueFrame(0, 1);
DrawDialogueFrame(0, 1);
sub_8126ABC();
taskId = CreateTask(sub_812A2C4, 8);
gTasks[taskId].data[2] = 0;
@@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId)
void sub_812A458(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
}
src/dewford_trend.c
+2 -2
View File
@@ -159,7 +159,7 @@ static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c)
}
}
void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t size, u8 unused)
{
u16 i, j, r3, players;
struct EasyChatPair *buffer1, *buffer2, *src, *dst, *foo_of_buffer2;
@@ -176,7 +176,7 @@ void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
{
players = GetLinkPlayerCount();
for (i = 0; i < players; i++)
memcpy(&(buffer1[i * 5]), (u8 *)a + i * b, 40);
memcpy(&(buffer1[i * 5]), (u8 *)a + i * size, 40);
src = buffer1;
dst = buffer2;
r3 = 0;
src/diploma.c
+2 -3
View File
@@ -13,8 +13,7 @@
#include "text.h"
#include "overworld.h"
#include "menu.h"
extern bool16 sub_80C0944(void);
#include "pokedex.h"
extern const u8 gText_DexNational[];
extern const u8 gText_DexHoenn[];
@@ -197,7 +196,7 @@ static void InitDiplomaWindow(void)
InitWindows(sDiplomaWinTemplates);
DeactivateAllTextPrinters();
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0);
}
src/easy_chat.c
+2976 -1182
View File
File diff suppressed because it is too large Load Diff
src/egg_hatch.c
+3 -3
View File
@@ -574,7 +574,7 @@ static void Task_EggHatchPlayBGM(u8 taskID)
if (gTasks[taskID].data[0] == 0)
{
StopMapMusic();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
}
if (gTasks[taskID].data[0] == 1)
PlayBGM(MUS_ME_SHINKA);
@@ -606,7 +606,7 @@ static void CB2_EggHatch_1(void)
case 1:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(sEggHatchData->windowId, 0);
FillWindowPixelBuffer(sEggHatchData->windowId, PIXEL_FILL(0));
sEggHatchData->CB2_PalCounter = 0;
sEggHatchData->CB2_state++;
}
@@ -857,7 +857,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
{
FillWindowPixelBuffer(windowId, 0xFF);
FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
sEggHatchData->textColor[0] = 0;
sEggHatchData->textColor[1] = 5;
sEggHatchData->textColor[2] = 6;
src/electric.c
-3
View File
@@ -5,9 +5,6 @@
#include "constants/songs.h"
#include "sound.h"
extern void sub_810E2C8(struct Sprite *);
extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *);
static void sub_810A1A8(struct Sprite *);
static void sub_810A1F8(struct Sprite *);
static void sub_810A214(struct Sprite *);
src/event_data.c
+11 -11
View File
@@ -23,8 +23,8 @@ EWRAM_DATA u16 gSpecialVar_LastTalked = 0;
EWRAM_DATA u16 gSpecialVar_Facing = 0;
EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
EWRAM_DATA u16 gSpecialVar_Unused_0x8014 = 0;
EWRAM_DATA static u8 gSpecialFlags[16] = {0};
extern u16 *const gSpecialVars[];
@@ -32,7 +32,7 @@ void InitEventData(void)
{
memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags));
memset(gSaveBlock1Ptr->vars, 0, sizeof(gSaveBlock1Ptr->vars));
memset(gUnknown_020375FC, 0, sizeof(gUnknown_020375FC));
memset(gSpecialFlags, 0, sizeof(gSpecialFlags));
}
void ClearTempFieldEventData(void)
@@ -131,13 +131,13 @@ void sub_809D4D8(void)
void sub_809D570(void)
{
VarSet(VAR_EVENT_PICHU_SLOT, 0);
VarSet(VAR_0x40DE, 0);
VarSet(VAR_0x40DF, 0);
VarSet(VAR_0x40E0, 0);
VarSet(VAR_0x40E1, 0);
VarSet(VAR_0x40E2, 0);
VarSet(VAR_0x40E3, 0);
VarSet(VAR_0x40E4, 0);
VarSet(VAR_NEVER_READ_0x40DE, 0);
VarSet(VAR_NEVER_READ_0x40DF, 0);
VarSet(VAR_NEVER_READ_0x40E0, 0);
VarSet(VAR_NEVER_READ_0x40E1, 0);
VarSet(VAR_NEVER_READ_0x40E2, 0);
VarSet(VAR_NEVER_READ_0x40E3, 0);
VarSet(VAR_NEVER_READ_0x40E4, 0);
}
void DisableResetRTC(void)
@@ -199,7 +199,7 @@ u8 *GetFlagPointer(u16 id)
else if (id < SPECIAL_FLAGS_START)
return &gSaveBlock1Ptr->flags[id / 8];
else
return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8];
return &gSpecialFlags[(id - SPECIAL_FLAGS_START) / 8];
}
u8 FlagSet(u16 id)
src/field_control_avatar.c
+9 -10
View File
@@ -32,8 +32,7 @@
#include "constants/map_types.h"
#include "constants/maps.h"
#include "constants/songs.h"
extern bool32 TryStartMatchCall(void);
#include "match_call.h"
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
@@ -147,7 +146,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
if (CheckForTrainersWantingBattle() == TRUE)
return TRUE;
if (mapheader_run_first_tag2_script_list_match() == 1)
if (TryRunOnFrameMapScript() == TRUE)
return TRUE;
if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE)
@@ -557,9 +556,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(EventScript_EggHatch);
return TRUE;
}
if (sub_813B3B0() == TRUE)
if (UnusualWeatherHasExpired() == TRUE)
{
ScriptContext1_SetupScript(gUnknown_08273D1F);
ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1);
return TRUE;
}
if (ShouldDoBrailleRegicePuzzle() == TRUE)
@@ -567,27 +566,27 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(IslandCave_EventScript_238EAF);
return TRUE;
}
if (is_tile_that_overrides_player_control() == TRUE)
if (ShouldDoWallyCall() == TRUE)
{
ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
return TRUE;
}
if (sub_8138120() == TRUE)
if (ShouldDoWinonaCall() == TRUE)
{
ScriptContext1_SetupScript(Route119_EventScript_1F49EC);
return TRUE;
}
if (sub_8138168() == TRUE)
if (ShouldDoScottCall() == TRUE)
{
ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6);
return TRUE;
}
if (sub_81381B0() == TRUE)
if (ShouldDoRoxanneCall() == TRUE)
{
ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_21307B);
return TRUE;
}
if (sub_81381F8() == TRUE)
if (ShouldDoRivalRayquazaCall() == TRUE)
{
ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175);
return TRUE;
src/field_effect.c
+2 -8
View File
@@ -240,12 +240,6 @@ static IWRAM_DATA u8 sActiveList[32];
extern u8 *gFieldEffectScriptPointers[];
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern void sub_81555D8(u8, u8);
extern void pal_fill_for_maplights(void);
extern void sub_80E1558(u8);
extern void sub_80E1570(void);
extern bool8 sub_80E1584(void);
extern void WarpFadeScreen(void);
// .rodata
const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
@@ -2443,7 +2437,7 @@ static void sub_80B8410(struct Task *task)
bool8 FldEff_FieldMoveShowMon(void)
{
u8 taskId;
if (is_map_type_1_2_3_5_or_6(GetCurrentMapType()) == TRUE)
if (IsMapTypeOutdoors(GetCurrentMapType()) == TRUE)
{
taskId = CreateTask(sub_80B8554, 0xff);
} else
@@ -2620,7 +2614,7 @@ static void sub_80B8874(u16 offs)
dest = (u16 *)(VRAM + 0x140 + offs);
for (i = 0; i < 0x140; i++, dest++)
{
*dest = gFieldMoveStreaksTilemap[i] | 0xf000;
*dest = gFieldMoveStreaksTilemap[i] | METATILE_ELEVATION_MASK;
}
}
src/field_message_box.c
+4 -6
View File
@@ -4,9 +4,7 @@
#include "string_util.h"
#include "task.h"
#include "text.h"
extern bool32 IsMatchCallTaskActive(void);
extern void StartMatchCallFromScript(u8*);
#include "match_call.h"
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
@@ -33,7 +31,7 @@ static void sub_8098154(u8 taskId)
task->data[0]++;
break;
case 1:
NewMenuHelpers_DrawDialogueFrame(0, 1);
DrawDialogueFrame(0, 1);
task->data[0]++;
break;
case 2:
@@ -127,7 +125,7 @@ static void textbox_auto_and_task_add(void)
void HideFieldMessageBox(void)
{
task_del_textbox();
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
sFieldMessageBoxMode = 0;
}
@@ -146,7 +144,7 @@ bool8 IsFieldMessageBoxHidden(void)
void sub_8098358(void)
{
task_del_textbox();
NewMenuHelpers_DrawStdWindowFrame(0, 1);
DrawStdWindowFrame(0, 1);
sFieldMessageBoxMode = 0;
}
src/field_player_avatar.c
+7 -7
View File
@@ -1918,7 +1918,7 @@ static bool8 Fishing9(struct Task *task)
static bool8 Fishing10(struct Task *task)
{
AlignFishingAnimationFrames();
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3);
task->tStep++;
task->tFrameCounter = 0;
@@ -1944,7 +1944,7 @@ static bool8 Fishing11(struct Task *task)
sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0);
gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
sub_8197434(0, TRUE);
ClearDialogWindowAndFrame(0, TRUE);
task->tFrameCounter++;
return FALSE;
}
@@ -1966,7 +1966,7 @@ static bool8 Fishing12(struct Task *task)
{
AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3);
task->tStep = FISHING_SHOW_RESULT;
return TRUE;
@@ -1977,7 +1977,7 @@ static bool8 Fishing13(struct Task *task)
{
AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3);
task->tStep++;
return TRUE;
@@ -2017,7 +2017,7 @@ static bool8 Fishing16(struct Task *task)
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
UnfreezeEventObjects();
sub_8197434(0, TRUE);
ClearDialogWindowAndFrame(0, TRUE);
sub_80ED950(0);
DestroyTask(FindTaskIdByFunc(Task_Fishing));
}
@@ -2125,7 +2125,7 @@ void sub_808D194(void)
sub_808D1FC(CreateTask(sub_808D1FC, 0));
}
bool8 sub_808D1B4(void)
bool32 sub_808D1B4(void)
{
return FuncIsActiveTask(sub_808D1FC);
}
@@ -2135,7 +2135,7 @@ void sub_808D1C8(void)
sub_808D094(CreateTask(sub_808D094, 0));
}
bool8 sub_808D1E8(void)
bool32 sub_808D1E8(void)
{
return FuncIsActiveTask(sub_808D094);
}
src/field_region_map.c
+4 -4
View File
@@ -139,11 +139,11 @@ static void FieldUpdateRegionMap(void)
sFieldRegionMapHandler->state++;
break;
case 1:
SetWindowBorderStyle(1, 0, 0x27, 0xd);
DrawStdFrameWithCustomTileAndPalette(1, 0, 0x27, 0xd);
offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
AddTextPrinterParameterized(1, 1, gText_Hoenn, offset, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
SetWindowBorderStyle(0, 0, 0x27, 0xd);
DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd);
PrintRegionMapSecName();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
sFieldRegionMapHandler->state++;
@@ -196,13 +196,13 @@ static void PrintRegionMapSecName(void)
{
if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE)
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
}
else
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
CopyWindowToVram(0, 3);
}
}
src/field_screen_effect.c
+11 -25
View File
@@ -10,7 +10,6 @@
#include "field_screen_effect.h"
#include "field_special_scene.h"
#include "field_weather.h"
// #include "fldeff_flash.h"
#include "gpu_regs.h"
#include "link.h"
#include "link_rfu.h"
@@ -31,22 +30,9 @@
#include "constants/event_object_movement_constants.h"
#include "constants/songs.h"
#include "constants/rgb.h"
extern bool32 sub_81D6534(void);
extern bool8 walkrun_is_standing_still(void);
extern void ScriptUnfreezeEventObjects(void);
extern void sub_80FB768(void);
extern void sub_808D194(void);
extern void sub_808D1C8(void);
extern bool32 sub_808D1B4(void);
extern bool32 sub_808D1E8(void);
extern void sub_80B6B68(void);
extern void sub_80B6E4C(u8, u8);
extern void sub_80B75D8(u8);
extern void sub_80B7A74(u8);
extern void sub_808C0A8(u8);
extern u8 GetMapPairFadeToType(u8, u8);
extern u8 GetMapPairFadeFromType(u8, u8);
#include "trainer_hill.h"
#include "event_obj_lock.h"
#include "fldeff.h"
extern const u16 gUnknown_82EC7CC[];
@@ -255,7 +241,7 @@ void sub_80AF2B4(u8 taskId)
break;
case 2:
sub_8009F18();
sub_8086C2C();
ResetAllMultiplayerState();
ScriptContext2_Disable();
DestroyTask(taskId);
break;
@@ -503,7 +489,7 @@ void DoWarp(void)
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
WarpFadeScreen();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = mapldr_default;
CreateTask(sub_80AFA0C, 10);
@@ -514,7 +500,7 @@ void DoDiveWarp(void)
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
WarpFadeScreen();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
gFieldCallback = mapldr_default;
CreateTask(sub_80AFA0C, 10);
}
@@ -524,7 +510,7 @@ void sub_80AF79C(void)
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
FadeScreen(FADE_TO_WHITE, 8);
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
gFieldCallback = sub_80AF3B0;
CreateTask(sub_80AFA0C, 10);
}
@@ -621,7 +607,7 @@ void sub_80AF948(void)
CreateTask(sub_80AF8E0, 10);
}
static void sub_80AF96C(u8 taskId)
static void Task_ReturnToWorldFromLinkRoom(u8 taskId)
{
s16 *data = gTasks[taskId].data;
@@ -654,7 +640,7 @@ static void sub_80AF96C(u8 taskId)
void sub_80AF9F8(void)
{
CreateTask(sub_80AF96C, 10);
CreateTask(Task_ReturnToWorldFromLinkRoom, 10);
}
static void sub_80AFA0C(u8 taskId)
@@ -734,7 +720,7 @@ static void sub_80AFA88(u8 taskId)
case 4:
TryFadeOutOldMapMusic();
WarpFadeScreen();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
task->data[0] = 0;
task->func = sub_80AFA0C;
break;
@@ -771,7 +757,7 @@ void sub_80AFC60(void)
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
WarpFadeScreen();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = sub_80AF3C8;
CreateTask(task0A_fade_n_map_maybe, 10);
src/field_special_scene.c
+2 -2
View File
@@ -301,7 +301,7 @@ void Task_HandlePorthole(u8 taskId)
break;
case EXIT_PORTHOLE: // exit porthole.
FlagClear(FLAG_SPECIAL_FLAG_0x4001);
FlagClear(FLAG_SPECIAL_FLAG_0x4000);
FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
SetWarpDestinationToDynamicWarp(0);
DoDiveWarp();
DestroyTask(taskId);
@@ -338,7 +338,7 @@ void sub_80FB7A4(void)
{
FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_SPECIAL_FLAG_0x4001);
FlagSet(FLAG_SPECIAL_FLAG_0x4000);
FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
sub_80FB59C();
sub_80AF8B8();
src/field_specials.c
+107 -69
View File
@@ -54,6 +54,8 @@
#include "constants/moves.h"
#include "constants/vars.h"
#include "constants/battle_frontier.h"
#include "constants/weather.h"
#include "palette.h"
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0;
@@ -79,9 +81,6 @@ extern const u16 gEventObjectPalette17[];
extern const u16 gEventObjectPalette33[];
extern const u16 gEventObjectPalette34[];
extern void LoadPalette(const void *src, u32 offset, u16 size); // incorrect signature, needed to match
extern void BlendPalettes(u32, u8, u16);
extern void FieldInitRegionMap(MainCallback callback);
void UpdateMovedLilycoveFanClubMembers(void);
void sub_813BF60(void);
@@ -359,17 +358,17 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
return 0;
}
bool32 is_tile_that_overrides_player_control(void)
bool32 ShouldDoWallyCall(void)
{
if (FlagGet(FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL))
{
switch (gMapHeader.mapType)
{
case 1:
case 2:
case 3:
case 6:
if (++(*GetVarPointer(VAR_0x40F2)) < 0xFA)
case MAP_TYPE_TOWN:
case MAP_TYPE_CITY:
case MAP_TYPE_ROUTE:
case MAP_TYPE_OCEAN_ROUTE:
if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250)
{
return FALSE;
}
@@ -386,7 +385,7 @@ bool32 is_tile_that_overrides_player_control(void)
return TRUE;
}
bool32 sub_8138120(void)
bool32 ShouldDoWinonaCall(void)
{
if (FlagGet(FLAG_REGISTER_WINONA_POKENAV))
{
@@ -395,8 +394,8 @@ bool32 sub_8138120(void)
case MAP_TYPE_TOWN:
case MAP_TYPE_CITY:
case MAP_TYPE_ROUTE:
case MAP_TYPE_6:
if (++(*GetVarPointer(VAR_0x40F3)) < 10)
case MAP_TYPE_OCEAN_ROUTE:
if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10)
{
return FALSE;
}
@@ -413,7 +412,7 @@ bool32 sub_8138120(void)
return TRUE;
}
bool32 sub_8138168(void)
bool32 ShouldDoScottCall(void)
{
if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX))
{
@@ -423,7 +422,7 @@ bool32 sub_8138168(void)
case 2:
case 3:
case 6:
if (++(*GetVarPointer(VAR_0x40F5)) < 0xA)
if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10)
{
return FALSE;
}
@@ -440,7 +439,7 @@ bool32 sub_8138168(void)
return TRUE;
}
bool32 sub_81381B0(void)
bool32 ShouldDoRoxanneCall(void)
{
if (FlagGet(FLAG_ENABLE_ROXANNE_FIRST_CALL))
{
@@ -450,7 +449,7 @@ bool32 sub_81381B0(void)
case 2:
case 3:
case 6:
if (++(*GetVarPointer(VAR_0x40F4)) < 0xFA)
if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250)
{
return FALSE;
}
@@ -467,7 +466,7 @@ bool32 sub_81381B0(void)
return TRUE;
}
bool32 sub_81381F8(void)
bool32 ShouldDoRivalRayquazaCall(void)
{
if (FlagGet(FLAG_DEFEATED_MAGMA_SPACE_CENTER))
{
@@ -477,7 +476,7 @@ bool32 sub_81381F8(void)
case 2:
case 3:
case 6:
if (++(*GetVarPointer(VAR_0x40F6)) < 0xFA)
if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250)
{
return FALSE;
}
@@ -590,7 +589,9 @@ void SpawnLinkPartnerEventObject(void)
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum)
{
paletteNum += 6;
u8 adjustedPaletteNum;
// Note: This temp var is necessary; paletteNum += 6 doesn't match.
adjustedPaletteNum = paletteNum + 6;
if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN ||
graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY ||
graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL ||
@@ -601,21 +602,21 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent
{
u8 spriteId = gEventObjects[obj].spriteId;
struct Sprite *sprite = &gSprites[spriteId];
sprite->oam.paletteNum = paletteNum;
sprite->oam.paletteNum = adjustedPaletteNum;
switch (graphicsId)
{
case EVENT_OBJ_GFX_LINK_RS_BRENDAN:
LoadPalette(gEventObjectPalette33, 0x100 + paletteNum * 16, 0x20);
LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20);
break;
case EVENT_OBJ_GFX_LINK_RS_MAY:
LoadPalette(gEventObjectPalette34, 0x100 + paletteNum * 16, 0x20);
LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20);
break;
case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL:
LoadPalette(gEventObjectPalette8, 0x100 + paletteNum * 16, 0x20);
LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20);
break;
case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
LoadPalette(gEventObjectPalette17, 0x100 + paletteNum * 16, 0x20);
LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20);
break;
}
}
@@ -886,8 +887,8 @@ static void PetalburgGymFunc(u8 a0, u16 a1)
}
for (i = 0; i < nDoors; i++)
{
MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | 0xc00);
MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | 0xc00);
MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | METATILE_COLLISION_MASK);
MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | METATILE_COLLISION_MASK);
}
DrawWholeMapView();
}
@@ -1099,7 +1100,7 @@ static void PCTurnOnEffect_1(s16 flag, s8 dx, s8 dy)
tileId = 0x27e;
}
}
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | 0xc00);
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
}
void DoPCTurnOffEffect(void)
@@ -1140,7 +1141,7 @@ static void PCTurnOffEffect(void)
{
tileId = 0x259;
}
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | 0xc00);
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
DrawWholeMapView();
}
@@ -1515,7 +1516,7 @@ bool8 FoundBlackGlasses(void)
void SetRoute119Weather(void)
{
if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE)
if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
{
SetSav1Weather(20);
}
@@ -1523,7 +1524,7 @@ void SetRoute119Weather(void)
void SetRoute123Weather(void)
{
if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE)
if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
{
SetSav1Weather(21);
}
@@ -1859,7 +1860,7 @@ void sub_8139B60(void)
void sub_8139C10(void)
{
sub_8198070(gUnknown_0203AB5E, TRUE);
ClearStdWindowAndFrameToTransparent(gUnknown_0203AB5E, TRUE);
RemoveWindow(gUnknown_0203AB5E);
}
@@ -1891,7 +1892,7 @@ static void sub_8139C80(u8 taskId)
{
for (x = 0; x < 3; x++)
{
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | 0xC00);
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -1901,7 +1902,7 @@ static void sub_8139C80(u8 taskId)
{
for (x = 0; x < 3; x++)
{
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | 0xC00);
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -2644,8 +2645,8 @@ static void sub_813A570(u8 taskId)
sub_813A738(taskId);
DestroyListMenuTask(task->data[14], NULL, NULL);
Free(gUnknown_0203AB64);
sub_8198070(task->data[13], 1);
FillWindowPixelBuffer(task->data[13], 0);
ClearStdWindowAndFrameToTransparent(task->data[13], 1);
FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0));
CopyWindowToVram(task->data[13], 2);
RemoveWindow(task->data[13]);
DestroyTask(taskId);
@@ -2889,7 +2890,7 @@ void sub_813A958(void)
void sub_813A988(void)
{
sub_8198070(gUnknown_0203AB6D, TRUE);
ClearStdWindowAndFrameToTransparent(gUnknown_0203AB6D, TRUE);
RemoveWindow(gUnknown_0203AB6D);
}
@@ -2941,7 +2942,7 @@ void sub_813AA18(void)
void sub_813AA44(void)
{
sub_8198070(gUnknown_0203AB6E, TRUE);
ClearStdWindowAndFrameToTransparent(gUnknown_0203AB6E, TRUE);
RemoveWindow(gUnknown_0203AB6E);
}
@@ -3000,7 +3001,7 @@ static void sub_813AA60(u16 a0, u16 a1)
if (a0 > 2 && a0 < 7)
{
FillWindowPixelRect(0, 0x11, 0, 0, 216, 32);
FillWindowPixelRect(0, PIXEL_FILL(1), 0, 0, 216, 32);
switch (a0)
{
case 3:
@@ -3139,7 +3140,7 @@ static void sub_813AD34(u8 a0, u16 a1)
if (a0 == 9 || a0 == 10)
{
FillWindowPixelRect(gUnknown_0203AB5E, 0x11, 0, 0, 96, 48);
FillWindowPixelRect(gUnknown_0203AB5E, PIXEL_FILL(1), 0, 0, 96, 48);
if (a0 == 10)
{
AddTextPrinterParameterized(gUnknown_0203AB5E, 1, gUnknown_085B3254[a1], 0, 1, 0, NULL);
@@ -3153,7 +3154,7 @@ static void sub_813AD34(u8 a0, u16 a1)
void sub_813ADB8(void)
{
sub_8198070(gUnknown_0203AB5E, TRUE);
ClearStdWindowAndFrameToTransparent(gUnknown_0203AB5E, TRUE);
RemoveWindow(gUnknown_0203AB5E);
}
@@ -3225,8 +3226,8 @@ void sub_813AF48(void)
struct Task *task = &gTasks[taskId];
DestroyListMenuTask(task->data[14], NULL, NULL);
Free(gUnknown_0203AB64);
sub_8198070(task->data[13], TRUE);
FillWindowPixelBuffer(task->data[13], 0);
ClearStdWindowAndFrameToTransparent(task->data[13], TRUE);
FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0));
ClearWindowTilemap(task->data[13]);
CopyWindowToVram(task->data[13], 2);
RemoveWindow(task->data[13]);
@@ -3378,7 +3379,7 @@ u16 get_unknown_box_id(void)
return gUnknown_0203AB6F;
}
bool32 sub_813B21C(void)
bool8 sub_813B21C(void)
{
if (FlagGet(FLAG_SYS_STORAGE_UNKNOWN_FLAG) == FALSE)
{
@@ -3420,40 +3421,59 @@ bool8 sub_813B260(void)
return FALSE;
}
void sub_813B2E4(void)
void CreateUnusualWeatherEvent(void)
{
u16 randomValue = Random();
VarSet(VAR_0x4038, 0);
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
{
VarSet(VAR_0x4037, (randomValue & 7) + 1);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
}
else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
{
VarSet(VAR_0x4037, (randomValue & 7) + 9);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
}
else if ((randomValue & 1) == 0)
{
randomValue = Random();
VarSet(VAR_0x4037, (randomValue & 7) + 1);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START);
}
else
{
randomValue = Random();
VarSet(VAR_0x4037, (randomValue & 7) + 9);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START);
}
}
bool32 sub_813B374(void)
// Saves the map name for the current unusual weather location in gStringVar1, then
// returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
bool32 GetUnusualWeatherMapNameAndType(void)
{
static const u8 gUnknown_085B3400[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
static const u8 sUnusualWeatherMapNumbers[] = {
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115),
MAP_NUM(ROUTE115),
MAP_NUM(ROUTE116),
MAP_NUM(ROUTE116),
MAP_NUM(ROUTE118),
MAP_NUM(ROUTE118),
MAP_NUM(ROUTE105),
MAP_NUM(ROUTE105),
MAP_NUM(ROUTE125),
MAP_NUM(ROUTE125),
MAP_NUM(ROUTE127),
MAP_NUM(ROUTE127),
MAP_NUM(ROUTE129),
MAP_NUM(ROUTE129)
};
u16 var = VarGet(VAR_0x4037);
u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
GetMapName(gStringVar1, gUnknown_085B3400[var - 1], 0);
GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0);
if (var < 9)
if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START)
{
return FALSE;
}
@@ -3463,21 +3483,39 @@ bool32 sub_813B374(void)
}
}
bool8 sub_813B3B0(void)
bool8 UnusualWeatherHasExpired(void)
{
static const u8 gUnknown_085B3410[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c };
// Duplicate array.
static const u8 sUnusualWeatherMapNumbers_2[] = {
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115),
MAP_NUM(ROUTE115),
MAP_NUM(ROUTE116),
MAP_NUM(ROUTE116),
MAP_NUM(ROUTE118),
MAP_NUM(ROUTE118),
MAP_NUM(ROUTE105),
MAP_NUM(ROUTE105),
MAP_NUM(ROUTE125),
MAP_NUM(ROUTE125),
MAP_NUM(ROUTE127),
MAP_NUM(ROUTE127),
MAP_NUM(ROUTE129),
MAP_NUM(ROUTE129)
};
u16 var1 = VarGet(VAR_0x4038);
u16 var2 = VarGet(VAR_0x4037);
u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER);
u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION);
if (!var2)
if (unusualWeather == UNUSUAL_WEATHER_NONE)
{
return FALSE;
}
if (++var1 > 999)
if (++steps > 999)
{
VarSet(VAR_0x4038, 0);
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0);
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE))
{
switch (gSaveBlock1Ptr->location.mapNum)
@@ -3487,7 +3525,7 @@ bool8 sub_813B3B0(void)
case MAP_NUM(MARINE_CAVE_END):
case MAP_NUM(TERRA_CAVE_ENTRANCE):
case MAP_NUM(TERRA_CAVE_END):
VarSet(VAR_0x4039, 1);
VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
return FALSE;
default:
break;
@@ -3502,34 +3540,34 @@ bool8 sub_813B3B0(void)
case MAP_NUM(UNDERWATER5):
case MAP_NUM(UNDERWATER6):
case MAP_NUM(UNDERWATER7):
VarSet(VAR_0x4039, 1);
VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1);
return FALSE;
default:
break;
}
}
if (gSaveBlock1Ptr->location.mapNum == gUnknown_085B3410[var2 - 1] &&
if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] &&
gSaveBlock1Ptr->location.mapGroup == 0)
{
return TRUE;
}
else
{
VarSet(VAR_0x4037, 0);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE);
return FALSE;
}
}
else
{
VarSet(VAR_0x4038, var1);
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps);
return FALSE;
}
}
void sub_813B484(void)
void Unused_SetWeatherSunny(void)
{
sub_80AB104(2);
SetCurrentAndNextWeather(WEATHER_SUNNY);
}
bool32 sub_813B490(void)
@@ -3576,7 +3614,7 @@ bool32 sub_813B4E0(void)
bool32 sub_813B514(void)
{
if (!VarGet(VAR_0x403F))
if (!VarGet(VAR_ALWAYS_ZERO_0x403F))
{
return FALSE;
}
src/field_weather.c
+8 -7
View File
@@ -186,11 +186,11 @@ void StartWeather(void)
}
}
void ChangeWeather(u8 weather)
void SetNextWeather(u8 weather)
{
if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY)
{
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
}
if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather)
@@ -203,18 +203,19 @@ void ChangeWeather(u8 weather)
gWeatherPtr->finishStep = 0;
}
void sub_80AB104(u8 weather)
void SetCurrentAndNextWeather(u8 weather)
{
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
gWeatherPtr->currWeather = weather;
gWeatherPtr->nextWeather = weather;
}
void sub_80AB130(u8 weather)
void SetCurrentAndNextWeatherNoDelay(u8 weather)
{
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
gWeatherPtr->currWeather = weather;
gWeatherPtr->nextWeather = weather;
// Overrides the normal delay during screen fading.
gWeatherPtr->readyForInit = TRUE;
}
@@ -1053,7 +1054,7 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect)
}
}
void PlayRainSoundEffect(void)
void PlayRainStoppingSoundEffect(void)
{
if (IsSpecialSEPlaying())
{
src/field_weather_effect.c
+52 -51
View File
@@ -16,8 +16,8 @@
void sub_80AC6B4(struct Sprite *);
// EWRAM
EWRAM_DATA static u8 gUnknown_02038BC4 = 0;
EWRAM_DATA static u16 gUnknown_02038BC6 = 0;
EWRAM_DATA static u8 gCurrentAlternatingWeather = 0;
EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
// CONST
const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal");
@@ -2286,13 +2286,14 @@ void unc_0807DAB4(struct Sprite *sprite)
//------------------------------------------------------------------------------
static void sub_80AEC94(u32 a0, u32 a1)
// Unused function.
static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1)
{
gUnknown_02038BC4 = a0;
gUnknown_02038BC6 = a1;
gCurrentAlternatingWeather = a0;
gUnusedWeatherRelated = a1;
}
static void sub_80AECA8(u8 taskId)
static void Task_DoAlternatingWeather(u8 taskId)
{
s16 *data = gTasks[taskId].data;
@@ -2301,8 +2302,8 @@ static void sub_80AECA8(u8 taskId)
case 0:
if (data[15]-- <= 0)
{
ChangeWeather(data[1]);
gUnknown_02038BC4 = data[1];
SetNextWeather(data[1]);
gCurrentAlternatingWeather = data[1];
data[15] = 600;
data[0]++;
}
@@ -2310,8 +2311,8 @@ static void sub_80AECA8(u8 taskId)
case 1:
if (data[15]-- <= 0)
{
ChangeWeather(data[2]);
gUnknown_02038BC4 = data[2];
SetNextWeather(data[2]);
gCurrentAlternatingWeather = data[2];
data[15] = 600;
data[0] = 0;
}
@@ -2319,25 +2320,25 @@ static void sub_80AECA8(u8 taskId)
}
}
static void sub_80AED28(void)
static void CreateAlternatingWeatherTask(void)
{
u8 taskId = CreateTask(sub_80AECA8, 0);
u8 taskId = CreateTask(Task_DoAlternatingWeather, 0);
s16 *data = gTasks[taskId].data;
data[15] = 600;
if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY)
if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY)
{
data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_RAIN_HEAVY;
}
else if (gUnknown_02038BC4 == WEATHER_DROUGHT)
else if (gCurrentAlternatingWeather == WEATHER_DROUGHT)
{
data[1] = WEATHER_RAIN_HEAVY;
data[2] = WEATHER_DROUGHT;
}
else
{
gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_RAIN_HEAVY;
}
@@ -2368,51 +2369,51 @@ void SetSav1WeatherFromCurrMapHeader(void)
void SetWeather(u32 weather)
{
SetSav1Weather(weather);
ChangeWeather(GetSav1Weather());
SetNextWeather(GetSav1Weather());
}
void SetWeather_Unused(u32 weather)
{
SetSav1Weather(weather);
sub_80AB104(GetSav1Weather());
SetCurrentAndNextWeather(GetSav1Weather());
}
void DoCurrentWeather(void)
{
u8 weather = GetSav1Weather();
if (weather == WEATHER_15)
if (weather == WEATHER_ALTERNATING)
{
if (!FuncIsActiveTask(sub_80AECA8))
sub_80AED28();
weather = gUnknown_02038BC4;
if (!FuncIsActiveTask(Task_DoAlternatingWeather))
CreateAlternatingWeatherTask();
weather = gCurrentAlternatingWeather;
}
else
{
if (FuncIsActiveTask(sub_80AECA8))
DestroyTask(FindTaskIdByFunc(sub_80AECA8));
gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
if (FuncIsActiveTask(Task_DoAlternatingWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
}
ChangeWeather(weather);
SetNextWeather(weather);
}
void sub_80AEE84(void)
void ResumePausedWeather(void)
{
u8 weather = GetSav1Weather();
if (weather == WEATHER_15)
if (weather == WEATHER_ALTERNATING)
{
if (!FuncIsActiveTask(sub_80AECA8))
sub_80AED28();
weather = gUnknown_02038BC4;
if (!FuncIsActiveTask(Task_DoAlternatingWeather))
CreateAlternatingWeatherTask();
weather = gCurrentAlternatingWeather;
}
else
{
if (FuncIsActiveTask(sub_80AECA8))
DestroyTask(FindTaskIdByFunc(sub_80AECA8));
gUnknown_02038BC4 = WEATHER_RAIN_HEAVY;
if (FuncIsActiveTask(Task_DoAlternatingWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather));
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY;
}
sub_80AB104(weather);
SetCurrentAndNextWeather(weather);
}
static const u8 sWeatherCycleRoute119[] =
@@ -2434,25 +2435,25 @@ static u8 TranslateWeatherNum(u8 weather)
{
switch (weather)
{
case WEATHER_NONE: return WEATHER_NONE;
case WEATHER_CLOUDS: return WEATHER_CLOUDS;
case WEATHER_SUNNY: return WEATHER_SUNNY;
case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT;
case WEATHER_SNOW: return WEATHER_SNOW;
case WEATHER_RAIN_MED: return WEATHER_RAIN_MED;
case WEATHER_FOG_1: return WEATHER_FOG_1;
case WEATHER_ASH: return WEATHER_ASH;
case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
case WEATHER_FOG_2: return WEATHER_FOG_2;
case WEATHER_FOG_3: return WEATHER_FOG_3;
case WEATHER_SHADE: return WEATHER_SHADE;
case WEATHER_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY;
case WEATHER_BUBBLES: return WEATHER_BUBBLES;
case WEATHER_15: return WEATHER_15;
case WEATHER_NONE: return WEATHER_NONE;
case WEATHER_CLOUDS: return WEATHER_CLOUDS;
case WEATHER_SUNNY: return WEATHER_SUNNY;
case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT;
case WEATHER_SNOW: return WEATHER_SNOW;
case WEATHER_RAIN_MED: return WEATHER_RAIN_MED;
case WEATHER_FOG_1: return WEATHER_FOG_1;
case WEATHER_ASH: return WEATHER_ASH;
case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
case WEATHER_FOG_2: return WEATHER_FOG_2;
case WEATHER_FOG_3: return WEATHER_FOG_3;
case WEATHER_SHADE: return WEATHER_SHADE;
case WEATHER_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY;
case WEATHER_BUBBLES: return WEATHER_BUBBLES;
case WEATHER_ALTERNATING: return WEATHER_ALTERNATING;
case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
default: return WEATHER_NONE;
default: return WEATHER_NONE;
}
}
src/fieldmap.c
+23 -22
View File
@@ -53,7 +53,7 @@ void InitMap(void)
{
InitMapLayoutData(&gMapHeader);
sub_80E8EE0(gMapHeader.events);
mapheader_run_script_with_tag_x1();
RunOnLoadMapScript();
}
void InitMapFromSavedGame(void)
@@ -62,7 +62,7 @@ void InitMapFromSavedGame(void)
sub_80E9238(0);
sub_80E8EE0(gMapHeader.events);
LoadSavedMapView();
mapheader_run_script_with_tag_x1();
RunOnLoadMapScript();
UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
}
@@ -383,15 +383,15 @@ u8 MapGridGetZCoordAt(int x, int y)
i = (x + 1) & 1;
i += ((y + 1) & 1) * 2;
block = gMapHeader.mapLayout->border[i];
block |= 0xc00;
block |= METATILE_COLLISION_MASK;
}
if (block == 0x3ff)
if (block == METATILE_ID_UNDEFINED)
{
return 0;
}
return block >> 12;
return block >> METATILE_ELEVATION_SHIFT;
}
u8 MapGridIsImpassableAt(int x, int y)
@@ -411,13 +411,13 @@ u8 MapGridIsImpassableAt(int x, int y)
i = (x + 1) & 1;
i += ((y + 1) & 1) * 2;
block = gMapHeader.mapLayout->border[i];
block |= 0xc00;
block |= METATILE_COLLISION_MASK;
}
if (block == 0x3ff)
if (block == METATILE_ID_UNDEFINED)
{
return 1;
}
return (block & 0xc00) >> 10;
return (block & METATILE_COLLISION_MASK) >> METATILE_COLLISION_SHIFT;
}
u32 MapGridGetMetatileIdAt(int x, int y)
@@ -439,18 +439,19 @@ u32 MapGridGetMetatileIdAt(int x, int y)
mapLayout = gMapHeader.mapLayout;
i = (x + 1) & 1;
i += ((y + 1) & 1) * 2;
block = mapLayout->border[i] | 0xc00;
block = mapLayout->border[i] | METATILE_COLLISION_MASK;
}
if (block == 0x3ff)
if (block == METATILE_ID_UNDEFINED)
{
border = gMapHeader.mapLayout->border;
j = (x + 1) & 1;
j += ((y + 1) & 1) * 2;
block2 = gMapHeader.mapLayout->border[j];
block2 |= 0xc00;
return block2 & block;
// This OR is completely pointless.
block2 |= METATILE_COLLISION_MASK;
return block2 & METATILE_ID_MASK;
}
return block & 0x3ff;
return block & METATILE_ID_MASK;
}
u32 MapGridGetMetatileBehaviorAt(int x, int y)
@@ -464,7 +465,7 @@ u8 MapGridGetMetatileLayerTypeAt(int x, int y)
{
u16 metatile;
metatile = MapGridGetMetatileIdAt(x, y);
return (GetBehaviorByMetatileId(metatile) & 0xf000) >> 12;
return (GetBehaviorByMetatileId(metatile) & METATILE_ELEVATION_MASK) >> METATILE_ELEVATION_SHIFT;
}
void MapGridSetMetatileIdAt(int x, int y, u16 metatile)
@@ -474,7 +475,7 @@ void MapGridSetMetatileIdAt(int x, int y, u16 metatile)
&& y >= 0 && y < gBackupMapLayout.height)
{
i = x + y * gBackupMapLayout.width;
gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & 0xf000) | (metatile & 0xfff);
gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & METATILE_ELEVATION_MASK) | (metatile & ~METATILE_ELEVATION_MASK);
}
}
@@ -654,7 +655,7 @@ int GetMapBorderIdAt(int x, int y)
i = gBackupMapLayout.width;
i *= y;
block = gBackupMapLayout.map[x + i];
if (block == 0x3ff)
if (block == METATILE_ID_UNDEFINED)
{
goto fail;
}
@@ -664,8 +665,8 @@ int GetMapBorderIdAt(int x, int y)
mapLayout = gMapHeader.mapLayout;
j = (x + 1) & 1;
j += ((y + 1) & 1) * 2;
block2 = 0xc00 | mapLayout->border[j];
if (block2 == 0x3ff)
block2 = METATILE_COLLISION_MASK | mapLayout->border[j];
if (block2 == METATILE_ID_UNDEFINED)
{
goto fail;
}
@@ -775,7 +776,7 @@ bool8 CameraMove(int x, int y)
old_y = gSaveBlock1Ptr->pos.y;
connection = sub_8088950(direction, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y);
sub_80887F8(connection, direction, x, y);
mliX_load_map(connection->mapGroup, connection->mapNum);
LoadMapFromCameraTransition(connection->mapGroup, connection->mapNum);
gCamera.active = TRUE;
gCamera.x = old_x - gSaveBlock1Ptr->pos.x;
gCamera.y = old_y - gSaveBlock1Ptr->pos.y;
@@ -921,9 +922,9 @@ void sub_8088B94(int x, int y, int a2)
if (x >= 0 && x < gBackupMapLayout.width && y >= 0 && y < gBackupMapLayout.height)
{
if (a2 != 0)
gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= 0xC00;
gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= METATILE_COLLISION_MASK;
else
gBackupMapLayout.map[x + gBackupMapLayout.width * y] &= 0xF3FF;
gBackupMapLayout.map[x + gBackupMapLayout.width * y] &= ~METATILE_COLLISION_MASK;
}
}
@@ -937,7 +938,7 @@ static bool8 SkipCopyingMetatileFromSavedMap(u16* mapMetatilePtr, u16 mapWidth,
else
mapMetatilePtr += mapWidth;
if (sub_80FADE4(*mapMetatilePtr & 0x3FF, yMode) == 1)
if (sub_80FADE4(*mapMetatilePtr & METATILE_ID_MASK, yMode) == 1)
return TRUE;
return FALSE;
}
src/fldeff_cut.c
-1
View File
@@ -20,7 +20,6 @@
#include "constants/field_effects.h"
#include "constants/songs.h"
extern void ScriptUnfreezeEventObjects(void);
extern bool8 IsMewPlayingHideAndSeek(void);
extern struct MapPosition gPlayerFacingPosition;
src/fldeff_escalator.c
+7 -7
View File
@@ -7,7 +7,7 @@
static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0;
static void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
static void sub_80E12E8(u8 taskId, const s16 *list, u16 isImpassableFlag)
{
s16 r5 = gTasks[taskId].data[4] - 1;
s16 r3 = gTasks[taskId].data[5] - 1;
@@ -26,9 +26,9 @@ static void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
if (list[r4] == metatileId)
{
if (r4 != 2)
MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]);
MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[r4 + 1]);
else
MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]);
MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[0]);
}
}
}
@@ -44,9 +44,9 @@ static void sub_80E12E8(u8 taskId, const s16 *list, u16 c)
if (list[2 - r4] == metatileId)
{
if (r4 != 2)
MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]);
MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[1 - r4]);
else
MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]);
MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[2]);
}
}
}
@@ -76,13 +76,13 @@ static void sub_80E1444(u8 taskId)
sub_80E12E8(taskId, gUnknown_08589AC0, 0);
break;
case 2:
sub_80E12E8(taskId, gUnknown_08589AC6, 0xC00);
sub_80E12E8(taskId, gUnknown_08589AC6, METATILE_COLLISION_MASK);
break;
case 3:
sub_80E12E8(taskId, gUnknown_08589ACC, 0);
break;
case 4:
sub_80E12E8(taskId, gUnknown_08589AD2, 0xC00);
sub_80E12E8(taskId, gUnknown_08589AD2, METATILE_COLLISION_MASK);
break;
case 5:
sub_80E12E8(taskId, gUnknown_08589AD8, 0);
src/fldeff_misc.c
+5 -5
View File
@@ -1126,7 +1126,7 @@ void GetShieldToyTVDecorationInfo(void)
if (!VarGet(VAR_CURRENT_SECRET_BASE))
return;
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x10);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x10);
break;
case 734:
ConvertIntToDecimalStringN(gStringVar1, 50, STR_CONV_MODE_LEFT_ALIGN, 2);
@@ -1137,7 +1137,7 @@ void GetShieldToyTVDecorationInfo(void)
if (!VarGet(VAR_CURRENT_SECRET_BASE))
return;
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x20);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x20);
break;
case 756:
gSpecialVar_Result = 1;
@@ -1145,7 +1145,7 @@ void GetShieldToyTVDecorationInfo(void)
if (!VarGet(VAR_CURRENT_SECRET_BASE))
return;
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
break;
case 757:
gSpecialVar_Result = 2;
@@ -1153,7 +1153,7 @@ void GetShieldToyTVDecorationInfo(void)
if (!VarGet(VAR_CURRENT_SECRET_BASE))
return;
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
break;
case 758:
gSpecialVar_Result = 3;
@@ -1161,7 +1161,7 @@ void GetShieldToyTVDecorationInfo(void)
if (!VarGet(VAR_CURRENT_SECRET_BASE))
return;
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80);
break;
}
}
src/fldeff_softboiled.c
+1 -1
View File
@@ -86,7 +86,7 @@ static void sub_8161724(u8 taskId)
sub_81B0FCC(gUnknown_0203CEC8.unk9, 0);
gUnknown_0203CEC8.unk9 = gUnknown_0203CEC8.unkA;
sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
sub_8198070(0x6, FALSE);
ClearStdWindowAndFrameToTransparent(0x6, FALSE);
ClearWindowTilemap(0x6);
display_pokemon_menu_message(0);
gTasks[taskId].func = sub_81B1370;
src/flying.c
+1349 -60
View File
File diff suppressed because it is too large Load Diff
src/frontier_pass.c
+4 -4
View File
@@ -1090,7 +1090,7 @@ static void ShowAndPrintWindows(void)
for (i = 0; i < WINDOW_COUNT; i++)
{
PutWindowTilemap(i);
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
}
x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 96);
@@ -1116,7 +1116,7 @@ static void ShowAndPrintWindows(void)
static void PrintAreaDescription(u8 cursorArea)
{
FillWindowPixelBuffer(WINDOW_DESCRIPTION, 0);
FillWindowPixelBuffer(WINDOW_DESCRIPTION, PIXEL_FILL(0));
if (cursorArea == CURSOR_AREA_RECORD && !sPassData->hasBattleRecord)
AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[0]);
else if (cursorArea != CURSOR_AREA_NOTHING)
@@ -1656,7 +1656,7 @@ static void PrintOnFrontierMap(void)
for (i = 0; i < MAP_WINDOW_COUNT; i++)
{
PutWindowTilemap(i);
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
}
for (i = 0; i < NUM_FRONTIER_FACILITIES; i++)
@@ -1698,7 +1698,7 @@ static void HandleFrontierMapCursorMove(u8 direction)
StartSpriteAnim(sMapData->mapIndicatorSprite, sMapLandmarks[sMapData->cursorPos].animNum);
sMapData->mapIndicatorSprite->pos1.x = sMapLandmarks[sMapData->cursorPos].x;
sMapData->mapIndicatorSprite->pos1.y = sMapLandmarks[sMapData->cursorPos].y;
FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, 0);
FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PIXEL_FILL(0));
AddTextPrinterParameterized3(MAP_WINDOW_DESCRIPTION, 1, 4, 0, sTextColors[0], 0, sMapLandmarks[sMapData->cursorPos].description);
for (i = 0; i < 3; i++)
src/frontier_util.c
+20 -23
View File
@@ -35,8 +35,7 @@
#include "constants/moves.h"
#include "constants/items.h"
#include "constants/event_objects.h"
extern u8 gSelectedOrderFromParty[];
#include "party_menu.h"
struct FrontierBrainMon
{
@@ -48,8 +47,6 @@ struct FrontierBrainMon
u16 moves[4];
};
extern void sub_81B8558(void);
// This file's functions.
static void sub_81A17A0(void);
static void sub_81A1830(void);
@@ -1044,8 +1041,8 @@ static void TowerPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x
static void ShowTowerResultsWindow(u8 battleMode)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
if (battleMode == FRONTIER_MODE_SINGLES)
StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults);
else if (battleMode == FRONTIER_MODE_DOUBLES)
@@ -1115,8 +1112,8 @@ static void DomePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2
static void ShowDomeResultsWindow(u8 battleMode)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
if (battleMode == FRONTIER_MODE_SINGLES)
StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults);
else
@@ -1191,8 +1188,8 @@ static void PalacePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8
static void ShowPalaceResultsWindow(u8 battleMode)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
if (battleMode == FRONTIER_MODE_SINGLES)
StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults);
else
@@ -1247,8 +1244,8 @@ static void PikePrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
static void ShowPikeResultsWindow(void)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults);
PrintAligned(gStringVar4, 0);
AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 33, TEXT_SPEED_FF, NULL);
@@ -1309,8 +1306,8 @@ static void ArenaPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
static void ShowArenaResultsWindow(void)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
PrintHyphens(10);
StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults);
PrintAligned(gStringVar4, 2);
@@ -1395,8 +1392,8 @@ static void FactoryPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8
static void ShowFactoryResultsWindow(u8 battleMode)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
if (battleMode == FRONTIER_MODE_SINGLES)
StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults);
else
@@ -1460,8 +1457,8 @@ static void PyramidPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y)
static void ShowPyramidResultsWindow(void)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C74);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults);
PrintAligned(gStringVar4, 2);
AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 49, TEXT_SPEED_FF, NULL);
@@ -1483,8 +1480,8 @@ static void ShowLinkContestResultsWindow(void)
s32 x;
gRecordsWindowId = AddWindow(&gUnknown_08611C7C);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
StringExpandPlaceholders(gStringVar4, gText_LinkContestResults);
x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
@@ -2353,8 +2350,8 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode)
void ShowRankingHallRecordsWindow(void)
{
gRecordsWindowId = AddWindow(&gUnknown_08611C84);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_50);
PutWindowTilemap(gRecordsWindowId);
CopyWindowToVram(gRecordsWindowId, 3);
@@ -2362,7 +2359,7 @@ void ShowRankingHallRecordsWindow(void)
void ScrollRankingHallRecordsWindow(void)
{
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_OPEN);
CopyWindowToVram(gRecordsWindowId, 2);
}
src/graphics.c
+7 -7
View File
@@ -1152,16 +1152,16 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa
const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz");
const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz");
const u32 gUnknown_08D97BEC[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz");
const u32 gMoveSelectorBitmap[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz");
const u32 gUnknown_08D97CF4[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz");
const u32 gUnknown_08D97D0C[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz");
const u32 gUnknown_08D9853C[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz");
const u32 gUnknown_08D9862C[] = INCBIN_U32("graphics/interface/status_screen.bin.lz");
const u32 gStatusScreenBitmap[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz");
const u32 gStatusScreenPalette[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz");
const u32 gPageInfoTilemap[] = INCBIN_U32("graphics/interface/status_screen.bin.lz");
const u32 gUnknown_08D987FC[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz");
const u32 gUnknown_08D9898C[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz");
const u32 gUnknown_08D98B28[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz");
const u32 gPageSkillsTilemap[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz");
const u32 gPageBattleMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz");
const u32 gPageContestMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz");
const u32 gUnknown_08D98CC8[] = INCBIN_U32("graphics/interface/status_tilemap0.bin.lz");
const u32 gBagMaleTiles[] = INCBIN_U32("graphics/misc/bag_male.4bpp.lz");
src/hall_of_fame.c
+9 -11
View File
@@ -66,8 +66,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
#define HALL_OF_FAME_MAX_TEAMS 50
extern void ReturnFromHallOfFamePC(void);
// this file's functions
static void ClearVramOamPltt_LoadHofPal(void);
static void sub_8174F70(void);
@@ -490,7 +488,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
}
*lastSavedTeam = *sHofMonPtr;
NewMenuHelpers_DrawDialogueFrame(0, 0);
DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_TrySaveData;
@@ -570,7 +568,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
gSprites[spriteId].tSpecies = currMon->species;
gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate;
gTasks[taskId].tMonSpriteId(currMonId) = spriteId;
sub_8197434(0, TRUE);
ClearDialogWindowAndFrame(0, TRUE);
gTasks[taskId].func = Task_Hof_PrintMonInfoAfterAnimating;
}
@@ -649,7 +647,7 @@ static void sub_8173DC0(u8 taskId)
gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1;
}
BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24));
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
CopyWindowToVram(0, 3);
gTasks[taskId].tFrameCount = 7;
gTasks[taskId].func = sub_8173EA4;
@@ -697,7 +695,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
{
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2);
NewMenuHelpers_DrawDialogueFrame(0, 0);
DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
@@ -1066,7 +1064,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{
sub_8198180(gText_UnkCtrlF800Exit, 8, TRUE);
NewMenuHelpers_DrawDialogueFrame(0, 0);
DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
@@ -1086,7 +1084,7 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId)
static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
{
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0);
AddTextPrinterParameterized3(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF);
CopyWindowToVram(0, 3);
@@ -1099,7 +1097,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
s32 dexNumber;
s32 width;
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0);
// dex number
@@ -1180,9 +1178,9 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
u32 width;
u16 trainerId;
FillWindowPixelBuffer(1, 0x11);
FillWindowPixelBuffer(1, PIXEL_FILL(1));
PutWindowTilemap(1);
SetWindowBorderStyle(1, FALSE, 0x21D, 0xD);
DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized3(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name);
width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70);
src/hof_pc.c
-4
View File
@@ -7,10 +7,6 @@
#include "script_menu.h"
#include "task.h"
extern void Overworld_PlaySpecialMapMusic(void);
extern bool16 ScrSpecial_CreatePCMenu(void);
extern void ScriptMenu_DisplayPCStartupPrompt(void);
static void ReshowPCMenuAfterHallOfFamePC(void);
static void Task_WaitForPaletteFade(u8);
src/ice.c
+23 -24
View File
@@ -21,30 +21,29 @@ struct HailStruct {
};
static void sub_810B6C4(struct Sprite *);
extern void sub_810B848(struct Sprite *);
extern void AnimIcePunchSwirlingParticle(struct Sprite *);
extern void AnimIceBeamParticle(struct Sprite *);
extern void AnimIceEffectParticle(struct Sprite *);
extern void AnimFlickerIceEffectParticle(struct Sprite *);
extern void AnimSwirlingSnowball_Step1(struct Sprite *);
extern void AnimSwirlingSnowball_Step2(struct Sprite *);
extern void AnimSwirlingSnowball_Step3(struct Sprite *);
extern void AnimSwirlingSnowball_End(struct Sprite *);
extern void AnimMoveParticleBeyondTarget(struct Sprite *);
extern void AnimWiggleParticleTowardsTarget(struct Sprite *);
extern void AnimWaveFromCenterOfTarget(struct Sprite *);
extern void InitSwirlingFogAnim(struct Sprite *);
extern void AnimSwirlingFogAnim(struct Sprite *);
extern void AnimThrowMistBall(struct Sprite *);
extern void InitPoisonGasCloudAnim(struct Sprite *);
extern void MovePoisonGasCloud(struct Sprite *);
extern void AnimHailBegin(struct Sprite *);
extern void AnimHailContinue(struct Sprite *);
extern void sub_80A8EE4(struct Sprite *);
extern void InitIceBallAnim(struct Sprite *);
extern void AnimThrowIceBall(struct Sprite *);
extern void InitIceBallParticle(struct Sprite *);
extern void AnimIceBallParticle(struct Sprite *);
void sub_810B848(struct Sprite *);
void AnimIcePunchSwirlingParticle(struct Sprite *);
void AnimIceBeamParticle(struct Sprite *);
void AnimIceEffectParticle(struct Sprite *);
void AnimFlickerIceEffectParticle(struct Sprite *);
void AnimSwirlingSnowball_Step1(struct Sprite *);
void AnimSwirlingSnowball_Step2(struct Sprite *);
void AnimSwirlingSnowball_Step3(struct Sprite *);
void AnimSwirlingSnowball_End(struct Sprite *);
void AnimMoveParticleBeyondTarget(struct Sprite *);
void AnimWiggleParticleTowardsTarget(struct Sprite *);
void AnimWaveFromCenterOfTarget(struct Sprite *);
void InitSwirlingFogAnim(struct Sprite *);
void AnimSwirlingFogAnim(struct Sprite *);
void AnimThrowMistBall(struct Sprite *);
void InitPoisonGasCloudAnim(struct Sprite *);
void MovePoisonGasCloud(struct Sprite *);
void AnimHailBegin(struct Sprite *);
void AnimHailContinue(struct Sprite *);
void InitIceBallAnim(struct Sprite *);
void AnimThrowIceBall(struct Sprite *);
void InitIceBallParticle(struct Sprite *);
void AnimIceBallParticle(struct Sprite *);
void AnimTask_Haze2(u8);
void AnimTask_OverlayFogTiles(u8);
void AnimTask_Hail2(u8);
src/item.c
+2 -2
View File
@@ -539,8 +539,8 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
if (CurrentMapIsSecretBase() == TRUE)
{
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x200);
VarSet(VAR_0x40ED, itemId);
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x200);
VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, itemId);
}
var = GetItemListPosition(pocket);
src/item_menu.c
+21 -21
View File
@@ -8,6 +8,7 @@
#include "bg.h"
#include "constants/items.h"
#include "constants/songs.h"
#include "data2.h"
#include "decompress.h"
#include "event_data.h"
#include "event_object_movement.h"
@@ -140,7 +141,6 @@ void unknown_ItemMenu_Confirm2(u8 taskId);
void unknown_item_menu_type(u8 taskId);
void item_menu_type_2(u8 taskId);
void display_sell_item_ask_str(u8 taskId);
void unknown_ItemMenu_Confirm(u8 taskId);
void display_deposit_item_ask_str(u8 taskId);
void item_menu_type_b(u8 taskId);
void BagMenuActuallyToss(u8 taskId);
@@ -446,7 +446,6 @@ EWRAM_DATA u16 gSpecialVar_ItemId = 0;
static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0;
extern u8 *const gPocketNamesStringsTable[];
extern const u8 gMoveNames[][0xD];
extern u8* gReturnToXStringsTable[];
extern const u8 EventScript_2736B3[];
extern const u16 gUnknown_0860F074[];
@@ -476,7 +475,7 @@ void CB2_ChooseBerry(void)
GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
}
void sub_81AABF0(void(*callback)(void))
void sub_81AABF0(void (*callback)(void))
{
GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
}
@@ -884,7 +883,7 @@ void bag_menu_print_description_box_text(int a)
StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1);
str = gStringVar4;
}
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, str, 3, 1, 0, 0, 0, 0);
}
@@ -896,7 +895,7 @@ void bag_menu_print_cursor_(u8 a, u8 b)
void bag_menu_print_cursor(u8 a, u8 b)
{
if (b == 0xFF)
FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
FillWindowPixelRect(0, PIXEL_FILL(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
else
bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b);
@@ -1028,7 +1027,7 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u
s16* data = gTasks[taskId].data;
data[10] = AddItemMessageWindow(4);
FillWindowPixelBuffer(data[10], 17);
FillWindowPixelBuffer(data[10], PIXEL_FILL(1));
DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback);
schedule_bg_copy_tilemap_to_vram(1);
}
@@ -1293,7 +1292,7 @@ void bag_menu_swap_items(u8 taskId)
gUnknown_0203CE54->unk81A = data[1];
CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
sub_80D4FEC(data[1]);
sub_81AB89C();
@@ -1505,7 +1504,7 @@ void sub_81AC644(u8 unused)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
}
if (gUnknown_0203CE54->unk828 == 1)
@@ -1646,7 +1645,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId)
bag_menu_print_there_is_no_pokemon(taskId);
else
{
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
schedule_bg_copy_tilemap_to_vram(0);
if (gUnknown_0203CE58.pocket != BERRIES_POCKET)
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
@@ -1670,7 +1669,7 @@ void ItemMenu_Toss(u8 taskId)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
sub_81ABC3C(7);
gTasks[taskId].func = Task_ChooseHowManyToToss;
@@ -1684,7 +1683,7 @@ void BagMenuConfirmToss(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3);
StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
bag_menu_yes_no(taskId, 5, &gUnknown_08614084);
}
@@ -1727,7 +1726,7 @@ void BagMenuActuallyToss(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
gTasks[taskId].func = Task_ActuallyToss;
}
@@ -2043,7 +2042,7 @@ void display_deposit_item_ask_str(u8 taskId)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
sub_81ABC3C(7);
gTasks[taskId].func = sub_81ADA7C;
@@ -2078,7 +2077,7 @@ void sub_81ADB14(u8 taskId)
{
s16* data = gTasks[taskId].data;
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
if (ItemId_GetImportance(gSpecialVar_ItemId))
{
bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0);
@@ -2244,7 +2243,7 @@ void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2)
window.width = 16;
window.height = 2;
windowId = AddWindow(&window);
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40);
bag_menu_print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1);
if (pocketName2)
@@ -2283,7 +2282,7 @@ void setup_bag_menu_textboxes(void)
LoadPalette(&gUnknown_0860F074, 0xF0, 0x20);
for (i = 0; i < 3; i++)
{
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
PutWindowTilemap(i);
}
schedule_bg_copy_tilemap_to_vram(0);
@@ -2306,7 +2305,7 @@ u8 bag_menu_add_window(u8 a)
if (*ptr == 0xFF)
{
*ptr = AddWindow(&gUnknown_086141AC[a]);
SetWindowBorderStyle(*ptr, 0, 1, 14);
DrawStdFrameWithCustomTileAndPalette(*ptr, 0, 1, 14);
schedule_bg_copy_tilemap_to_vram(1);
}
return *ptr;
@@ -2317,7 +2316,7 @@ void bag_menu_remove_window(u8 a)
u8 *ptr = &gUnknown_0203CE54->windowPointers[a];
if (*ptr != 0xFF)
{
sub_8198070(*ptr, 0);
ClearStdWindowAndFrameToTransparent(*ptr, 0);
ClearWindowTilemap(*ptr);
RemoveWindow(*ptr);
schedule_bg_copy_tilemap_to_vram(1);
@@ -2338,7 +2337,8 @@ void bag_menu_RemoveBagItem_message_window(u8 a)
u8 *ptr = &gUnknown_0203CE54->windowPointers[a];
if (*ptr != 0xFF)
{
sub_8197DF8(*ptr, 0);
ClearDialogWindowAndFrameToTransparent(*ptr, FALSE);
// This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it.
ClearWindowTilemap(*ptr);
RemoveWindow(*ptr);
schedule_bg_copy_tilemap_to_vram(1);
@@ -2366,7 +2366,7 @@ void bag_menu_remove_money_window(void)
void bag_menu_prepare_tmhm_move_window(void)
{
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
blit_move_info_icon(3, 19, 0, 0);
blit_move_info_icon(3, 20, 0, 12);
blit_move_info_icon(3, 21, 0, 24);
@@ -2380,7 +2380,7 @@ void PrintTMHMMoveData(u16 itemId)
u16 moveId;
const u8* text;
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
if (itemId == ITEM_NONE)
{
for (i = 0; i < 4; i++)
src/item_use.c
+11 -25
View File
@@ -8,13 +8,15 @@
#include "coins.h"
#include "data2.h"
#include "event_data.h"
#include "fieldmap.h"
#include "event_object_movement.h"
#include "fieldmap.h"
#include "field_effect.h"
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_weather.h"
#include "item.h"
#include "item_menu.h"
#include "item_use.h"
#include "mail.h"
#include "main.h"
#include "menu.h"
@@ -37,31 +39,15 @@
#include "constants/items.h"
#include "constants/songs.h"
#include "constants/vars.h"
#include "event_obj_lock.h"
extern void unknown_ItemMenu_Confirm(u8 taskId);
extern void sub_81C5B14(u8 taskId);
extern void ScriptUnfreezeEventObjects(void);
extern void ItemUseOutOfBattle_TMHM(u8 a);
extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
extern bool8 IsPlayerFacingSurfableFishableWater(void);
extern bool8 sub_81221AC(void);
extern u8 Route102_EventScript_274482[];
extern u8 Route102_EventScript_2744C0[];
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
extern int sub_80247BC(void);
extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection);
extern void SetUpItemUseCallback(u8 taskId);
extern void ItemUseCB_Medicine(u8, TaskFunc);
extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
extern void sub_81C5924(void);
extern void sub_81C59BC(void);
extern void sub_81AB9A8(u8);
extern void StartEscapeRopeFieldEffect(void);
extern u8* sub_806CF78(u16);
extern void sub_81B89F0(void);
extern u8 GetItemEffectType(u16);
extern struct MapConnection *sub_8088A8C(s16, s16);
extern s32 sub_80247BC(void);
void SetUpItemUseCallback(u8 taskId);
void MapPostLoadHook_UseItem(void);
void sub_80AF6D4(void);
void Task_CallItemUseOnFieldCallback(u8 taskId);
@@ -188,7 +174,7 @@ void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemO
void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
DestroyTask(taskId);
ScriptUnfreezeEventObjects();
ScriptContext2_Disable();
@@ -350,7 +336,7 @@ void sub_80FD504(u8 taskId)
void sub_80FD5CC(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
ScriptUnfreezeEventObjects();
ScriptContext2_Disable();
DestroyTask(taskId);
@@ -404,12 +390,12 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
{
struct MapHeader *mapHeader;
u16 localX, localY;
u32 localOffset;
s32 localLength;
mapHeader = mapconnection_get_mapheader(connection);
struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection);
switch (connection->direction)
{
src/learn_move.c
+3 -3
View File
@@ -498,7 +498,7 @@ static void LearnMoveMain(void)
case 27:
if (!sub_81D2C3C())
{
FillWindowPixelBuffer(3, 0x11);
FillWindowPixelBuffer(3, PIXEL_FILL(1));
if (sLearnMoveStruct2.showContestInfo == FALSE)
{
sLearnMoveStruct->state = 3;
@@ -631,7 +631,7 @@ static void HideSpritesAndPrintTeachText(bool8 a)
if (!a)
{
StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn);
FillWindowPixelBuffer(3, 0x11);
FillWindowPixelBuffer(3, PIXEL_FILL(1));
AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL);
}
}
@@ -695,7 +695,7 @@ static void ShowTeachMoveText(bool8 showContest)
if (showContest == FALSE)
{
StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn);
FillWindowPixelBuffer(3, 0x11);
FillWindowPixelBuffer(3, PIXEL_FILL(1));
AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL);
}
}
src/lilycove_lady.c
+3 -3
View File
@@ -695,7 +695,7 @@ u8 sub_818E2D8(void)
void sub_818E2FC(void)
{
easy_chat_input_maybe();
ShowEasyChatScreen();
}
bool8 sub_818E308(void)
@@ -763,8 +763,8 @@ void sub_818E430(void)
void sub_818E47C(void)
{
gSpecialVar_0x8004 = 0x11;
easy_chat_input_maybe();
gSpecialVar_0x8004 = EASY_CHAT_TYPE_QUIZ_SET_QUESTION;
ShowEasyChatScreen();
}
void sub_818E490(void)
src/link.c
+20 -18
View File
@@ -28,7 +28,7 @@
#include "link.h"
#include "link_rfu.h"
extern u16 gUnknown_03005DA8;
extern u16 gHeldKeyCodeToSend;
// Static type declarations
@@ -302,9 +302,9 @@ void LinkTestScreen(void)
SetMainCallback2(CB2_LinkTest);
}
void sub_8009628(u8 a0)
void SetLocalLinkPlayerId(u8 playerId)
{
gLocalLinkPlayer.id = a0;
gLocalLinkPlayer.id = playerId;
}
static void InitLocalLinkPlayer(void)
@@ -695,12 +695,12 @@ static void BuildSendCmd(u16 command)
gSendCmd[0] = LINKCMD_0x5566;
break;
case LINKCMD_SEND_HELD_KEYS_2:
if (gUnknown_03005DA8 == 0 || gLinkTransferringData)
if (gHeldKeyCodeToSend == 0 || gLinkTransferringData)
{
break;
}
gSendCmd[0] = LINKCMD_SEND_HELD_KEYS_2;
gSendCmd[1] = gUnknown_03005DA8;
gSendCmd[1] = gHeldKeyCodeToSend;
break;
}
}
@@ -714,11 +714,11 @@ void sub_8009F18(void)
gLinkCallback = sub_8009F70;
}
bool32 sub_8009F3C(void)
bool32 IsSendingKeysToLink(void)
{
if (gWirelessCommType)
{
return sub_800F7E4();
return IsSendingKeysToRfu();
}
if (gLinkCallback == sub_8009F70)
{
@@ -1142,7 +1142,7 @@ void ResetBlockReceivedFlag(u8 who)
}
}
void sub_800A620(void)
void CheckShouldAdvanceLinkState(void)
{
if ((gLinkStatus & LINK_STAT_MASTER) && EXTRACT_PLAYER_COUNT(gLinkStatus) > 1)
{
@@ -1327,7 +1327,9 @@ void sub_800AA04(u8 a0)
}
}
u8 sub_800AA48(void)
// The number of players when trading began. This is frequently compared against the
// current number of connected players to check if anyone dropped out.
u8 GetSavedPlayerCount(void)
{
return gSavedLinkPlayerCount;
}
@@ -1683,8 +1685,8 @@ static void sub_800B080(void)
CopyToBgTilemapBuffer(1, gWirelessLinkDisplayTilemap, 0, 0);
CopyBgTilemapBufferToVram(1);
LoadPalette(gWirelessLinkDisplayPal, 0, 0x20);
FillWindowPixelBuffer(0, 0x00);
FillWindowPixelBuffer(2, 0x00);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized3(0, 3, 2, 6, gUnknown_082ED224, 0, gText_CommErrorEllipsis);
AddTextPrinterParameterized3(2, 3, 2, 1, gUnknown_082ED224, 0, gText_MoveCloserToLinkPartner);
PutWindowTilemap(0);
@@ -1696,8 +1698,8 @@ static void sub_800B080(void)
static void sub_800B138(void)
{
LoadBgTiles(0, g2BlankTilesGfx, 0x20, 0);
FillWindowPixelBuffer(1, 0x00);
FillWindowPixelBuffer(2, 0x00);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized3(1, 3, 2, 0, gUnknown_082ED224, 0, gText_CommErrorCheckConnections);
PutWindowTilemap(1);
PutWindowTilemap(2);
@@ -1849,7 +1851,7 @@ bool8 HandleLinkConnection(void)
r5 = sub_8010F1C();
if (sub_808766C() == TRUE)
{
if (r4 == TRUE || sub_800F0B8() || r5)
if (r4 == TRUE || IsRfuRecvQueueEmpty() || r5)
{
return TRUE;
}
@@ -1882,18 +1884,18 @@ void sub_800B4C0(void)
}
}
u32 sub_800B4DC(void)
u32 GetLinkRecvQueueLength(void)
{
if (gWirelessCommType != 0)
{
return sub_80124D4();
return GetRfuRecvQueueLength();
}
return gLink.recvQueue.count;
}
bool8 sub_800B504(void)
bool32 sub_800B504(void)
{
if (sub_800B4DC() > 2)
if (GetLinkRecvQueueLength() > 2)
{
return TRUE;
}

Some files were not shown because too many files have changed in this diff Show More