summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-05 18:19:18 -0500
committerhuderlem <huderlem@gmail.com>2019-11-06 16:38:02 -0600
commit37bd93ec6c3890048e49bada3e41127fd3fcea4f (patch)
tree0fdee14c081098c12ae364148e0b22bc4e748f9a
parente7f6459a890901d59ca179c40f58bd84b255e467 (diff)
Rename mystery event msg scripts
-rw-r--r--data/mystery_event.s (renamed from data/mystery_event_msg.s)16
-rw-r--r--data/scripts/mevent_altering_cave.inc (renamed from data/scripts/meventmsg_altering_cave.inc)0
-rw-r--r--data/scripts/mevent_aurora_ticket.inc (renamed from data/scripts/meventmsg_aurora_ticket.inc)0
-rw-r--r--data/scripts/mevent_battle_card.inc (renamed from data/scripts/meventmsg_battle_card.inc)0
-rw-r--r--data/scripts/mevent_mystic_ticket.inc (renamed from data/scripts/meventmsg_mystic_ticket.inc)0
-rw-r--r--data/scripts/mevent_old_sea_map.inc (renamed from data/scripts/meventmsg_old_sea_map.inc)0
-rw-r--r--data/scripts/mevent_pichu.inc (renamed from data/scripts/meventmsg_pichu.inc)0
-rw-r--r--data/scripts/mevent_stamp_card.inc (renamed from data/scripts/meventmsg_stamp_card.inc)0
-rw-r--r--data/scripts/mevent_trainer.inc (renamed from data/scripts/meventmsg_trainer.inc)0
-rw-r--r--ld_script.txt2
10 files changed, 9 insertions, 9 deletions
diff --git a/data/mystery_event_msg.s b/data/mystery_event.s
index 877e5c649..d707731b6 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
index 072005934..072005934 100644
--- a/data/scripts/meventmsg_altering_cave.inc
+++ b/data/scripts/mevent_altering_cave.inc
diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
index 811c840aa..811c840aa 100644
--- a/data/scripts/meventmsg_aurora_ticket.inc
+++ b/data/scripts/mevent_aurora_ticket.inc
diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/mevent_battle_card.inc
index 8c36ed63a..8c36ed63a 100644
--- a/data/scripts/meventmsg_battle_card.inc
+++ b/data/scripts/mevent_battle_card.inc
diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
index 0264fb77f..0264fb77f 100644
--- a/data/scripts/meventmsg_mystic_ticket.inc
+++ b/data/scripts/mevent_mystic_ticket.inc
diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
index dffb56caa..dffb56caa 100644
--- a/data/scripts/meventmsg_old_sea_map.inc
+++ b/data/scripts/mevent_old_sea_map.inc
diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/mevent_pichu.inc
index 4df317564..4df317564 100644
--- a/data/scripts/meventmsg_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/mevent_stamp_card.inc
index dcef80a50..dcef80a50 100644
--- a/data/scripts/meventmsg_stamp_card.inc
+++ b/data/scripts/mevent_stamp_card.inc
diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/mevent_trainer.inc
index 1b0117078..1b0117078 100644
--- a/data/scripts/meventmsg_trainer.inc
+++ b/data/scripts/mevent_trainer.inc
diff --git a/ld_script.txt b/ld_script.txt
index 92aafebde..ca59a71a7 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