dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up mystery gift sync, document wonder news

Browse Source
This commit is contained in:
GriffinR
2022-11-21 23:52:11 -05:00
parent 76c3b014d8
commit a19cb44458
17 changed files with 212 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/mystery_gift.h
+8
View File
@@ -44,4 +44,12 @@
#define WONDER_CARD_FLAG_OFFSET 1000
#define NEWS_REWARD_NONE 0
#define NEWS_REWARD_RECV_SMALL 1
#define NEWS_REWARD_RECV_BIG 2
#define NEWS_REWARD_WAITING 3
#define NEWS_REWARD_SENT_SMALL 4
#define NEWS_REWARD_SENT_BIG 5
#define NEWS_REWARD_AT_MAX 6
#endif //GUARD_CONSTANTS_MYSTERY_GIFT_H
include/global.h
+2 -2
View File
@@ -628,8 +628,8 @@ struct FameCheckerSaveData
struct WonderNewsMetadata
{
u8 newsType:2;
u8 unk_0_2:3;
u8 unk_0_5:3;
u8 sentRewardCounter:3;
u8 rewardCounter:3;
u8 berry;
};
include/mystery_gift_link.h
-1
View File
@@ -2,7 +2,6 @@
#define GUARD_MYSTERY_GIFT_LINK_H
#define MG_LINK_BUFFER_SIZE 0x400
#define ME_SEND_BUF_SIZE MG_LINK_BUFFER_SIZE
// Send/receive ids for the Client/Server to make sure
// they're sending/receiving the same thing
include/mystery_gift_server.h
+3 -3
View File
@@ -49,7 +49,7 @@ enum {
// Create arguments for SVR_LOAD_CLIENT_SCRIPT or SVR_LOAD_MSG
// (a script/text size and pointer to send to the client)
#define PTR_ARG(pointer) .flag = sizeof(pointer), .parameter = pointer
#define PTR_ARG(pointer) .param = sizeof(pointer), .ptr = pointer
// IDs for server messages when ending a script.
// Given as the parameter to SVR_RETURN, and resolved to text in GetServerResultMessage
@@ -74,8 +74,8 @@ enum {
struct MysteryGiftServerCmd
{
u32 instr;
bool32 flag;
const void *parameter;
bool32 param;
const void *ptr;
};
struct MysteryGiftServer