fix starter indexing and removed debug code

Definitive-Pokemon · Jun 16, 2024 · 0084944 · 0084944
1 parent 9dbced2
commit 0084944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/field_specials.c b/src/field_specials.c
@@ -1632,9 +1632,9 @@ void ForcePlayerToStartSurfing(void)
 }
 
 static const u16 sStarterSpecies[] = {
-    SPECIES_ELEKID,
     SPECIES_MAGBY,
-    SPECIES_SMOOCHUM
+    SPECIES_SMOOCHUM,
+    SPECIES_ELEKID
 };
 
 static u16 GetStarterSpeciesById(u16 idx)

diff --git a/src/roamer.c b/src/roamer.c
@@ -89,13 +89,6 @@ u16 GetRoamerSpecies(void)
     u16 species = SPECIES_NONE;
     u16 starter = GetStarterSpecies();
 
-    if(FlagGet(FLAG_CAUGHT_RAIKOU))
-        PlaySE(SE_EXP);
-    if(FlagGet(FLAG_CAUGHT_ENTEI))
-        PlaySE(SE_EXP);
-    if(FlagGet(FLAG_CAUGHT_SUICUNE))
-        PlaySE(SE_EXP);
-
     switch(starter)
     {
         case SPECIES_ELEKID:
@@ -113,8 +106,6 @@ u16 GetRoamerSpecies(void)
             }
             break;
         case SPECIES_MAGBY:
-            species = SPECIES_ENTEI;
-        /*
             if(!FlagGet(FLAG_CAUGHT_ENTEI))
             {
                 species = SPECIES_ENTEI;
@@ -127,7 +118,6 @@ u16 GetRoamerSpecies(void)
             {
                 species = SPECIES_RAIKOU;
             }
-            */
             break;
         case SPECIES_SMOOCHUM:
             if(!FlagGet(FLAG_CAUGHT_SUICUNE))