Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-26 00:13:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make mystery_event_msg great again

Browse Source
This commit is contained in:
scnorton 2017-12-18 12:23:15 -05:00
parent da6cbc139a
commit 16935c0548
4 changed files with 69 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/mystery_event_msg.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef GUARD_MYSTERY_EVENT_MSG_H
#define GUARD_MYSTERY_EVENT_MSG_H
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_NewAdversaryInBattleTower[];
extern const u8 gOtherText_DataCannotUseVersion[];
#endif //GUARD_MYSTERY_EVENT_MSG_H

2
ld_script.txt
View File

@ -600,7 +600,7 @@ SECTIONS {
src/debug/unknown_debug_menu.o(.rodata);
data/strings2.o(.rodata);
src/engine/menu_cursor.o(.rodata);
src/engine/mystery_event_script.o(.rodata);
src/engine/mystery_event_msg.o(.rodata);
src/libs/m4a_tables.o(.rodata);
data/sound_data.o(.rodata);
} =0

51
src/engine/mystery_event_msg.c Normal file
View File

@ -0,0 +1,51 @@
#include "global.h"
#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

51
src/engine/mystery_event_script.c
View File

@ -14,6 +14,7 @@
#include "string_util.h"
#include "text.h"
#include "util.h"
#include "mystery_event_msg.h"
#if ENGLISH
#define LANGUAGE_MASK 0x2
@ -32,56 +33,6 @@ extern void party_compaction(void);
extern ScrCmdFunc gMysteryEventScriptCmdTable[];
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
#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};
static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4)