From 4b59eea00ee53e9cb8ccdf81a9986c6bfa3ff78c Mon Sep 17 00:00:00 2001 From: iriv24 Date: Sat, 4 Jan 2025 22:47:48 -0500 Subject: [PATCH] add VERSION_NONE to GBA cartridge versions --- include/global/pm_version.h | 23 ++++++++++++----------- src/main.c | 2 +- src/overlay097/ov97_0222D30C.c | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/global/pm_version.h b/include/global/pm_version.h index 87eb3641a8..89652f5f58 100644 --- a/include/global/pm_version.h +++ b/include/global/pm_version.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_PM_VERSION_H #define POKEPLATINUM_PM_VERSION_H -#define SAPPHIRE 1 -#define RUBY 2 -#define EMERALD 3 -#define FIRERED 4 -#define LEAFGREEN 5 -#define HEARTGOLD 7 -#define SOULSILVER 8 -#define DIAMOND 10 -#define PEARL 11 -#define PLATINUM 12 -#define COLOSSEUM 15 +#define VERSION_NONE 0 +#define SAPPHIRE 1 +#define RUBY 2 +#define EMERALD 3 +#define FIRERED 4 +#define LEAFGREEN 5 +#define HEARTGOLD 7 +#define SOULSILVER 8 +#define DIAMOND 10 +#define PEARL 11 +#define PLATINUM 12 +#define COLOSSEUM 15 #define JAPANESE 1 #define ENGLISH 2 diff --git a/src/main.c b/src/main.c index cc8efe3795..d5af9148fb 100644 --- a/src/main.c +++ b/src/main.c @@ -71,7 +71,7 @@ void NitroMain(void) InitGraphics(); InitKeypadAndTouchpad(); - SetGBACartridgeVersion(0); + SetGBACartridgeVersion(VERSION_NONE); PM_GetBackLight(&sSavedBacklightState, NULL); sub_0202419C(); InitRTC(); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index d49864c682..694d772151 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -2445,7 +2445,7 @@ static int ov97_022301BC(OverlayManager *param0, int *param1) Heap_Destroy(86); if (v0->unk_1638 == 2) { - SetGBACartridgeVersion(0); + SetGBACartridgeVersion(VERSION_NONE); } ov97_02238400(0);