Don't pass redundant label names to table_width and list_start (#484

)
pret · Dec 27, 2024 · 22db770 · 22db770
1 parent 20576b0
commit 22db770
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 60 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -692,8 +692,8 @@ ROM0 bank #0:
 	         $296e = DisplayTextID.spriteHandling
 	         $2987 = DisplayTextID.noCarry
 	         $298a = DisplayTextID.skipSpriteHandling
-	         $29ba = DisplayTextID.not_u1
-	         $29cd = DisplayTextID.not_u2
+	         $29ba = DisplayTextID.not_u2
+	         $29cd = DisplayTextID.not_u3
 	         $29d6 = AfterDisplayingTextID
 	         $29df = HoldTextDisplayOpen
 	         $29e8 = CloseTextDisplay
@@ -2359,7 +2359,6 @@ ROMX bank #2:
 	         $5b1f = Audio1_HWChannelDisableMasks
 	         $5b27 = Audio1_HWChannelEnableMasks
 	         $5b2f = Audio1_Pitches
-	         $5b2f = Audio1_Pitches._table_width_u1
 	         $5b47 = Music_RivalAlternateStart
 	         $5b60 = Audio1_OverwriteChannelPointer
 	         $5b65 = Music_RivalAlternateTempo
@@ -5619,7 +5618,6 @@ ROMX bank #8:
 	         $62de = Audio2_HWChannelDisableMasks
 	         $62e6 = Audio2_HWChannelEnableMasks
 	         $62ee = Audio2_Pitches
-	         $62ee = Audio2_Pitches._table_width_u2
 	         $6306 = Music_PokeFluteInBattle
 	         $631d = Audio2_OverwriteChannelPointer
 	SECTION: $6322-$7f51 ($1c30 bytes) ["Music 2"]
@@ -14873,7 +14871,6 @@ ROMX bank #31:
 	         $5b93 = Audio3_HWChannelDisableMasks
 	         $5b9b = Audio3_HWChannelEnableMasks
 	         $5ba3 = Audio3_Pitches
-	         $5ba3 = Audio3_Pitches._table_width_u3
 	SECTION: $5bbb-$7ff9 ($243f bytes) ["Music 3"]
 	         $5bbb = Music_BikeRiding_Ch1
 	         $5bc9 = Music_BikeRiding_Ch1.mainloop
@@ -18704,9 +18701,9 @@ WRAM0 bank #0:
 	         $cd3d = wPlayerCharacterOAMTile
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
+	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
-	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -667,8 +667,8 @@
 00:296e DisplayTextID.spriteHandling
 00:2987 DisplayTextID.noCarry
 00:298a DisplayTextID.skipSpriteHandling
-00:29ba DisplayTextID.not_u1
-00:29cd DisplayTextID.not_u2
+00:29ba DisplayTextID.not_u2
+00:29cd DisplayTextID.not_u3
 00:29d6 AfterDisplayingTextID
 00:29df HoldTextDisplayOpen
 00:29e8 CloseTextDisplay
@@ -2321,7 +2321,6 @@
 02:5b1f Audio1_HWChannelDisableMasks
 02:5b27 Audio1_HWChannelEnableMasks
 02:5b2f Audio1_Pitches
-02:5b2f Audio1_Pitches._table_width_u1
 02:5b47 Music_RivalAlternateStart
 02:5b60 Audio1_OverwriteChannelPointer
 02:5b65 Music_RivalAlternateTempo
@@ -5536,7 +5535,6 @@
 08:62de Audio2_HWChannelDisableMasks
 08:62e6 Audio2_HWChannelEnableMasks
 08:62ee Audio2_Pitches
-08:62ee Audio2_Pitches._table_width_u2
 08:6306 Music_PokeFluteInBattle
 08:631d Audio2_OverwriteChannelPointer
 08:6322 SFX_Pokeflute_Ch5
@@ -14639,7 +14637,6 @@
 1f:5b93 Audio3_HWChannelDisableMasks
 1f:5b9b Audio3_HWChannelEnableMasks
 1f:5ba3 Audio3_Pitches
-1f:5ba3 Audio3_Pitches._table_width_u3
 1f:5bbb Music_BikeRiding_Ch1
 1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
@@ -18370,9 +18367,9 @@
 00:cd3d wPlayerCharacterOAMTile
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
+00:cd3d wUnusedCreditsByte
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
-00:cd3d wUnusedCreditsByte
 00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -692,8 +692,8 @@ ROM0 bank #0:
 	         $296e = DisplayTextID.spriteHandling
 	         $2987 = DisplayTextID.noCarry
 	         $298a = DisplayTextID.skipSpriteHandling
-	         $29ba = DisplayTextID.not_u1
-	         $29cd = DisplayTextID.not_u2
+	         $29ba = DisplayTextID.not_u2
+	         $29cd = DisplayTextID.not_u3
 	         $29d6 = AfterDisplayingTextID
 	         $29df = HoldTextDisplayOpen
 	         $29e8 = CloseTextDisplay
@@ -2369,7 +2369,6 @@ ROMX bank #2:
 	         $5b1f = Audio1_HWChannelDisableMasks
 	         $5b27 = Audio1_HWChannelEnableMasks
 	         $5b2f = Audio1_Pitches
-	         $5b2f = Audio1_Pitches._table_width_u1
 	         $5b47 = Music_RivalAlternateStart
 	         $5b60 = Audio1_OverwriteChannelPointer
 	         $5b65 = Music_RivalAlternateTempo
@@ -5629,7 +5628,6 @@ ROMX bank #8:
 	         $62de = Audio2_HWChannelDisableMasks
 	         $62e6 = Audio2_HWChannelEnableMasks
 	         $62ee = Audio2_Pitches
-	         $62ee = Audio2_Pitches._table_width_u2
 	         $6306 = Music_PokeFluteInBattle
 	         $631d = Audio2_OverwriteChannelPointer
 	SECTION: $6322-$7f51 ($1c30 bytes) ["Music 2"]
@@ -14883,7 +14881,6 @@ ROMX bank #31:
 	         $5b93 = Audio3_HWChannelDisableMasks
 	         $5b9b = Audio3_HWChannelEnableMasks
 	         $5ba3 = Audio3_Pitches
-	         $5ba3 = Audio3_Pitches._table_width_u3
 	SECTION: $5bbb-$7ff9 ($243f bytes) ["Music 3"]
 	         $5bbb = Music_BikeRiding_Ch1
 	         $5bc9 = Music_BikeRiding_Ch1.mainloop
@@ -20313,9 +20310,9 @@ HRAM bank #0:
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
 	         $ff95 = hQuotient
-	         $ff95 = hProduct
 	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hProduct
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity

diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -667,8 +667,8 @@
 00:296e DisplayTextID.spriteHandling
 00:2987 DisplayTextID.noCarry
 00:298a DisplayTextID.skipSpriteHandling
-00:29ba DisplayTextID.not_u1
-00:29cd DisplayTextID.not_u2
+00:29ba DisplayTextID.not_u2
+00:29cd DisplayTextID.not_u3
 00:29d6 AfterDisplayingTextID
 00:29df HoldTextDisplayOpen
 00:29e8 CloseTextDisplay
@@ -2331,7 +2331,6 @@
 02:5b1f Audio1_HWChannelDisableMasks
 02:5b27 Audio1_HWChannelEnableMasks
 02:5b2f Audio1_Pitches
-02:5b2f Audio1_Pitches._table_width_u1
 02:5b47 Music_RivalAlternateStart
 02:5b60 Audio1_OverwriteChannelPointer
 02:5b65 Music_RivalAlternateTempo
@@ -5546,7 +5545,6 @@
 08:62de Audio2_HWChannelDisableMasks
 08:62e6 Audio2_HWChannelEnableMasks
 08:62ee Audio2_Pitches
-08:62ee Audio2_Pitches._table_width_u2
 08:6306 Music_PokeFluteInBattle
 08:631d Audio2_OverwriteChannelPointer
 08:6322 SFX_Pokeflute_Ch5
@@ -14649,7 +14647,6 @@
 1f:5b93 Audio3_HWChannelDisableMasks
 1f:5b9b Audio3_HWChannelEnableMasks
 1f:5ba3 Audio3_Pitches
-1f:5ba3 Audio3_Pitches._table_width_u3
 1f:5bbb Music_BikeRiding_Ch1
 1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
@@ -19969,9 +19966,9 @@
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
 00:ff95 hQuotient
-00:ff95 hProduct
 00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hProduct
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -698,8 +698,8 @@ ROM0 bank #0:
 	         $296e = DisplayTextID.spriteHandling
 	         $2987 = DisplayTextID.noCarry
 	         $298a = DisplayTextID.skipSpriteHandling
-	         $29ba = DisplayTextID.not_u1
-	         $29cd = DisplayTextID.not_u2
+	         $29ba = DisplayTextID.not_u2
+	         $29cd = DisplayTextID.not_u3
 	         $29d6 = AfterDisplayingTextID
 	         $29df = HoldTextDisplayOpen
 	         $29e8 = CloseTextDisplay
@@ -2375,7 +2375,6 @@ ROMX bank #2:
 	         $5b1f = Audio1_HWChannelDisableMasks
 	         $5b27 = Audio1_HWChannelEnableMasks
 	         $5b2f = Audio1_Pitches
-	         $5b2f = Audio1_Pitches._table_width_u1
 	         $5b47 = Music_RivalAlternateStart
 	         $5b60 = Audio1_OverwriteChannelPointer
 	         $5b65 = Music_RivalAlternateTempo
@@ -5635,7 +5634,6 @@ ROMX bank #8:
 	         $62de = Audio2_HWChannelDisableMasks
 	         $62e6 = Audio2_HWChannelEnableMasks
 	         $62ee = Audio2_Pitches
-	         $62ee = Audio2_Pitches._table_width_u2
 	         $6306 = Music_PokeFluteInBattle
 	         $631d = Audio2_OverwriteChannelPointer
 	SECTION: $6322-$7f51 ($1c30 bytes) ["Music 2"]
@@ -14923,7 +14921,6 @@ ROMX bank #31:
 	         $5b93 = Audio3_HWChannelDisableMasks
 	         $5b9b = Audio3_HWChannelEnableMasks
 	         $5ba3 = Audio3_Pitches
-	         $5ba3 = Audio3_Pitches._table_width_u3
 	SECTION: $5bbb-$7ff9 ($243f bytes) ["Music 3"]
 	         $5bbb = Music_BikeRiding_Ch1
 	         $5bc9 = Music_BikeRiding_Ch1.mainloop
@@ -20355,9 +20352,9 @@ HRAM bank #0:
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
 	         $ff95 = hQuotient
-	         $ff95 = hProduct
 	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hProduct
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity

diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -673,8 +673,8 @@
 00:296e DisplayTextID.spriteHandling
 00:2987 DisplayTextID.noCarry
 00:298a DisplayTextID.skipSpriteHandling
-00:29ba DisplayTextID.not_u1
-00:29cd DisplayTextID.not_u2
+00:29ba DisplayTextID.not_u2
+00:29cd DisplayTextID.not_u3
 00:29d6 AfterDisplayingTextID
 00:29df HoldTextDisplayOpen
 00:29e8 CloseTextDisplay
@@ -2337,7 +2337,6 @@
 02:5b1f Audio1_HWChannelDisableMasks
 02:5b27 Audio1_HWChannelEnableMasks
 02:5b2f Audio1_Pitches
-02:5b2f Audio1_Pitches._table_width_u1
 02:5b47 Music_RivalAlternateStart
 02:5b60 Audio1_OverwriteChannelPointer
 02:5b65 Music_RivalAlternateTempo
@@ -5552,7 +5551,6 @@
 08:62de Audio2_HWChannelDisableMasks
 08:62e6 Audio2_HWChannelEnableMasks
 08:62ee Audio2_Pitches
-08:62ee Audio2_Pitches._table_width_u2
 08:6306 Music_PokeFluteInBattle
 08:631d Audio2_OverwriteChannelPointer
 08:6322 SFX_Pokeflute_Ch5
@@ -14689,7 +14687,6 @@
 1f:5b93 Audio3_HWChannelDisableMasks
 1f:5b9b Audio3_HWChannelEnableMasks
 1f:5ba3 Audio3_Pitches
-1f:5ba3 Audio3_Pitches._table_width_u3
 1f:5bbb Music_BikeRiding_Ch1
 1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
@@ -20011,9 +20008,9 @@
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
 00:ff95 hQuotient
-00:ff95 hProduct
 00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hProduct
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity

diff --git a/pokered.map b/pokered.map
@@ -692,8 +692,8 @@ ROM0 bank #0:
 	         $296e = DisplayTextID.spriteHandling
 	         $2987 = DisplayTextID.noCarry
 	         $298a = DisplayTextID.skipSpriteHandling
-	         $29ba = DisplayTextID.not_u1
-	         $29cd = DisplayTextID.not_u2
+	         $29ba = DisplayTextID.not_u2
+	         $29cd = DisplayTextID.not_u3
 	         $29d6 = AfterDisplayingTextID
 	         $29df = HoldTextDisplayOpen
 	         $29e8 = CloseTextDisplay
@@ -2359,7 +2359,6 @@ ROMX bank #2:
 	         $5b1f = Audio1_HWChannelDisableMasks
 	         $5b27 = Audio1_HWChannelEnableMasks
 	         $5b2f = Audio1_Pitches
-	         $5b2f = Audio1_Pitches._table_width_u1
 	         $5b47 = Music_RivalAlternateStart
 	         $5b60 = Audio1_OverwriteChannelPointer
 	         $5b65 = Music_RivalAlternateTempo
@@ -5619,7 +5618,6 @@ ROMX bank #8:
 	         $62de = Audio2_HWChannelDisableMasks
 	         $62e6 = Audio2_HWChannelEnableMasks
 	         $62ee = Audio2_Pitches
-	         $62ee = Audio2_Pitches._table_width_u2
 	         $6306 = Music_PokeFluteInBattle
 	         $631d = Audio2_OverwriteChannelPointer
 	SECTION: $6322-$7f51 ($1c30 bytes) ["Music 2"]
@@ -14873,7 +14871,6 @@ ROMX bank #31:
 	         $5b93 = Audio3_HWChannelDisableMasks
 	         $5b9b = Audio3_HWChannelEnableMasks
 	         $5ba3 = Audio3_Pitches
-	         $5ba3 = Audio3_Pitches._table_width_u3
 	SECTION: $5bbb-$7ff9 ($243f bytes) ["Music 3"]
 	         $5bbb = Music_BikeRiding_Ch1
 	         $5bc9 = Music_BikeRiding_Ch1.mainloop
@@ -18704,9 +18701,9 @@ WRAM0 bank #0:
 	         $cd3d = wPlayerCharacterOAMTile
 	         $cd3d = wCoordIndex
 	         $cd3d = wTempSCX
+	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wBoxMonCounts
 	         $cd3d = wHoFTeamIndex
-	         $cd3d = wUnusedCreditsByte
 	         $cd3d = wWhichTrade
 	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount

diff --git a/pokered.sym b/pokered.sym
@@ -667,8 +667,8 @@
 00:296e DisplayTextID.spriteHandling
 00:2987 DisplayTextID.noCarry
 00:298a DisplayTextID.skipSpriteHandling
-00:29ba DisplayTextID.not_u1
-00:29cd DisplayTextID.not_u2
+00:29ba DisplayTextID.not_u2
+00:29cd DisplayTextID.not_u3
 00:29d6 AfterDisplayingTextID
 00:29df HoldTextDisplayOpen
 00:29e8 CloseTextDisplay
@@ -2321,7 +2321,6 @@
 02:5b1f Audio1_HWChannelDisableMasks
 02:5b27 Audio1_HWChannelEnableMasks
 02:5b2f Audio1_Pitches
-02:5b2f Audio1_Pitches._table_width_u1
 02:5b47 Music_RivalAlternateStart
 02:5b60 Audio1_OverwriteChannelPointer
 02:5b65 Music_RivalAlternateTempo
@@ -5536,7 +5535,6 @@
 08:62de Audio2_HWChannelDisableMasks
 08:62e6 Audio2_HWChannelEnableMasks
 08:62ee Audio2_Pitches
-08:62ee Audio2_Pitches._table_width_u2
 08:6306 Music_PokeFluteInBattle
 08:631d Audio2_OverwriteChannelPointer
 08:6322 SFX_Pokeflute_Ch5
@@ -14639,7 +14637,6 @@
 1f:5b93 Audio3_HWChannelDisableMasks
 1f:5b9b Audio3_HWChannelEnableMasks
 1f:5ba3 Audio3_Pitches
-1f:5ba3 Audio3_Pitches._table_width_u3
 1f:5bbb Music_BikeRiding_Ch1
 1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
@@ -18370,9 +18367,9 @@
 00:cd3d wPlayerCharacterOAMTile
 00:cd3d wCoordIndex
 00:cd3d wTempSCX
+00:cd3d wUnusedCreditsByte
 00:cd3d wBoxMonCounts
 00:cd3d wHoFTeamIndex
-00:cd3d wUnusedCreditsByte
 00:cd3d wWhichTrade
 00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount