Decompile data: mystery_event_msg

4 files changed, 50 insertions, 91 deletions

diff --git a/data-de/mystery_event_msg.s b/data-de/mystery_event_msg.s
deleted file mode 100644
index 578aa357f..000000000
--- a/data-de/mystery_event_msg.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gOtherText_BerryObtainedDadHasIt:: @ 842F798
-	.string "Eine {STR_VAR_2}BEERE! Vater in der \n"
-	.string "ARENA von BLÜTENBURG CITY besitzt\l"
-	.string "auch eine.$"
-
-gOtherText_BerryTransformed:: @ 842F7CA
-	.string "Die {STR_VAR_1}BEERE verwandelte\n"
-	.string "sich in eine {STR_VAR_2}BEERE!$"
-
-gOtherText_BerryAlreadyObtained:: @ 842F7F6
-	.string "Du hast schon eine {STR_VAR_1}BEERE.$"
-
-gOtherText_SpecialRibbonReceived:: @ 842F81E
-	.string "Ein besonderes BAND wurde deinem\n"
-	.string "POKéMON im Team verliehen.$"
-
-gOtherText_DexUpgraded:: @ 842F852
-	.string "Der POKéDEX wurde mit dem NATIONALEN\n"
-	.string "MODUS ausgerüstet.$"
-
-gOtherText_RareWordAdded:: @ 842F888
-	.string "Ein seltenes Wort wurde hinzugefügt.$"
-
-gOtherText_PokeWasSentOver:: @ 842F8A4
-	.string "{STR_VAR_1} wurde gesendet!$"
-
-gOtherText_PartyIsFull:: @ 842F8B6
-	.string "Dein Team ist bereits vollständig.\n"
-	.string "{STR_VAR_1} kann nicht gesendet\l"
-	.string "werden.$"
-
-gOtherText_NewTrainerInHoenn:: @ 842F8E5
-	.string "Ein neuer TRAINER ist in HOENN\n"
-	.string "angekommen.$"
-	.string "Ein neuer Widersacher ist im DUELLTURM\n"
-	.string "eingetroffen.$"
-
-gOtherText_DataCannotUseVersion:: @ 842F93A
-	.string "Die Daten können in dieser Edition\n"
-	.string "nicht eingesetzt werden.$"
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
deleted file mode 100644
index 26e6a9e06..000000000
--- a/data/mystery_event_msg.s
+++ /dev/null
@@ -1,35 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gOtherText_BerryObtainedDadHasIt:: @ 842F798
-	.string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$"
-
-gOtherText_BerryTransformed:: @ 842F7CA
-	.string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$"
-
-gOtherText_BerryAlreadyObtained:: @ 842F7F6
-	.string "The {STR_VAR_1} BERRY has already been\nobtained.$"
-
-gOtherText_SpecialRibbonReceived:: @ 842F81E
-	.string "A special RIBBON was awarded to your\nparty POKéMON.$"
-
-gOtherText_DexUpgraded:: @ 842F852
-	.string "The POKéDEX has been upgraded with\nthe NATIONAL MODE.$"
-
-gOtherText_RareWordAdded:: @ 842F888
-	.string "A rare word has been added.$"
-
-gOtherText_PokeWasSentOver:: @ 842F8A4
-	.string "{STR_VAR_1} was sent over!$"
-
-gOtherText_PartyIsFull:: @ 842F8B6
-	.string "Your party is full.\n{STR_VAR_1} could not be sent over.$"
-
-gOtherText_NewTrainerInHoenn:: @ 842F8E5
-	.string "A new TRAINER has arrived in HOENN.$"
-	.string "A new adversary has arrived in the\nBATTLE TOWER.$"
-
-gOtherText_DataCannotUseVersion:: @ 842F93A
-	.string "This data cannot be used in\nthis version.$"
diff --git a/ld_script.txt b/ld_script.txt
index 961295022..3ebc5e74c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -600,7 +600,7 @@ SECTIONS {
         src/debug/unknown_debug_menu.o(.rodata);
         data/strings2.o(.rodata);
         src/engine/menu_cursor.o(.rodata);
-        data/mystery_event_msg.o(.rodata);
+        src/engine/mystery_event_script.o(.rodata);
         src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c
index 12ad329da..0f79b6efb 100644
--- a/src/engine/mystery_event_script.c
+++ b/src/engine/mystery_event_script.c
@@ -32,16 +32,55 @@ extern void party_compaction(void);
 extern ScrCmdFunc gMysteryEventScriptCmdTable[];
 extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
 
-extern const u8 gOtherText_BerryObtainedDadHasIt[];
-extern const u8 gOtherText_BerryTransformed[];
-extern const u8 gOtherText_BerryAlreadyObtained[];
-extern const u8 gOtherText_SpecialRibbonReceived[];
-extern const u8 gOtherText_DexUpgraded[];
-extern const u8 gOtherText_RareWordAdded[];
-extern const u8 gOtherText_PokeWasSentOver[];
-extern const u8 gOtherText_PartyIsFull[];
-extern const u8 gOtherText_NewTrainerInHoenn[];
-extern const u8 gOtherText_DataCannotUseVersion[];
+#if ENGLISH
+
+const u8 gOtherText_BerryObtainedDadHasIt[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.");
+
+const u8 gOtherText_BerryTransformed[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.");
+
+const u8 gOtherText_BerryAlreadyObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained.");
+
+const u8 gOtherText_SpecialRibbonReceived[] = _("A special RIBBON was awarded to your\nparty POKéMON.");
+
+const u8 gOtherText_DexUpgraded[] = _("The POKéDEX has been upgraded with\nthe NATIONAL MODE.");
+
+const u8 gOtherText_RareWordAdded[] = _("A rare word has been added.");
+
+const u8 gOtherText_PokeWasSentOver[] = _("{STR_VAR_1} was sent over!");
+
+const u8 gOtherText_PartyIsFull[] = _("Your party is full.\n{STR_VAR_1} could not be sent over.");
+
+const u8 gOtherText_NewTrainerInHoenn[] = _("A new TRAINER has arrived in HOENN.");
+
+const u8 gOtherText_NewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER.");
+
+const u8 gOtherText_DataCannotUseVersion[] = _("This data cannot be used in\nthis version.");
+
+#elif GERMAN
+
+const u8 gOtherText_BerryObtainedDadHasIt[] = _("Eine {STR_VAR_2}BEERE! Vater in der \nARENA von BLÜTENBURG CITY besitzt\lauch eine.");
+
+const u8 gOtherText_BerryTransformed[] = _("Die {STR_VAR_1}BEERE verwandelte\nsich in eine {STR_VAR_2}BEERE!");
+
+const u8 gOtherText_BerryAlreadyObtained[] = _("Du hast schon eine {STR_VAR_1}BEERE.");
+
+const u8 gOtherText_SpecialRibbonReceived[] = _("Ein besonderes BAND wurde deinem\nPOKéMON im Team verliehen.");
+
+const u8 gOtherText_DexUpgraded[] = _("Der POKéDEX wurde mit dem NATIONALEN\nMODUS ausgerüstet.");
+
+const u8 gOtherText_RareWordAdded[] = _("Ein seltenes Wort wurde hinzugefügt.");
+
+const u8 gOtherText_PokeWasSentOver[] = _("{STR_VAR_1} wurde gesendet!");
+
+const u8 gOtherText_PartyIsFull[] = _("Dein Team ist bereits vollständig.\n{STR_VAR_1} kann nicht gesendet\lwerden.");
+
+const u8 gOtherText_NewTrainerInHoenn[] = _("Ein neuer TRAINER ist in HOENN\nangekommen.");
+
+const u8 gOtherText_NewAdversaryInBattleTower[] = _("Ein neuer Widersacher ist im DUELLTURM\neingetroffen.");
+
+const u8 gOtherText_DataCannotUseVersion[] = _("Die Daten können in dieser Edition\nnicht eingesetzt werden.");
+
+#endif // ENGLISH/GERMAN
 
 static EWRAM_DATA struct ScriptContext sMysteryEventScriptContext = {0};