diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm index 58b948a0b..5754de087 100644 --- a/audio/cry_pointers.asm +++ b/audio/cry_pointers.asm @@ -1,6 +1,6 @@ Cries: ; entries correspond to CRY_* constants (see constants/cry_constants.asm) - table_width 3, Cries + table_width 3 dba Cry_Nidoran_M dba Cry_Nidoran_F dba Cry_Slowpoke diff --git a/audio/engine.asm b/audio/engine.asm index 9bea0b459..a32ced688 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -223,7 +223,7 @@ UpdateChannels: jp hl .ChannelFunctions: - table_width 2, UpdateChannels.ChannelFunctions + table_width 2 ; music channels dw .Channel1 dw .Channel2 @@ -1371,7 +1371,7 @@ ParseMusicCommand: MusicCommands: ; entries correspond to audio constants (see macros/scripts/audio.asm) - table_width 2, MusicCommands + table_width 2 dw Music_Octave8 dw Music_Octave7 dw Music_Octave6 @@ -2783,7 +2783,7 @@ StereoTracks: db $11, $22, $44, $88 ChannelPointers: - table_width 2, ChannelPointers + table_width 2 ; music channels dw wChannel1 dw wChannel2 diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 12dda56bc..2c5c0e7b1 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -2,7 +2,7 @@ Music: ; entries correspond to MUSIC_* constants - table_width 3, Music + table_width 3 dba Music_Nothing dba Music_TitleScreen dba Music_Route1 diff --git a/audio/notes.asm b/audio/notes.asm index e1d693137..dd19f2442 100644 --- a/audio/notes.asm +++ b/audio/notes.asm @@ -1,5 +1,5 @@ FrequencyTable: - table_width 2, FrequencyTable + table_width 2 dw 0 ; __ dw $f82c ; C_ dw $f89d ; C# diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 9049b89e3..151e4eb67 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -1,6 +1,6 @@ SFX: ; entries correspond to SFX_* constants - table_width 3, SFX + table_width 3 dba Sfx_DexFanfare5079 dba Sfx_Item dba Sfx_CaughtMon diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index d34ea2f0a..0e389a861 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -4,7 +4,7 @@ BattleCommandPointers: ; entries correspond to macros/scripts/battle_commands.asm - table_width 2, BattleCommandPointers + table_width 2 dw BattleCommand_CheckTurn dw BattleCommand_CheckObedience dw BattleCommand_UsedMoveText diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm index ae6c6cfdd..0baa808b0 100644 --- a/data/battle/stat_names.asm +++ b/data/battle/stat_names.asm @@ -1,6 +1,6 @@ StatNames: ; entries correspond to stat ids - list_start StatNames + list_start li "ATTACK" li "DEFENSE" li "SPEED" diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index e00e510f8..4457bc721 100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -1,6 +1,6 @@ BattleAnimFrameData: ; entries correspond to BATTLE_ANIM_FRAMESET_* constants - table_width 2, BattleAnimFrameData + table_width 2 dw .Frameset_HitBig ; BATTLE_ANIM_FRAMESET_HIT_BIG dw .Frameset_Hit ; BATTLE_ANIM_FRAMESET_HIT dw .Frameset_HitSmall ; BATTLE_ANIM_FRAMESET_HIT_SMALL diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index e13584d35..bd7cba487 100644 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm @@ -6,7 +6,7 @@ ENDM BattleAnimOAMData: ; entries correspond to BATTLE_ANIM_OAMSET_* constants - table_width 4, BattleAnimOAMData + table_width 4 battleanimoam $00, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_00 battleanimoam $04, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_01 battleanimoam $08, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_02 diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 5b367f550..7e0dd661e 100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm @@ -6,7 +6,7 @@ ENDM AnimObjGFX: ; entries correspond to BATTLE_ANIM_GFX_* constants - table_width 4, AnimObjGFX + table_width 4 anim_obj_gfx 0, AnimObj00GFX anim_obj_gfx 21, AnimObjHitGFX anim_obj_gfx 6, AnimObjCutGFX diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 3eb8b086f..56278e4fd 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -18,7 +18,7 @@ ENDM BattleAnimObjects: ; entries correspond to BATTLE_ANIM_OBJ_* constants - table_width BATTLEANIMOBJ_LENGTH, BattleAnimObjects + table_width BATTLEANIMOBJ_LENGTH ; BATTLE_ANIM_OBJ_HIT_BIG_YFIX battleanimobj RELATIVE_X, $ff, BATTLE_ANIM_FRAMESET_HIT_BIG, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_HIT ; BATTLE_ANIM_OBJ_HIT_YFIX diff --git a/data/collision/collision_permissions.asm b/data/collision/collision_permissions.asm index 9c0eb1a75..2565fabbb 100644 --- a/data/collision/collision_permissions.asm +++ b/data/collision/collision_permissions.asm @@ -1,6 +1,6 @@ CollisionPermissionTable:: ; entries correspond to COLL_* constants - table_width 1, CollisionPermissionTable + table_width 1 db LAND_TILE ; COLL_FLOOR db LAND_TILE ; COLL_01 db LAND_TILE ; 02 diff --git a/data/credits_strings_pointers.asm b/data/credits_strings_pointers.asm index 0b178d1d6..b07de87a3 100644 --- a/data/credits_strings_pointers.asm +++ b/data/credits_strings_pointers.asm @@ -1,6 +1,6 @@ CreditsStringsPointers: ; entries correspond to constants/credits_constants.asm - table_width 2, CreditsStringsPointers + table_width 2 dw Credits_SatoshiTajiri dw Credits_JunichiMasuda dw Credits_TetsuyaWatanabe diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm index b3f949467..0240771d1 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -7,7 +7,7 @@ ENDM DecorationAttributes: ; entries correspond to deco constants - table_width DECOATTR_STRUCT_LENGTH, DecorationAttributes + table_width DECOATTR_STRUCT_LENGTH decoration DECO_PLANT, 0, 0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0 decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index 00d0b09d1..eaacdd44c 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -1,6 +1,6 @@ DecorationIDs: ; see constants/deco_constants.asm - table_width 1, DecorationIDs + table_width 1 db DECO_FEATHERY_BED ; 2 db DECO_PINK_BED ; 3 diff --git a/data/decorations/names.asm b/data/decorations/names.asm index df179a94c..44ba4bbd0 100644 --- a/data/decorations/names.asm +++ b/data/decorations/names.asm @@ -1,6 +1,6 @@ DecorationNames: ; entries correspond to constants/deco_constants.asm - list_start DecorationNames + list_start li "CANCEL" li "PUT IT AWAY" li "MAGNAPLANT" diff --git a/data/events/bug_contest_flags.asm b/data/events/bug_contest_flags.asm index f3d9ff74d..53b66bf78 100644 --- a/data/events/bug_contest_flags.asm +++ b/data/events/bug_contest_flags.asm @@ -1,5 +1,5 @@ BugCatchingContestantEventFlagTable: - table_width 2, BugCatchingContestantEventFlagTable + table_width 2 dw EVENT_BUG_CATCHING_CONTESTANT_1A dw EVENT_BUG_CATCHING_CONTESTANT_2A dw EVENT_BUG_CATCHING_CONTESTANT_3A diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index da2be381d..b2b91f137 100644 --- a/data/events/bug_contest_winners.asm +++ b/data/events/bug_contest_winners.asm @@ -1,5 +1,5 @@ BugContestantPointers: - table_width 2, BugContestantPointers + table_width 2 dw BugContestant_BugCatcherDon ; this reverts back to the player dw BugContestant_BugCatcherDon dw BugContestant_BugCatcherEd diff --git a/data/events/elevator_floors.asm b/data/events/elevator_floors.asm index 861653bae..94d252a45 100644 --- a/data/events/elevator_floors.asm +++ b/data/events/elevator_floors.asm @@ -1,6 +1,6 @@ ElevatorFloorNames: ; entries correspond to FLOOR_* constants - table_width 2, ElevatorFloorNames + table_width 2 dw .B4F dw .B3F dw .B2F diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index 420098997..a98319cc7 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -6,7 +6,7 @@ ENDM EngineFlags: ; entries correspond to ENGINE_* constants - table_width 3, EngineFlags + table_width 3 ; pokegear engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F diff --git a/data/events/happiness_changes.asm b/data/events/happiness_changes.asm index 8e3c46875..661526993 100644 --- a/data/events/happiness_changes.asm +++ b/data/events/happiness_changes.asm @@ -1,6 +1,6 @@ HappinessChanges: ; entries correspond to HAPPINESS_* constants - table_width 3, HappinessChanges + table_width 3 ; change if happiness < 100, change if happiness < 200, change otherwise db +5, +3, +2 ; Gained a level db +5, +3, +2 ; Vitamin diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm index c36e4b958..c0f6fbb0b 100644 --- a/data/events/npc_trades.asm +++ b/data/events/npc_trades.asm @@ -7,7 +7,7 @@ ENDM NPCTrades: ; entries correspond to NPCTRADE_* constants - table_width NPCTRADE_STRUCT_LENGTH, NPCTrades + table_width NPCTRADE_STRUCT_LENGTH npctrade TRADE_DIALOGSET_COLLECTOR, DROWZEE, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER diff --git a/data/growth_rates.asm b/data/growth_rates.asm index dfbb5ffa5..8a2864f7b 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -11,7 +11,7 @@ ENDM GrowthRates: ; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) - table_width 4, GrowthRates + table_width 4 growth_rate 1, 1, 0, 0, 0 ; Medium Fast growth_rate 3, 4, 10, 0, 30 ; Slightly Fast growth_rate 3, 4, 20, 0, 70 ; Slightly Slow diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm index 1ad361c1c..a7bbb0f0f 100644 --- a/data/icon_pointers.asm +++ b/data/icon_pointers.asm @@ -1,6 +1,6 @@ IconPointers: ; entries correspond to ICON_* constants (see constants/icon_constants.asm) - table_width 2, IconPointers + table_width 2 dw NullIcon dw PoliwagIcon dw JigglypuffIcon diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 26b9e0874..594a8bb31 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -7,7 +7,7 @@ ENDM ItemAttributes: ; entries correspond to item ids (see constants/item_constants.asm) - table_width ITEMATTR_STRUCT_LENGTH, ItemAttributes + table_width ITEMATTR_STRUCT_LENGTH ; MASTER_BALL item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; ULTRA_BALL diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index 7c195f784..4b6f0c034 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -1,6 +1,6 @@ ItemDescriptions: ; entries correspond to item ids (see constants/item_constants.asm) - table_width 2, ItemDescriptions + table_width 2 dw MasterBallDesc dw UltraBallDesc dw BrightpowderDesc diff --git a/data/items/fruit_trees.asm b/data/items/fruit_trees.asm index ff39551e7..9e4a6d7e4 100644 --- a/data/items/fruit_trees.asm +++ b/data/items/fruit_trees.asm @@ -1,6 +1,6 @@ FruitTreeItems: ; entries correspond to FRUITTREE_* constants - table_width 1, FruitTreeItems + table_width 1 db BERRY ; ROUTE_29 db BERRY ; ROUTE_30_1 db BERRY ; ROUTE_38 diff --git a/data/items/marts.asm b/data/items/marts.asm index d96281dfd..a8762680c 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,6 +1,6 @@ Marts: ; entries correspond to MART_* constants (see constants/mart_constants.asm) - table_width 2, Marts + table_width 2 dw MartCherrygrove dw MartCherrygroveDex dw MartViolet diff --git a/data/items/names.asm b/data/items/names.asm index 9408f6a80..ac1c776f3 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,5 +1,5 @@ ItemNames:: - list_start ItemNames + list_start li "MASTER BALL" li "ULTRA BALL" li "BRIGHTPOWDER" diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm index 9669c5278..14376ae1a 100644 --- a/data/items/pocket_names.asm +++ b/data/items/pocket_names.asm @@ -1,6 +1,6 @@ ItemPocketNames: ; entries correspond to item type constants - table_width 2, ItemPocketNames + table_width 2 dw .Item dw .Key dw .Ball diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm index 99e9be734..e73d94177 100644 --- a/data/maps/environment_colors.asm +++ b/data/maps/environment_colors.asm @@ -1,6 +1,6 @@ EnvironmentColorsPointers: ; entries correspond to environment constants (see constants/map_data_constants.asm) - table_width 2, EnvironmentColorsPointers + table_width 2 dw .OutdoorColors ; unused dw .OutdoorColors ; TOWN dw .OutdoorColors ; ROUTE diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 23faf5735..999ba5724 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -6,7 +6,7 @@ ENDM Landmarks: ; entries correspond to constants/landmark_constants.asm - table_width 4, Landmarks + table_width 4 landmark -8, -16, SpecialMapName landmark 140, 100, NewBarkTownName landmark 128, 100, Route29Name diff --git a/data/maps/maps.asm b/data/maps/maps.asm index e791f2fb3..5f51fb714 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -16,7 +16,7 @@ ENDM MapGroupPointers:: ; pointers to the first map of each map group - table_width 2, MapGroupPointers + table_width 2 dw MapGroup_Olivine ; 1 dw MapGroup_Mahogany ; 2 dw MapGroup_Dungeons ; 3 @@ -46,7 +46,7 @@ MapGroupPointers:: assert_table_length NUM_MAP_GROUPS MapGroup_Olivine: - table_width MAP_LENGTH, MapGroup_Olivine + table_width MAP_LENGTH map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map OlivineTimsHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -64,7 +64,7 @@ MapGroup_Olivine: assert_table_length NUM_OLIVINE_MAPS MapGroup_Mahogany: - table_width MAP_LENGTH, MapGroup_Mahogany + table_width MAP_LENGTH map MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -75,7 +75,7 @@ MapGroup_Mahogany: assert_table_length NUM_MAHOGANY_MAPS MapGroup_Dungeons: - table_width MAP_LENGTH, MapGroup_Dungeons + table_width MAP_LENGTH map SproutTower1F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SproutTower2F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SproutTower3F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -161,7 +161,7 @@ MapGroup_Dungeons: assert_table_length NUM_DUNGEONS_MAPS MapGroup_Ecruteak: - table_width MAP_LENGTH, MapGroup_Ecruteak + table_width MAP_LENGTH map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakTinTowerBackEntrance, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -174,7 +174,7 @@ MapGroup_Ecruteak: assert_table_length NUM_ECRUTEAK_MAPS MapGroup_Blackthorn: - table_width MAP_LENGTH, MapGroup_Blackthorn + table_width MAP_LENGTH map BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -188,7 +188,7 @@ MapGroup_Blackthorn: assert_table_length NUM_BLACKTHORN_MAPS MapGroup_Cinnabar: - table_width MAP_LENGTH, MapGroup_Cinnabar + table_width MAP_LENGTH map CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route19FuchsiaGate, TILESET_GATE, GATE, LANDMARK_ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -200,7 +200,7 @@ MapGroup_Cinnabar: assert_table_length NUM_CINNABAR_MAPS MapGroup_Cerulean: - table_width MAP_LENGTH, MapGroup_Cerulean + table_width MAP_LENGTH map CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeruleanPoliceStation, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -222,7 +222,7 @@ MapGroup_Cerulean: assert_table_length NUM_CERULEAN_MAPS MapGroup_Azalea: - table_width MAP_LENGTH, MapGroup_Azalea + table_width MAP_LENGTH map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CharcoalKiln, TILESET_HOUSE, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map AzaleaMart, TILESET_MART, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -233,7 +233,7 @@ MapGroup_Azalea: assert_table_length NUM_AZALEA_MAPS MapGroup_LakeOfRage: - table_width MAP_LENGTH, MapGroup_LakeOfRage + table_width MAP_LENGTH map LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route43MahoganyGate, TILESET_GATE, GATE, LANDMARK_ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -243,7 +243,7 @@ MapGroup_LakeOfRage: assert_table_length NUM_LAKE_OF_RAGE_MAPS MapGroup_Violet: - table_width MAP_LENGTH, MapGroup_Violet + table_width MAP_LENGTH map Route32, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH map Route35, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND map Route36, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE @@ -264,7 +264,7 @@ MapGroup_Violet: assert_table_length NUM_VIOLET_MAPS MapGroup_Goldenrod: - table_width MAP_LENGTH, MapGroup_Goldenrod + table_width MAP_LENGTH map Route34, TILESET_JOHTO_MODERN, ROUTE, LANDMARK_ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -290,7 +290,7 @@ MapGroup_Goldenrod: assert_table_length NUM_GOLDENROD_MAPS MapGroup_Vermilion: - table_width MAP_LENGTH, MapGroup_Vermilion + table_width MAP_LENGTH map Route6, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND map Route11, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map VermilionCity, TILESET_KANTO, TOWN, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN @@ -307,7 +307,7 @@ MapGroup_Vermilion: assert_table_length NUM_VERMILION_MAPS MapGroup_Pallet: - table_width MAP_LENGTH, MapGroup_Pallet + table_width MAP_LENGTH map Route1, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map PalletTown, TILESET_KANTO, TOWN, LANDMARK_PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -317,7 +317,7 @@ MapGroup_Pallet: assert_table_length NUM_PALLET_MAPS MapGroup_Pewter: - table_width MAP_LENGTH, MapGroup_Pewter + table_width MAP_LENGTH map Route3, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map PewterCity, TILESET_KANTO, TOWN, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -329,7 +329,7 @@ MapGroup_Pewter: assert_table_length NUM_PEWTER_MAPS MapGroup_FastShip: - table_width MAP_LENGTH, MapGroup_FastShip + table_width MAP_LENGTH map OlivinePort, TILESET_PORT, ROUTE, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map VermilionPort, TILESET_PORT, ROUTE, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map FastShip1F, TILESET_LIGHTHOUSE, INDOOR, LANDMARK_FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -345,7 +345,7 @@ MapGroup_FastShip: assert_table_length NUM_FAST_SHIP_MAPS MapGroup_Indigo: - table_width MAP_LENGTH, MapGroup_Indigo + table_width MAP_LENGTH map Route23, TILESET_KANTO, TOWN, LANDMARK_ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE map WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -357,7 +357,7 @@ MapGroup_Indigo: assert_table_length NUM_INDIGO_MAPS MapGroup_Fuchsia: - table_width MAP_LENGTH, MapGroup_Fuchsia + table_width MAP_LENGTH map Route13, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map Route14, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route15, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE @@ -374,7 +374,7 @@ MapGroup_Fuchsia: assert_table_length NUM_FUCHSIA_MAPS MapGroup_Lavender: - table_width MAP_LENGTH, MapGroup_Lavender + table_width MAP_LENGTH map Route8, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route12, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map Route10South, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE @@ -392,7 +392,7 @@ MapGroup_Lavender: assert_table_length NUM_LAVENDER_MAPS MapGroup_Silver: - table_width MAP_LENGTH, MapGroup_Silver + table_width MAP_LENGTH map Route28, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map SilverCaveOutside, TILESET_KANTO, TOWN, LANDMARK_SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -400,7 +400,7 @@ MapGroup_Silver: assert_table_length NUM_SILVER_MAPS MapGroup_CableClub: - table_width MAP_LENGTH, MapGroup_CableClub + table_width MAP_LENGTH map Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SPECIAL, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE map TradeCenter, TILESET_GATE, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Colosseum, TILESET_GATE, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -408,7 +408,7 @@ MapGroup_CableClub: assert_table_length NUM_CABLE_CLUB_MAPS MapGroup_Celadon: - table_width MAP_LENGTH, MapGroup_Celadon + table_width MAP_LENGTH map Route7, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route16, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route17, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE @@ -438,7 +438,7 @@ MapGroup_Celadon: assert_table_length NUM_CELADON_MAPS MapGroup_Cianwood: - table_width MAP_LENGTH, MapGroup_Cianwood + table_width MAP_LENGTH map Route40, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route41, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map CianwoodCity, TILESET_JOHTO, TOWN, LANDMARK_CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE @@ -451,7 +451,7 @@ MapGroup_Cianwood: assert_table_length NUM_CIANWOOD_MAPS MapGroup_Viridian: - table_width MAP_LENGTH, MapGroup_Viridian + table_width MAP_LENGTH map Route2, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route22, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND map ViridianCity, TILESET_KANTO, TOWN, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND @@ -468,7 +468,7 @@ MapGroup_Viridian: assert_table_length NUM_VIRIDIAN_MAPS MapGroup_NewBark: - table_width MAP_LENGTH, MapGroup_NewBark + table_width MAP_LENGTH map Route26, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map Route27, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map Route29, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE @@ -485,7 +485,7 @@ MapGroup_NewBark: assert_table_length NUM_NEW_BARK_MAPS MapGroup_Saffron: - table_width MAP_LENGTH, MapGroup_Saffron + table_width MAP_LENGTH map Route5, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map SaffronCity, TILESET_KANTO, TOWN, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map FightingDojo, TILESET_TRAIN_STATION, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -504,7 +504,7 @@ MapGroup_Saffron: assert_table_length NUM_SAFFRON_MAPS MapGroup_Cherrygrove: - table_width MAP_LENGTH, MapGroup_Cherrygrove + table_width MAP_LENGTH map Route30, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND map Route31, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND map CherrygroveCity, TILESET_JOHTO, TOWN, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 7a597eb35..8e6ede069 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -3,7 +3,7 @@ OutdoorSprites: ; entries correspond to MAPGROUP_* constants - table_width 2, OutdoorSprites + table_width 2 dw OlivineGroupSprites dw MahoganyGroupSprites dw DungeonsGroupSprites diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index bcc49f182..e344b0cb9 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -10,7 +10,7 @@ DEF NUM_ROOFS EQU const_value MapGroupRoofs: ; entries correspond to MAPGROUP_* constants ; values are indexes for Roofs (see below) - table_width 1, MapGroupRoofs + table_width 1 db -1 ; 0 db ROOF_OLIVINE ; 1 (Olivine) db ROOF_AZALEA ; 2 (Mahogany) @@ -42,7 +42,7 @@ MapGroupRoofs: Roofs: ; entries correspond to ROOF_* constants - table_width ROOF_LENGTH * LEN_2BPP_TILE, Roofs + table_width ROOF_LENGTH * LEN_2BPP_TILE INCBIN "gfx/tilesets/roofs/new_bark.2bpp" INCBIN "gfx/tilesets/roofs/violet.2bpp" INCBIN "gfx/tilesets/roofs/azalea.2bpp" diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index f83d9235d..18d01477e 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -1,6 +1,6 @@ MapSetupScripts: ; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm) - table_width 2, MapSetupScripts + table_width 2 dw MapSetupScript_Warp dw MapSetupScript_Continue dw MapSetupScript_ReloadMap diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 5f95b58f8..82bcd23ee 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -1,6 +1,6 @@ MapGroupRoofSGBPalInds: ; entries correspond to map groups - table_width 1, MapGroupRoofSGBPalInds + table_width 1 db PREDEFPAL_ROUTES db PREDEFPAL_OLIVINE db PREDEFPAL_MAHOGANY diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index 61938cd4d..a8a874da8 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -6,7 +6,7 @@ ENDM SpawnPoints: ; entries correspond to SPAWN_* constants - table_width 4, SpawnPoints + table_width 4 spawn PLAYERS_HOUSE_2F, 3, 3 spawn VIRIDIAN_POKECENTER_1F, 5, 3 diff --git a/data/mon_menu.asm b/data/mon_menu.asm index 318262f7f..4e30b5d7d 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -11,7 +11,7 @@ DEF NUM_MONMENUVALUES EQU const_value - 1 MonMenuOptionStrings: ; entries correspond to MONMENUVALUE_* constants - list_start MonMenuOptionStrings + list_start li "STATS" li "SWITCH" li "ITEM" @@ -23,7 +23,7 @@ MonMenuOptionStrings: MonMenuOptions: ; category, item, value; actions are in PokemonActionSubmenu (see engine/pokemon/mon_menu.asm) - table_width 3, MonMenuOptions + table_width 3 ; moves db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY diff --git a/data/moves/animations.asm b/data/moves/animations.asm index b5dbe8e89..841640390 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -1,6 +1,6 @@ BattleAnimations:: ; entries correspond to constants/move_constants.asm - table_width 2, BattleAnimations + table_width 2 dw BattleAnim_Dummy dw BattleAnim_Pound dw BattleAnim_KarateChop diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index 9773852ff..97ec531c6 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -1,6 +1,6 @@ MoveDescriptions:: ; entries correspond to move ids (see constants/move_constants.asm) - table_width 2, MoveDescriptions + table_width 2 dw PoundDescription dw KarateChopDescription dw DoubleslapDescription diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm index c83492602..44f9fd71a 100644 --- a/data/moves/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -1,6 +1,6 @@ MoveEffectsPointers: ; entries correspond to EFFECT_* constants - table_width 2, MoveEffectsPointers + table_width 2 dw NormalHit dw DoSleep dw PoisonHit diff --git a/data/moves/moves.asm b/data/moves/moves.asm index f2d3c07d4..6f1b44afa 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -13,7 +13,7 @@ ENDM Moves: ; entries correspond to move ids (see constants/move_constants.asm) - table_width MOVE_LENGTH, Moves + table_width MOVE_LENGTH move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0 move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0 diff --git a/data/moves/names.asm b/data/moves/names.asm index 8b6103837..a564c5eeb 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,5 +1,5 @@ MoveNames:: - list_start MoveNames + list_start li "POUND" li "KARATE CHOP" li "DOUBLESLAP" diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 43b6f255b..509407189 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -3,7 +3,7 @@ TMHMMoves: ; entries correspond to *_TMNUM constants (see constants/item_constants.asm) - table_width 1, TMHMMoves + table_width 1 ; TMs for n, 1, NUM_TMS + 1 diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm index bc0e26401..8e0f7e597 100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm @@ -19,7 +19,7 @@ ENDM PartyMenuQualityPointers: ; entries correspond to PARTYMENUACTION_* constants - table_width 2, PartyMenuQualityPointers + table_width 2 dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON dw .Default ; PARTYMENUACTION_HEALING_ITEM dw .Default ; PARTYMENUACTION_SWITCH diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm index 0a1fd5b16..3f72f5a61 100644 --- a/data/phone/non_trainer_names.asm +++ b/data/phone/non_trainer_names.asm @@ -1,6 +1,6 @@ NonTrainerCallerNames: ; entries correspond to PHONECONTACT_* constants (see constants/trainer_constants.asm) - table_width 2, NonTrainerCallerNames + table_width 2 dw .none dw .mom dw .bikeshop diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index 82193839b..0039bbfd5 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -10,7 +10,7 @@ ENDM PhoneContacts: ; entries correspond to PHONE_* constants - table_width PHONE_CONTACT_SIZE, PhoneContacts + table_width PHONE_CONTACT_SIZE phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneCalleeScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 55c157d8e..81ee31878 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -7,7 +7,7 @@ ENDM SpecialPhoneCallList: ; entries correspond to SPECIALCALL_* constants - table_width SPECIALCALL_SIZE, SpecialPhoneCallList + table_width SPECIALCALL_SIZE specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index af4686ae7..422fb7b2e 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -22,7 +22,7 @@ MACRO tmhm ENDM BaseData:: - table_width BASE_DATA_SIZE, BaseData + table_width BASE_DATA_SIZE INCLUDE "data/pokemon/base_stats/bulbasaur.asm" INCLUDE "data/pokemon/base_stats/ivysaur.asm" INCLUDE "data/pokemon/base_stats/venusaur.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index b52418b5a..610561a8e 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -5,7 +5,7 @@ ENDM PokemonCries:: ; entries correspond to constants/pokemon_constants.asm - table_width MON_CRY_LENGTH, PokemonCries + table_width MON_CRY_LENGTH mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 890745500..71307e218 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -1,6 +1,6 @@ PokedexDataPointerTable: ; entries correspond to constants/pokemon_constants.asm - table_width 2, PokedexDataPointerTable + table_width 2 dw BulbasaurPokedexEntry dw IvysaurPokedexEntry dw VenusaurPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 63e80c3c2..3468df177 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,7 +1,7 @@ ; Every Pokémon sorted alphabetically by name. AlphabeticalPokedexOrder: - table_width 1, AlphabeticalPokedexOrder + table_width 1 db ABRA db AERODACTYL db AIPOM diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 77977cb3a..110909686 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -1,7 +1,7 @@ ; Every Pokémon sorted in New Pokédex Order. NewPokedexOrder: - table_width 1, NewPokedexOrder + table_width 1 db CHIKORITA db BAYLEEF db MEGANIUM diff --git a/data/pokemon/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm index fadb531c3..d232c1878 100644 --- a/data/pokemon/egg_move_pointers.asm +++ b/data/pokemon/egg_move_pointers.asm @@ -1,5 +1,5 @@ EggMovePointers:: - table_width 2, EggMovePointers + table_width 2 dw BulbasaurEggMoves dw NoEggMoves dw NoEggMoves diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm index 3b4155252..d81547bb9 100644 --- a/data/pokemon/evos_attacks_pointers.asm +++ b/data/pokemon/evos_attacks_pointers.asm @@ -1,7 +1,7 @@ ; Evolutions and attacks are grouped together since they're both checked at level-up. EvosAttacksPointers:: - table_width 2, EvosAttacksPointers + table_width 2 dw BulbasaurEvosAttacks dw IvysaurEvosAttacks dw VenusaurEvosAttacks diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 1c523a014..9a6d6a0a8 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -1,7 +1,7 @@ ; The original base Special stat for each Pokémon from Red/Blue KantoMonSpecials: - table_width 1, KantoMonSpecials + table_width 1 db 65 ; BULBASAUR db 80 ; IVYSAUR db 100 ; VENUSAUR diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index ca40398a4..66da283e4 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -1,5 +1,5 @@ Pokered_MonIndices: - table_width 1, Pokered_MonIndices + table_width 1 db RHYDON db KANGASKHAN db NIDORAN_M diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 506d060c3..ccc380b86 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,7 +1,7 @@ ; party menu icons MonMenuIcons: - table_width 1, MonMenuIcons + table_width 1 db ICON_BULBASAUR ; BULBASAUR db ICON_BULBASAUR ; IVYSAUR db ICON_BULBASAUR ; VENUSAUR diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index ad1d0ef57..575ec1ef3 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -1,5 +1,5 @@ PokemonNames:: - table_width NAME_LENGTH - 1, PokemonNames + table_width NAME_LENGTH - 1 db "BULBASAUR@" db "IVYSAUR@@@" db "VENUSAUR@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index ece766bd3..ff9042f4b 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -7,7 +7,7 @@ PokemonPalettes: ; Shiny palettes are defined directly, not generated. ; 2 middle palettes, front and shiny, with 2 colors each - table_width PAL_COLOR_SIZE * 2 * 2, PokemonPalettes + table_width PAL_COLOR_SIZE * 2 * 2 ; 000 RGB 30, 22, 17 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index ff21bb70a..8e036353d 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -2,7 +2,7 @@ PokemonPicPointers:: ; entries correspond to Pokémon species - table_width 3 * 2, PokemonPicPointers + table_width 3 * 2 dba_pics BulbasaurFrontpic, BulbasaurBackpic dba_pics IvysaurFrontpic, IvysaurBackpic dba_pics VenusaurFrontpic, VenusaurBackpic diff --git a/data/pokemon/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm index 12146ae63..286d56794 100644 --- a/data/pokemon/unown_pic_pointers.asm +++ b/data/pokemon/unown_pic_pointers.asm @@ -1,6 +1,6 @@ UnownPicPointers:: ; entries correspond to Unown letters - table_width 3 * 2, UnownPicPointers + table_width 3 * 2 dba_pics UnownAFrontpic, UnownABackpic dba_pics UnownBFrontpic, UnownBBackpic dba_pics UnownCFrontpic, UnownCBackpic diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index f6acb4a97..f6035b2ff 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -7,7 +7,7 @@ ENDM UnownWords: ; entries correspond to UNOWN_* form constants - table_width 2, UnownWords + table_width 2 dw UnownWordA ; unused dw UnownWordA dw UnownWordB diff --git a/data/radio/channel_music.asm b/data/radio/channel_music.asm index e8536821b..1a4970955 100644 --- a/data/radio/channel_music.asm +++ b/data/radio/channel_music.asm @@ -1,6 +1,6 @@ RadioChannelSongs: ; entries correspond to radio channel ids (see constants/radio_constants.asm) - table_width 2, RadioChannelSongs + table_width 2 dw MUSIC_POKEMON_TALK dw MUSIC_POKEMON_CENTER dw MUSIC_TITLE diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 64525efb9..0f12aaabb 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -1,6 +1,6 @@ SpriteAnimFrameData: ; entries correspond to SPRITE_ANIM_FRAMESET_* constants (see constants/sprite_anim_constants.asm) - table_width 2, SpriteAnimFrameData + table_width 2 dw .Frameset_00 dw .Frameset_PartyMon dw .Frameset_PartyMonWithMail diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 07b45f50e..1c2b506e2 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -6,7 +6,7 @@ ENDM SpriteAnimOAMData: ; entries correspond to SPRITE_ANIM_OAMSET_* constants (see constants/sprite_anim_constants.asm) - table_width 3, SpriteAnimOAMData + table_width 3 spriteanimoam $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1 spriteanimoam $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2 spriteanimoam $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1 diff --git a/data/sprite_anims/unused_gfx.asm b/data/sprite_anims/unused_gfx.asm index 868d6581c..6e7f5c815 100644 --- a/data/sprite_anims/unused_gfx.asm +++ b/data/sprite_anims/unused_gfx.asm @@ -6,7 +6,7 @@ ENDM UnusedSpriteAnimGFX: ; entries correspond to SPRITE_ANIM_DICT_* constants - table_width 4, UnusedSpriteAnimGFX + table_width 4 ; # tiles, gfx bank, gfx pointer ; (all pointers were dummied out to .DeletedGFX) sprite_anim_obj_gfx 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_DEFAULT diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm index ef4485bda..cd93d328b 100644 --- a/data/sprites/emotes.asm +++ b/data/sprites/emotes.asm @@ -7,7 +7,7 @@ ENDM Emotes: ; entries correspond to EMOTE_* constants - table_width EMOTE_LENGTH, Emotes + table_width EMOTE_LENGTH emote ShockEmote, 4, $f8 emote QuestionEmote, 4, $f8 emote HappyEmote, 4, $f8 diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 405194f65..ae6d7c36d 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -1,6 +1,6 @@ Facings: ; entries correspond to FACING_* constants (see constants/map_object_constants.asm) - table_width 2, Facings + table_width 2 dw FacingStepDown0 dw FacingStepDown1 dw FacingStepDown2 diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index 5bc0e0eb6..46f477ebd 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -1,6 +1,6 @@ SpriteMovementData:: ; entries correspond to SPRITEMOVEDATA_* constants - table_width NUM_SPRITEMOVEDATA_FIELDS, SpriteMovementData + table_width NUM_SPRITEMOVEDATA_FIELDS ; SPRITEMOVEDATA_00 db SPRITEMOVEFN_00 ; movement function diff --git a/data/sprites/sprite_mons.asm b/data/sprites/sprite_mons.asm index 9d3e62acd..676efe21f 100644 --- a/data/sprites/sprite_mons.asm +++ b/data/sprites/sprite_mons.asm @@ -1,6 +1,6 @@ SpriteMons: ; entries correspond to SPRITE_* constants past SPRITE_POKEMON - table_width 1, SpriteMons + table_width 1 db UNOWN db GEODUDE db GROWLITHE diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 0760da305..0c06fe651 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -6,7 +6,7 @@ ENDM OverworldSprites: ; entries correspond to SPRITE_* constants - table_width NUM_SPRITEDATA_FIELDS, OverworldSprites + table_width NUM_SPRITEDATA_FIELDS overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN diff --git a/data/tilesets.asm b/data/tilesets.asm index 9a82e5777..0437a5450 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -12,7 +12,7 @@ ENDM Tilesets:: ; entries correspond to TILESET_* constants (see constants/tileset_constants.asm) - table_width TILESET_LENGTH, Tilesets + table_width TILESET_LENGTH tileset Tileset0 tileset TilesetJohto tileset TilesetJohtoModern diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 8170f28b8..f8015d606 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -1,6 +1,6 @@ TrainerClassAttributes: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - table_width NUM_TRAINER_ATTRIBUTES, TrainerClassAttributes + table_width NUM_TRAINER_ATTRIBUTES ; Falkner db NO_ITEM, NO_ITEM ; items diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 3f385d7f7..54965cd09 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,6 +1,6 @@ TrainerClassNames:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - list_start TrainerClassNames + list_start li "LEADER" li "LEADER" li "LEADER" diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index ba4e86267..026307bd3 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,6 +1,6 @@ TrainerClassDVs: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - table_width 2, TrainerClassDVs + table_width 2 ; atk,def,spd,spc dn 9, 10, 7, 7 ; FALKNER dn 8, 8, 8, 8 ; WHITNEY diff --git a/data/trainers/encounter_music.asm b/data/trainers/encounter_music.asm index 8f9c55e24..3a5894ed8 100644 --- a/data/trainers/encounter_music.asm +++ b/data/trainers/encounter_music.asm @@ -2,7 +2,7 @@ TrainerEncounterMusic:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - table_width 1, TrainerEncounterMusic + table_width 1 db MUSIC_HIKER_ENCOUNTER ; none db MUSIC_YOUNGSTER_ENCOUNTER ; falkner db MUSIC_LASS_ENCOUNTER ; whitney diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index f44f65ff1..f34b6e41e 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -4,7 +4,7 @@ TrainerPalettes: ; Each .gbcpal is generated from the corresponding .png, and ; only the middle two colors are included, not black or white. - table_width PAL_COLOR_SIZE * 2, TrainerPalettes + table_width PAL_COLOR_SIZE * 2 PlayerPalette: ; Chris uses the same colors as Cal INCBIN "gfx/trainers/cal.gbcpal", middle_colors diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm index 4acfb70e7..9335446d7 100644 --- a/data/trainers/party_pointers.asm +++ b/data/trainers/party_pointers.asm @@ -2,7 +2,7 @@ TrainerGroups: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - table_width 2, TrainerGroups + table_width 2 dw FalknerGroup dw WhitneyGroup dw BugsyGroup diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index 371d3d35e..1aa738909 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -2,7 +2,7 @@ TrainerPicPointers:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - table_width 3, TrainerPicPointers + table_width 3 dba_pic FalknerPic dba_pic WhitneyPic dba_pic BugsyPic diff --git a/data/types/names.asm b/data/types/names.asm index 94fe67e13..de0c23443 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -1,6 +1,6 @@ TypeNames: ; entries correspond to types (see constants/type_constants.asm) - table_width 2, TypeNames + table_width 2 dw Normal dw Fighting dw Flying diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index 1345c27cd..d109a7de6 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,6 +1,6 @@ PokedexTypeSearchStrings: ; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm) - table_width POKEDEX_TYPE_STRING_LENGTH, PokedexTypeSearchStrings + table_width POKEDEX_TYPE_STRING_LENGTH db " ---- @" db " NORMAL @" db " FIRE @" diff --git a/data/types/search_types.asm b/data/types/search_types.asm index dd9ea5628..e14c8893d 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -1,6 +1,6 @@ PokedexTypeSearchConversionTable: ; entries correspond with PokedexTypeSearchStrings (see data/types/search_strings.asm) - table_width 1, PokedexTypeSearchConversionTable + table_width 1 db NORMAL db FIRE db WATER diff --git a/data/wild/fish.asm b/data/wild/fish.asm index 3833c4fe5..efca10361 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -8,7 +8,7 @@ ENDM FishGroups: ; entries correspond to FISHGROUP_* constants - table_width FISHGROUP_DATA_LENGTH, FishGroups + table_width FISHGROUP_DATA_LENGTH fishgroup 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super fishgroup 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super fishgroup 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm index 4ce027910..de9963e0f 100644 --- a/data/wild/probabilities.asm +++ b/data/wild/probabilities.asm @@ -4,7 +4,7 @@ MACRO mon_prob ENDM GrassMonProbTable: - table_width 2, GrassMonProbTable + table_width 2 mon_prob 30, 0 ; 30% chance mon_prob 60, 1 ; 30% chance mon_prob 80, 2 ; 20% chance @@ -15,7 +15,7 @@ GrassMonProbTable: assert_table_length NUM_GRASSMON WaterMonProbTable: - table_width 2, WaterMonProbTable + table_width 2 mon_prob 60, 0 ; 60% chance mon_prob 90, 1 ; 30% chance mon_prob 100, 2 ; 10% chance diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index d473e31ac..d3e1566f2 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -13,7 +13,7 @@ MACRO roam_map ENDM RoamMaps: - list_start RoamMaps + list_start ; start map, ...other maps roam_map ROUTE_29, ROUTE_30, ROUTE_46 roam_map ROUTE_30, ROUTE_29, ROUTE_31 diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 4b877084b..4f97e7ec7 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -1,6 +1,6 @@ TreeMons: ; entries correspond to TREEMON_SET_* constants - table_width 2, TreeMons + table_width 2 dw TreeMonSet_None dw TreeMonSet_Forest dw TreeMonSet_Canyon diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index edcc87071..35fc3d1ae 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -304,7 +304,7 @@ RunBattleAnimCommand: BattleAnimCommands:: ; entries correspond to anim_* constants (see macros/scripts/battle_anims.asm) - table_width 2, BattleAnimCommands + table_width 2 dw BattleAnimCmd_Obj dw BattleAnimCmd_1GFX dw BattleAnimCmd_2GFX diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 793aa98fe..bb71beff7 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -13,7 +13,7 @@ DoBattleAnimFrame: .Jumptable: ; entries correspond to BATTLE_ANIM_FUNC_* constants - table_width 2, DoBattleAnimFrame.Jumptable + table_width 2 dw BattleAnimFunction_Null dw BattleAnimFunction_MoveFromUserToTarget dw BattleAnimFunction_MoveFromUserToTargetAndDisappear diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 5b5f4cc71..2aefb610e 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -1174,7 +1174,7 @@ DebugRoom_BoxStructStrings: .SendBox: db "SEND BOX@" DebugRoom_BoxAddresses: - table_width 3, DebugRoom_BoxAddresses + table_width 3 for n, 1, NUM_BOXES + 1 dba sBox{d:n} endr diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index da60a8ecb..9cc2c3dca 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -193,7 +193,7 @@ CheckForLuckyNumberWinners: ret .BoxBankAddresses: - table_width 3, CheckForLuckyNumberWinners.BoxBankAddresses + table_width 3 for n, 1, NUM_BOXES + 1 dba sBox{d:n} endr diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index fe75a15d4..1c991f118 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -866,7 +866,7 @@ GetUnknownSlotReelData: ; unreferenced ret .data: - table_width 1, GetUnknownSlotReelData.data + table_width 1 db 0 ; SLOTS_SEVEN db 1 ; SLOTS_POKEBALL db 2 ; SLOTS_CHERRY @@ -1839,7 +1839,7 @@ Slots_GetPayout: ret .PayoutTable: - table_width 2, Slots_GetPayout.PayoutTable + table_width 2 dw 300 ; SLOTS_SEVEN dw 50 ; SLOTS_POKEBALL dw 6 ; SLOTS_CHERRY @@ -1887,7 +1887,7 @@ Slots_PayoutText: ret .PayoutStrings: - table_width 6, Slots_PayoutText.PayoutStrings + table_width 6 dbw "300@", .LinedUpSevens ; SLOTS_SEVEN dbw "50@@", .LinedUpPokeballs ; SLOTS_POKEBALL dbw "6@@@", .LinedUpMonOrCherry ; SLOTS_CHERRY diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 45eb912e8..908bba95c 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -30,7 +30,7 @@ LoadSGBLayoutCGB: CGBLayoutJumptable: ; entries correspond to SCGB_* constants (see constants/scgb_constants.asm) - table_width 2, CGBLayoutJumptable + table_width 2 dw _CGB_BattleGrayscale dw _CGB_BattleColors dw _CGB_PokegearPals diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 22ccec5d5..b33b94c0a 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1088,7 +1088,7 @@ INCLUDE "gfx/sgb/pal_packets.asm" INCLUDE "data/sgb_ctrl_packets.asm" PredefPals: - table_width PALETTE_SIZE, PredefPals + table_width PALETTE_SIZE INCLUDE "gfx/sgb/predef.pal" assert_table_length NUM_PREDEF_PALS @@ -1218,7 +1218,7 @@ MapObjectPals:: INCLUDE "gfx/overworld/npc_sprites.pal" RoofPals: - table_width PAL_COLOR_SIZE * 2 * 2, RoofPals + table_width PAL_COLOR_SIZE * 2 * 2 INCLUDE "gfx/tilesets/roofs.pal" assert_table_length NUM_MAP_GROUPS + 1 diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index 51a05e9ac..279839809 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -23,7 +23,7 @@ LoadSGBLayout: SGBLayoutJumptable: ; entries correspond to SCGB_* constants (see constants/scgb_constants.asm) - table_width 2, SGBLayoutJumptable + table_width 2 dw .SGB_BattleGrayscale dw .SGB_BattleColors dw .SGB_PokegearPals diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index f6e562f93..b61949b62 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -13,7 +13,7 @@ _DoItemEffect:: ItemEffects: ; entries correspond to item ids (see constants/item_constants.asm) - table_width 2, ItemEffects + table_width 2 dw PokeBallEffect ; MASTER_BALL dw PokeBallEffect ; ULTRA_BALL dw NoEffect ; BRIGHTPOWDER diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 45dd11337..623d15213 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1028,7 +1028,7 @@ EraseBoxes: ret BoxAddresses: - table_width 5, BoxAddresses + table_width 5 for n, 1, NUM_BOXES + 1 db BANK(sBox{d:n}) ; aka BANK(sBox{d:n}End) dw sBox{d:n}, sBox{d:n}End diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index cb1b50ee1..38dab31ea 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -49,7 +49,7 @@ _PlayerDecorationMenu: dw .category_pointers .category_pointers: - table_width 2 + 2, _PlayerDecorationMenu.category_pointers + table_width 2 + 2 dw DecoBedMenu, .bed dw DecoCarpetMenu, .carpet dw DecoPlantMenu, .plant @@ -124,7 +124,7 @@ _PlayerDecorationMenu: ret .owned_pointers: - table_width 3, _PlayerDecorationMenu.owned_pointers + table_width 3 dwb FindOwnedBeds, 0 ; bed dwb FindOwnedCarpets, 1 ; carpet dwb FindOwnedPlants, 2 ; plant @@ -455,7 +455,7 @@ DoDecorationAction2: ret .DecoActions: - table_width 2, DoDecorationAction2.DecoActions + table_width 2 dw DecoAction_nothing dw DecoAction_setupbed dw DecoAction_putawaybed @@ -513,7 +513,7 @@ GetDecoName: ret .NameFunctions: - table_width 2, GetDecoName.NameFunctions + table_width 2 dw .invalid dw .plant dw .bed @@ -969,7 +969,7 @@ DescribeDecoration:: .Jumptable: ; entries correspond to DECODESC_* constants - table_width 2, DescribeDecoration.Jumptable + table_width 2 dw DecorationDesc_Poster dw DecorationDesc_LeftOrnament dw DecorationDesc_RightOrnament diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 288dda708..0be62ab6d 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -558,7 +558,7 @@ TryObjectEvent: ret ObjectEventTypeArray: - table_width 3, ObjectEventTypeArray + table_width 3 dbw OBJECTTYPE_SCRIPT, .script dbw OBJECTTYPE_ITEMBALL, .itemball dbw OBJECTTYPE_TRAINER, .trainer @@ -629,7 +629,7 @@ TryBGEvent: ret BGEventJumptable: - table_width 2, BGEventJumptable + table_width 2 dw .read dw .up dw .down @@ -748,7 +748,7 @@ PlayerMovement: PlayerMovementPointers: ; entries correspond to PLAYERMOVEMENT_* constants - table_width 2, PlayerMovementPointers + table_width 2 dw .normal dw .warp dw .turn @@ -964,7 +964,7 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - table_width 3, PlayerEventScriptPointers + table_width 3 dba InvalidEventScript ; PLAYEREVENT_NONE dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index fc7f5e1b9..04eaa3389 100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -1,6 +1,6 @@ ObjectActionPairPointers: ; entries correspond to OBJECT_ACTION_* constants (see constants/map_object_constants.asm) - table_width 2 + 2, ObjectActionPairPointers + table_width 2 + 2 ; normal action, frozen action dw SetFacingStanding, SetFacingStanding dw SetFacingStandAction, SetFacingCurrent diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 77fdb07a1..6f5b070df 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -524,7 +524,7 @@ StepFunction_FromMovement: .Pointers: ; entries correspond to SPRITEMOVEFN_* constants (see constants/map_object_constants.asm) - table_width 2, StepFunction_FromMovement.Pointers + table_width 2 dw MovementFunction_Null ; 00 dw MovementFunction_RandomWalkY ; 01 dw MovementFunction_RandomWalkX ; 02 @@ -1088,7 +1088,7 @@ _SetRandomStepDuration: StepTypesJumptable: ; entries correspond to STEP_TYPE_* constants (see constants/map_object_constants.asm) - table_width 2, StepTypesJumptable + table_width 2 dw StepFunction_Reset ; 00 dw StepFunction_FromMovement ; 01 dw StepFunction_NPCWalk ; 02 diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2b9dcf738..0796025aa 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,6 +1,6 @@ MovementPointers: ; entries correspond to movement_* constants (see macros/scripts/movement.asm) - table_width 2, MovementPointers + table_width 2 dw Movement_turn_head_down ; 00 dw Movement_turn_head_up ; 01 dw Movement_turn_head_left ; 02 diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 145787c16..a23ce6e65 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -462,7 +462,7 @@ DoPlayerMovement:: .Steps: ; entries correspond to STEP_* constants (see constants/map_object_constants.asm) - table_width 2, DoPlayerMovement.Steps + table_width 2 dw .SlowStep dw .NormalStep dw .FastStep diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index d54597ff9..c34573666 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -63,7 +63,7 @@ RunScriptCommand: ScriptCommandTable: ; entries correspond to *_command constants (see macros/scripts/events.asm) - table_width 2, ScriptCommandTable + table_width 2 dw Script_scall ; 00 dw Script_farscall ; 01 dw Script_memcall ; 02 diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index e51e58848..9d06a5024 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1936,7 +1936,7 @@ PlayRadio: PlayRadioStationPointers: ; entries correspond to MAPRADIO_* constants - table_width 2, PlayRadioStationPointers + table_width 2 dw LoadStation_PokemonChannel dw LoadStation_OaksPokemonTalk dw LoadStation_PokedexShow diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 3c08a14c1..e2ae65b73 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -20,7 +20,7 @@ PlayRadioShow: RadioJumptable: ; entries correspond to constants/radio_constants.asm - table_width 2, RadioJumptable + table_width 2 dw OaksPKMNTalk1 ; $00 dw PokedexShow1 ; $01 dw BenMonMusic1 ; $02 @@ -327,7 +327,7 @@ OaksPKMNTalk8: jp NextRadioLine .Adverbs: - table_width 2, OaksPKMNTalk8.Adverbs + table_width 2 dw .OPT_SweetAdorablyText dw .OPT_WigglySlicklyText dw .OPT_AptlyNamedText @@ -436,7 +436,7 @@ OaksPKMNTalk9: jp NextRadioLine .Adjectives: - table_width 2, OaksPKMNTalk9.Adjectives + table_width 2 dw .OPT_CuteText dw .OPT_WeirdText dw .OPT_PleasantText @@ -1118,7 +1118,7 @@ PeoplePlaces5: jp NextRadioLine .Adjectives: - table_width 2, PeoplePlaces5.Adjectives + table_width 2 dw PnP_CuteText dw PnP_LazyText dw PnP_HappyText @@ -1254,7 +1254,7 @@ PeoplePlaces7: jp PrintRadioLine .Adjectives: - table_width 2, PeoplePlaces7.Adjectives + table_width 2 dw PnP_CuteText dw PnP_LazyText dw PnP_HappyText diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 4c2accaa2..f0971875f 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2134,7 +2134,7 @@ GetBoxPointer: ret .BoxBankAddresses: - table_width 3, GetBoxPointer.BoxBankAddresses + table_width 3 for n, 1, NUM_BOXES + 1 dba sBox{d:n} endr @@ -2341,7 +2341,7 @@ GetBoxCount: ret .BoxBankAddresses: - table_width 3, GetBoxCount.BoxBankAddresses + table_width 3 for n, 1, NUM_BOXES + 1 dba sBox{d:n} endr diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 27707c0d8..251007ff9 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -365,7 +365,7 @@ LoadBoxMonListing: ; unreferenced ret .BoxAddresses: - table_width 3, LoadBoxMonListing.BoxAddresses + table_width 3 for n, 1, NUM_BOXES + 1 dba sBox{d:n} endr diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index f951ac869..ba0cff179 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -114,7 +114,7 @@ endc MailGFXPointers: ; entries correspond to *MAIL_INDEX constants - table_width 3, MailGFXPointers + table_width 3 dbw FLOWER_MAIL, LoadFlowerMailGFX dbw SURF_MAIL, LoadSurfMailGFX dbw LITEBLUEMAIL, LoadLiteBlueMailGFX diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index d070ef9ec..3fbb16e91 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -260,7 +260,7 @@ EggStats_ScrollToLoadMon: StatsScreen_LoadPageJumptable: ; entries correspond to *_PAGE constants - table_width 2, StatsScreen_LoadPageJumptable + table_width 2 dw LoadPinkPage dw LoadGreenPage dw LoadBluePage diff --git a/engine/sprite_anims/functions.asm b/engine/sprite_anims/functions.asm index 5a18deda5..83394b0c5 100644 --- a/engine/sprite_anims/functions.asm +++ b/engine/sprite_anims/functions.asm @@ -13,7 +13,7 @@ DoSpriteAnimFrame: .Jumptable: ; entries correspond to SPRITE_ANIM_FUNC_* constants (see constants/sprite_anim_constants.asm) - table_width 2, DoSpriteAnimFrame.Jumptable + table_width 2 dw AnimSeq_Null dw AnimSeq_PartyMon dw AnimSeq_PartyMonSwitch diff --git a/gfx/font.asm b/gfx/font.asm index ccaed1543..81e49cd45 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -8,7 +8,7 @@ FontBattleExtra: INCBIN "gfx/font/font_battle_extra.2bpp" Frames: - table_width TEXTBOX_FRAME_TILES * LEN_1BPP_TILE, Frames + table_width TEXTBOX_FRAME_TILES * LEN_1BPP_TILE INCBIN "gfx/frames/1.1bpp" INCBIN "gfx/frames/2.1bpp" INCBIN "gfx/frames/3.1bpp" diff --git a/gfx/footprints.asm b/gfx/footprints.asm index a35114d2d..297929b34 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -9,7 +9,7 @@ DEF footprint_bottom EQUS "2 * LEN_1BPP_TILE, 2 * LEN_1BPP_TILE" Footprints: ; Entries correspond to Pokémon species, two apiece, 8 tops then 8 bottoms - table_width LEN_1BPP_TILE * 4, Footprints + table_width LEN_1BPP_TILE * 4 ; 001-008 top halves INCBIN "gfx/footprints/bulbasaur.1bpp", footprint_top diff --git a/home/battle_vars.asm b/home/battle_vars.asm index 2cf7b515e..793d5dc2b 100644 --- a/home/battle_vars.asm +++ b/home/battle_vars.asm @@ -47,7 +47,7 @@ GetBattleVarAddr:: BattleVarPairs: ; entries correspond to BATTLE_VARS_* constants - table_width 2, BattleVarPairs + table_width 2 dw .Substatus1 dw .Substatus2 dw .Substatus3 @@ -96,7 +96,7 @@ BattleVarPairs: BattleVarLocations: ; entries correspond to PLAYER_* and ENEMY_* constants - table_width 2 + 2, BattleVarLocations + table_width 2 + 2 dw wPlayerSubStatus1, wEnemySubStatus1 dw wPlayerSubStatus2, wEnemySubStatus2 dw wPlayerSubStatus3, wEnemySubStatus3 diff --git a/home/text.asm b/home/text.asm index 0635568c0..4edbb3fd6 100644 --- a/home/text.asm +++ b/home/text.asm @@ -615,7 +615,7 @@ DoTextUntilTerminator:: TextCommands:: ; entries correspond to TX_* constants (see macros/scripts/text.asm) - table_width 2, TextCommands + table_width 2 dw TextCommand_START ; TX_START dw TextCommand_RAM ; TX_RAM dw TextCommand_BCD ; TX_BCD diff --git a/home/vblank.asm b/home/vblank.asm index 969d42c65..fe596363a 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -39,7 +39,7 @@ VBlank:: VBlankHandlers: ; entries correspond to VBLANK_* constants (see constants/ram_constants.asm) - table_width 2, VBlankHandlers + table_width 2 dw VBlank_Normal dw VBlank_Cutscene dw VBlank_SoundOnly diff --git a/macros/asserts.asm b/macros/asserts.asm index f0fa52a96..57cc1c334 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -1,13 +1,29 @@ ; Macros to verify assumptions about the data or code +MACRO _redef_current_label + if DEF(\1) + PURGE \1 + endc + if _NARG == 3 + (\3) + DEF \1 EQUS "\<_NARG>" + elif DEF(..) + if .. - @ == 0 + DEF \1 EQUS "{..}" + endc + elif DEF(.) + if . - @ == 0 + DEF \1 EQUS "{.}" + endc + endc + if !DEF(\1) + DEF \1 EQUS \2 + {\1}: + endc +ENDM + MACRO table_width DEF CURRENT_TABLE_WIDTH = \1 - if _NARG == 2 - REDEF CURRENT_TABLE_START EQUS "\2" - else - REDEF CURRENT_TABLE_START EQUS "._table_width\@" - {CURRENT_TABLE_START}: - endc + _redef_current_label CURRENT_TABLE_START, "._table_width\@", 2, \# ENDM MACRO assert_table_length @@ -18,12 +34,7 @@ ENDM MACRO list_start DEF list_index = 0 - if _NARG == 1 - REDEF CURRENT_LIST_START EQUS "\1" - else - REDEF CURRENT_LIST_START EQUS "._list_start\@" - {CURRENT_LIST_START}: - endc + _redef_current_label CURRENT_LIST_START, "._list_start\@", 1, \# ENDM MACRO li