diff --git a/data/event_scripts.s b/data/event_scripts.s index eb84add17f..348c6fe8cf 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -833,9 +833,7 @@ Common_EventScript_PlayerHandedOverTheItem:: .ifdef FRENCH .include "data/text/general_fr.inc" .else -.ifdef ENGLISH .include "data/text/general.inc" -.endif .endif .include "data/text/pc_transfer.inc" .include "data/text/questionnaire.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 7c59fec967..e95f0aebe0 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -22,20 +22,8 @@ AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: release end -AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: - .string "I'm investigating this ship on behalf\n" - .string "of CAPT. STERN.\p" - .string "He also asked me to find a SCANNER,\n" - .string "but I haven't had any success…$" - -AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: - .string "Oh! That's a SCANNER!\p" - .string "Listen, can I get you to deliver that\n" - .string "to CAPT. STERN?\p" - .string "I want to investigate this ship a\n" - .string "little more.$" - -AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: - .string "This ship is called S.S. CACTUS.\n" - .string "It seems to be from an earlier era.$" - +.ifdef FRENCH + .include "data/maps/AbandonedShip_CaptainsOffice/text_fr.inc" +.else + .include "data/maps/AbandonedShip_CaptainsOffice/text.inc" @ENGLISH DEFAULT +.endif diff --git a/data/maps/AbandonedShip_CaptainsOffice/text.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc new file mode 100644 index 0000000000..627ca4bb7f --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/text.inc @@ -0,0 +1,17 @@ +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: + .string "I'm investigating this ship on behalf\n" + .string "of CAPT. STERN.\p" + .string "He also asked me to find a SCANNER,\n" + .string "but I haven't had any success…$" + +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: + .string "Oh! That's a SCANNER!\p" + .string "Listen, can I get you to deliver that\n" + .string "to CAPT. STERN?\p" + .string "I want to investigate this ship a\n" + .string "little more.$" + +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: + .string "This ship is called S.S. CACTUS.\n" + .string "It seems to be from an earlier era.$" + diff --git a/data/maps/AbandonedShip_CaptainsOffice/text_fr.inc b/data/maps/AbandonedShip_CaptainsOffice/text_fr.inc new file mode 100644 index 0000000000..b97340be1b --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/text_fr.inc @@ -0,0 +1,17 @@ +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: + .string "J’examine ce bateau pour le\n" + .string "CAPT. POUPE.\p" + .string "Il m’a aussi demandé de rapporter un\n" + .string "SCANNER, mais je n’en ai pas trouvé…$" + +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: + .string "Oh, c’est un SCANNER!\p" + .string "Ecoute, je peux te demander d’apporter\n" + .string "ça au CAPT. POUPE?\p" + .string "Je voudrais continuer d’examiner ce\n" + .string "bateau.$" + +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: + .string "Ce navire s’appelle LE CACTUS.\n" + .string "Il semble être d’une autre époque.$" + diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 2c850d1fdc..a124eeaf6c 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -10,17 +10,8 @@ AbandonedShip_Corridors_1F_EventScript_Charlie:: msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Corridors_1F_Text_CharlieIntro: - .string "What's so funny about having my inner\n" - .string "tube aboard the ship?$" - -AbandonedShip_Corridors_1F_Text_CharlieDefeat: - .string "Whoa, you overwhelmed me!$" - -AbandonedShip_Corridors_1F_Text_CharliePostBattle: - .string "It's not easy throwing POKé BALLS\n" - .string "while hanging on to an inner tube!$" - -AbandonedShip_Corridors_1F_Text_IsntItFunHere: - .string "Isn't it fun here?\n" - .string "I get excited just being here!$" +.ifdef FRENCH + .include "data/maps/AbandonedShip_Corridors_1F/text_fr.inc" +.else + .include "data/maps/AbandonedShip_Corridors_1F/text.inc" @ENGLISH DEFAULT +.endif diff --git a/data/maps/AbandonedShip_Corridors_1F/text.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc new file mode 100644 index 0000000000..bba9a5fe25 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/text.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_1F_Text_CharlieIntro: + .string "What's so funny about having my inner\n" + .string "tube aboard the ship?$" + +AbandonedShip_Corridors_1F_Text_CharlieDefeat: + .string "Whoa, you overwhelmed me!$" + +AbandonedShip_Corridors_1F_Text_CharliePostBattle: + .string "It's not easy throwing POKé BALLS\n" + .string "while hanging on to an inner tube!$" + +AbandonedShip_Corridors_1F_Text_IsntItFunHere: + .string "Isn't it fun here?\n" + .string "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Corridors_1F/text_fr.inc b/data/maps/AbandonedShip_Corridors_1F/text_fr.inc new file mode 100644 index 0000000000..b29e28dbf0 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/text_fr.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_1F_Text_CharlieIntro: + .string "Qu’est-ce qu’il y a de si drôle à me voir\n" + .string "à bord du bateau avec ma bouée?$" + +AbandonedShip_Corridors_1F_Text_CharlieDefeat: + .string "Waouh, tu m’as écrasé!$" + +AbandonedShip_Corridors_1F_Text_CharliePostBattle: + .string "C’est dur de lancer des POKé BALLS tout\n" + .string "en se cramponnant à une bouée!$" + +AbandonedShip_Corridors_1F_Text_IsntItFunHere: + .string "C’est cool ici, hein?\n" + .string "Je suis tout excité rien que d’être là!$"