summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/credits.h6
-rw-r--r--include/easy_chat.h2
-rw-r--r--include/global.h22
-rw-r--r--include/graphics.h3
-rw-r--r--include/hall_of_fame.h2
-rw-r--r--include/mevent.h42
-rw-r--r--include/mevent_server.h14
-rw-r--r--include/mystery_event_script.h4
-rw-r--r--include/pokemon.h2
-rw-r--r--include/reset_save_heap.h2
-rw-r--r--include/save.h18
-rw-r--r--include/script.h2
-rw-r--r--include/strings.h14
-rw-r--r--include/trainer_pokemon_sprites.h1
14 files changed, 76 insertions, 58 deletions
diff --git a/include/credits.h b/include/credits.h
new file mode 100644
index 000000000..763abd77f
--- /dev/null
+++ b/include/credits.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CREDITS_H
+#define GUARD_CREDITS_H
+
+extern bool8 gHasHallOfFameRecords;
+
+#endif //GUARD_CREDITS_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 6c3947ea9..765758035 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -34,7 +34,7 @@ void InitEasyChatPhrases(void);
u8 *CopyEasyChatWord(u8 *dest, u16 word);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
-void ResetSomeMEventECBuffer_3120_338(void);
+void EC_ResetMEventProfileMaybe(void);
void InitEasyChatPhrases(void);
void EnableRareWord(u8);
bool8 InitEasyChatSelection(void);
diff --git a/include/global.h b/include/global.h
index 22faa7b1c..874717784 100644
--- a/include/global.h
+++ b/include/global.h
@@ -636,7 +636,7 @@ struct FameCheckerSaveData
#define NUM_EASY_CHAT_EXTRA_PHRASES 33
#define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0))
-struct MEventBuffer_3120_Sub
+struct MEWonderNewsData
{
u16 unk_00;
u8 unk_02;
@@ -645,13 +645,13 @@ struct MEventBuffer_3120_Sub
u8 unk_2C[10][40];
};
-struct MEventBuffer_3120
+struct MEWonderNewsStruct
{
u32 crc;
- struct MEventBuffer_3120_Sub data;
+ struct MEWonderNewsData data;
};
-struct MEventBuffer_32E0_Sub
+struct MEWonderCardData
{
u16 unk_00;
u16 unk_02;
@@ -667,10 +667,10 @@ struct MEventBuffer_32E0_Sub
u8 unk_122[40];
};
-struct MEventBuffer_32E0
+struct MEWonderCardStruct
{
u32 crc;
- struct MEventBuffer_32E0_Sub data;
+ struct MEWonderCardData data;
};
struct MEventBuffer_3430_Sub
@@ -690,11 +690,11 @@ struct MEventBuffer_3430
struct MEventBuffers
{
- /*0x000 0x3120*/ struct MEventBuffer_3120 buffer_000;
- /*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0;
+ /*0x000 0x3120*/ struct MEWonderNewsStruct menews;
+ /*0x1c0 0x32e0*/ struct MEWonderCardStruct mecard;
/*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310;
- /*0x338 0x3458*/ u16 unk_338[4];
- /*0x340 0x3460*/ struct MENewsJisanStruct unk_340;
+ /*0x338 0x3458*/ u16 ec_profile_maybe[4];
+ /*0x340 0x3460*/ struct MENewsJisanStruct me_jisan;
/*0x344 0x3464*/ u32 unk_344[2][5];
}; // 0x36C 0x348C
@@ -766,7 +766,7 @@ struct SaveBlock1
/*0x309C*/ u8 giftRibbons[52];
/*0x30D0*/ struct Roamer roamer;
/*0x30EC*/ struct EnigmaBerry enigmaBerry;
- /*0x3120*/ struct MEventBuffers unk_3120;
+ /*0x3120*/ struct MEventBuffers mysteryEventBuffers;
/*0x348C*/ u8 filler_348C[400];
/*0x361C*/ struct RamScript ramScript;
/*0x3A08*/ u8 filler3A08[12];
diff --git a/include/graphics.h b/include/graphics.h
index 0e804e17c..bc87e4d53 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4226,4 +4226,7 @@ extern const u16 gTradeMenuMonBox_Tilemap[];
extern const u16 gUnknown_8E9CBBC[];
extern const u16 gUnknown_8E9CB9C[];
+extern const u32 gFile_graphics_misc_confetti_sheet[];
+extern const u32 gFile_graphics_misc_confetti_palette[];
+
#endif //GUARD_GRAPHICS_H
diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h
index 1d2122399..fd8aed909 100644
--- a/include/hall_of_fame.h
+++ b/include/hall_of_fame.h
@@ -7,7 +7,7 @@ void CB2_DoHallOfFameScreen(void);
void CB2_DoHallOfFameScreenDontSaveData(void);
void CB2_DoHallOfFamePC(void);
void sub_8175280(void);
-void sub_80F2978(void);
+void CB2_InitHofPC(void);
void HallOfFamePCBeginFade(void);
void ReturnFromHallOfFamePC(void);
diff --git a/include/mevent.h b/include/mevent.h
index 31ab9e421..81caeb42f 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -3,22 +3,22 @@
#include "global.h"
-struct MEventStruct_Unk1442CC
+struct MEventClientHeaderStruct
{
u32 unk_00;
u16 unk_04;
u32 unk_08;
u16 unk_0C;
u32 unk_10;
- u16 unk_14;
+ u16 id;
u16 unk_16[4];
struct MEventBuffer_3430_Sub unk_20;
u8 unk_44;
- u8 unk_45[7];
- u8 unk_4C[4];
- u16 unk_50[6];
- u8 unk_5C[4];
- u8 unk_60;
+ u8 playerName[7];
+ u8 playerTrainerId[4];
+ u16 easyChatProfile[6];
+ u8 gameCode[4];
+ u8 version;
};
struct MEvent_Str_1
@@ -33,25 +33,25 @@ struct MEvent_Str_2
u8 fill_00[0x40];
};
-struct MEventBuffer_3120_Sub * GetSavedWonderNews(void);
-struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
+struct MEWonderNewsData * GetSavedWonderNews(void);
+struct MEWonderCardData * GetSavedWonderCard(void);
struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
struct MENewsJisanStruct * GetMENewsJisanStructPtr(void);
-bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
+bool32 sub_8143DC8(const struct MEWonderNewsData * src);
bool32 ValidateReceivedWonderNews(void);
bool32 ValidateReceivedWonderCard(void);
bool32 sub_8143EF4(const u8 * src);
-bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data);
-void sub_814410C(struct MEventBuffer_32E0_Sub * buffer);
+bool32 sub_8143F68(const struct MEWonderCardData * data);
+void sub_814410C(struct MEWonderCardData * buffer);
bool32 sub_8144254(const u16 * data);
-void sub_81442CC(struct MEventStruct_Unk1442CC * data);
-bool32 sub_81443D4(const struct MEventStruct_Unk1442CC * data);
-u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused);
-u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused);
-bool32 sub_8144474(const struct MEventStruct_Unk1442CC * a0, const u16 * a1);
-u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command);
-bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6);
-bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0);
+void BuildMEventClientHeader(struct MEventClientHeaderStruct * data);
+bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data);
+u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
+u32 sub_8144434(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
+bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1);
+u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command);
+bool32 InitWonderCardResources(struct MEWonderCardData * r5, struct MEventBuffer_3430_Sub * r6);
+bool32 InitWonderNewsResources(const struct MEWonderNewsData * a0);
s32 FadeToWonderCardMenu(void);
s32 FadeToWonderNewsMenu(void);
void DestroyWonderCard(void);
@@ -69,6 +69,6 @@ u32 MENews_GetInput(u16 input);
void sub_8143D24(void);
u16 sub_81445C0(u32 command);
void sub_8144714(u32 a0, u32 a1);
-u16 *sub_8143DA8(void);
+u16 *GetMEventProfileECWordsMaybe(void);
#endif //GUARD_MEVENT_H
diff --git a/include/mevent_server.h b/include/mevent_server.h
index 10ee96401..ddc00b978 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -31,7 +31,7 @@ struct send_recv_header
u16 size;
};
-struct mevent_cmd_ish
+struct mevent_client_cmd
{
u32 instr;
u32 parameter;
@@ -46,12 +46,12 @@ struct mevent_client
u32 cmdidx;
void * sendBuffer;
void * recvBuffer;
- struct mevent_cmd_ish * cmdBuffer;
+ struct mevent_client_cmd * cmdBuffer;
void * buffer;
struct mevent_srv_sub manager;
};
-struct mevent_cmd
+struct mevent_server_cmd
{
u32 instr;
bool32 flag;
@@ -64,11 +64,11 @@ struct mevent_srv_common
u32 param;
u32 mainseqno;
u32 cmdidx;
- const struct mevent_cmd * cmdBuffer;
+ const struct mevent_server_cmd * cmdBuffer;
void * recvBuffer;
- struct MEventBuffer_32E0_Sub * mevent_32e0;
- struct MEventBuffer_3120_Sub * mevent_3120;
- struct MEventStruct_Unk1442CC * mevent_unk1442cc;
+ struct MEWonderCardData * card;
+ struct MEWonderNewsData * news;
+ struct MEventClientHeaderStruct * mevent_unk1442cc;
void * sendBuffer1;
u32 sendBuffer1Size;
void * sendBuffer2;
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index be64663ed..8c59136c1 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -7,7 +7,7 @@ u32 RunMysteryEventScript(u8 *);
void SetMysteryEventScriptStatus(u32 val);
u16 GetRecordMixingGift(void);
-void sub_80DA89C(u8 *);
-bool32 sub_80DA8B0(u32 *);
+void MEventScript_InitContext(u8 *);
+bool32 MEventScript_Run(u32 *);
#endif // GUARD_MYSTERY_EVENT_SCRIPT_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 79933a22c..3d0faca36 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -609,7 +609,7 @@ u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm);
u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
u8 GetNumberOfRelearnableMoves(struct Pokemon *mon);
-u16 sub_8043F90(u16 species);
+u16 SpeciesToPokedexNum(u16 species);
void ClearBattleMonForms(void);
void PlayBattleBGM(void);
void PlayMapChosenOrBattleBGM(u16 songId);
diff --git a/include/reset_save_heap.h b/include/reset_save_heap.h
index 8cb038906..e29448815 100644
--- a/include/reset_save_heap.h
+++ b/include/reset_save_heap.h
@@ -7,7 +7,7 @@
// Exported ROM declarations
-void sub_8079B7C(void);
+void ResetSaveHeap(void);
#endif //GUARD_RESET_SAVE_HEAP_H
diff --git a/include/save.h b/include/save.h
index 41d2ec666..ed527eefd 100644
--- a/include/save.h
+++ b/include/save.h
@@ -54,6 +54,11 @@ struct SaveSectionOffsets
#define UNKNOWN_CHECK_VALUE 0x8012025
+#define SECTOR_SAVE1(n) (n)
+#define SECTOR_SAVE2(n) ((n) + NUM_SECTORS_PER_SAVE_SLOT)
+#define SECTOR_HOF(n) ((n) + 2 * NUM_SECTORS_PER_SAVE_SLOT)
+#define SECTOR_TTOWER(n) ((n) + 2 * NUM_SECTORS_PER_SAVE_SLOT + 2)
+
// SetSectorDamagedStatus states
enum
{
@@ -62,17 +67,6 @@ enum
CHECK // unused
};
-// Do save types
-enum
-{
- NORMAL_SAVE,
- LINK_SAVE,
- EREADER_SAVE,
- HOF_SAVE,
- DIFFERENT_FILE_SAVE,
- HOF_DELETE_SAVE // unused
-};
-
extern u16 gFirstSaveSector;
extern u32 gPrevSaveCounter;
extern u16 gLastKnownGoodSector;
@@ -117,7 +111,7 @@ u8 sub_80DA40C(void);
u8 sub_80DA434(void);
u8 sub_80DA45C(void);
bool8 sub_80DA4A0(void);
-u8 Save_LoadGameData(u8 a1);
+u8 Save_LoadGameData(u8 saveType);
u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
u32 sub_8153634(u8 sector, u8* src);
void sub_8153688(u8 taskId);
diff --git a/include/script.h b/include/script.h
index 4e8b8c305..c0b23e248 100644
--- a/include/script.h
+++ b/include/script.h
@@ -63,7 +63,7 @@ bool32 sub_80991F8(void);
u8 *sub_8099244(void);
void sub_80992A0(u8 *script, u16 scriptSize);
bool32 sub_8069DFC(void);
-void sub_8069EA4(u8 * script, u16 scriptSize);
+void MEventSetRamScript(u8 * script, u16 scriptSize);
u8 * sub_8069E48(void);
void sub_8069998(u8 var);
void sub_80699F8(void);
diff --git a/include/strings.h b/include/strings.h
index 32f4dcf43..80ede79ef 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -710,4 +710,18 @@ extern const u8 gEasyChatGroupName_TrendySaying[];
extern const u8 gEasyChatGroupName_Pokemon2[];
extern const u8 gText_ThreeQuestionMarks[];
+// hall_of_fame
+extern const u8 gText_LeagueChamp[];
+extern const u8 gText_HOFNumber[];
+extern const u8 gText_UPDOWNPick_ABUTTONBBUTTONCancel[];
+extern const u8 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack[];
+extern const u8 gText_ABUTTONExit[];
+extern const u8 gText_HOFCorrupted[];
+extern const u8 gText_WelcomeToHOF[];
+extern const u8 gText_Number[];
+extern const u8 gText_Level[];
+extern const u8 gText_IDNumber[];
+extern const u8 gText_Name[];
+extern const u8 gText_MainMenuTime[];
+
#endif //GUARD_STRINGS_H
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h
index a267737f5..3e27f58e4 100644
--- a/include/trainer_pokemon_sprites.h
+++ b/include/trainer_pokemon_sprites.h
@@ -12,6 +12,7 @@ u16 sub_818D8F0(u16 spriteId);
u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
+u16 FreeAndDestroyMonPicSprite(u16);
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 06:02:58 +0000