From d8738435bfa9600e01218c4bf0c5dfe5b958dc8a Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 7 Jul 2025 23:01:29 +0000 Subject: [PATCH] Use less generic labels for party finding loops (#514) --- pokeblue.map | 4 ++-- pokeblue.sym | 4 ++-- pokeblue_debug.map | 4 ++-- pokeblue_debug.sym | 4 ++-- pokeblue_vc.map | 4 ++-- pokeblue_vc.sym | 4 ++-- pokered.map | 4 ++-- pokered.sym | 4 ++-- pokered_vc.map | 4 ++-- pokered_vc.sym | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index 0d3a07f9e..cdad1f924 100644 --- 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 diff --git a/pokeblue.sym b/pokeblue.sym index 803be3cdb..2fba8c85a 100644 --- 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 diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 93a2546c9..a9cc1cc85 100644 --- 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 diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index 2c7029c12..a2b7ed1f6 100644 --- 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 diff --git a/pokeblue_vc.map b/pokeblue_vc.map index da92ff68c..24ed01eae 100644 --- 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 diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index dd6557f18..5e19d7b09 100644 --- 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 diff --git a/pokered.map b/pokered.map index e44c934fd..aba0857ca 100644 --- 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 diff --git a/pokered.sym b/pokered.sym index 768bb2f37..0878d2dcb 100644 --- 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 diff --git a/pokered_vc.map b/pokered_vc.map index da27ce46b..08a15d6e9 100644 --- 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 diff --git a/pokered_vc.sym b/pokered_vc.sym index 3b3134401..a6ade5b89 100644 --- 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