Skip to content

Commit 9995085

Browse files
Rangi42Rangi42
committed
Don't pass redundant label names to table_width and list_start 
1 parent 61c9ba5 commit 9995085

File tree

140 files changed

+214
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+214
-203
lines changed

‎audio/cry_pointers.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Cries:
22
; entries correspond to CRY_* constants (see constants/cry_constants.asm)
3-
table_width 3, Cries
3+
table_width 3
44
dba Cry_Nidoran_M
55
dba Cry_Nidoran_F
66
dba Cry_Slowpoke

‎audio/engine.asm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ UpdateChannels:
223223
jp hl
224224

225225
.ChannelFunctions:
226-
table_width 2, UpdateChannels.ChannelFunctions
226+
table_width 2
227227
; music channels
228228
dw .Channel1
229229
dw .Channel2
@@ -1371,7 +1371,7 @@ ParseMusicCommand:
13711371

13721372
MusicCommands:
13731373
; entries correspond to audio constants (see macros/scripts/audio.asm)
1374-
table_width 2, MusicCommands
1374+
table_width 2
13751375
dw Music_Octave8
13761376
dw Music_Octave7
13771377
dw Music_Octave6
@@ -2783,7 +2783,7 @@ StereoTracks:
27832783
db $11, $22, $44, $88
27842784

27852785
ChannelPointers:
2786-
table_width 2, ChannelPointers
2786+
table_width 2
27872787
; music channels
27882788
dw wChannel1
27892789
dw wChannel2

‎audio/music_pointers.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Music:
44
; entries correspond to MUSIC_* constants
5-
table_width 3, Music
5+
table_width 3
66
dba Music_Nothing
77
dba Music_TitleScreen
88
dba Music_Route1

‎audio/notes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FrequencyTable:
2-
table_width 2, FrequencyTable
2+
table_width 2
33
dw 0 ; __
44
dw $f82c ; C_
55
dw $f89d ; C#

‎audio/sfx_pointers.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SFX:
22
; entries correspond to SFX_* constants
3-
table_width 3, SFX
3+
table_width 3
44
dba Sfx_DexFanfare5079
55
dba Sfx_Item
66
dba Sfx_CaughtMon

‎data/battle/effect_command_pointers.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
BattleCommandPointers:
66
; entries correspond to macros/scripts/battle_commands.asm
7-
table_width 2, BattleCommandPointers
7+
table_width 2
88
dw BattleCommand_CheckTurn
99
dw BattleCommand_CheckObedience
1010
dw BattleCommand_UsedMoveText

‎data/battle/stat_names.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
StatNames:
22
; entries correspond to stat ids
3-
list_start StatNames
3+
list_start
44
li "ATTACK"
55
li "DEFENSE"
66
li "SPEED"

‎data/battle_anims/framesets.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleAnimFrameData:
22
; entries correspond to BATTLE_ANIM_FRAMESET_* constants
3-
table_width 2, BattleAnimFrameData
3+
table_width 2
44
dw .Frameset_HitBig ; BATTLE_ANIM_FRAMESET_HIT_BIG
55
dw .Frameset_Hit ; BATTLE_ANIM_FRAMESET_HIT
66
dw .Frameset_HitSmall ; BATTLE_ANIM_FRAMESET_HIT_SMALL

‎data/battle_anims/oam.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDM
66

77
BattleAnimOAMData:
88
; entries correspond to BATTLE_ANIM_OAMSET_* constants
9-
table_width 4, BattleAnimOAMData
9+
table_width 4
1010
battleanimoam $00, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_00
1111
battleanimoam $04, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_01
1212
battleanimoam $08, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_02

‎data/battle_anims/object_gfx.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDM
66

77
AnimObjGFX:
88
; entries correspond to BATTLE_ANIM_GFX_* constants
9-
table_width 4, AnimObjGFX
9+
table_width 4
1010
anim_obj_gfx 0, AnimObj00GFX
1111
anim_obj_gfx 21, AnimObjHitGFX
1212
anim_obj_gfx 6, AnimObjCutGFX

‎data/battle_anims/objects.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENDM
1818

1919
BattleAnimObjects:
2020
; entries correspond to BATTLE_ANIM_OBJ_* constants
21-
table_width BATTLEANIMOBJ_LENGTH, BattleAnimObjects
21+
table_width BATTLEANIMOBJ_LENGTH
2222
; BATTLE_ANIM_OBJ_HIT_BIG_YFIX
2323
battleanimobj RELATIVE_X, $ff, BATTLE_ANIM_FRAMESET_HIT_BIG, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_HIT
2424
; BATTLE_ANIM_OBJ_HIT_YFIX

‎data/battle_tower/classes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ BattleTowerTrainers:
22
; The trainer class is not used in Crystal 1.0 due to a bug.
33
; Instead, the sixth character in the trainer's name is used.
44
; See BattleTowerText in engine/events/battle_tower/trainer_text.asm.
5-
table_width (NAME_LENGTH - 1) + 1, BattleTowerTrainers
5+
table_width (NAME_LENGTH - 1) + 1
66
; name, class
77
db "HANSON@@@@", FISHER
88
db "SAWYER@@@@", POKEMANIAC

‎data/battle_tower/parties.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleTowerMons:
22
; 10 groups (one per floor level) of 21 mons (BATTLETOWER_NUM_UNIQUE_MON).
3-
table_width NICKNAMED_MON_STRUCT_LENGTH, BattleTowerMons
3+
table_width NICKNAMED_MON_STRUCT_LENGTH
44

55
; BattleTowerMons group 1
66

‎data/battle_tower/unknown.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BattleTowerTrainerData:: ; ???
22
; 70 tables (BATTLETOWER_NUM_UNIQUE_TRAINERS) of 18 two-argument entries (total size BATTLETOWER_TRAINERDATALENGTH).
33
; Second argument points to an entry in Unknown_170470, to which the first argument is compared.
4-
table_width BATTLETOWER_TRAINERDATALENGTH, BattleTowerTrainerData
4+
table_width BATTLETOWER_TRAINERDATALENGTH
55

66
; BattleTowerTrainerData table 1:
77
db $37, 3

‎data/collision/collision_permissions.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CollisionPermissionTable::
22
; entries correspond to COLL_* constants
3-
table_width 1, CollisionPermissionTable
3+
table_width 1
44
db LAND_TILE ; COLL_FLOOR
55
db LAND_TILE ; COLL_01
66
db LAND_TILE ; 02

‎data/credits_strings.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CreditsStringsPointers:
22
; entries correspond to constants/credits_constants.asm
3-
table_width 2, CreditsStringsPointers
3+
table_width 2
44
dw .SatoshiTajiri
55
dw .JunichiMasuda
66
dw .TetsuyaWatanabe

‎data/decorations/attributes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENDM
77

88
DecorationAttributes:
99
; entries correspond to deco constants
10-
table_width DECOATTR_STRUCT_LENGTH, DecorationAttributes
10+
table_width DECOATTR_STRUCT_LENGTH
1111
decoration DECO_PLANT, 0, 0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
1212
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
1313
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b

‎data/decorations/decorations.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DecorationIDs:
22
; see constants/deco_constants.asm
3-
table_width 1, DecorationIDs
3+
table_width 1
44

55
db DECO_FEATHERY_BED ; 2
66
db DECO_PINK_BED ; 3

‎data/decorations/names.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DecorationNames:
22
; entries correspond to constants/deco_constants.asm
3-
list_start DecorationNames
3+
list_start
44
li "CANCEL"
55
li "PUT IT AWAY"
66
li "MAGNAPLANT"

‎data/events/bug_contest_flags.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BugCatchingContestantEventFlagTable:
2-
table_width 2, BugCatchingContestantEventFlagTable
2+
table_width 2
33
dw EVENT_BUG_CATCHING_CONTESTANT_1A
44
dw EVENT_BUG_CATCHING_CONTESTANT_2A
55
dw EVENT_BUG_CATCHING_CONTESTANT_3A

‎data/events/bug_contest_winners.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BugContestantPointers:
2-
table_width 2, BugContestantPointers
2+
table_width 2
33
dw BugContestant_BugCatcherDon ; this reverts back to the player
44
dw BugContestant_BugCatcherDon
55
dw BugContestant_BugCatcherEd

‎data/events/elevator_floors.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ElevatorFloorNames:
22
; entries correspond to FLOOR_* constants
3-
table_width 2, ElevatorFloorNames
3+
table_width 2
44
dw .B4F
55
dw .B3F
66
dw .B2F

‎data/events/engine_flags.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDM
66

77
EngineFlags:
88
; entries correspond to ENGINE_* constants
9-
table_width 3, EngineFlags
9+
table_width 3
1010

1111
; pokegear
1212
engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F

‎data/events/happiness_changes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
HappinessChanges:
22
; entries correspond to HAPPINESS_* constants
3-
table_width 3, HappinessChanges
3+
table_width 3
44
; change if happiness < 100, change if happiness < 200, change otherwise
55
db +5, +3, +2 ; Gained a level
66
db +5, +3, +2 ; Vitamin

‎data/events/npc_trades.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENDM
77

88
NPCTrades:
99
; entries correspond to NPCTRADE_* constants
10-
table_width NPCTRADE_STRUCT_LENGTH, NPCTrades
10+
table_width NPCTRADE_STRUCT_LENGTH
1111
npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
1212
npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
1313
npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER

‎data/events/odd_eggs.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENDM
77

88
OddEggProbabilities:
99
; entries correspond to OddEggs (below)
10-
table_width 2, OddEggProbabilities
10+
table_width 2
1111
DEF prob_total = 0
1212
; Pichu
1313
prob 8
@@ -34,7 +34,7 @@ DEF prob_total = 0
3434
assert prob_total == 100, "OddEggProbabilities do not sum to 100%!"
3535

3636
OddEggs:
37-
table_width NICKNAMED_MON_STRUCT_LENGTH, OddEggs
37+
table_width NICKNAMED_MON_STRUCT_LENGTH
3838

3939
db PICHU
4040
db NO_ITEM

‎data/events/unown_walls.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ DEF UNOWNWORD_{d:UNOWNWORDS_HO_OH} EQUS "HO-OH"
66

77
UnownWalls:
88
; entries correspond to UNOWNWORDS_* constants
9-
list_start UnownWalls
9+
list_start
1010
for x, NUM_UNOWN_WALLS
1111
li "{UNOWNWORD_{d:x}}"
1212
endr
1313
assert_list_length NUM_UNOWN_WALLS
1414

1515
MenuHeaders_UnownWalls:
1616
; entries correspond to UNOWNWORDS_* constants
17-
table_width UNOWN_WALL_MENU_HEADER_SIZE, MenuHeaders_UnownWalls
17+
table_width UNOWN_WALL_MENU_HEADER_SIZE
1818
for x, NUM_UNOWN_WALLS
1919
DEF n = CHARLEN("{UNOWNWORD_{d:x}}")
2020
db MENU_BACKUP_TILES ; flags

‎data/growth_rates.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENDM
1111

1212
GrowthRates:
1313
; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm)
14-
table_width 4, GrowthRates
14+
table_width 4
1515
growth_rate 1, 1, 0, 0, 0 ; Medium Fast
1616
growth_rate 3, 4, 10, 0, 30 ; Slightly Fast
1717
growth_rate 3, 4, 20, 0, 70 ; Slightly Slow

‎data/icon_pointers.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IconPointers:
22
; entries correspond to ICON_* constants (see constants/icon_constants.asm)
3-
table_width 2, IconPointers
3+
table_width 2
44
dw NullIcon
55
dw PoliwagIcon
66
dw JigglypuffIcon

‎data/items/attributes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENDM
77

88
ItemAttributes:
99
; entries correspond to item ids (see constants/item_constants.asm)
10-
table_width ITEMATTR_STRUCT_LENGTH, ItemAttributes
10+
table_width ITEMATTR_STRUCT_LENGTH
1111
; MASTER_BALL
1212
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
1313
; ULTRA_BALL

‎data/items/buena_prizes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BuenaPrizeItems:
2-
table_width 2, BuenaPrizeItems
2+
table_width 2
33
db ULTRA_BALL, 2
44
db FULL_RESTORE, 2
55
db NUGGET, 3

‎data/items/descriptions.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ItemDescriptions:
22
; entries correspond to item ids (see constants/item_constants.asm)
3-
table_width 2, ItemDescriptions
3+
table_width 2
44
dw MasterBallDesc
55
dw UltraBallDesc
66
dw BrightpowderDesc

‎data/items/fruit_trees.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FruitTreeItems:
22
; entries correspond to FRUITTREE_* constants
3-
table_width 1, FruitTreeItems
3+
table_width 1
44
db BERRY ; ROUTE_29
55
db BERRY ; ROUTE_30_1
66
db BERRY ; ROUTE_38

‎data/items/marts.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Marts:
22
; entries correspond to MART_* constants (see constants/mart_constants.asm)
3-
table_width 2, Marts
3+
table_width 2
44
dw MartCherrygrove
55
dw MartCherrygroveDex
66
dw MartViolet

‎data/items/names.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ItemNames::
2-
list_start ItemNames
2+
list_start
33
li "MASTER BALL"
44
li "ULTRA BALL"
55
li "BRIGHTPOWDER"

‎data/items/pocket_names.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ItemPocketNames:
22
; entries correspond to item type constants
3-
table_width 2, ItemPocketNames
3+
table_width 2
44
dw .Item
55
dw .Key
66
dw .Ball

‎data/maps/environment_colors.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
EnvironmentColorsPointers:
22
; entries correspond to environment constants (see constants/map_data_constants.asm)
3-
table_width 2, EnvironmentColorsPointers
3+
table_width 2
44
dw .OutdoorColors ; unused
55
dw .OutdoorColors ; TOWN
66
dw .OutdoorColors ; ROUTE

‎data/maps/landmarks.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDM
66

77
Landmarks:
88
; entries correspond to constants/landmark_constants.asm
9-
table_width 4, Landmarks
9+
table_width 4
1010
landmark -8, -16, SpecialMapName
1111
landmark 140, 100, NewBarkTownName
1212
landmark 128, 100, Route29Name

0 commit comments

Comments
 (0)