summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/easy_chat.h61
-rw-r--r--include/constants/global.h1
-rw-r--r--include/constants/items.h4
-rw-r--r--include/constants/pokemon.h2
-rw-r--r--include/dewford_trend.h2
-rw-r--r--include/easy_chat.h102
-rw-r--r--include/global.h2
-rw-r--r--include/graphics.h46
-rw-r--r--include/international_string_util.h4
-rwxr-xr-xinclude/mevent.h4
-rw-r--r--include/palette.h4
-rw-r--r--include/player_pc.h2
-rw-r--r--include/pokemon_icon.h6
-rw-r--r--include/script.h2
-rw-r--r--include/task.h1
15 files changed, 147 insertions, 96 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index 8e82cfef0..069f17fcb 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -28,29 +28,29 @@
#define EASY_CHAT_PERSON_BOY 2
#define EASY_CHAT_PERSON_DISPLAY_NONE 3
-#define EC_GROUP_POKEMON 0x0
-#define EC_GROUP_TRAINER 0x1
-#define EC_GROUP_STATUS 0x2
-#define EC_GROUP_BATTLE 0x3
-#define EC_GROUP_GREETINGS 0x4
-#define EC_GROUP_PEOPLE 0x5
-#define EC_GROUP_VOICES 0x6
-#define EC_GROUP_SPEECH 0x7
-#define EC_GROUP_ENDINGS 0x8
-#define EC_GROUP_FEELINGS 0x9
-#define EC_GROUP_CONDITIONS 0xa
-#define EC_GROUP_ACTIONS 0xb
-#define EC_GROUP_LIFESTYLE 0xc
-#define EC_GROUP_HOBBIES 0xd
-#define EC_GROUP_TIME 0xe
-#define EC_GROUP_MISC 0xf
-#define EC_GROUP_ADJECTIVES 0x10
-#define EC_GROUP_EVENTS 0x11
-#define EC_GROUP_MOVE_1 0x12
-#define EC_GROUP_MOVE_2 0x13
-#define EC_GROUP_TRENDY_SAYING 0x14
-#define EC_GROUP_POKEMON_2 0x15
-#define EC_NUM_GROUPS 0x16
+#define EC_GROUP_POKEMON 0
+#define EC_GROUP_TRAINER 1
+#define EC_GROUP_STATUS 2
+#define EC_GROUP_BATTLE 3
+#define EC_GROUP_GREETINGS 4
+#define EC_GROUP_PEOPLE 5
+#define EC_GROUP_VOICES 6
+#define EC_GROUP_SPEECH 7
+#define EC_GROUP_ENDINGS 8
+#define EC_GROUP_FEELINGS 9
+#define EC_GROUP_CONDITIONS 10
+#define EC_GROUP_ACTIONS 11
+#define EC_GROUP_LIFESTYLE 12
+#define EC_GROUP_HOBBIES 13
+#define EC_GROUP_TIME 14
+#define EC_GROUP_MISC 15
+#define EC_GROUP_ADJECTIVES 16
+#define EC_GROUP_EVENTS 17
+#define EC_GROUP_MOVE_1 18
+#define EC_GROUP_MOVE_2 19
+#define EC_GROUP_TRENDY_SAYING 20
+#define EC_GROUP_POKEMON_NATIONAL 21
+#define EC_NUM_GROUPS 22
// TRAINER
#define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0
@@ -1105,13 +1105,22 @@
#define PHRASE_COOL_LATIOS 4
#define PHRASE_SUPER_HUSTLE 5
+#define EC_NUM_ALPHABET_GROUPS 27 // 26 (1 for each letter) + 1 (Others)
+
+#define EC_MAX_WORDS_IN_GROUP 270 // The closest is words by letter S, at 262
+
+#define EC_MASK_GROUP 0x7F
+#define EC_MASK_INDEX 0x1FF
+
#define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
-#define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
+#define EC_POKEMON_NATIONAL(mon) ((EC_GROUP_POKEMON_NATIONAL << 9) | SPECIES_##mon)
#define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move)
#define EC_MOVE2(move) ((EC_GROUP_MOVE_2 << 9) | MOVE_##move)
#define EC_GROUP(word) ((word) >> 9)
-#define EC_INDEX(word) ((word) & 0x1FF)
-#define EC_WORD(group, index) ((((group) & 0x7F) << 9) | ((index) & 0x1FF))
+#define EC_INDEX(word) ((word) & EC_MASK_INDEX)
+#define EC_WORD(group, index) ((((group) & EC_MASK_GROUP) << 9) | ((index) & EC_MASK_INDEX))
+
+#define EC_EMPTY_WORD 0xFFFF
#endif // GUARD_CONSTANTS_EASY_CHAT_H
diff --git a/include/constants/global.h b/include/constants/global.h
index d8dad0f45..213ccca5b 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -84,6 +84,7 @@
#define MAIL_WORDS_COUNT 9
#define EASY_CHAT_BATTLE_WORDS_COUNT 6
#define MOVE_NAME_LENGTH 12
+#define NUM_QUESTIONNAIRE_WORDS 4
#define MALE 0
#define FEMALE 1
diff --git a/include/constants/items.h b/include/constants/items.h
index 71338da8e..8f77e80de 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -495,7 +495,9 @@
#define NUM_ROUTE_114_MAN_BERRIES (LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1)
#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED (FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX)
-#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
+#define ITEM_TO_BERRY(itemId)(((itemId) - FIRST_BERRY_INDEX) + 1)
+#define ITEM_TO_MAIL(itemId)((itemId) - FIRST_MAIL_INDEX)
+#define MAIL_NONE 0xFF
#define NUM_TECHNICAL_MACHINES 50
#define NUM_HIDDEN_MACHINES 8
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index a0bb2c7ce..11a7c7fc5 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -288,8 +288,6 @@
#define MAX_TOTAL_EVS 510
#define EV_ITEM_RAISE_LIMIT 100
-#define UNOWN_FORM_COUNT 28
-
// Battle move flags
#define FLAG_MAKES_CONTACT (1 << 0)
#define FLAG_PROTECT_AFFECTED (1 << 1)
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index bdb0fc95c..a7ed006f0 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -4,7 +4,7 @@
void InitDewfordTrend(void);
void UpdateDewfordTrendPerDay(u16);
void UpdateDewfordTrendPerDay(u16 days);
-bool8 sub_81226D8(u16 *a);
+bool8 IsPhraseTrendy(u16 *a);
void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t b, u8 unused);
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 2fa7f7b3e..4d2bc7c98 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -24,55 +24,55 @@ struct EasyChatScreen
/*0x01*/ u8 templateId;
/*0x02*/ u8 numColumns;
/*0x03*/ u8 numRows;
- /*0x04*/ u8 state;
+ /*0x04*/ u8 inputState;
/*0x05*/ s8 mainCursorColumn;
/*0x06*/ s8 mainCursorRow;
- /*0x07*/ u8 unk_07;
- /*0x08*/ u8 stateBackup;
- /*0x09*/ u8 unk_09;
- /*0x0A*/ s8 unk_0a;
- /*0x0B*/ s8 unk_0b;
- /*0x0C*/ u8 unk_0c;
- /*0x0D*/ u8 unk_0d;
- /*0x0E*/ u8 unk_0e;
- /*0x0F*/ u8 unk_0f;
- /*0x10*/ s8 unk_10;
- /*0x11*/ s8 unk_11;
+ /*0x07*/ u8 maxWords;
+ /*0x08*/ u8 inputStateBackup;
+ /*0x09*/ bool8 inAlphabetMode;
+ /*0x0A*/ s8 keyboardColumn;
+ /*0x0B*/ s8 keyboardRow;
+ /*0x0C*/ u8 keyboardScrollOffset;
+ /*0x0D*/ u8 keyboardLastRow;
+ /*0x0E*/ u8 wordSelectScrollOffset;
+ /*0x0F*/ u8 wordSelectLastRow;
+ /*0x10*/ s8 wordSelectColumn;
+ /*0x11*/ s8 wordSelectRow;
/*0x12*/ u8 displayedPersonType;
- /*0x13*/ u8 unk_13;
- /*0x14*/ u8 unk_14[0x20];
+ /*0x13*/ u8 unused; // Set to 0, never read
+ /*0x14*/ u8 quizTitle[32];
/*0x34*/ const u8 *titleText;
- /*0x38*/ u16 *words;
- /*0x3C*/ u16 ecWordBuffer[9];
+ /*0x38*/ u16 *savedPhrase;
+ /*0x3C*/ u16 currentPhrase[9];
};
-struct Unk203A11C
+struct EasyChatScreenControl
{
- u16 unk0;
+ u16 funcState;
u16 windowId;
- u16 unk4;
- u8 unk6;
- u8 unk7;
- s8 unk8;
- u8 unk9;
- u8 unkA;
- u8 unkB[0xC1];
- u8 unkCC[0x202];
- u16 unk2CE;
- int unk2D0;
- int unk2D4;
- struct Sprite *unk2D8;
- struct Sprite *unk2DC;
- struct Sprite *unk2E0;
- struct Sprite *unk2E4;
- struct Sprite *unk2E8;
- struct Sprite *unk2EC;
- struct Sprite *unk2F0;
- struct Sprite *unk2F4;
- struct Sprite *unk2F8;
- struct Sprite *unk2FC;
- u16 unk300[BG_SCREEN_SIZE / 2];
- u16 unkB00[BG_SCREEN_SIZE / 2];
+ u16 currentFuncId;
+ u8 curWindowAnimState;
+ u8 destWindowAnimState;
+ s8 windowAnimStateDir;
+ u8 modeWindowState;
+ bool8 fourFooterOptions; // Never read (template is used directly instead)
+ u8 phrasePrintBuffer[193];
+ u8 wordSelectPrintBuffer[514];
+ u16 scrollOffset;
+ int scrollDest;
+ int scrollSpeed;
+ struct Sprite *mainCursorSprite;
+ struct Sprite *rectangleCursorSpriteRight;
+ struct Sprite *rectangleCursorSpriteLeft;
+ struct Sprite *wordSelectCursorSprite;
+ struct Sprite *buttonWindowSprite;
+ struct Sprite *modeWindowSprite;
+ struct Sprite *scrollIndicatorUpSprite;
+ struct Sprite *scrollIndicatorDownSprite;
+ struct Sprite *startButtonSprite;
+ struct Sprite *selectButtonSprite;
+ u16 bg1TilemapBuffer[BG_SCREEN_SIZE / 2];
+ u16 bg3TilemapBuffer[BG_SCREEN_SIZE / 2];
};
struct EasyChatPhraseFrameDimensions
@@ -104,15 +104,15 @@ struct EasyChatGroup
u16 numEnabledWords;
};
-struct Unk203A120
+struct EasyChatScreenWordData
{
- u16 unk0;
- u16 unk2[EC_NUM_GROUPS];
- u16 unk2E[27];
- u16 unk64[27][270];
- u8 filler3958[0x2C];
- u16 unk3984[0x10E];
- u16 unk3BA0;
+ u16 numUnlockedGroups;
+ u16 unlockedGroupIds[EC_NUM_GROUPS];
+ u16 numUnlockedAlphabetWords[EC_NUM_ALPHABET_GROUPS];
+ u16 unlockedAlphabetWords[EC_NUM_ALPHABET_GROUPS][EC_MAX_WORDS_IN_GROUP];
+ u8 unused[44];
+ u16 selectedGroupWords[EC_MAX_WORDS_IN_GROUP];
+ u16 numSelectedGroupWords;
}; /*size = 0x3BA4*/
struct EasyChatWordsByLetter
@@ -124,7 +124,7 @@ struct EasyChatWordsByLetter
void InitEasyChatPhrases(void);
void ShowEasyChatScreen(void);
u8 * CopyEasyChatWord(u8 *dest, u16 word);
-bool32 sub_811F8D8(int word);
+bool32 IsEasyChatAnswerUnlocked(int word);
void InitializeEasyChatWordArray(u16 *words, u16 length);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
bool8 IsBardWordInvalid(u16 word);
@@ -133,7 +133,7 @@ u16 GetNewHipsterPhraseToTeach(void);
u16 EasyChat_GetNumWordsInGroup(u8);
u16 GetRandomEasyChatWordFromUnlockedGroup(u16);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
-void sub_811F8BC(void);
+void InitQuestionnaireWords(void);
void UnlockAdditionalPhrase(u8 additionalPhraseId);
#endif // GUARD_EASYCHAT_H
diff --git a/include/global.h b/include/global.h
index 44df26a9b..3d3ea0229 100644
--- a/include/global.h
+++ b/include/global.h
@@ -893,7 +893,7 @@ struct MysteryEventStruct
/*0x000 0x322C*/ struct WonderNewsSaveStruct wonderNews;
/*0x1c0 0x33EC*/ struct WonderCardSaveStruct wonderCard;
/*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310;
- /*0x338 0x3564*/ u16 unk_338[4];
+ /*0x338 0x3564*/ u16 questionnaireWords[NUM_QUESTIONNAIRE_WORDS];
/*0x340 0x356C*/ struct MysteryEventStruct unk_340;
/*0x344 0x3570*/ u32 unk_344[2][5];
}; // 0x36C 0x3598
diff --git a/include/graphics.h b/include/graphics.h
index bade0b0a7..c0bd13e5b 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4977,10 +4977,10 @@ extern const u32 gEasyChatWindow_Gfx[];
extern const u32 gEasyChatWindow_Tilemap[];
extern const u32 gEasyChatMode_Gfx[];
extern const u16 gEasyChatMode_Pal[];
-extern const u32 gEasyChatCursor_Gfx[];
-extern const u16 gEasyChatCursor_Pal[];
-extern const u32 gEasyChatRightWindow_Gfx[];
-extern const u16 gEasyChatRightWindow_Pal[];
+extern const u32 gEasyChatRectangleCursor_Gfx[];
+extern const u16 gEasyChatRectangleCursor_Pal[];
+extern const u32 gEasyChatButtonWindow_Gfx[];
+extern const u16 gEasyChatButtonWindow_Pal[];
// Use Pokeblock
extern const u32 gUsePokeblockCondition_Gfx[];
@@ -5025,4 +5025,42 @@ extern const u16 gObjectEventPal_May[];
extern const u16 gObjectEventPal_RubySapphireBrendan[];
extern const u16 gObjectEventPal_RubySapphireMay[];
+// Mail
+extern const u16 gMailPalette_Orange[];
+extern const u16 gMailPalette_Harbor[];
+extern const u16 gMailPalette_Glitter[];
+extern const u16 gMailPalette_Mech[];
+extern const u16 gMailPalette_Wood[];
+extern const u16 gMailPalette_Wave[];
+extern const u16 gMailPalette_Bead[];
+extern const u16 gMailPalette_Shadow[];
+extern const u16 gMailPalette_Tropic[];
+extern const u16 gMailPalette_Dream[];
+extern const u16 gMailPalette_Fab[];
+extern const u16 gMailPalette_Retro[];
+extern const u8 gMailTiles_Orange[];
+extern const u8 gMailTilemap_Orange[];
+extern const u8 gMailTiles_Harbor[];
+extern const u8 gMailTilemap_Harbor[];
+extern const u8 gMailTiles_Glitter[];
+extern const u8 gMailTilemap_Glitter[];
+extern const u8 gMailTiles_Mech[];
+extern const u8 gMailTilemap_Mech[];
+extern const u8 gMailTiles_Wood[];
+extern const u8 gMailTilemap_Wood[];
+extern const u8 gMailTiles_Wave[];
+extern const u8 gMailTilemap_Wave[];
+extern const u8 gMailTiles_Bead[];
+extern const u8 gMailTilemap_Bead[];
+extern const u8 gMailTiles_Shadow[];
+extern const u8 gMailTilemap_Shadow[];
+extern const u8 gMailTiles_Tropic[];
+extern const u8 gMailTilemap_Tropic[];
+extern const u8 gMailTiles_Dream[];
+extern const u8 gMailTilemap_Dream[];
+extern const u8 gMailTiles_Fab[];
+extern const u8 gMailTilemap_Fab[];
+extern const u8 gMailTiles_Retro[];
+extern const u8 gMailTilemap_Retro[];
+
#endif //GUARD_GRAPHICS_H
diff --git a/include/international_string_util.h b/include/international_string_util.h
index cf3c5f723..f76fc5be1 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -4,7 +4,7 @@
#include "menu.h"
#include "list_menu.h"
-void sub_81DB52C(u8 *src);
+void ConvertInternationalPlayerName(u8 *src);
void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language);
int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth);
int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth);
@@ -16,7 +16,7 @@ int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu);
void CopyMonCategoryText(int dexNum, u8 *dest);
u8 *sub_81DB494(u8 *str, int fontId, const u8 *str2, int totalStringWidth);
void PadNameString(u8 *dest, u8 padChar);
-void sub_81DB554(u8 *, u8);
+void ConvertInternationalPlayerNameStripChar(u8 *, u8);
void sub_81DB5AC(u8 *);
int sub_81DB604(u8 *);
void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows);
diff --git a/include/mevent.h b/include/mevent.h
index 8c0ebbad7..4b7d39b0c 100755
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -21,7 +21,7 @@ struct MEventStruct_Unk1442CC
u16 unk_0C;
u32 unk_10;
u16 unk_14;
- u16 unk_16[4];
+ u16 unk_16[NUM_QUESTIONNAIRE_WORDS];
struct MEventBuffer_3430_Sub unk_20;
u8 unk_44;
u8 unk_45[7];
@@ -36,7 +36,7 @@ struct WonderNews *GetSavedWonderNews(void);
struct WonderCard *GetSavedWonderCard(void);
struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void);
struct MysteryEventStruct *sub_801B044(void);
-u16 *sub_801B058(void);
+u16 *GetQuestionnaireWordsPtr(void);
void DestroyWonderNews(void);
bool32 sub_801B078(const struct WonderNews *src);
bool32 ValidateReceivedWonderNews(void);
diff --git a/include/palette.h b/include/palette.h
index f874bcd74..072edef56 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -14,6 +14,10 @@
#define PALETTE_FADE_STATUS_DONE 0
#define PALETTE_FADE_STATUS_LOADING 0xFF
+#define PALETTES_BG 0x0000FFFF
+#define PALETTES_OBJECTS 0xFFFF0000
+#define PALETTES_ALL (PALETTES_BG | PALETTES_OBJECTS)
+
enum
{
FAST_FADE_IN_FROM_WHITE,
diff --git a/include/player_pc.h b/include/player_pc.h
index 219c11440..bdf4a4e0e 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -73,7 +73,7 @@ struct PlayerPCItemPageStruct
u8 pageItems;
u8 count;
u8 filler[3];
- u8 scrollIndicatorId;
+ u8 scrollIndicatorTaskId;
};
// Exported type declarations
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index dbd7f2895..c0f823bb1 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -10,14 +10,14 @@ const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
const u16 *GetValidMonIconPalettePtr(u16 speciesId);
u16 GetIconSpecies(u16 species, u32 personality);
u16 GetUnownLetterByPersonality(u32 personality);
-u16 sub_80D2E84(u16 speciesId);
+u16 GetIconSpeciesNoPersonality(u16 speciesId);
void LoadMonIconPalettes(void);
void LoadMonIconPalette(u16 species);
void FreeMonIconPalettes(void);
-u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+u8 CreateMonIconNoPersonality(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 handleDeoxys);
void FreeMonIconPalette(u16 species);
void FreeAndDestroyMonIconSprite(struct Sprite *sprite);
-u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 handleDeoxys);
u8 UpdateMonIconFrame(struct Sprite *sprite);
void LoadMonIconPalette(u16 species);
void sub_80D328C(struct Sprite *sprite);
diff --git a/include/script.h b/include/script.h
index f9fb09b5d..63f6f5aef 100644
--- a/include/script.h
+++ b/include/script.h
@@ -26,8 +26,6 @@ u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void));
void StopScript(struct ScriptContext *ctx);
bool8 RunScriptCommand(struct ScriptContext *ctx);
-u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr);
-const u8 *ScriptPop(struct ScriptContext *ctx);
void ScriptJump(struct ScriptContext *ctx, const u8 *ptr);
void ScriptCall(struct ScriptContext *ctx, const u8 *ptr);
void ScriptReturn(struct ScriptContext *ctx);
diff --git a/include/task.h b/include/task.h
index d0ca34f7f..9d1ee42c4 100644
--- a/include/task.h
+++ b/include/task.h
@@ -3,6 +3,7 @@
#define HEAD_SENTINEL 0xFE
#define TAIL_SENTINEL 0xFF
+#define TASK_NONE TAIL_SENTINEL
#define NUM_TASKS 16
#define NUM_TASK_DATA 16
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:13:25 +0000