diff --git a/Makefile b/Makefile index 17a69b222..ac1a4b2ef 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,7 @@ EXE := endif GAME_VERSION ?= FIRERED -GAME_LANGUAGE ?= ENGLISH -GAME_REVISION ?= 0 +REVISION ?= 0 MAKER_CODE := 01 MODERN ?= 1 TEST ?= 0 @@ -60,25 +59,6 @@ $(error unknown version $(GAME_VERSION)) endif endif -# Revision -ifeq ($(GAME_REVISION),0) -BUILD_NAME := $(BUILD_NAME) -else -ifeq ($(GAME_REVISION),1) -BUILD_NAME := $(BUILD_NAME)_rev1 -else -$(error unknown revision $(GAME_REVISION)) -endif -endif - -# Language -ifeq ($(GAME_LANGUAGE),ENGLISH) -BUILD_NAME := $(BUILD_NAME) -GAME_CODE := $(GAME_CODE)E -else -$(error unknown language $(GAME_LANGUAGE)) -endif - ifeq (agbcc,$(MAKECMDGOALS)) MODERN := 0 endif @@ -150,7 +130,7 @@ SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR) MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) TEST_BUILDDIR = $(OBJ_DIR)/$(TEST_SUBDIR) -ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN) --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 +ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN) --defsym $(GAME_VERSION)=1 ifeq ($(MODERN),0) CC1 := tools/agbcc/bin/agbcc$(EXE) @@ -185,7 +165,7 @@ ifeq ($(TEST),1) OBJ_DIR := $(TEST_OBJ_DIR_NAME) endif -CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN) -DTESTING=$(TEST) -D$(GAME_VERSION) -DREVISION=$(GAME_REVISION) -D$(GAME_LANGUAGE) +CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN) -DTESTING=$(TEST) -D$(GAME_VERSION) ifneq ($(MODERN),1) CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef endif @@ -525,7 +505,7 @@ LDFLAGS = -Map ../../$(MAP) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat - $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent + $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ @@ -543,7 +523,7 @@ $(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS) $(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools @echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB) - $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) -d0 --silent + $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -d0 --silent $(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS)\0" ifeq ($(GITHUB_REPOSITORY_OWNER),rh-hideout) diff --git a/asm/macros.inc b/asm/macros.inc index ac7f5681f..dca13692c 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -160,10 +160,6 @@ .endm .macro abspath relative - .if REVISION == 0 - .ascii "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/" - .else .ascii "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/" - .endif .asciz "\relative" .endm diff --git a/constants/version.inc b/constants/version.inc index c5bef93d8..55eac837d 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -3,11 +3,4 @@ .else .equiv GAME_VERSION, 5 .endif - - .ifdef ENGLISH - .equiv GAME_LANGUAGE, 2 - .else - .ifdef GERMAN - .equiv GAME_LANGUAGE, 5 - .endif - .endif + diff --git a/data/text/help_system.inc b/data/text/help_system.inc index 3a083e82b..7a26091bf 100644 --- a/data/text/help_system.inc +++ b/data/text/help_system.inc @@ -977,13 +977,8 @@ Help_Text_HowToReadPokedex:: .string " the POKéDEX list.\n" .string "{CIRCLE_2} A caught POKéMON will provide a\n" .string " large amount of data.\n" - .if REVISION < 1 - .string "{CIRCLE_3} Select “AREA” to display the TOWN\n" - .string " MAP with the POKéMON's habitat(s).$" - .else .string "{CIRCLE_3} Select “NEXT DATA” to display the\n" .string " TOWN MAP with its habitat(s).$" - .endif Help_Text_HowToUseHomePC:: .string "{CIRCLE_1} Go up to the PC at home, then press\n" diff --git a/include/config.h b/include/config.h index 433a6b16c..6d54c10b5 100644 --- a/include/config.h +++ b/include/config.h @@ -41,12 +41,7 @@ #endif // GAME_VERSION // rev1 renamed the source folder for reasons -#if REVISION == 0 -#define CODE_ROOT "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/" -#else #define CODE_ROOT "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/" -#endif // REVISION - #define ABSPATH(x) (CODE_ROOT x) // Crashes may occur due to section reordering in the modern build, diff --git a/include/constants/global.h b/include/constants/global.h index f2dedfec2..046bc7f18 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -33,9 +33,7 @@ #define LANGUAGE_SPANISH 7 #define NUM_LANGUAGES 7 -#ifdef ENGLISH #define GAME_LANGUAGE (LANGUAGE_ENGLISH) -#endif // party sizes #define PARTY_SIZE 6 diff --git a/src/daycare.c b/src/daycare.c index 8dd24db64..9e57e182a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1625,11 +1625,7 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare u8 lvlText[12]; u8 intText[8]; -#if REVISION == 0 - strcpy((char *)lvlText, (const char *)gText_Lv); -#else StringCopy(lvlText, gText_Lv); -#endif level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps); ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(lvlText, intText); diff --git a/src/intro.c b/src/intro.c index 24e0a7ef4..ee8c7c303 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1253,9 +1253,7 @@ static void IntroCB_GF_RevealLogo(struct IntroSequenceData * this) if (!IsDma3ManagerBusyWithBgCopy()) { DestroySprite(this->gameFreakLogoArtSprite); - #if REVISION >= 1 GFScene_CreatePresentsSprite(); - #endif this->timer = 0; this->state++; } @@ -2099,14 +2097,12 @@ static struct Sprite *GFScene_CreateLogoSprite(void) return &gSprites[spriteId]; } -#if REVISION >= 1 static void GFScene_CreatePresentsSprite(void) { int i; for (i = 0; i < 2; i++) gSprites[CreateSprite(&sSpriteTemplate_Presents, 104 + 32 * i, 108, 5)].oam.tileNum += i * 4; } -#endif #define tState data[0] #define tTimer data[1] diff --git a/src/main.c b/src/main.c index d65d4a0e5..4c96317bd 100644 --- a/src/main.c +++ b/src/main.c @@ -30,17 +30,12 @@ static void IntrDummy(void); extern void gInitialMainCB2(void); const u8 gGameVersion = GAME_VERSION; - const u8 gGameLanguage = GAME_LANGUAGE; #if MODERN const char BuildDateTime[] = __DATE__ " " __TIME__; #else -#if REVISION == 0 -const char BuildDateTime[] = "2004 04 26 11:20"; -#else const char BuildDateTime[] = "2004 07 20 09:30"; -#endif //REVISION #endif //MODERN const IntrFunc gIntrTableTemplate[] = @@ -158,10 +153,8 @@ void AgbMain() #endif #endif -#if REVISION == 1 if (gFlashMemoryPresent != TRUE) SetMainCallback2(NULL); -#endif gLinkTransferringData = FALSE; gAgbMainLoop_sp = __builtin_frame_address(0); diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index c1721d433..c77d72b0f 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -2699,7 +2699,7 @@ void DexScreen_DexPageZoomEffectFrame(u8 bg, u8 scale) void DexScreen_PrintMonCategory(u8 windowId, u16 species, u8 x, u8 y) { - u8 * categoryName; + u8 *categoryName; u8 index, categoryStr[12]; u16 natDexNum = SpeciesToNationalDexNum(species); @@ -2707,11 +2707,7 @@ void DexScreen_PrintMonCategory(u8 windowId, u16 species, u8 x, u8 y) index = 0; if (DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE)) { -#if REVISION == 0 - while ((categoryName[index] != CHAR_SPACE) && (index < 11)) -#else while ((categoryName[index] != EOS) && (index < 11)) -#endif { categoryStr[index] = categoryName[index]; index++;