From 37bd93ec6c3890048e49bada3e41127fd3fcea4f Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Tue, 5 Nov 2019 18:19:18 -0500
Subject: [PATCH] Rename mystery event msg scripts

---
 data/{mystery_event_msg.s => mystery_event.s}    | 16 ++++++++--------
 ...ltering_cave.inc => mevent_altering_cave.inc} |  0
 ...urora_ticket.inc => mevent_aurora_ticket.inc} |  0
 ...sg_battle_card.inc => mevent_battle_card.inc} |  0
 ...ystic_ticket.inc => mevent_mystic_ticket.inc} |  0
 ...sg_old_sea_map.inc => mevent_old_sea_map.inc} |  0
 .../{meventmsg_pichu.inc => mevent_pichu.inc}    |  0
 ...tmsg_stamp_card.inc => mevent_stamp_card.inc} |  0
 ...{meventmsg_trainer.inc => mevent_trainer.inc} |  0
 ld_script.txt                                    |  2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename data/{mystery_event_msg.s => mystery_event.s} (52%)
 rename data/scripts/{meventmsg_altering_cave.inc => mevent_altering_cave.inc} (100%)
 rename data/scripts/{meventmsg_aurora_ticket.inc => mevent_aurora_ticket.inc} (100%)
 rename data/scripts/{meventmsg_battle_card.inc => mevent_battle_card.inc} (100%)
 rename data/scripts/{meventmsg_mystic_ticket.inc => mevent_mystic_ticket.inc} (100%)
 rename data/scripts/{meventmsg_old_sea_map.inc => mevent_old_sea_map.inc} (100%)
 rename data/scripts/{meventmsg_pichu.inc => mevent_pichu.inc} (100%)
 rename data/scripts/{meventmsg_stamp_card.inc => mevent_stamp_card.inc} (100%)
 rename data/scripts/{meventmsg_trainer.inc => mevent_trainer.inc} (100%)

diff --git a/data/mystery_event_msg.s b/data/mystery_event.s
similarity index 52%
rename from data/mystery_event_msg.s
rename to data/mystery_event.s
index 877e5c649a..d707731b62 100644
--- a/data/mystery_event_msg.s
+++ b/data/mystery_event.s
@@ -15,11 +15,11 @@
 	.section .rodata
 
 	.align 2
-	.include "data/scripts/meventmsg_stamp_card.inc"
-	.include "data/scripts/meventmsg_pichu.inc"
-	.include "data/scripts/meventmsg_trainer.inc"
-	.include "data/scripts/meventmsg_battle_card.inc"
-	.include "data/scripts/meventmsg_aurora_ticket.inc"
-	.include "data/scripts/meventmsg_mystic_ticket.inc"
-	.include "data/scripts/meventmsg_altering_cave.inc"
-	.include "data/scripts/meventmsg_old_sea_map.inc"
+	.include "data/scripts/mevent_stamp_card.inc"
+	.include "data/scripts/mevent_pichu.inc"
+	.include "data/scripts/mevent_trainer.inc"
+	.include "data/scripts/mevent_battle_card.inc"
+	.include "data/scripts/mevent_aurora_ticket.inc"
+	.include "data/scripts/mevent_mystic_ticket.inc"
+	.include "data/scripts/mevent_altering_cave.inc"
+	.include "data/scripts/mevent_old_sea_map.inc"
diff --git a/data/scripts/meventmsg_altering_cave.inc b/data/scripts/mevent_altering_cave.inc
similarity index 100%
rename from data/scripts/meventmsg_altering_cave.inc
rename to data/scripts/mevent_altering_cave.inc
diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
similarity index 100%
rename from data/scripts/meventmsg_aurora_ticket.inc
rename to data/scripts/mevent_aurora_ticket.inc
diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/mevent_battle_card.inc
similarity index 100%
rename from data/scripts/meventmsg_battle_card.inc
rename to data/scripts/mevent_battle_card.inc
diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
similarity index 100%
rename from data/scripts/meventmsg_mystic_ticket.inc
rename to data/scripts/mevent_mystic_ticket.inc
diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
similarity index 100%
rename from data/scripts/meventmsg_old_sea_map.inc
rename to data/scripts/mevent_old_sea_map.inc
diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/mevent_pichu.inc
similarity index 100%
rename from data/scripts/meventmsg_pichu.inc
rename to data/scripts/mevent_pichu.inc
diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/mevent_stamp_card.inc
similarity index 100%
rename from data/scripts/meventmsg_stamp_card.inc
rename to data/scripts/mevent_stamp_card.inc
diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/mevent_trainer.inc
similarity index 100%
rename from data/scripts/meventmsg_trainer.inc
rename to data/scripts/mevent_trainer.inc
diff --git a/ld_script.txt b/ld_script.txt
index 92aafebdea..ca59a71a7c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -687,7 +687,7 @@ SECTIONS {
         data/text_input_strings.o(.rodata);
         data/fonts.o(.rodata);
         src/mystery_event_msg.o(.rodata);
-        data/mystery_event_msg.o(.rodata);
+        data/mystery_event.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0