Use less generic labels for party finding loops (#514)

2026-09-30 04:57:12 -05:00 · 2025-07-07 23:01:29 +00:00
parent 9fb3ddc1b2
commit d8738435bf
10 changed files with 20 additions and 20 deletions
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -6328,8 +6328,8 @@ ROMX bank #14:
 	         $5c48 = GetMonSpecies.enemyParty
 	         $5c4b = GetMonSpecies.getSpecies
 	         $5c53 = ReadTrainer
-	         $5c73 = ReadTrainer.outer
-	         $5c76 = ReadTrainer.inner
+	         $5c73 = ReadTrainer.CheckNextTrainer
+	         $5c76 = ReadTrainer.SkipTrainer
 	         $5c7c = ReadTrainer.IterateTrainer
 	         $5c84 = ReadTrainer.LoopTrainerData
 	         $5c97 = ReadTrainer.SpecialTrainer
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -6209,8 +6209,8 @@
 0e:5c48 GetMonSpecies.enemyParty
 0e:5c4b GetMonSpecies.getSpecies
 0e:5c53 ReadTrainer
-0e:5c73 ReadTrainer.outer
-0e:5c76 ReadTrainer.inner
+0e:5c73 ReadTrainer.CheckNextTrainer
+0e:5c76 ReadTrainer.SkipTrainer
 0e:5c7c ReadTrainer.IterateTrainer
 0e:5c84 ReadTrainer.LoopTrainerData
 0e:5c97 ReadTrainer.SpecialTrainer
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -6338,8 +6338,8 @@ ROMX bank #14:
 	         $5c48 = GetMonSpecies.enemyParty
 	         $5c4b = GetMonSpecies.getSpecies
 	         $5c53 = ReadTrainer
-	         $5c73 = ReadTrainer.outer
-	         $5c76 = ReadTrainer.inner
+	         $5c73 = ReadTrainer.CheckNextTrainer
+	         $5c76 = ReadTrainer.SkipTrainer
 	         $5c7c = ReadTrainer.IterateTrainer
 	         $5c84 = ReadTrainer.LoopTrainerData
 	         $5c97 = ReadTrainer.SpecialTrainer
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -6219,8 +6219,8 @@
 0e:5c48 GetMonSpecies.enemyParty
 0e:5c4b GetMonSpecies.getSpecies
 0e:5c53 ReadTrainer
-0e:5c73 ReadTrainer.outer
-0e:5c76 ReadTrainer.inner
+0e:5c73 ReadTrainer.CheckNextTrainer
+0e:5c76 ReadTrainer.SkipTrainer
 0e:5c7c ReadTrainer.IterateTrainer
 0e:5c84 ReadTrainer.LoopTrainerData
 0e:5c97 ReadTrainer.SpecialTrainer
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -6344,8 +6344,8 @@ ROMX bank #14:
 	         $5c48 = GetMonSpecies.enemyParty
 	         $5c4b = GetMonSpecies.getSpecies
 	         $5c53 = ReadTrainer
-	         $5c73 = ReadTrainer.outer
-	         $5c76 = ReadTrainer.inner
+	         $5c73 = ReadTrainer.CheckNextTrainer
+	         $5c76 = ReadTrainer.SkipTrainer
 	         $5c7c = ReadTrainer.IterateTrainer
 	         $5c84 = ReadTrainer.LoopTrainerData
 	         $5c97 = ReadTrainer.SpecialTrainer
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -6225,8 +6225,8 @@
 0e:5c48 GetMonSpecies.enemyParty
 0e:5c4b GetMonSpecies.getSpecies
 0e:5c53 ReadTrainer
-0e:5c73 ReadTrainer.outer
-0e:5c76 ReadTrainer.inner
+0e:5c73 ReadTrainer.CheckNextTrainer
+0e:5c76 ReadTrainer.SkipTrainer
 0e:5c7c ReadTrainer.IterateTrainer
 0e:5c84 ReadTrainer.LoopTrainerData
 0e:5c97 ReadTrainer.SpecialTrainer
--- a/pokered.map
+++ b/pokered.map
@@ -6328,8 +6328,8 @@ ROMX bank #14:
 	         $5c48 = GetMonSpecies.enemyParty
 	         $5c4b = GetMonSpecies.getSpecies
 	         $5c53 = ReadTrainer
-	         $5c73 = ReadTrainer.outer
-	         $5c76 = ReadTrainer.inner
+	         $5c73 = ReadTrainer.CheckNextTrainer
+	         $5c76 = ReadTrainer.SkipTrainer
 	         $5c7c = ReadTrainer.IterateTrainer
 	         $5c84 = ReadTrainer.LoopTrainerData
 	         $5c97 = ReadTrainer.SpecialTrainer
--- a/pokered.sym
+++ b/pokered.sym
@@ -6209,8 +6209,8 @@
 0e:5c48 GetMonSpecies.enemyParty
 0e:5c4b GetMonSpecies.getSpecies
 0e:5c53 ReadTrainer
-0e:5c73 ReadTrainer.outer
-0e:5c76 ReadTrainer.inner
+0e:5c73 ReadTrainer.CheckNextTrainer
+0e:5c76 ReadTrainer.SkipTrainer
 0e:5c7c ReadTrainer.IterateTrainer
 0e:5c84 ReadTrainer.LoopTrainerData
 0e:5c97 ReadTrainer.SpecialTrainer
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -6344,8 +6344,8 @@ ROMX bank #14:
 	         $5c48 = GetMonSpecies.enemyParty
 	         $5c4b = GetMonSpecies.getSpecies
 	         $5c53 = ReadTrainer
-	         $5c73 = ReadTrainer.outer
-	         $5c76 = ReadTrainer.inner
+	         $5c73 = ReadTrainer.CheckNextTrainer
+	         $5c76 = ReadTrainer.SkipTrainer
 	         $5c7c = ReadTrainer.IterateTrainer
 	         $5c84 = ReadTrainer.LoopTrainerData
 	         $5c97 = ReadTrainer.SpecialTrainer
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -6225,8 +6225,8 @@
 0e:5c48 GetMonSpecies.enemyParty
 0e:5c4b GetMonSpecies.getSpecies
 0e:5c53 ReadTrainer
-0e:5c73 ReadTrainer.outer
-0e:5c76 ReadTrainer.inner
+0e:5c73 ReadTrainer.CheckNextTrainer
+0e:5c76 ReadTrainer.SkipTrainer
 0e:5c7c ReadTrainer.IterateTrainer
 0e:5c84 ReadTrainer.LoopTrainerData
 0e:5c97 ReadTrainer.SpecialTrainer