Sync mevent file names

include/link_rfu.h

@@ -324,7 +324,7 @@ void RfuSetNormalDisconnectMode(void);
 void SetUnionRoomChatPlayerData(u32 numPlayers);
 void ClearRecvCommands(void);
 
-#include "mevent_server.h"
+#include "mystery_gift_server.h"
 extern const struct mevent_server_cmd gServerScript_ClientCanceledCard[];
 
 #endif //GUARD_LINK_RFU_H

include/mystery_gift.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_MEVENT_H
-#define GUARD_MEVENT_H
+#ifndef GUARD_MYSTERY_GIFT_H
+#define GUARD_MYSTERY_GIFT_H
 
 #include "global.h"
 
@@ -105,4 +105,4 @@ void MysteryGift_DisableStats(void);
 bool32 MysteryGift_TryEnableStatsByFlagId(u16 flagId);
 u16 GetWonderCardFlagId(void);
 
-#endif //GUARD_MEVENT_H
+#endif // GUARD_MYSTERY_GIFT_H

include/mystery_gift_server.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_MEVENT_SERVER_H
-#define GUARD_MEVENT_SERVER_H
+#ifndef GUARD_MYSTERY_GIFT_SERVER_H
+#define GUARD_MYSTERY_GIFT_SERVER_H
 
 #include "global.h"
 
@@ -126,4 +126,4 @@ void mevent_srv_init_wnews(void);
 void mevent_srv_new_wcard(void);
 u32 mevent_srv_common_do_exec(u16 * a0);
 
-#endif //GUARD_MEVENT_SERVER_H
+#endif //GUARD_MYSTERY_GIFT_SERVER_H

include/strings.h

@@ -1141,7 +1141,7 @@ extern const u8 gText_PeopleBattling[];
 extern const u8 gText_PeopleInUnionRoom[];
 extern const u8 gText_PeopleCommunicating[];
 
-// mevent
+// mystery_gift
 extern const u8 gJPText_ReceiveMysteryGiftWithEReader[];
 extern const u8 gJPText_SelectConnectFromEReaderMenu[];
 extern const u8 gJPText_SelectConnectWithGBA[];

include/wonder_news.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_MENEWS_JISAN_H
-#define GUARD_MENEWS_JISAN_H
+#ifndef GUARD_WONDER_NEWS_H
+#define GUARD_WONDER_NEWS_H
 
 #include "global.h"
 
@@ -7,4 +7,4 @@ void MENewsJisan_SetRandomReward(u32 a0);
 void MENewsJisanReset(void);
 void MENewsJisanStepCounter(void);
 
-#endif //GUARD_MENEWS_JISAN_H
+#endif //GUARD_WONDER_NEWS_H

ld_script.txt

@@ -275,13 +275,13 @@ SECTIONS {
         src/slot_machine.o(.text);
         src/roamer.o(.text);
         src/mystery_gift_menu.o(.text);
-        src/mevent.o(.text);
-        src/mevent_server_helpers.o(.text);
-        src/mevent_client.o(.text);
-        src/mevent_server.o(.text);
+        src/mystery_gift.o(.text);
+        src/mystery_gift_link.o(.text);
+        src/mystery_gift_client.o(.text);
+        src/mystery_gift_server.o(.text);
         src/mystery_gift_show_card.o(.text);
         src/mystery_gift_show_news.o(.text);
-        src/menews_jisan.o(.text);
+        src/wonder_news.o(.text);
         src/seagallop.o(.text);
         src/pokemon_jump.o(.text);
         src/berry_crush.o(.text);
@@ -568,15 +568,15 @@ SECTIONS {
         src/slot_machine.o(.rodata);
         src/roamer.o(.rodata);
         src/mystery_gift_menu.o(.rodata);
-        src/mevent.o(.rodata);
-        src/mevent_server_helpers.o(.rodata);
-        src/mevent_client.o(.rodata);
-        src/mevent_server.o(.rodata);
+        src/mystery_gift.o(.rodata);
+        src/mystery_gift_link.o(.rodata);
+        src/mystery_gift_client.o(.rodata);
+        src/mystery_gift_server.o(.rodata);
         src/mystery_gift_show_card.o(.rodata);
         src/mystery_gift_show_news.o(.rodata);
-        src/mevent_scripts.o(.rodata);
-        src/menews_jisan.o(.rodata);
-        src/menews_jisan.o(.rodata.str1.4);
+        src/mystery_gift_scripts.o(.rodata);
+        src/wonder_news.o(.rodata);
+        src/wonder_news.o(.rodata.str1.4);
         src/seagallop.o(.rodata);
         src/pokemon_jump.o(.rodata);
         src/berry_crush.o(.rodata);

src/cable_club.c

@@ -10,7 +10,7 @@
 #include "link.h"
 #include "load_save.h"
 #include "m4a.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
 #include "quest_log.h"

src/easy_chat.c

@@ -4,7 +4,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "field_message_box.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "menu.h"
 #include "mail.h"
 #include "pokedex.h"

src/easy_chat_2.c

@@ -3,7 +3,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "menu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "overworld.h"
 #include "strings.h"
 #include "task.h"

src/field_control_avatar.c

@@ -14,7 +14,7 @@
 #include "field_specials.h"
 #include "item_menu.h"
 #include "link.h"
-#include "menews_jisan.h"
+#include "wonder_news.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "renewable_hidden_items.h"

src/field_specials.c

@@ -28,7 +28,7 @@
 #include "pokedex.h"
 #include "text_window.h"
 #include "menu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "naming_screen.h"
 #include "party_menu.h"
 #include "dynamic_placeholder_text_util.h"

src/mystery_gift.c

@@ -12,11 +12,11 @@
 #include "event_data.h"
 #include "battle_tower.h"
 #include "new_game.h"
-#include "menews_jisan.h"
+#include "wonder_news.h"
 #include "cereader_tool.h"
 #include "mystery_gift_menu.h"
 #include "help_system.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "strings.h"
 
 struct MEventTaskData1

src/mystery_gift_client.c

@@ -5,8 +5,8 @@
 #include "script.h"
 #include "battle_tower.h"
 #include "mystery_event_script.h"
-#include "mevent.h"
-#include "mevent_server.h"
+#include "mystery_gift.h"
+#include "mystery_gift_server.h"
 
 static EWRAM_DATA struct mevent_client * s_mevent_client_ptr = NULL;
 

src/mystery_gift_link.c

@@ -2,7 +2,7 @@
 #include "util.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "mevent_server.h"
+#include "mystery_gift_server.h"
 
 static u32 mevent_receive_func(struct mevent_srv_sub *);
 static u32 mevent_send_func(struct mevent_srv_sub *);

src/mystery_gift_menu.c

@@ -9,12 +9,12 @@
 #include "title_screen.h"
 #include "list_menu.h"
 #include "link_rfu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "save.h"
 #include "link.h"
 #include "event_data.h"
-#include "mevent_server.h"
-#include "menews_jisan.h"
+#include "mystery_gift_server.h"
+#include "wonder_news.h"
 #include "help_system.h"
 #include "strings.h"
 #include "constants/songs.h"

src/mystery_gift_scripts.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "mevent_server.h"
+#include "mystery_gift_server.h"
 
 extern const struct mevent_server_cmd gServerScript_ClientCanceledCard[];
 

src/mystery_gift_server.c

@@ -1,8 +1,8 @@
 #include "global.h"
 #include "gflib.h"
 #include "script.h"
-#include "mevent.h"
-#include "mevent_server.h"
+#include "mystery_gift.h"
+#include "mystery_gift_server.h"
 
 EWRAM_DATA struct mevent_srv_common * s_mevent_srv_common_ptr = NULL;
 

src/mystery_gift_show_card.c

@@ -5,7 +5,7 @@
 #include "new_menu_helpers.h"
 #include "pokemon_icon.h"
 #include "mystery_gift_menu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "battle_anim.h"
 #include "constants/mystery_gift.h"
 

src/mystery_gift_show_news.c

@@ -2,7 +2,7 @@
 #include "gflib.h"
 #include "menu_indicators.h"
 #include "new_menu_helpers.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "mystery_gift_menu.h"
 #include "menu.h"
 #include "link_rfu.h"

src/new_game.c

@@ -22,7 +22,7 @@
 #include "berry.h"
 #include "easy_chat.h"
 #include "union_room_chat.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "renewable_hidden_items.h"
 #include "trainer_tower.h"
 #include "script.h"

src/script.c

@@ -7,7 +7,7 @@
 
 extern void ResetContextNpcTextColor(void); // field_specials
 extern u16 CalcCRC16WithTable(u8 *data, int length); // util
-extern bool32 ValidateReceivedWonderCard(void); // mevent
+extern bool32 ValidateReceivedWonderCard(void);
 
 #define RAM_SCRIPT_MAGIC 51
 

src/trade_scene.c

@@ -6,7 +6,7 @@
 #include "trade.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "graphics.h"
 #include "strings.h"
 #include "menu.h"

src/union_room.c

@@ -20,7 +20,7 @@
 #include "list_menu.h"
 #include "load_save.h"
 #include "menu.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "mystery_gift_menu.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"

src/union_room_message.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "link_rfu.h"
-#include "mevent_server.h"
+#include "mystery_gift_server.h"
 #include "constants/union_room.h"
 
 ALIGNED(4) const u8 gText_UR_EmptyString[] = _("");

src/wonder_news.c

@@ -1,8 +1,8 @@
 #include "global.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "random.h"
 #include "event_data.h"
-#include "menews_jisan.h"
+#include "wonder_news.h"
 #include "constants/items.h"
 
 static u32 GetMENewsJisanRewardItem(struct WonderNewsMetadata *);

sym_common.txt

@@ -40,7 +40,7 @@
 	.include "fame_checker.o"
 	.include "help_system_util.o"
 	.align 4
-	.include "mevent.o"
+	.include "mystery_gift.o"
 	.align 4
 	.include "battle_controller_pokedude.o"
 	.align 4

sym_ewram.txt

@@ -121,10 +121,10 @@
 	.include "src/slot_machine.o"
 	.include "src/roamer.o"
 	.include "src/mystery_gift_menu.o"
-	.include "src/mevent.o"
-	.include "src/mevent_server_helpers.o"
-	.include "src/mevent_client.o"
-	.include "src/mevent_server.o"
+	.include "src/mystery_gift.o"
+	.include "src/mystery_gift_link.o"
+	.include "src/mystery_gift_client.o"
+	.include "src/mystery_gift_server.o"
 	.include "src/mystery_gift_show_card.o"
 	.include "src/mystery_gift_show_news.o"
 	.include "src/seagallop.o"