Define player and rival names once, to be used in two places (#545)

2026-09-28 03:57:38 -05:00 · 2025-12-01 16:02:24 +00:00
parent 40e835f70f
commit 1f89bcb77d
10 changed files with 25 additions and 5 deletions
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -1671,7 +1671,9 @@ ROMX bank #1:
 	         $6adb = GetDefaultName.innerLoop
 	         $6ae7 = GetDefaultName.foundName
 	         $6af2 = DefaultNamesPlayerList
+	         $6afb = DefaultNamesPlayerList._list_start_u3
 	         $6b0a = DefaultNamesRivalList
+	         $6b13 = DefaultNamesRivalList._list_start_u4
 	         $6b20 = LinkMenuEmptyText
 	         $6b21 = SubtractAmountPaidFromMoney_
 	         $6b44 = HandleItemListSwapping
@@ -18382,8 +18384,8 @@ WRAM0 bank #0:
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13YCoord
 	         $c334 = wShadowOAMSprite13
+	         $c334 = wShadowOAMSprite13YCoord
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -1641,7 +1641,9 @@
 01:6adb GetDefaultName.innerLoop
 01:6ae7 GetDefaultName.foundName
 01:6af2 DefaultNamesPlayerList
+01:6afb DefaultNamesPlayerList._list_start_u3
 01:6b0a DefaultNamesRivalList
+01:6b13 DefaultNamesRivalList._list_start_u4
 01:6b20 LinkMenuEmptyText
 01:6b21 SubtractAmountPaidFromMoney_
 01:6b44 HandleItemListSwapping
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -1681,7 +1681,9 @@ ROMX bank #1:
 	         $6c19 = GetDefaultName.innerLoop
 	         $6c25 = GetDefaultName.foundName
 	         $6c30 = DefaultNamesPlayerList
+	         $6c39 = DefaultNamesPlayerList._list_start_u3
 	         $6c48 = DefaultNamesRivalList
+	         $6c51 = DefaultNamesRivalList._list_start_u4
 	         $6c5e = LinkMenuEmptyText
 	         $6c5f = SubtractAmountPaidFromMoney_
 	         $6c82 = HandleItemListSwapping
@@ -18392,8 +18394,8 @@ WRAM0 bank #0:
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13YCoord
 	         $c334 = wShadowOAMSprite13
+	         $c334 = wShadowOAMSprite13YCoord
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -1651,7 +1651,9 @@
 01:6c19 GetDefaultName.innerLoop
 01:6c25 GetDefaultName.foundName
 01:6c30 DefaultNamesPlayerList
+01:6c39 DefaultNamesPlayerList._list_start_u3
 01:6c48 DefaultNamesRivalList
+01:6c51 DefaultNamesRivalList._list_start_u4
 01:6c5e LinkMenuEmptyText
 01:6c5f SubtractAmountPaidFromMoney_
 01:6c82 HandleItemListSwapping
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -1683,7 +1683,9 @@ ROMX bank #1:
 	         $6adb = GetDefaultName.innerLoop
 	         $6ae7 = GetDefaultName.foundName
 	         $6af2 = DefaultNamesPlayerList
+	         $6afb = DefaultNamesPlayerList._list_start_u3
 	         $6b0a = DefaultNamesRivalList
+	         $6b13 = DefaultNamesRivalList._list_start_u4
 	         $6b20 = LinkMenuEmptyText
 	         $6b21 = SubtractAmountPaidFromMoney_
 	         $6b44 = HandleItemListSwapping
@@ -18434,8 +18436,8 @@ WRAM0 bank #0:
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13YCoord
 	         $c334 = wShadowOAMSprite13
+	         $c334 = wShadowOAMSprite13YCoord
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -1653,7 +1653,9 @@
 01:6adb GetDefaultName.innerLoop
 01:6ae7 GetDefaultName.foundName
 01:6af2 DefaultNamesPlayerList
+01:6afb DefaultNamesPlayerList._list_start_u3
 01:6b0a DefaultNamesRivalList
+01:6b13 DefaultNamesRivalList._list_start_u4
 01:6b20 LinkMenuEmptyText
 01:6b21 SubtractAmountPaidFromMoney_
 01:6b44 HandleItemListSwapping
--- a/pokered.map
+++ b/pokered.map
@@ -1671,7 +1671,9 @@ ROMX bank #1:
 	         $6adb = GetDefaultName.innerLoop
 	         $6ae7 = GetDefaultName.foundName
 	         $6af2 = DefaultNamesPlayerList
+	         $6afb = DefaultNamesPlayerList._list_start_u3
 	         $6b08 = DefaultNamesRivalList
+	         $6b11 = DefaultNamesRivalList._list_start_u4
 	         $6b20 = LinkMenuEmptyText
 	         $6b21 = SubtractAmountPaidFromMoney_
 	         $6b44 = HandleItemListSwapping
@@ -18382,8 +18384,8 @@ WRAM0 bank #0:
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13YCoord
 	         $c334 = wShadowOAMSprite13
+	         $c334 = wShadowOAMSprite13YCoord
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
--- a/pokered.sym
+++ b/pokered.sym
@@ -1641,7 +1641,9 @@
 01:6adb GetDefaultName.innerLoop
 01:6ae7 GetDefaultName.foundName
 01:6af2 DefaultNamesPlayerList
+01:6afb DefaultNamesPlayerList._list_start_u3
 01:6b08 DefaultNamesRivalList
+01:6b11 DefaultNamesRivalList._list_start_u4
 01:6b20 LinkMenuEmptyText
 01:6b21 SubtractAmountPaidFromMoney_
 01:6b44 HandleItemListSwapping
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -1683,7 +1683,9 @@ ROMX bank #1:
 	         $6adb = GetDefaultName.innerLoop
 	         $6ae7 = GetDefaultName.foundName
 	         $6af2 = DefaultNamesPlayerList
+	         $6afb = DefaultNamesPlayerList._list_start_u3
 	         $6b08 = DefaultNamesRivalList
+	         $6b11 = DefaultNamesRivalList._list_start_u4
 	         $6b20 = LinkMenuEmptyText
 	         $6b21 = SubtractAmountPaidFromMoney_
 	         $6b44 = HandleItemListSwapping
@@ -18437,8 +18439,8 @@ WRAM0 bank #0:
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13YCoord
 	         $c334 = wShadowOAMSprite13
+	         $c334 = wShadowOAMSprite13YCoord
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -1653,7 +1653,9 @@
 01:6adb GetDefaultName.innerLoop
 01:6ae7 GetDefaultName.foundName
 01:6af2 DefaultNamesPlayerList
+01:6afb DefaultNamesPlayerList._list_start_u3
 01:6b08 DefaultNamesRivalList
+01:6b11 DefaultNamesRivalList._list_start_u4
 01:6b20 LinkMenuEmptyText
 01:6b21 SubtractAmountPaidFromMoney_
 01:6b44 HandleItemListSwapping