more checking

Definitive-Pokemon · Jun 12, 2024 · 6760572 · 6760572
1 parent 2caf010
commit 6760572
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/data/maps/Debug/scripts.inc b/data/maps/Debug/scripts.inc
@@ -9,9 +9,7 @@ Debug_GiveFormMon::
 
 Debug_Battle::
 	lock
-	setwildbattle SPECIES_REGIGIGAS, 3, ITEM_NONE
-	delay 40
-	dowildbattle
+	givemon SPECIES_SUICUNE, 5, ITEM_NONE
 	release
 	end
 

diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c
@@ -227,13 +227,12 @@ s32 GetSpeciesPokedexAreaMarkers(u16 species, struct Subsprite * subsprites)
 
 static s32 GetRoamerIndex(u16 species)
 {
-    s32 i;
-    for (i = 0; i < ARRAY_COUNT(sRoamerPairs); i++)
-    {
-        if (sRoamerPairs[i].roamer == species)
-            return i;
-    }
-
+    if (species == SPECIES_ENTEI)
+        return 0;
+    if (species == SPECIES_SUICUNE)
+        return 1;
+    if (species == SPECIES_RAIKOU)
+        return 2;
     return -1;
 }