Match player name choices in LG

5 files changed, 40 insertions, 4 deletions

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 2ad1485c2..b899a217b 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -708,9 +708,8 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 extern const u8 gOtherText_NewName[];
 extern const u8 gNameChoice_Green[];
 extern const u8 gNameChoice_Red[];
-extern const u8 gNameChoice_Red[];
-extern const u8 gNameChoice_Fire[];
 extern const u8 gNameChoice_Fire[];
+extern const u8 gNameChoice_Leaf[];
 extern const u8 gNameChoice_Gary[];
 extern const u8 gNameChoice_Kaz[];
 extern const u8 gNameChoice_Toru[];
diff --git a/include/strings.h b/include/strings.h
index bc1aee889..90fd49b52 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -777,6 +777,11 @@ extern const u8 gText_Clefairy_500Coins[];
 extern const u8 gText_Dratini_2800Coins[];
 extern const u8 gText_Scyther_5500Coins[];
 extern const u8 gText_Porygon_9999Coins[];
+extern const u8 gText_Abra_120Coins[];
+extern const u8 gText_Clefairy_750Coins[];
+extern const u8 gText_Pinsir_2500Coins[];
+extern const u8 gText_Dratini_4600Coins[];
+extern const u8 gText_Porygon_6500Coins[];
 extern const u8 gText_NoThanks_2[];
 extern const u8 gText_HelixFossil[];
 extern const u8 gText_DomeFossil[];
diff --git a/src/menu2.c b/src/menu2.c
index 221f84318..1957715b2 100644
--- a/src/menu2.c
+++ b/src/menu2.c
@@ -419,7 +419,11 @@ static const u8 gUnknown_845FD54[][5] = {
     [SPECIES_LATIAS - 1] = {0x1e, 0x0c, 0x10, 0x23, 0x19},
     [SPECIES_LATIOS - 1] = {0x05, 0x0e, 0x10, 0x05, 0x1d},
     [SPECIES_JIRACHI - 1] = {0x1c, 0x15, 0x08, 0x1e, 0x22},
+#if defined(FIRERED)
     [SPECIES_DEOXYS - 1] = {0x1b, 0x08, 0x28, 0x1c, 0x16},
+#elif defined(LEAFGREEN)
+    [SPECIES_DEOXYS - 1] = {0x1a, 0x09, 0x28, 0x1a, 0x17},
+#endif
     [SPECIES_CHIMECHO - 1] = {0x1d, 0x0c, 0x08, 0x1c, 0x1a},
     [SPECIES_OLD_UNOWN_EMARK - 1] = {0x20, 0x21, 0x08, 0x20, 0x2b},
     [SPECIES_OLD_UNOWN_QMARK - 1] = {0x20, 0x23, 0x08, 0x20, 0x2d}
diff --git a/src/oak_speech.c b/src/oak_speech.c
index 79f8b18c7..0ad5d6a6f 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -271,11 +271,11 @@ static const struct WindowTemplate sNewGameAdventureIntroWindowTemplates[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-const u8 sTextColor_HelpSystem[4] = {
+static const u8 sTextColor_HelpSystem[4] = {
     0x00, 0x01, 0x02
 };
 
-const u8 sTextColor_OakSpeech[4] = {
+static const u8 sTextColor_OakSpeech[4] = {
     0x00, 0x02, 0x03
 };
 
@@ -405,11 +405,19 @@ static const u8 *const sHelpDocsPtrs[] = {
 };
 
 static const u8 *const sMaleNameChoices[] = {
+#if defined(FIRERED)
     gNameChoice_Red,
     gNameChoice_Fire,
     gNameChoice_Ash,
     gNameChoice_Kene,
     gNameChoice_Geki,
+#elif defined(LEAFGREEN)
+    gNameChoice_Green,
+    gNameChoice_Leaf,
+    gNameChoice_Gary,
+    gNameChoice_Kaz,
+    gNameChoice_Toru,
+#endif
     gNameChoice_Jak,
     gNameChoice_Janne,
     gNameChoice_Jonn,
@@ -427,8 +435,13 @@ static const u8 *const sMaleNameChoices[] = {
 };
 
 static const u8 *const sFemaleNameChoices[] = {
+#if defined(FIRERED)
     gNameChoice_Red,
     gNameChoice_Fire,
+#elif defined(LEAFGREEN)
+    gNameChoice_Green,
+    gNameChoice_Leaf,
+#endif
     gNameChoice_Omi,
     gNameChoice_Jodi,
     gNameChoice_Amanda,
@@ -449,10 +462,17 @@ static const u8 *const sFemaleNameChoices[] = {
 };
 
 static const u8 *const sRivalNameChoices[] = {
+#if defined(FIRERED)
     gNameChoice_Green,
     gNameChoice_Gary,
     gNameChoice_Kaz,
     gNameChoice_Toru
+#elif defined(LEAFGREEN)
+    gNameChoice_Red,
+    gNameChoice_Ash,
+    gNameChoice_Kene,
+    gNameChoice_Geki
+#endif
 };
 
 static void VBlankCB_NewGameOaksSpeech(void)
diff --git a/src/script_menu.c b/src/script_menu.c
index b3826322b..4ebd0f8f8 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -316,11 +316,19 @@ static const struct MenuAction sScriptMultiChoiceMenu_BikeShop[] = {
 };
 
 static const struct MenuAction sScriptMultiChoiceMenu_GameCornerPokemonPrizes[] = {
+#if defined(FIRERED)
     { gText_Abra_180Coins },
     { gText_Clefairy_500Coins },
     { gText_Dratini_2800Coins },
     { gText_Scyther_5500Coins },
     { gText_Porygon_9999Coins },
+#elif defined(LEAFGREEN)
+    { gText_Abra_120Coins },
+    { gText_Clefairy_750Coins },
+    { gText_Pinsir_2500Coins },
+    { gText_Dratini_4600Coins },
+    { gText_Porygon_6500Coins },
+#endif
     { gText_NoThanks_2 }
 };