summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/dewford_trend.h2
-rw-r--r--include/ewram.h17
-rw-r--r--include/item.h10
-rw-r--r--include/party_menu.h44
-rw-r--r--include/record_mixing.h10
-rw-r--r--include/secret_base.h2
-rw-r--r--include/tv.h4
7 files changed, 40 insertions, 49 deletions
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index 16b2bdd75..5540d6655 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -3,7 +3,7 @@
void InitDewfordTrend(void);
bool8 sub_80FA364(u16 *a);
-void sub_80FA4E4(void *, u32, u8);
+void ReceiveDewfordTrendData(void *, u32, u8);
void UpdateDewfordTrendPerDay(u16);
#endif
diff --git a/include/ewram.h b/include/ewram.h
index 3a96917ea..6be4cd50a 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -29,14 +29,15 @@ extern u8 gSharedMem[];
#define eSaveSection (struct SaveSector *)(gSharedMem + 0x0)
#define eSlotMachine ((struct SlotMachineEwramStruct *)(gSharedMem + 0x0))
#define ePokemonStorageSystem (*(struct PokemonStorageSystemData *)(gSharedMem + 0))
-#define ewram01000 (*(struct Unk2001000 *)(gSharedMem + 0x1000))
+#define ePartyMenu (*(struct Unk2001000 *)(gSharedMem + 0x1000))
#define ewramBerryPicTemp (gSharedMem + 0x1000)
-#define EWRAM_1000 (*(struct Struct2001000 *)(gSharedMem + 0x1000))
-#define ewram4000 (gSharedMem + 0x4000)
#define gUnknown_02007000 (*(ewramStruct_02007000 *)(gSharedMem + 0x7000))
-#define ARRAY_2007800 ((struct EasyChatPair *)(gSharedMem + 0x7800))
-#define ARRAY_2007900 ((struct EasyChatPair *)(gSharedMem + 0x7900))
-#define ewram_2008000 (*(struct PlayerRecords *)(gSharedMem + 0x08000))
+
+// record_mixing.c
+#define eLinkedDewfordTrendsBuffer ((struct EasyChatPair *)(gSharedMem + 0x7800))
+#define eSavedDewfordTrendsBuffer ((struct EasyChatPair *)(gSharedMem + 0x7900))
+#define eReceivedRecords (*(struct PlayerRecords *)(gSharedMem + 0x08000))
+#define eSentRecord (*(struct PlayerRecords *)(gSharedMem + 0x18000))
// pokedex.c
#define ePokedexGraphicsBuffer ((void *)&gSharedMem[0x8000])
@@ -167,7 +168,6 @@ extern u8 gSharedMem[];
#define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810))
#define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840))
#define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850))
-#define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000))
#define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000))
#define ewram18000_2 (&gSharedMem[0x18000])
#define ewram18000_3 *(struct Pokemon **)(gSharedMem + 0x18000)
@@ -187,9 +187,6 @@ extern u8 gSharedMem[];
#define eWRAM_19348Struct ((struct EWRAM_19348_Struct *)(gSharedMem + 0x19348))
#define ewram1A000 (&gSharedMem[0x1A000])
#define ewram1B000 (*(struct Unk201B000 *)(gSharedMem + 0x1B000))
-#define ewram1B000_alt (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
-#define EWRAM_1B000 ewram1B000_alt // FIXME
-#define EWRAM_1B000_2 (*(struct Struct201B000 *)(gSharedMem + 0x1B000))
#define EWRAM_1C000 (*(struct Struct201C000 *)(gSharedMem + 0x1C000))
#define gPartyMenu (*(struct PartyMenu *)(gSharedMem + 0x1C000))
#define sCreditsData (*(struct CreditsData *)(gSharedMem + 0x1C000))
diff --git a/include/item.h b/include/item.h
index 69fe1f941..9c7e1b673 100644
--- a/include/item.h
+++ b/include/item.h
@@ -1,6 +1,16 @@
#ifndef GUARD_ITEM_H
#define GUARD_ITEM_H
+// These constants are used in gItems
+enum
+{
+ POCKET_ITEMS = 1,
+ POCKET_POKE_BALLS,
+ POCKET_TM_HM,
+ POCKET_BERRIES,
+ POCKET_KEY_ITEMS,
+};
+
typedef void (*ItemUseFunc)(u8);
struct BagPocket
diff --git a/include/party_menu.h b/include/party_menu.h
index 98ac0ddde..b991d8297 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -43,49 +43,33 @@ struct PartyPopupMenu
/*0x4*/const u8 *items; // menu item ids (ids for a MenuAction2 array)
};
-// TODO: Unify these two structs
+#define pmStatGrowths data
+#define pmSetupState data[0]
+#define pmMonIndex data[1]
+#define pmUnk268 data[2]
+#define pmUnk272 data[7]
+#define pmUnk27E data[13]
+#define pmUnk280 data[14]
+#define pmUnk282 data[15]
struct Unk201B000
{
struct Pokemon unk0[6];
u8 menuType;
u8 promptTextId;
- u8 filler25A[2];
TaskFunc menuHandler;
u8 menuHandlerTaskId;
u8 unk261;
- u8 unk262;
+ u8 unk262; // Never read
u8 unk263;
- // Stat growth upon level-up. First 6 bytes = old stats, Second 6 bytes = new stats.
- s16 statGrowths[NUM_STATS * 2];
- u8 filler27C[2];
- s16 unk27E;
- s16 unk280;
- s16 unk282;
-};
-
-struct Struct201B000
-{
- u8 filler0[0x259];
- u8 promptTextId;
- u8 filler25A[6];
- u8 menuHandlerTaskId;
- u8 unk261;
- u8 unk262;
- s16 setupState;
- s16 monIndex;
- s16 unk268;
- u8 filler26A[8];
- u16 unk272;
- u8 filler274[14];
- u16 unk282;
+ s16 data[16];
};
struct Unk2001000
{
u8 unk0;
- u8 unk1;
- u8 unk2;
+ u8 slotId;
+ u8 slotId2;
u8 unk3;
u8 unk4;
u8 unk5;
@@ -123,7 +107,7 @@ void sub_806D3B4(u8 taskId, u16 species1, u16 species2);
void sub_806D4AC(u8 taskId, u16 species, u8 c);
void sub_806D50C(u8 taskId, u8 monIndex);
void PrintPartyMenuPromptText(u8 textId, u8 b);
-void sub_806D5A4(void);
+void PartyMenuEraseMsgBoxAndFrame(void);
void SetMonIconAnim(u8 spriteId, struct Pokemon *pokemon);
void CreatePartyMenuMonIcon(u8 taskId, u8 monIndex, u8 c, struct Pokemon *pokemon);
void TryCreatePartyMenuMonIcon(u8 a, u8 monIndex, struct Pokemon *pokemon);
@@ -158,7 +142,7 @@ void SetPartyPopupMenuOffsets(u8 menuIndex, u8 *left, u8 *top, const struct Part
void ShowPartyPopupMenu(u8 menuIndex, const struct PartyPopupMenu *menu, const struct MenuAction2 *menuActions, u8 cursorPos);
void ClosePartyPopupMenu(u8 index, const struct PartyPopupMenu *menu);
TaskFunc PartyMenuGetPopupMenuFunc(u8 menuIndex, const struct PartyPopupMenu *menus, const struct MenuAction2 *menuActions, u8 itemIndex);
-u8 sub_806E834(const u8 *message, u8 arg1);
+u8 DisplayPartyMenuMessage(const u8 *message, u8 noClearAfter);
void sub_806E8D0(u8 taskId, u16 b, TaskFunc c);
void party_menu_link_mon_held_item_object(u8);
void Task_ConfirmGiveHeldItem(u8);
diff --git a/include/record_mixing.h b/include/record_mixing.h
index 089a7337f..d1467493d 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -4,7 +4,7 @@
#include <stddef.h>
void RecordMixing_PrepareExchangePacket(void);
-void RecordMixing_ReceiveExchangePacket(u32 a);
+void RecordMixing_ReceiveExchangePacket(u32 which);
void Task_RecordMixing_SoundEffect(u8 taskId);
void Task_RecordMixing_Main(u8 taskId);
void sub_80B95F0(u8 taskId);
@@ -19,15 +19,15 @@ u8 GetMultiplayerId_(void);
u16 *GetPlayerRecvBuffer(u8 player);
void sub_80B9A78(void);
void sub_80B9A88(u8 *a);
-void sub_80B9B1C(u8 *a, size_t size, u8 index);
-void sub_80B9B70(void *a, u32 size, u8 index);
+void ReceiveOldManData(u8 *a, size_t size, u8 index);
+void ReceiveBattleTowerData(void *battleTowerRecord, u32 size, u8 index);
u8 sub_80B9BBC(struct DayCareMail *a);
void sub_80B9BC4(u8 *, size_t, u8[][2], u8 d, u8 e);
u8 sub_80B9C4C(u8 *a);
// ASM
-void sub_80B9C6C(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
-void sub_80B9F3C(u16 *, u8);
+void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows);
+void ReceiveGiftItem(u16 *pItemId, u8 b);
void sub_80BA00C(u8);
#endif // GUARD_RECORD_MIXING_H
diff --git a/include/secret_base.h b/include/secret_base.h
index dafbca085..130c78ca3 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -18,7 +18,7 @@ u8 *GetSecretBaseMapName(u8 *dest);
void SetPlayerSecretBaseRecordMixingParty();
const u8 *GetSecretBaseTrainerLoseText(void);
void sub_80BCF1C(u8 taskId);
-void sub_80BD674(void *playerRecords, u32 size, u8 c);
+void ReceiveSecretBasesData(void *playerRecords, u32 size, u8 c);
#if DEBUG
void unref_sub_80BCD7C(u8 secretBaseIndex);
u8 *sub_80BC190(u8 *dest, u8 arg1);
diff --git a/include/tv.h b/include/tv.h
index a7064f8fd..1ca601a35 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -72,7 +72,7 @@ s8 sub_80BF74C(TVShow tvShow[]);
bool8 sub_80BF77C(u16);
bool8 sub_80BF77C(u16);
u32 GetPlayerTrainerId(void);
-void sub_80BFD44(u8 *, u32, u8);
+void ReceiveTvShowsData(u8 *, u32, u8);
u8 sub_80C004C(TVShow *tv1, TVShow *tv2, u8 idx);
u8 sub_80C00B4(TVShow *tv1, TVShow *tv2, u8 idx);
u8 sub_80C0134(TVShow *tv1, TVShow *tv2, u8 idx);
@@ -99,7 +99,7 @@ void ResetGabbyAndTy(void);
void TakeTVShowInSearchOfTrainersOffTheAir(void);
extern u8 GabbyAndTyGetBattleNum(void);
void sub_80C04A0(void);
-void sub_80C0514(void *, u32, u8);
+void ReceivePokeNewsData(void *, u32, u8);
void DoTVShowBravoTrainerPokemonProfile(void);
void DoTVShowBravoTrainerBattleTowerProfile(void);
void DoTVShowTodaysSmartShopper(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 13:35:45 +0000