From b10eecc49d2d47ec7d757206ab9a390c17b79ee9 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 12 Jan 2025 21:12:05 -0300 Subject: [PATCH] Fixed matching French and Italian --- Makefile | 40 +++++++++++++++---- .../text_fr.inc | 5 +-- .../text_it.inc | 6 +-- .../text_fr.inc | 5 ++- .../text_it.inc | 6 +-- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 6d66c34d65..72e06c26b7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ # GBA rom header TITLE := POKEMON EMER -GAME_CODE := BPEE +GAME_CODE := BPE MAKER_CODE := 01 REVISION := 0 MODERN ?= 0 KEEP_TEMPS ?= 0 +LANGUAGE ?= ENGLISH # `File name`.gba ('_modern' will be appended to the modern builds) FILE_NAME := pokeemerald @@ -22,6 +23,29 @@ ifeq (compare,$(MAKECMDGOALS)) COMPARE := 1 endif +# Language +ifeq ($(LANGUAGE), ENGLISH) + GAME_CODE := $(GAME_CODE)E + BUILD_SUFIX := +else +ifeq ($(LANGUAGE), FRENCH) + GAME_CODE := $(GAME_CODE)F + BUILD_SUFIX := _fr +else +ifeq ($(LANGUAGE), ITALIAN) + GAME_CODE := $(GAME_CODE)I + BUILD_SUFIX := _it +else +ifeq ($(LANGUAGE), SPANISH) + GAME_CODE := $(GAME_CODE)S + BUILD_SUFIX := _es +else + $(error unknown language $(LANGUAGE)) +endif +endif +endif +endif + # Default make rule all: rom @@ -67,10 +91,10 @@ else CPP := $(PREFIX)cpp endif -ROM_NAME := $(FILE_NAME).gba -OBJ_DIR_NAME := $(BUILD_DIR)/emerald -MODERN_ROM_NAME := $(FILE_NAME)_modern.gba -MODERN_OBJ_DIR_NAME := $(BUILD_DIR)/modern +ROM_NAME := $(FILE_NAME)$(BUILD_SUFIX).gba +OBJ_DIR_NAME := $(BUILD_DIR)/emerald$(BUILD_SUFIX) +MODERN_ROM_NAME := $(FILE_NAME)$(BUILD_SUFIX)_modern.gba +MODERN_OBJ_DIR_NAME := $(BUILD_DIR)/modern$(BUILD_SUFIX) ELF_NAME := $(ROM_NAME:.gba=.elf) MAP_NAME := $(ROM_NAME:.gba=.map) @@ -106,14 +130,14 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) SHELL := bash -o pipefail # Set flags for tools -ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN) +ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN) --defsym $(LANGUAGE)=1 INCLUDE_DIRS := include INCLUDE_CPP_ARGS := $(INCLUDE_DIRS:%=-iquote %) INCLUDE_SCANINC_ARGS := $(INCLUDE_DIRS:%=-I %) O_LEVEL ?= 2 -CPPFLAGS := $(INCLUDE_CPP_ARGS) -Wno-trigraphs -DMODERN=$(MODERN) +CPPFLAGS := $(INCLUDE_CPP_ARGS) -Wno-trigraphs -DMODERN=$(MODERN) -D $(LANGUAGE) ifeq ($(MODERN),0) CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef CC1 := tools/agbcc/bin/agbcc$(EXE) @@ -230,7 +254,7 @@ compare: all # Other rules rom: $(ROM) ifeq ($(COMPARE),1) - @$(SHA1) rom.sha1 + @$(SHA1) rom$(BUILD_SUFIX).sha1 endif syms: $(SYM) diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_fr.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_fr.inc index e402190fb6..e06aa8e6e6 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_fr.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_fr.inc @@ -6,7 +6,6 @@ Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: .string "accident est vite arrivé!$" Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: - .string "Désolé, mais vous ne pouvez pas vous\n" - .string "déplacer à pied sur la PISTE CYCLABLE.\l" - .string "C’est trop dangereux.\p" + .string "Désolé, mais vous ne pouvez pas marcher\n" + .string "sur la PISTE CYCLABLE. C’est dangereux.\p" .string "Revenez avec un VELO.$" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_it.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_it.inc index e79d769d43..966401cec7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_it.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text_it.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: .string "Sulla PISTA CICLABILE puoi andare\n" .string "a tutta birra e correre quanto ti pare.\p" - .string "Prova il brivido della velocità,\n" - .string "ma cerca di non causare incidenti!$" + .string "Prova il brivido della velocità, ma\n" + .string "cerca di non causare incidenti!$" Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: .string "Spiacente, la PISTA CICLABILE non è\n" - .string "destinata ai pedoni. È pericolosa!\p" + .string "destinata ai pedoni. Troppo pericolosa!\p" .string "Torna con una BICI!$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_fr.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_fr.inc index 9dae1b1781..1460b5fc12 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_fr.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_fr.inc @@ -6,6 +6,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: .string "accident est vite arrivé!$" Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: - .string "Désolé, mais vous ne pouvez pas marcher\n" - .string "sur la PISTE CYCLABLE. C’est dangereux.\p" + .string "Désolé, mais vous ne pouvez pas vous\n" + .string "déplacer à pied sur la PISTE CYCLABLE.\l" + .string "C’est trop dangereux.\p" .string "Revenez avec un VELO.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_it.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_it.inc index 260fd84137..f9e0fb5ebb 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_it.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text_it.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: .string "Sulla PISTA CICLABILE puoi andare\n" .string "a tutta birra e correre quanto ti pare.\p" - .string "Prova il brivido della velocità, ma\n" - .string "cerca di non causare incidenti!$" + .string "Prova il brivido della velocità,\n" + .string "ma cerca di non causare incidenti!$" Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: .string "Spiacente, la PISTA CICLABILE non è\n" - .string "destinata ai pedoni. Troppo pericolosa!\p" + .string "destinata ai pedoni. È pericolosa!\p" .string "Torna con una BICI!$"