From 3c3101b72ca9e2d1dad163bba0e4360b31103d73 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 19 Nov 2022 18:39:26 -0500 Subject: [PATCH] Sync mevent file names --- common_syms/{mevent.txt => mystery_gift.txt} | 0 include/link_rfu.h | 2 +- include/{mevent.h => mystery_gift.h} | 6 ++--- ...{mevent_server.h => mystery_gift_server.h} | 6 ++--- include/strings.h | 2 +- include/{menews_jisan.h => wonder_news.h} | 6 ++--- ld_script.txt | 24 +++++++++---------- src/cable_club.c | 2 +- src/easy_chat.c | 2 +- src/easy_chat_2.c | 2 +- src/field_control_avatar.c | 2 +- src/field_specials.c | 2 +- src/{mevent.c => mystery_gift.c} | 4 ++-- ...{mevent_client.c => mystery_gift_client.c} | 4 ++-- ...t_server_helpers.c => mystery_gift_link.c} | 2 +- src/mystery_gift_menu.c | 6 ++--- ...event_scripts.c => mystery_gift_scripts.c} | 2 +- ...{mevent_server.c => mystery_gift_server.c} | 4 ++-- src/mystery_gift_show_card.c | 2 +- src/mystery_gift_show_news.c | 2 +- src/new_game.c | 2 +- src/script.c | 2 +- src/trade_scene.c | 2 +- src/union_room.c | 2 +- src/union_room_message.c | 2 +- src/{menews_jisan.c => wonder_news.c} | 4 ++-- sym_common.txt | 2 +- sym_ewram.txt | 8 +++---- 28 files changed, 53 insertions(+), 53 deletions(-) rename common_syms/{mevent.txt => mystery_gift.txt} (100%) rename include/{mevent.h => mystery_gift.h} (97%) rename include/{mevent_server.h => mystery_gift_server.h} (97%) rename include/{menews_jisan.h => wonder_news.h} (59%) rename src/{mevent.c => mystery_gift.c} (99%) rename src/{mevent_client.c => mystery_gift_client.c} (99%) rename src/{mevent_server_helpers.c => mystery_gift_link.c} (99%) rename src/{mevent_scripts.c => mystery_gift_scripts.c} (99%) rename src/{mevent_server.c => mystery_gift_server.c} (99%) rename src/{menews_jisan.c => wonder_news.c} (98%) diff --git a/common_syms/mevent.txt b/common_syms/mystery_gift.txt similarity index 100% rename from common_syms/mevent.txt rename to common_syms/mystery_gift.txt diff --git a/include/link_rfu.h b/include/link_rfu.h index e3b60ccb4..65d1cf6dd 100644 --- a/include/link_rfu.h +++ b/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 diff --git a/include/mevent.h b/include/mystery_gift.h similarity index 97% rename from include/mevent.h rename to include/mystery_gift.h index 92c664d46..e25598c9a 100644 --- a/include/mevent.h +++ b/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 diff --git a/include/mevent_server.h b/include/mystery_gift_server.h similarity index 97% rename from include/mevent_server.h rename to include/mystery_gift_server.h index 9560fe25f..06bac26f3 100644 --- a/include/mevent_server.h +++ b/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 diff --git a/include/strings.h b/include/strings.h index 0d1fe4afa..8326616b0 100644 --- a/include/strings.h +++ b/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[]; diff --git a/include/menews_jisan.h b/include/wonder_news.h similarity index 59% rename from include/menews_jisan.h rename to include/wonder_news.h index 8e1c251f9..ec845906e 100644 --- a/include/menews_jisan.h +++ b/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 diff --git a/ld_script.txt b/ld_script.txt index 5c7a3751d..e19fa1ee6 100644 --- a/ld_script.txt +++ b/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); diff --git a/src/cable_club.c b/src/cable_club.c index b3fbc1f78..730b42d3d 100644 --- a/src/cable_club.c +++ b/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" diff --git a/src/easy_chat.c b/src/easy_chat.c index 096bda634..443500453 100644 --- a/src/easy_chat.c +++ b/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" diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 5a3c9a7cb..1688e92e0 100644 --- a/src/easy_chat_2.c +++ b/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" diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 615a70e60..c673a0753 100644 --- a/src/field_control_avatar.c +++ b/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" diff --git a/src/field_specials.c b/src/field_specials.c index 84ffd75e3..8ee9bb04c 100644 --- a/src/field_specials.c +++ b/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" diff --git a/src/mevent.c b/src/mystery_gift.c similarity index 99% rename from src/mevent.c rename to src/mystery_gift.c index 984c792b3..a12238263 100644 --- a/src/mevent.c +++ b/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 diff --git a/src/mevent_client.c b/src/mystery_gift_client.c similarity index 99% rename from src/mevent_client.c rename to src/mystery_gift_client.c index e2d226ed6..289de83f4 100644 --- a/src/mevent_client.c +++ b/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; diff --git a/src/mevent_server_helpers.c b/src/mystery_gift_link.c similarity index 99% rename from src/mevent_server_helpers.c rename to src/mystery_gift_link.c index 33148d539..f90151d6b 100644 --- a/src/mevent_server_helpers.c +++ b/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 *); diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index b07a57ee0..7e65298cd 100644 --- a/src/mystery_gift_menu.c +++ b/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" diff --git a/src/mevent_scripts.c b/src/mystery_gift_scripts.c similarity index 99% rename from src/mevent_scripts.c rename to src/mystery_gift_scripts.c index 0c2918655..b99c16405 100644 --- a/src/mevent_scripts.c +++ b/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[]; diff --git a/src/mevent_server.c b/src/mystery_gift_server.c similarity index 99% rename from src/mevent_server.c rename to src/mystery_gift_server.c index 7d4929195..98211e2ae 100644 --- a/src/mevent_server.c +++ b/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; diff --git a/src/mystery_gift_show_card.c b/src/mystery_gift_show_card.c index c462bda76..16382ce8f 100644 --- a/src/mystery_gift_show_card.c +++ b/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" diff --git a/src/mystery_gift_show_news.c b/src/mystery_gift_show_news.c index b97e74c8c..e1112d726 100644 --- a/src/mystery_gift_show_news.c +++ b/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" diff --git a/src/new_game.c b/src/new_game.c index d6400d763..18ff73e29 100644 --- a/src/new_game.c +++ b/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" diff --git a/src/script.c b/src/script.c index 641c63572..9095ab3ba 100644 --- a/src/script.c +++ b/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 diff --git a/src/trade_scene.c b/src/trade_scene.c index 50f8e4780..8e0e2598d 100644 --- a/src/trade_scene.c +++ b/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" diff --git a/src/union_room.c b/src/union_room.c index 8b8410e3d..5c21a0ac6 100644 --- a/src/union_room.c +++ b/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" diff --git a/src/union_room_message.c b/src/union_room_message.c index 21d74736f..d3c3c6e46 100644 --- a/src/union_room_message.c +++ b/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[] = _(""); diff --git a/src/menews_jisan.c b/src/wonder_news.c similarity index 98% rename from src/menews_jisan.c rename to src/wonder_news.c index d8d4af917..20f0ab3e7 100644 --- a/src/menews_jisan.c +++ b/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 *); diff --git a/sym_common.txt b/sym_common.txt index e130c3bf4..51b041064 100644 --- a/sym_common.txt +++ b/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 diff --git a/sym_ewram.txt b/sym_ewram.txt index f957d320b..cee4e8281 100644 --- a/sym_ewram.txt +++ b/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"