summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/flags.h4
-rw-r--r--include/global.h20
-rw-r--r--include/new_menu_helpers.h1
-rw-r--r--include/party_menu.h1
-rw-r--r--include/pokemon.h6
-rw-r--r--include/text.h28
6 files changed, 29 insertions, 31 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index daa8b3132..ebf619541 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -136,7 +136,7 @@
#define FLAG_0x083 0x83
#define FLAG_0x084 0x84
#define FLAG_0x085 0x85
-#define FLAG_PENDING_DAYCARE_EGG 0x86
+#define FLAG_0x086 0x86
#define FLAG_0x087 0x87
#define FLAG_0x088 0x88
#define FLAG_0x089 0x89
@@ -616,7 +616,7 @@
#define FLAG_0x263 0x263
#define FLAG_0x264 0x264
#define FLAG_0x265 0x265
-#define FLAG_0x266 0x266
+#define FLAG_PENDING_DAYCARE_EGG 0x266
#define FLAG_0x267 0x267
#define FLAG_0x268 0x268
#define FLAG_0x269 0x269
diff --git a/include/global.h b/include/global.h
index de2221f8c..60185af00 100644
--- a/include/global.h
+++ b/include/global.h
@@ -498,9 +498,9 @@ struct ContestWinner
u8 contestRank;
};
-struct DaycareMiscMon
+struct DayCareMail
{
- struct MailStruct mail;
+ struct MailStruct message;
u8 OT_name[OT_NAME_LENGTH + 1];
u8 monName[POKEMON_NAME_LENGTH + 1];
u8 gameLanguage:4;
@@ -510,7 +510,7 @@ struct DaycareMiscMon
struct DaycareMon
{
struct BoxPokemon mon;
- struct DaycareMiscMon misc;
+ struct DayCareMail mail;
u32 steps;
};
@@ -519,14 +519,8 @@ struct DaycareMon
struct DayCare
{
struct DaycareMon mons[DAYCARE_MON_COUNT];
- u16 unk_118;
- u8 unk_11A;
-};
-
-struct DayCareMail
-{
- /*0x00*/ struct MailStruct message;
- /*0x24*/ u8 names[19];
+ u16 offspringPersonality;
+ u8 stepCounter;
};
struct RecordMixingDayCareMail
@@ -753,7 +747,9 @@ struct SaveBlock1
/*0x3A48*/ u8 filler_3a48[4];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
- /*0x3A94*/ u8 filler3A94[0x2A0];
+ /*0x3A94*/ u8 filler3A94[0x204];
+ /*0x3C98*/ struct DaycareMon route5DayCareMon;
+ /*0x3D24*/ u8 filler3D24[0x10];
/*0x3D34*/ u32 unkArrayIdx;
/*0x3D38*/ struct TrainerTowerLog unkArray[4];
};
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index fc9c1b9dc..d24b7e3e5 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -31,5 +31,6 @@ void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void);
void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void sub_80F696C(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
+void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
#endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 09b160954..34b375e42 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -26,5 +26,6 @@ void sub_8124C8C(void);
void sub_8126EDC(void);
void c2_8123744(void);
u8 GetCursorSelectionMonId(void);
+void sub_8128370(void);
#endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c84eb4c42..bf2326ff8 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -7,9 +7,9 @@
#define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3
-#define MON_DATA_SANITY_BIT1 4
-#define MON_DATA_SANITY_BIT2 5
-#define MON_DATA_SANITY_BIT3 6
+#define MON_DATA_SANITY_IS_BAD_EGG 4
+#define MON_DATA_SANITY_HAS_SPECIES 5
+#define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9
diff --git a/include/text.h b/include/text.h
index d2c2ecf42..e0533cc98 100644
--- a/include/text.h
+++ b/include/text.h
@@ -106,9 +106,9 @@ struct TextPrinterSubStruct
u8 active;
};
-struct TextSubPrinter // TODO: Better name
+struct TextPrinterTemplate // TODO: Better name
{
- const u8* current_text_offset;
+ const u8* currentChar;
u8 windowId;
u8 fontId;
u8 x;
@@ -117,17 +117,17 @@ struct TextSubPrinter // TODO: Better name
u8 currentY;
u8 letterSpacing;
u8 lineSpacing;
- u8 fontColor_l:4; // 0xC
- u8 fontColor_h:4;
+ u8 unk:4; // 0xC
+ u8 fgColor:4;
u8 bgColor:4;
u8 shadowColor:4;
};
struct TextPrinter
{
- struct TextSubPrinter subPrinter;
+ struct TextPrinterTemplate subPrinter;
- void (*callback)(struct TextSubPrinter *, u16); // 0x10
+ void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
union {
struct TextPrinterSubStruct sub;
@@ -150,8 +150,8 @@ struct FontInfo
u8 maxLetterHeight;
u8 letterSpacing;
u8 lineSpacing;
- u8 fontColor_l:4;
- u8 fontColor_h:4;
+ u8 unk:4;
+ u8 fgColor:4;
u8 bgColor:4;
u8 shadowColor:4;
};
@@ -172,10 +172,10 @@ struct KeypadIcon
};
typedef struct {
- u8 flag_0:1;
- u8 flag_1:1;
- u8 flag_2:1;
- u8 flag_3:1;
+ u8 canABSpeedUpPrint:1;
+ u8 useAlternateDownArrow:1;
+ u8 autoScroll:1;
+ u8 forceMidTextSpeed:1;
} TextFlags;
extern TextFlags gTextFlags;
@@ -194,8 +194,8 @@ extern u8 gStringVar4[];
void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void);
-u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
-bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
+bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
void RunTextPrinters(void);
bool16 IsTextPrinterActive(u8 id);
u32 RenderFont(struct TextPrinter *textPrinter);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 06:22:57 +0000