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

)
pret · Dec 27, 2024 · e0a91e1 · e0a91e1
1 parent 81ec0c6
commit e0a91e1
Show file tree

Hide file tree

Showing 12 changed files with 708 additions and 708 deletions.
diff --git a/pokegold.map b/pokegold.map
@@ -306,7 +306,7 @@ ROM0 bank #0:
 	         $0f7e = DummyChar
 	         $0f7f = NextChar
 	         $0f83 = CheckDict
-	         $1014 = CheckDict.not_u1
+	         $1014 = CheckDict.not_u2
 	         $1030 = CheckDict.diacritic
 	         $1037 = CheckDict.not_diacritic
 	         $1047 = CheckDict.hiragana_dakuten
@@ -631,9 +631,9 @@ ROM0 bank #0:
 	         $1ff3 = LoadMetatiles.row
 	         $1ff7 = LoadMetatiles.col
 	         $2000 = LoadMetatiles.ok
-	         $2026 = LoadMetatiles.next_u2
-	         $2039 = LoadMetatiles.next_u3
-	         $204c = LoadMetatiles.next_u4
+	         $2026 = LoadMetatiles.next_u4
+	         $2039 = LoadMetatiles.next_u5
+	         $204c = LoadMetatiles.next_u6
 	         $2073 = LoadMetatiles.ok2
 	         $2078 = ReturnToMapFromSubmenu
 	         $2086 = HandleNewMap
@@ -1024,16 +1024,16 @@ ROM0 bank #0:
 	         $34ba = CopyTilemapAtOnce.wait2
 	         $34c8 = CopyTilemapAtOnce.CopyBGMapViaStack
 	         $34d9 = CopyTilemapAtOnce.loop
-	         $34da = CopyTilemapAtOnce.loop_u5
-	         $34e3 = CopyTilemapAtOnce.loop_u6
-	         $34ec = CopyTilemapAtOnce.loop_u7
-	         $34f5 = CopyTilemapAtOnce.loop_u8
-	         $34fe = CopyTilemapAtOnce.loop_u9
-	         $3507 = CopyTilemapAtOnce.loop_u10
-	         $3510 = CopyTilemapAtOnce.loop_u11
-	         $3519 = CopyTilemapAtOnce.loop_u12
-	         $3522 = CopyTilemapAtOnce.loop_u13
-	         $352b = CopyTilemapAtOnce.loop_u14
+	         $34da = CopyTilemapAtOnce.loop_u7
+	         $34e3 = CopyTilemapAtOnce.loop_u8
+	         $34ec = CopyTilemapAtOnce.loop_u9
+	         $34f5 = CopyTilemapAtOnce.loop_u10
+	         $34fe = CopyTilemapAtOnce.loop_u11
+	         $3507 = CopyTilemapAtOnce.loop_u12
+	         $3510 = CopyTilemapAtOnce.loop_u13
+	         $3519 = CopyTilemapAtOnce.loop_u14
+	         $3522 = CopyTilemapAtOnce.loop_u15
+	         $352b = CopyTilemapAtOnce.loop_u16
 	         $3546 = SetDefaultBGPAndOBP
 	         $3556 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor
 	         $3564 = ClearPalettes
@@ -2129,11 +2129,11 @@ ROMX bank #2:
 	         $4ac3 = QueueFollowerFirstStep.up
 	         $4ac7 = QueueFollowerFirstStep.same_xy
 	         $4ac9 = _Sine
-	         $4ad5 = _Sine.negative_u1
-	         $4adf = _Sine.apply_u1
-	         $4aee = _Sine.multiply_u1
-	         $4af3 = _Sine.even_u1
-	         $4afb = _Sine.sinetable_u1
+	         $4ad5 = _Sine.negative_u9
+	         $4adf = _Sine.apply_u9
+	         $4aee = _Sine.multiply_u9
+	         $4af3 = _Sine.even_u9
+	         $4afb = _Sine.sinetable_u9
 	         $4b3b = GetPredefPointer
 	         $4b5b = PredefPointers
 	         $4b5b = LearnMovePredef
@@ -11522,31 +11522,31 @@ ROMX bank #35:
 	         $402d = SaveMenu_CopyTilemapAtOnce.wait2
 	         $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 	         $404c = SaveMenu_CopyTilemapAtOnce.loop
-	         $404d = SaveMenu_CopyTilemapAtOnce.loop_u2
-	         $4056 = SaveMenu_CopyTilemapAtOnce.loop_u3
-	         $405f = SaveMenu_CopyTilemapAtOnce.loop_u4
-	         $4068 = SaveMenu_CopyTilemapAtOnce.loop_u5
-	         $4071 = SaveMenu_CopyTilemapAtOnce.loop_u6
-	         $407a = SaveMenu_CopyTilemapAtOnce.loop_u7
-	         $4083 = SaveMenu_CopyTilemapAtOnce.loop_u8
-	         $408c = SaveMenu_CopyTilemapAtOnce.loop_u9
-	         $4095 = SaveMenu_CopyTilemapAtOnce.loop_u10
-	         $409e = SaveMenu_CopyTilemapAtOnce.loop_u11
+	         $404d = SaveMenu_CopyTilemapAtOnce.loop_u68
+	         $4056 = SaveMenu_CopyTilemapAtOnce.loop_u69
+	         $405f = SaveMenu_CopyTilemapAtOnce.loop_u70
+	         $4068 = SaveMenu_CopyTilemapAtOnce.loop_u71
+	         $4071 = SaveMenu_CopyTilemapAtOnce.loop_u72
+	         $407a = SaveMenu_CopyTilemapAtOnce.loop_u73
+	         $4083 = SaveMenu_CopyTilemapAtOnce.loop_u74
+	         $408c = SaveMenu_CopyTilemapAtOnce.loop_u75
+	         $4095 = SaveMenu_CopyTilemapAtOnce.loop_u76
+	         $409e = SaveMenu_CopyTilemapAtOnce.loop_u77
 	         $40b9 = PhoneRing_CopyTilemapAtOnce
 	         $40d3 = PhoneRing_CopyTilemapAtOnce.wait
 	         $40ee = PhoneRing_CopyTilemapAtOnce.wait2
 	         $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 	         $410d = PhoneRing_CopyTilemapAtOnce.loop
-	         $410e = PhoneRing_CopyTilemapAtOnce.loop_u12
-	         $4117 = PhoneRing_CopyTilemapAtOnce.loop_u13
-	         $4120 = PhoneRing_CopyTilemapAtOnce.loop_u14
-	         $4129 = PhoneRing_CopyTilemapAtOnce.loop_u15
-	         $4132 = PhoneRing_CopyTilemapAtOnce.loop_u16
-	         $413b = PhoneRing_CopyTilemapAtOnce.loop_u17
-	         $4144 = PhoneRing_CopyTilemapAtOnce.loop_u18
-	         $414d = PhoneRing_CopyTilemapAtOnce.loop_u19
-	         $4156 = PhoneRing_CopyTilemapAtOnce.loop_u20
-	         $415f = PhoneRing_CopyTilemapAtOnce.loop_u21
+	         $410e = PhoneRing_CopyTilemapAtOnce.loop_u78
+	         $4117 = PhoneRing_CopyTilemapAtOnce.loop_u79
+	         $4120 = PhoneRing_CopyTilemapAtOnce.loop_u80
+	         $4129 = PhoneRing_CopyTilemapAtOnce.loop_u81
+	         $4132 = PhoneRing_CopyTilemapAtOnce.loop_u82
+	         $413b = PhoneRing_CopyTilemapAtOnce.loop_u83
+	         $4144 = PhoneRing_CopyTilemapAtOnce.loop_u84
+	         $414d = PhoneRing_CopyTilemapAtOnce.loop_u85
+	         $4156 = PhoneRing_CopyTilemapAtOnce.loop_u86
+	         $415f = PhoneRing_CopyTilemapAtOnce.loop_u87
 	         $417a = _ResetClock
 	         $41bb = _ResetClock.wrongpassword
 	         $41c2 = _ResetClock.PasswordAskResetText
@@ -11683,11 +11683,11 @@ ROMX bank #35:
 	         $4979 = WipeLYOverrides.wipe
 	         $497c = WipeLYOverrides.loop
 	         $4981 = StartTrainerBattle_DrawSineWave
-	         $498c = StartTrainerBattle_DrawSineWave.negative_u22
-	         $4996 = StartTrainerBattle_DrawSineWave.apply_u22
-	         $49a5 = StartTrainerBattle_DrawSineWave.multiply_u22
-	         $49aa = StartTrainerBattle_DrawSineWave.even_u22
-	         $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u22
+	         $498c = StartTrainerBattle_DrawSineWave.negative_u88
+	         $4996 = StartTrainerBattle_DrawSineWave.apply_u88
+	         $49a5 = StartTrainerBattle_DrawSineWave.multiply_u88
+	         $49aa = StartTrainerBattle_DrawSineWave.even_u88
+	         $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u88
 	         $49f2 = StartTrainerBattle_ZoomToBlack
 	         $49fb = StartTrainerBattle_ZoomToBlack.loop
 	         $4a16 = StartTrainerBattle_ZoomToBlack.done
@@ -12057,11 +12057,11 @@ ROMX bank #35:
 	         $668a = Sprites_Cosine
 	         $668a = UnusedSpriteAnimGFX.DeletedGFX
 	         $668c = Sprites_Sine
-	         $6697 = Sprites_Sine.negative_u23
-	         $66a1 = Sprites_Sine.apply_u23
-	         $66b0 = Sprites_Sine.multiply_u23
-	         $66b5 = Sprites_Sine.even_u23
-	         $66bd = Sprites_Sine.sinetable_u23
+	         $6697 = Sprites_Sine.negative_u93
+	         $66a1 = Sprites_Sine.apply_u93
+	         $66b0 = Sprites_Sine.multiply_u93
+	         $66b5 = Sprites_Sine.even_u93
+	         $66bd = Sprites_Sine.sinetable_u93
 	         $66fd = AnimateEndOfExpBar
 	         $6708 = AnimateEndOfExpBar.load
 	         $6715 = AnimateEndOfExpBar.loop
@@ -16270,10 +16270,10 @@ ROMX bank #51:
 	         $6671 = BattleAnim_IncAnonJumptableIndex
 	         $6677 = BattleAnim_Cosine
 	         $6679 = BattleAnim_Sine
-	         $6684 = BattleAnim_Sine.negative_u24
-	         $668e = BattleAnim_Sine.apply_u24
-	         $669d = BattleAnim_Sine.multiply_u24
-	         $66a2 = BattleAnim_Sine.even_u24
+	         $6684 = BattleAnim_Sine.negative_u118
+	         $668e = BattleAnim_Sine.apply_u118
+	         $669d = BattleAnim_Sine.multiply_u118
+	         $66a2 = BattleAnim_Sine.even_u118
 	         $66aa = BattleAnim_Sine_e
 	         $66b0 = BattleAnim_Cosine_e
 	         $66b6 = BattleAnim_AbsSinePrecise
@@ -17119,14 +17119,14 @@ ROMX bank #56:
 	         $7511 = BillsPC_RefreshTextboxes.placeholder_string
 	         $7518 = BillsPC_RefreshTextboxes.Placeholder
 	         $751e = CopyBoxmonSpecies
-	         $7545 = CopyBoxmonSpecies.loop_u25
-	         $7567 = CopyBoxmonSpecies.done_u25
+	         $7545 = CopyBoxmonSpecies.loop_u122
+	         $7567 = CopyBoxmonSpecies.done_u122
 	         $7575 = CopyBoxmonSpecies.party
-	         $7578 = CopyBoxmonSpecies.loop_u26
-	         $759a = CopyBoxmonSpecies.done_u26
+	         $7578 = CopyBoxmonSpecies.loop_u123
+	         $759a = CopyBoxmonSpecies.done_u123
 	         $75a5 = CopyBoxmonSpecies.sBox
-	         $75ad = CopyBoxmonSpecies.loop_u27
-	         $75cf = CopyBoxmonSpecies.done_u27
+	         $75ad = CopyBoxmonSpecies.loop_u124
+	         $75cf = CopyBoxmonSpecies.done_u124
 	         $75dd = BillsPC_GetSelectedPokemonSpecies
 	         $75ef = BillsPC_UpdateSelectionCursor
 	         $75f9 = BillsPC_UpdateSelectionCursor.place_cursor

diff --git a/pokegold.sym b/pokegold.sym
@@ -271,7 +271,7 @@
 00:0f7e DummyChar
 00:0f7f NextChar
 00:0f83 CheckDict
-00:1014 CheckDict.not_u1
+00:1014 CheckDict.not_u2
 00:1030 CheckDict.diacritic
 00:1037 CheckDict.not_diacritic
 00:1047 CheckDict.hiragana_dakuten
@@ -596,9 +596,9 @@
 00:1ff3 LoadMetatiles.row
 00:1ff7 LoadMetatiles.col
 00:2000 LoadMetatiles.ok
-00:2026 LoadMetatiles.next_u2
-00:2039 LoadMetatiles.next_u3
-00:204c LoadMetatiles.next_u4
+00:2026 LoadMetatiles.next_u4
+00:2039 LoadMetatiles.next_u5
+00:204c LoadMetatiles.next_u6
 00:2073 LoadMetatiles.ok2
 00:2078 ReturnToMapFromSubmenu
 00:2086 HandleNewMap
@@ -989,16 +989,16 @@
 00:34ba CopyTilemapAtOnce.wait2
 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack
 00:34d9 CopyTilemapAtOnce.loop
-00:34da CopyTilemapAtOnce.loop_u5
-00:34e3 CopyTilemapAtOnce.loop_u6
-00:34ec CopyTilemapAtOnce.loop_u7
-00:34f5 CopyTilemapAtOnce.loop_u8
-00:34fe CopyTilemapAtOnce.loop_u9
-00:3507 CopyTilemapAtOnce.loop_u10
-00:3510 CopyTilemapAtOnce.loop_u11
-00:3519 CopyTilemapAtOnce.loop_u12
-00:3522 CopyTilemapAtOnce.loop_u13
-00:352b CopyTilemapAtOnce.loop_u14
+00:34da CopyTilemapAtOnce.loop_u7
+00:34e3 CopyTilemapAtOnce.loop_u8
+00:34ec CopyTilemapAtOnce.loop_u9
+00:34f5 CopyTilemapAtOnce.loop_u10
+00:34fe CopyTilemapAtOnce.loop_u11
+00:3507 CopyTilemapAtOnce.loop_u12
+00:3510 CopyTilemapAtOnce.loop_u13
+00:3519 CopyTilemapAtOnce.loop_u14
+00:3522 CopyTilemapAtOnce.loop_u15
+00:352b CopyTilemapAtOnce.loop_u16
 00:3546 SetDefaultBGPAndOBP
 00:3556 SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor
 00:3564 ClearPalettes
@@ -2084,11 +2084,11 @@
 02:4ac3 QueueFollowerFirstStep.up
 02:4ac7 QueueFollowerFirstStep.same_xy
 02:4ac9 _Sine
-02:4ad5 _Sine.negative_u1
-02:4adf _Sine.apply_u1
-02:4aee _Sine.multiply_u1
-02:4af3 _Sine.even_u1
-02:4afb _Sine.sinetable_u1
+02:4ad5 _Sine.negative_u9
+02:4adf _Sine.apply_u9
+02:4aee _Sine.multiply_u9
+02:4af3 _Sine.even_u9
+02:4afb _Sine.sinetable_u9
 02:4b3b GetPredefPointer
 02:4b5b PredefPointers
 02:4b5b LearnMovePredef
@@ -11310,31 +11310,31 @@
 23:402d SaveMenu_CopyTilemapAtOnce.wait2
 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 23:404c SaveMenu_CopyTilemapAtOnce.loop
-23:404d SaveMenu_CopyTilemapAtOnce.loop_u2
-23:4056 SaveMenu_CopyTilemapAtOnce.loop_u3
-23:405f SaveMenu_CopyTilemapAtOnce.loop_u4
-23:4068 SaveMenu_CopyTilemapAtOnce.loop_u5
-23:4071 SaveMenu_CopyTilemapAtOnce.loop_u6
-23:407a SaveMenu_CopyTilemapAtOnce.loop_u7
-23:4083 SaveMenu_CopyTilemapAtOnce.loop_u8
-23:408c SaveMenu_CopyTilemapAtOnce.loop_u9
-23:4095 SaveMenu_CopyTilemapAtOnce.loop_u10
-23:409e SaveMenu_CopyTilemapAtOnce.loop_u11
+23:404d SaveMenu_CopyTilemapAtOnce.loop_u68
+23:4056 SaveMenu_CopyTilemapAtOnce.loop_u69
+23:405f SaveMenu_CopyTilemapAtOnce.loop_u70
+23:4068 SaveMenu_CopyTilemapAtOnce.loop_u71
+23:4071 SaveMenu_CopyTilemapAtOnce.loop_u72
+23:407a SaveMenu_CopyTilemapAtOnce.loop_u73
+23:4083 SaveMenu_CopyTilemapAtOnce.loop_u74
+23:408c SaveMenu_CopyTilemapAtOnce.loop_u75
+23:4095 SaveMenu_CopyTilemapAtOnce.loop_u76
+23:409e SaveMenu_CopyTilemapAtOnce.loop_u77
 23:40b9 PhoneRing_CopyTilemapAtOnce
 23:40d3 PhoneRing_CopyTilemapAtOnce.wait
 23:40ee PhoneRing_CopyTilemapAtOnce.wait2
 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 23:410d PhoneRing_CopyTilemapAtOnce.loop
-23:410e PhoneRing_CopyTilemapAtOnce.loop_u12
-23:4117 PhoneRing_CopyTilemapAtOnce.loop_u13
-23:4120 PhoneRing_CopyTilemapAtOnce.loop_u14
-23:4129 PhoneRing_CopyTilemapAtOnce.loop_u15
-23:4132 PhoneRing_CopyTilemapAtOnce.loop_u16
-23:413b PhoneRing_CopyTilemapAtOnce.loop_u17
-23:4144 PhoneRing_CopyTilemapAtOnce.loop_u18
-23:414d PhoneRing_CopyTilemapAtOnce.loop_u19
-23:4156 PhoneRing_CopyTilemapAtOnce.loop_u20
-23:415f PhoneRing_CopyTilemapAtOnce.loop_u21
+23:410e PhoneRing_CopyTilemapAtOnce.loop_u78
+23:4117 PhoneRing_CopyTilemapAtOnce.loop_u79
+23:4120 PhoneRing_CopyTilemapAtOnce.loop_u80
+23:4129 PhoneRing_CopyTilemapAtOnce.loop_u81
+23:4132 PhoneRing_CopyTilemapAtOnce.loop_u82
+23:413b PhoneRing_CopyTilemapAtOnce.loop_u83
+23:4144 PhoneRing_CopyTilemapAtOnce.loop_u84
+23:414d PhoneRing_CopyTilemapAtOnce.loop_u85
+23:4156 PhoneRing_CopyTilemapAtOnce.loop_u86
+23:415f PhoneRing_CopyTilemapAtOnce.loop_u87
 23:417a _ResetClock
 23:41bb _ResetClock.wrongpassword
 23:41c2 _ResetClock.PasswordAskResetText
@@ -11471,11 +11471,11 @@
 23:4979 WipeLYOverrides.wipe
 23:497c WipeLYOverrides.loop
 23:4981 StartTrainerBattle_DrawSineWave
-23:498c StartTrainerBattle_DrawSineWave.negative_u22
-23:4996 StartTrainerBattle_DrawSineWave.apply_u22
-23:49a5 StartTrainerBattle_DrawSineWave.multiply_u22
-23:49aa StartTrainerBattle_DrawSineWave.even_u22
-23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u22
+23:498c StartTrainerBattle_DrawSineWave.negative_u88
+23:4996 StartTrainerBattle_DrawSineWave.apply_u88
+23:49a5 StartTrainerBattle_DrawSineWave.multiply_u88
+23:49aa StartTrainerBattle_DrawSineWave.even_u88
+23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u88
 23:49f2 StartTrainerBattle_ZoomToBlack
 23:49fb StartTrainerBattle_ZoomToBlack.loop
 23:4a16 StartTrainerBattle_ZoomToBlack.done
@@ -11845,11 +11845,11 @@
 23:668a UnusedSpriteAnimGFX.DeletedGFX
 23:668a Sprites_Cosine
 23:668c Sprites_Sine
-23:6697 Sprites_Sine.negative_u23
-23:66a1 Sprites_Sine.apply_u23
-23:66b0 Sprites_Sine.multiply_u23
-23:66b5 Sprites_Sine.even_u23
-23:66bd Sprites_Sine.sinetable_u23
+23:6697 Sprites_Sine.negative_u93
+23:66a1 Sprites_Sine.apply_u93
+23:66b0 Sprites_Sine.multiply_u93
+23:66b5 Sprites_Sine.even_u93
+23:66bd Sprites_Sine.sinetable_u93
 23:66fd AnimateEndOfExpBar
 23:6708 AnimateEndOfExpBar.load
 23:6715 AnimateEndOfExpBar.loop
@@ -15985,10 +15985,10 @@
 33:6671 BattleAnim_IncAnonJumptableIndex
 33:6677 BattleAnim_Cosine
 33:6679 BattleAnim_Sine
-33:6684 BattleAnim_Sine.negative_u24
-33:668e BattleAnim_Sine.apply_u24
-33:669d BattleAnim_Sine.multiply_u24
-33:66a2 BattleAnim_Sine.even_u24
+33:6684 BattleAnim_Sine.negative_u118
+33:668e BattleAnim_Sine.apply_u118
+33:669d BattleAnim_Sine.multiply_u118
+33:66a2 BattleAnim_Sine.even_u118
 33:66aa BattleAnim_Sine_e
 33:66b0 BattleAnim_Cosine_e
 33:66b6 BattleAnim_AbsSinePrecise
@@ -16811,14 +16811,14 @@
 38:7511 BillsPC_RefreshTextboxes.placeholder_string
 38:7518 BillsPC_RefreshTextboxes.Placeholder
 38:751e CopyBoxmonSpecies
-38:7545 CopyBoxmonSpecies.loop_u25
-38:7567 CopyBoxmonSpecies.done_u25
+38:7545 CopyBoxmonSpecies.loop_u122
+38:7567 CopyBoxmonSpecies.done_u122
 38:7575 CopyBoxmonSpecies.party
-38:7578 CopyBoxmonSpecies.loop_u26
-38:759a CopyBoxmonSpecies.done_u26
+38:7578 CopyBoxmonSpecies.loop_u123
+38:759a CopyBoxmonSpecies.done_u123
 38:75a5 CopyBoxmonSpecies.sBox
-38:75ad CopyBoxmonSpecies.loop_u27
-38:75cf CopyBoxmonSpecies.done_u27
+38:75ad CopyBoxmonSpecies.loop_u124
+38:75cf CopyBoxmonSpecies.done_u124
 38:75dd BillsPC_GetSelectedPokemonSpecies
 38:75ef BillsPC_UpdateSelectionCursor
 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor