Use __SCOPE__ to simplify table_width

Rangi42 · Rangi42 · commit c89c75674ed0 · 2025-11-12T14:19:10.000-05:00
diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm
@@ -2,7 +2,7 @@ NumberOfSongs1:
 	db $1f
 
 SongBanks1:
-	table_width 1, SongBanks1
+	table_width 1
 	db BANK(Music_Stop)
 	db BANK(Music_TitleScreen)
 	db BANK(Music_DuelTheme1)
@@ -37,7 +37,7 @@ SongBanks1:
 	assert_table_length NUM_SONGS
 
 SongHeaderPointers1:
-	table_width 2, SongHeaderPointers1
+	table_width 2
 	dw Music_Stop
 	dw Music_TitleScreen
 	dw Music_DuelTheme1
diff --git a/src/audio/music2_headers.asm b/src/audio/music2_headers.asm
@@ -2,7 +2,7 @@ NumberOfSongs2:
 	db $1f
 
 SongBanks2:
-	table_width 1, SongBanks2
+	table_width 1
 	db BANK(Music_Stop)
 	db BANK(Music_TitleScreen)
 	db BANK(Music_DuelTheme1)
@@ -37,7 +37,7 @@ SongBanks2:
 	assert_table_length NUM_SONGS
 
 SongHeaderPointers2:
-	table_width 2, SongHeaderPointers2
+	table_width 2
 	dw Music_Stop
 	dw NULL
 	dw NULL
diff --git a/src/audio/sfx_headers.asm b/src/audio/sfx_headers.asm
@@ -2,7 +2,7 @@ NumberOfSFX:
 	db NUM_SFX
 
 SFXHeaderPointers:
-	table_width 2, SFXHeaderPointers
+	table_width 2
 	dw Sfx_Stop
 	dw Sfx_Cursor
 	dw Sfx_Confirm
diff --git a/src/data/auto_deck_machines.asm b/src/data/auto_deck_machines.asm
@@ -10,7 +10,7 @@ MACRO auto_deck
 ENDM
 
 AutoDeckMachineEntries:
-	table_width 6, AutoDeckMachineEntries
+	table_width 6
 
 ; Fighting Auto Deck Machine
 	auto_deck AllFightingPokemonCardList,   AllFightingPokemonText,   AllFightingPokemonDescriptionText
diff --git a/src/data/cards.asm b/src/data/cards.asm
@@ -2,7 +2,7 @@
 ; convenience once the meaning of all fields is figured out.
 
 CardPointers::
-	table_width 2, CardPointers
+	table_width 2
 	dw NULL
 	dw GrassEnergyCard
 	dw FireEnergyCard
diff --git a/src/data/deck_ai_pointers.asm b/src/data/deck_ai_pointers.asm
@@ -1,5 +1,5 @@
 DeckAIPointerTable::
-	table_width 2, DeckAIPointerTable
+	table_width 2
 	dw AIActionTable_SamPractice         ; SAMS_PRACTICE_DECK
 	dw AIActionTable_GeneralDecks        ; PRACTICE_PLAYER_DECK
 	dw AIActionTable_GeneralDecks        ; SAMS_NORMAL_DECK
diff --git a/src/data/decks.asm b/src/data/decks.asm
@@ -1,5 +1,5 @@
 DeckPointers::
-	table_width 2, DeckPointers
+	table_width 2
 	dw UnnamedDeck
 	dw UnnamedDeck2
 	dw SamsPracticeDeck
diff --git a/src/data/duel/animations/attack_animations.asm b/src/data/duel/animations/attack_animations.asm
@@ -1,5 +1,5 @@
 PointerTable_AttackAnimation:
-	table_width 2, PointerTable_AttackAnimation
+	table_width 2
 	dw NULL                                ; ATK_ANIM_NONE
 	dw AttackAnimation_Hit                 ; ATK_ANIM_HIT
 	dw AttackAnimation_BigHit              ; ATK_ANIM_BIG_HIT
diff --git a/src/data/duel/animations/duel_animations.asm b/src/data/duel/animations/duel_animations.asm
@@ -1,6 +1,6 @@
 ; data for each animation ID (see src/constants/sprite_constants.asm)
 Animations:
-	table_width 6, Animations
+	table_width 6
 	; DUEL_ANIM_NONE
 	db NONE ; sprite ID
 	db NONE ; palette ID
diff --git a/src/data/duel/duel_configurations.asm b/src/data/duel/duel_configurations.asm
@@ -1,5 +1,5 @@
 DeckIDDuelConfigurations:
-	table_width 10, DeckIDDuelConfigurations
+	table_width 10
 	db SAMS_PRACTICE_DECK_ID ; deck ID
 	db SAM_PIC ; NPC portrait
 	tx SamNPCName ; name text ID
diff --git a/src/data/duel/portraits.asm b/src/data/duel/portraits.asm
@@ -5,7 +5,7 @@ MACRO portrait
 ENDM
 
 PortraitGfxData:
-	table_width 4, PortraitGfxData
+	table_width 4
 	portrait TILESET_PLAYER,    PALETTE_119, SGBData_PlayerPortraitPals       ; INVALID_PIC
 	portrait TILESET_PLAYER,    PALETTE_119, SGBData_PlayerPortraitPals       ; PLAYER_PIC
 	portrait TILESET_RONALD,    PALETTE_121, SGBData_RonaldPortraitPals       ; RONALD_PIC
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
@@ -1,6 +1,6 @@
 MapHeaders:
 ; sgb tilemap, cgb tilemap, initial cgb palette (always 0), sgb palette, final cgb palette, song
-	table_width 6, MapHeaders
+	table_width 6
 	db TILEMAP_OVERWORLD_MAP,           TILEMAP_OVERWORLD_MAP_CGB,           PALETTE_0, MAP_SGB_PALS_1,  PALETTE_1,  MUSIC_OVERWORLD     ; OVERWORLD_MAP
 	db TILEMAP_MASON_LABORATORY,        TILEMAP_MASON_LABORATORY_CGB,        PALETTE_0, MAP_SGB_PALS_2,  PALETTE_2,  MUSIC_OVERWORLD     ; MASON_LABORATORY
 	db TILEMAP_DECK_MACHINE_ROOM,       TILEMAP_DECK_MACHINE_ROOM_CGB,       PALETTE_0, MAP_SGB_PALS_2,  PALETTE_2,  MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
diff --git a/src/data/map_ow_frameset_pointers.asm b/src/data/map_ow_frameset_pointers.asm
@@ -1,6 +1,6 @@
 MapOWFramesetPointers:
 ; non-cgb, cgb
-	table_width 4, MapOWFramesetPointers
+	table_width 4
 	dw OverworldMapOWFrameset,    OverworldMapCGBOWFrameset    ; OVERWORLD_MAP
 	dw MasonLaboratoryOWFrameset, MasonLaboratoryOWFrameset    ; MASON_LABORATORY
 	dw DeckMachineRoomOWFrameset, DeckMachineRoomCGBOWFrameset ; DECK_MACHINE_ROOM
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
@@ -12,7 +12,7 @@
 ; e: load map/closed text box
 
 MapScripts::
-	table_width NUM_MAP_SCRIPTS * 2, MapScripts
+	table_width NUM_MAP_SCRIPTS * 2
 
 ; OVERWORLD_MAP
 	dw NULL
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
@@ -2,7 +2,7 @@
 ; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
 ; The Deck IDs are used for the challenge hall
 NPCHeaderPointers:
-	table_width 2, NPCHeaderPointers
+	table_width 2
 	dw DrMasonNPCHeader
 	dw DrMasonNPCHeader
 	dw Ronald1NPCHeader
diff --git a/src/data/overworld_map/cursor_transitions.asm b/src/data/overworld_map/cursor_transitions.asm
@@ -1,5 +1,5 @@
 OverworldMap_CursorTransitions:
-	table_width 4, OverworldMap_CursorTransitions
+	table_width 4
 
 	; unused
 	db OWMAP_SCIENCE_CLUB     ; NORTH
diff --git a/src/data/overworld_map/map_positions.asm b/src/data/overworld_map/map_positions.asm
@@ -1,5 +1,5 @@
 OverworldMap_MapPositions:
-	table_width 2, OverworldMap_MapPositions
+	table_width 2
 	db $00, $00 ; unused
 	db $0c, $68 ; OWMAP_MASON_LABORATORY
 	db $04, $18 ; OWMAP_ISHIHARAS_HOUSE
diff --git a/src/data/overworld_map/overworld_warps.asm b/src/data/overworld_map/overworld_warps.asm
@@ -4,7 +4,7 @@
 ; 2: player's y coordinate when entering the map
 ; 4: 00
 OverworldMapWarps:
-	table_width 4, OverworldMapWarps
+	table_width 4
 	db $00, $00, $00, $00
 	db MASON_LABORATORY,        $0e, $1a, $00
 	db ISHIHARAS_HOUSE,         $08, $14, $00
diff --git a/src/data/overworld_map/player_movement_paths.asm b/src/data/overworld_map/player_movement_paths.asm
@@ -1,5 +1,5 @@
 OverworldMap_PlayerMovementPaths:
-	table_width 2, OverworldMap_PlayerMovementPaths
+	table_width 2
 	dw OverworldMap_MasonLaboratoryPaths
 	dw OverworldMap_IshiharasHousePaths
 	dw OverworldMap_FightingClubPaths
@@ -15,7 +15,7 @@ OverworldMap_PlayerMovementPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_MasonLaboratoryPaths:
-	table_width 2, OverworldMap_MasonLaboratoryPaths
+	table_width 2
 	dw OverworldMap_NoMovement
 	dw OverworldMap_MasonLaboratoryPathToIshiharasHouse
 	dw OverworldMap_StraightPath
@@ -31,7 +31,7 @@ OverworldMap_MasonLaboratoryPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_IshiharasHousePaths:
-	table_width 2, OverworldMap_IshiharasHousePaths
+	table_width 2
 	dw OverworldMap_IshiharasHousePathToMasonLaboratory
 	dw OverworldMap_NoMovement
 	dw OverworldMap_IshiharasHousePathToFightingClub
@@ -47,7 +47,7 @@ OverworldMap_IshiharasHousePaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_FightingClubPaths:
-	table_width 2, OverworldMap_FightingClubPaths
+	table_width 2
 	dw OverworldMap_StraightPath
 	dw OverworldMap_FightingClubPathToIshiharasHouse
 	dw OverworldMap_NoMovement
@@ -63,7 +63,7 @@ OverworldMap_FightingClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_RockClubPaths:
-	table_width 2, OverworldMap_RockClubPaths
+	table_width 2
 	dw OverworldMap_RockClubPathToMasonLaboratory
 	dw OverworldMap_RockClubPathToIshiharasHouse
 	dw OverworldMap_RockClubPathToFightingClub
@@ -79,7 +79,7 @@ OverworldMap_RockClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_WaterClubPaths:
-	table_width 2, OverworldMap_WaterClubPaths
+	table_width 2
 	dw OverworldMap_WaterClubPathToMasonLaboratory
 	dw OverworldMap_WaterClubPathToIshiharasHouse
 	dw OverworldMap_WaterClubPathToFightingClub
@@ -95,7 +95,7 @@ OverworldMap_WaterClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_LightningClubPaths:
-	table_width 2, OverworldMap_LightningClubPaths
+	table_width 2
 	dw OverworldMap_LightningClubPathToMasonLaboratory
 	dw OverworldMap_LightningClubPathToIshiharasHouse
 	dw OverworldMap_StraightPath
@@ -111,7 +111,7 @@ OverworldMap_LightningClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_GrassClubPaths:
-	table_width 2, OverworldMap_GrassClubPaths
+	table_width 2
 	dw OverworldMap_GrassClubPathToMasonLaboratory
 	dw OverworldMap_GrassClubPathToIshiharasHouse
 	dw OverworldMap_StraightPath
@@ -127,7 +127,7 @@ OverworldMap_GrassClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_PsychicClubPaths:
-	table_width 2, OverworldMap_PsychicClubPaths
+	table_width 2
 	dw OverworldMap_PsychicClubPathToMasonLaboratory
 	dw OverworldMap_PsychicClubPathToIshiharasHouse
 	dw OverworldMap_PsychicClubPathToFightingClub
@@ -143,7 +143,7 @@ OverworldMap_PsychicClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_ScienceClubPaths:
-	table_width 2, OverworldMap_ScienceClubPaths
+	table_width 2
 	dw OverworldMap_ScienceClubPathToMasonLaboratory
 	dw OverworldMap_ScienceClubPathToIshiharasHouse
 	dw OverworldMap_StraightPath
@@ -159,7 +159,7 @@ OverworldMap_ScienceClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_FireClubPaths:
-	table_width 2, OverworldMap_FireClubPaths
+	table_width 2
 	dw OverworldMap_FireClubPathToMasonLaboratory
 	dw OverworldMap_FireClubPathToIshiharasHouse
 	dw OverworldMap_FireClubPathToFightingClub
@@ -175,7 +175,7 @@ OverworldMap_FireClubPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_ChallengeHallPaths:
-	table_width 2, OverworldMap_ChallengeHallPaths
+	table_width 2
 	dw OverworldMap_ChallengeHallPathToMasonLaboratory
 	dw OverworldMap_ChallengeHallPathToIshiharasHouse
 	dw OverworldMap_ChallengeHallPathToFightingClub
@@ -191,7 +191,7 @@ OverworldMap_ChallengeHallPaths:
 	assert_table_length NUM_OWMAPS - 1
 
 OverworldMap_PokemonDomePaths:
-	table_width 2, OverworldMap_PokemonDomePaths
+	table_width 2
 	dw OverworldMap_PokemonDomePathToMasonLaboratory
 	dw OverworldMap_PokemonDomePathToIshiharasHouse
 	dw OverworldMap_StraightPath
diff --git a/src/data/palette_pointers.asm b/src/data/palette_pointers.asm
@@ -7,7 +7,7 @@ MACRO palette_pointer
 ENDM
 
 Palettes:
-	table_width 4, Palettes
+	table_width 4
 	palette_pointer Palette0,   8, 1 ; PALETTE_0
 	palette_pointer Palette1,   8, 0 ; PALETTE_1
 	palette_pointer Palette2,   8, 0 ; PALETTE_2
diff --git a/src/data/scenes.asm b/src/data/scenes.asm
@@ -1,5 +1,5 @@
 ScenePointers:
-	table_width 2, ScenePointers
+	table_width 2
 	dw Scene_TitleScreen
 	dw Scene_ColosseumBooster
 	dw Scene_EvolutionBooster
diff --git a/src/data/script_table.asm b/src/data/script_table.asm
@@ -1,5 +1,5 @@
 OverworldScriptTable::
-	table_width 2, OverworldScriptTable
+	table_width 2
 	dw ScriptCommand_EndScript
 	dw ScriptCommand_CloseAdvancedTextBox
 	dw ScriptCommand_PrintNPCText
diff --git a/src/data/sprite_animation_pointers.asm b/src/data/sprite_animation_pointers.asm
@@ -5,7 +5,7 @@ MACRO anim_data_pointer
 ENDM
 
 SpriteAnimations:
-	table_width 4, SpriteAnimations
+	table_width 4
 	anim_data_pointer AnimData0   ; SPRITE_ANIM_LIGHT_NPC_UP
 	anim_data_pointer AnimData1   ; SPRITE_ANIM_LIGHT_NPC_RIGHT
 	anim_data_pointer AnimData2   ; SPRITE_ANIM_LIGHT_NPC_DOWN
diff --git a/src/data/warps.asm b/src/data/warps.asm
@@ -1,5 +1,5 @@
 WarpDataPointers:
-	table_width 2, WarpDataPointers
+	table_width 2
 	dw NULL
 	dw MasonLaboratoryWarpData
 	dw DeckMachineRoomWarpData
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
@@ -1257,7 +1257,7 @@ Func_80baa:
 	ret
 
 .TilemapPointers
-	table_width 2, Func_80baa.TilemapPointers
+	table_width 2
 	dw .PokemonDomeDoor      ; MAP_EVENT_POKEMON_DOME_DOOR
 	dw .HallOfHonorDoor      ; MAP_EVENT_HALL_OF_HONOR_DOOR
 	dw .FightingDeckMachine  ; MAP_EVENT_FIGHTING_DECK_MACHINE
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
@@ -165,7 +165,7 @@ GetBoosterCardType:
 	ret
 
 CardTypeTable:
-	table_width 1, CardTypeTable
+	table_width 1
 	db BOOSTER_CARD_TYPE_FIRE      ; TYPE_PKMN_FIRE
 	db BOOSTER_CARD_TYPE_GRASS     ; TYPE_PKMN_GRASS
 	db BOOSTER_CARD_TYPE_LIGHTNING ; TYPE_PKMN_LIGHTNING
@@ -548,7 +548,7 @@ FindBoosterDataPointer:
 	ret
 
 BoosterDataJumptable:
-	table_width 2, BoosterDataJumptable
+	table_width 2
 	dw BoosterPack_ColosseumNeutral
 	dw BoosterPack_ColosseumGrass
 	dw BoosterPack_ColosseumFire
diff --git a/src/engine/duel/animations/commands.asm b/src/engine/duel/animations/commands.asm
@@ -160,7 +160,7 @@ AnimationCommand_AnimScreen:
 	jp PlayAttackAnimationCommands_NextCommand
 
 AnimationCommandPointerTable:
-	table_width 2, AnimationCommandPointerTable
+	table_width 2
 	dw AnimationCommand_AnimEnd      ; ANIMCMD_END
 	dw AnimationCommand_AnimNormal   ; ANIMCMD_NORMAL
 	dw AnimationCommand_AnimPlayer   ; ANIMCMD_PLAYER_SIDE
diff --git a/src/engine/duel/core.asm b/src/engine/duel/core.asm
@@ -6482,7 +6482,7 @@ DoLinkOpponentTurn:
 ; on a link duel, this is referenced by DoLinkOpponentTurn in a loop (on each opponent's HandleTurn)
 ; on a non-link duel (vs AI opponent), this is referenced by AIMakeDecision
 OppActionTable:
-	table_width 2, OppActionTable
+	table_width 2
 	dw DuelTransmissionError
 	dw OppAction_PlayBasicPokemonCard
 	dw OppAction_EvolvePokemonCard
diff --git a/src/engine/gfx/sprites.asm b/src/engine/gfx/sprites.asm
@@ -6,7 +6,7 @@ MACRO gfx_pointer
 ENDM
 
 Sprites:
-	table_width 4, Sprites
+	table_width 4
 	gfx_pointer OWPlayerGfx,         $14 ; SPRITE_OW_PLAYER
 	gfx_pointer OWRonaldGfx,         $14 ; SPRITE_OW_RONALD
 	gfx_pointer OWDrMasonGfx,        $14 ; SPRITE_OW_DRMASON
diff --git a/src/engine/gfx/tilemaps.asm b/src/engine/gfx/tilemaps.asm
@@ -6,7 +6,7 @@ MACRO tilemap
 ENDM
 
 Tilemaps:
-	table_width 4, Tilemaps
+	table_width 4
 	tilemap OverworldMapTilemap,               TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP
 	tilemap OverworldMapCGBTilemap,            TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP_CGB
 	tilemap MasonLaboratoryTilemap,            TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY
diff --git a/src/engine/gfx/tilesets.asm b/src/engine/gfx/tilesets.asm
@@ -6,7 +6,7 @@ MACRO tileset
 ENDM
 
 Tilesets:
-	table_width 4, Tilesets
+	table_width 4
 	tileset OverworldMapTiles,             193 ; TILESET_OVERWORLD_MAP
 	tileset MasonLaboratoryTilesetGfx,     151 ; TILESET_MASON_LABORATORY
 	tileset IshiharaTilesetGfx,             77 ; TILESET_ISHIHARA
diff --git a/src/engine/menus/duel_init.asm b/src/engine/menus/duel_init.asm
@@ -65,7 +65,7 @@ OpponentDeckNameLabel:
 	db $ff
 
 OpponentTitlesAndDeckNames:
-	table_width 4, OpponentTitlesAndDeckNames
+	table_width 4
 
 	tx TechText
 	tx SamsPracticeDeckName
diff --git a/src/engine/menus/give_booster_pack.asm b/src/engine/menus/give_booster_pack.asm
diff --git a/src/engine/menus/mail.asm b/src/engine/menus/mail.asm
diff --git a/src/engine/menus/medal.asm b/src/engine/menus/medal.asm
diff --git a/src/engine/menus/play_area.asm b/src/engine/menus/play_area.asm
diff --git a/src/engine/menus/print_stats.asm b/src/engine/menus/print_stats.asm
diff --git a/src/engine/overworld/scripting.asm b/src/engine/overworld/scripting.asm
diff --git a/src/engine/sgb.asm b/src/engine/sgb.asm
diff --git a/src/home/map.asm b/src/home/map.asm
diff --git a/src/macros/asserts.asm b/src/macros/asserts.asm
