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

Streamline pointer notation (#2139)

Browse Source
This commit is contained in:
Bassoonian
2025-05-16 13:04:44 +02:00
committed by GitHub
parent 74bf498aaa
commit 16357c7e29
89 changed files with 406 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/battle.h
View File

@@ -218,11 +218,11 @@ struct StatsArray
struct BattleResources
{
struct SecretBase* secretBase;
struct SecretBase *secretBase;
struct ResourceFlags *flags;
struct BattleScriptsStack* battleScriptsStack;
struct BattleCallbacksStack* battleCallbackStack;
struct StatsArray* beforeLvlUp;
struct BattleScriptsStack *battleScriptsStack;
struct BattleCallbacksStack *battleCallbackStack;
struct StatsArray *beforeLvlUp;
struct AI_ThinkingStruct *ai;
struct BattleHistory *battleHistory;
struct BattleScriptsStack *AI_ScriptsStack;

2
include/battle_controllers.h
View File

@@ -288,7 +288,7 @@ void BtlController_EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
void BtlController_EmitFaintingCry(u8 bufferId);
void BtlController_EmitIntroSlide(u8 bufferId, u8 environmentId);
void BtlController_EmitIntroTrainerBallThrow(u8 bufferId);
void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 flags);
void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus *hpAndStatus, u8 flags);
void BtlController_EmitHidePartyStatusSummary(u8 bufferId);
void BtlController_EmitEndBounceEffect(u8 bufferId);
void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);

2
include/battle_script_commands.h
View File

@@ -21,7 +21,7 @@ void BufferMoveToLearnIntoBattleTextBuff2(void);
void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
bool8 UproarWakeUpCheck(u8 battler);
extern void (* const gBattleScriptingCommandsTable[])(void);
extern void (*const gBattleScriptingCommandsTable[])(void);
extern const u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4];
#endif // GUARD_BATTLE_SCRIPT_COMMANDS_H

10
include/contest.h
View File

@@ -290,11 +290,11 @@ struct ContestResources
struct ContestGraphicsState *gfxState;
struct ContestMoveAnimData *moveAnim;
struct ContestTV *tv;
struct ContestUnused * unused;
u8 * contestBgTilemaps[CONTESTANT_COUNT];
void * boxBlinkTiles1;
void * boxBlinkTiles2;
void * animBgTileBuffer;
struct ContestUnused *unused;
u8 *contestBgTilemaps[CONTESTANT_COUNT];
void *boxBlinkTiles1;
void *boxBlinkTiles2;
void *animBgTileBuffer;
};
#define eContest (*gContestResources->contest)

2
include/global.h
View File

@@ -1070,7 +1070,7 @@ struct SaveBlock1
// sizeof: 0x3D88
};
extern struct SaveBlock1* gSaveBlock1Ptr;
extern struct SaveBlock1 *gSaveBlock1Ptr;
struct MapPosition
{

2
include/item.h
View File

@@ -58,7 +58,7 @@ u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos);
u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 pocketPos);
void CompactItemsInBagPocket(struct BagPocket *bagPocket);
void SortBerriesOrTMHMs(struct BagPocket *bagPocket);
void MoveItemSlotInList(struct ItemSlot* itemSlots_, u32 from, u32 to_);
void MoveItemSlotInList(struct ItemSlot *itemSlots_, u32 from, u32 to_);
void ClearBag(void);
u16 CountTotalItemQuantityInBag(u16 itemId);
bool8 AddPyramidBagItem(u16 itemId, u16 count);

2
include/item_menu.h
View File

@@ -102,7 +102,7 @@ void ResetBagScrollPositions(void);
void ChooseBerryForMachine(void (*exitCallback)(void));
void CB2_ChooseBerry(void);
void Task_FadeAndCloseBagMenu(u8 taskId);
void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable* funcTable);
void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable);
void UpdatePocketItemList(u8 pocketId);
void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId));
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);

2
include/link.h
View File

@@ -233,7 +233,7 @@ struct Link
struct BlockRequest
{
void * address;
void *address;
u32 size;
};

4
include/list_menu.h
View File

@@ -38,8 +38,8 @@ struct ListMenuItem
struct ListMenuTemplate
{
const struct ListMenuItem *items;
void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
void (* itemPrintFunc)(u8 windowId, u32 itemId, u8 y);
void (*moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
void (*itemPrintFunc)(u8 windowId, u32 itemId, u8 y);
u16 totalItems;
u16 maxShowed;
u8 windowId;

4
include/mauville_old_man.h
View File

@@ -7,8 +7,8 @@ void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void);
void SetMauvilleOldManObjEventGfx(void);
void SanitizeMauvilleOldManForRuby(OldMan *dest);
void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language);
void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 version, u32 language);
void SanitizeReceivedRubyOldMan(union OldMan *oldMan, u32 version, u32 language);
void SanitizeReceivedEmeraldOldMan(union OldMan *oldMan, u32 version, u32 language);
void ResetMauvilleOldManFlag(void);
#endif // GUARD_MAUVILLE_OLD_MAN_H

2
include/menu_specialized.h
View File

@@ -115,7 +115,7 @@ void GetConditionMenuMonNameAndLocString(u8 *locationDst, u8 *nameDst, u16 boxId
void GetConditionMenuMonConditions(struct ConditionGraph *graph, u8 *sheen, u16 boxId, u16 monId, u16 partyId, u16 id, u16 numMons, bool8 excludesCancel);
void GetConditionMenuMonGfx(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 partyId, u16 numMons, bool8 excludesCancel);
void LoadConditionMonPicTemplate(struct SpriteSheet *sheet, struct SpriteTemplate *template, struct SpritePalette *pal);
void LoadConditionSelectionIcons(struct SpriteSheet *sheets, struct SpriteTemplate * template, struct SpritePalette *pals);
void LoadConditionSelectionIcons(struct SpriteSheet *sheets, struct SpriteTemplate *template, struct SpritePalette *pals);
s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst);
// Condition sparkles

4
include/mini_printf.h
View File

@@ -45,8 +45,8 @@
#else
s32 mini_vsnprintf(char* buffer, u32 buffer_len, const char *fmt, va_list va);
s32 mini_vpprintf(void* buf, const char *fmt, va_list va);
s32 mini_vsnprintf(char *buffer, u32 buffer_len, const char *fmt, va_list va);
s32 mini_vpprintf(void *buf, const char *fmt, va_list va);
#endif
#endif

10
include/mystery_gift_client.h
View File

@@ -75,16 +75,16 @@ struct MysteryGiftClient
u32 funcId;
u32 funcState;
u32 cmdidx;
void * sendBuffer;
void * recvBuffer;
struct MysteryGiftClientCmd * script;
void * msg;
void *sendBuffer;
void *recvBuffer;
struct MysteryGiftClientCmd *script;
void *msg;
struct MysteryGiftLink link;
bool32 isWonderNews;
};
void MysteryGiftClient_Create(bool32 isWonderNews);
u32 MysteryGiftClient_Run(u16 * endVal);
u32 MysteryGiftClient_Run(u16 *endVal);
void MysteryGiftClient_AdvanceState(void);
void * MysteryGiftClient_GetMsg(void);
void MysteryGiftClient_SetParam(u32 value);

14
include/mystery_gift_link.h
View File

@@ -34,16 +34,16 @@ struct MysteryGiftLink
u16 sendCounter;
u16 sendCRC;
u16 sendSize;
void * recvBuffer;
const void * sendBuffer;
void *recvBuffer;
const void *sendBuffer;
u32 (*recvFunc)(struct MysteryGiftLink *);
u32 (*sendFunc)(struct MysteryGiftLink *);
};
void MysteryGiftLink_Init(struct MysteryGiftLink * link, u32 sendPlayerId, u32 recvPlayerId);
void MysteryGiftLink_InitSend(struct MysteryGiftLink * link, u32 ident, const void * src, u32 size);
bool32 MysteryGiftLink_Recv(struct MysteryGiftLink * link);
bool32 MysteryGiftLink_Send(struct MysteryGiftLink * link);
void MysteryGiftLink_InitRecv(struct MysteryGiftLink * link, u32 ident, void * dest);
void MysteryGiftLink_Init(struct MysteryGiftLink *link, u32 sendPlayerId, u32 recvPlayerId);
void MysteryGiftLink_InitSend(struct MysteryGiftLink *link, u32 ident, const void *src, u32 size);
bool32 MysteryGiftLink_Recv(struct MysteryGiftLink *link);
bool32 MysteryGiftLink_Send(struct MysteryGiftLink *link);
void MysteryGiftLink_InitRecv(struct MysteryGiftLink *link, u32 ident, void *dest);
#endif //GUARD_MYSTERY_GIFT_LINK_H

18
include/mystery_gift_server.h
View File

@@ -71,7 +71,7 @@ struct MysteryGiftServerCmd
{
u32 instr;
u32 parameter;
const void * ptr;
const void *ptr;
};
struct MysteryGiftServer
@@ -80,14 +80,14 @@ struct MysteryGiftServer
u32 param;
u32 funcId;
u32 cmdidx;
const struct MysteryGiftServerCmd * script;
void * recvBuffer;
struct WonderCard * card;
struct WonderNews * news;
struct MysteryGiftLinkGameData * linkGameData;
const void * ramScript;
const struct MysteryGiftServerCmd *script;
void *recvBuffer;
struct WonderCard *card;
struct WonderNews *news;
struct MysteryGiftLinkGameData *linkGameData;
const void *ramScript;
u32 ramScriptSize;
const void * clientScript;
const void *clientScript;
u32 clientScriptSize;
u32 stamp;
struct MysteryGiftLink link;
@@ -95,6 +95,6 @@ struct MysteryGiftServer
void MysterGiftServer_CreateForCard();
void MysterGiftServer_CreateForNews();
u32 MysterGiftServer_Run(u16 * endVal);
u32 MysterGiftServer_Run(u16 *endVal);
#endif //GUARD_MYSTERY_GIFT_SERVER_H

4
include/mystery_gift_view.h
View File

@@ -9,8 +9,8 @@ enum {
NEWS_INPUT_NONE = 0xFF
};
bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * metadata);
bool32 WonderNews_Init(const struct WonderNews * news);
bool32 WonderCard_Init(struct WonderCard *card, struct WonderCardMetadata *metadata);
bool32 WonderNews_Init(const struct WonderNews *news);
s32 WonderCard_Enter(void);
s32 WonderNews_Enter(void);
s32 WonderCard_Exit(bool32 flag);

2
include/pokenav.h
View File

@@ -33,7 +33,7 @@ typedef void (*PokenavListBufferItemFunc)(struct PokenavListItem *, u8 *);
struct PokenavListTemplate
{
struct PokenavListItem * list;
struct PokenavListItem *list;
u16 count;
u16 startIndex;
u8 itemSize;

4
include/tilesets.h
View File

@@ -4,7 +4,7 @@
extern const u32 gTilesetTiles_General[];
extern const u16 gTilesetPalettes_General[][16];
extern const struct Tileset * const gTilesetPointer_SecretBase;
extern const struct Tileset * const gTilesetPointer_SecretBaseRedCave;
extern const struct Tileset *const gTilesetPointer_SecretBase;
extern const struct Tileset *const gTilesetPointer_SecretBaseRedCave;
#endif //GUARD_tilesets_H