diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2024-12-27 12:52:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-27 12:52:30 -0500 |
| commit | f8a7ac34b90acb71122d71c89aa8e95b4346cf20 (patch) | |
| tree | edffd155c9eb0adcea7517c2303f1c2d50021774 /data/maps | |
| parent | Remove `-Wnumeric-string=2` (diff) | |
| download | pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.gz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.xz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.zip | |
Don't pass redundant label names to `table_width` and `list_start` (#125)
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/hide_show_data.asm | 4 | ||||
| -rw-r--r-- | data/maps/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/maps/map_header_pointers.asm | 2 | ||||
| -rw-r--r-- | data/maps/songs.asm | 2 | ||||
| -rw-r--r-- | data/maps/sprite_sets.asm | 6 | ||||
| -rw-r--r-- | data/maps/town_map_entries.asm | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 59824e80..72e3add9 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -2,7 +2,7 @@ MapHSPointers: ; entries correspond to map ids - table_width 2, MapHSPointers + table_width 2 dw PalletTownHS dw ViridianCityHS dw PewterCityHS @@ -260,7 +260,7 @@ NoHS: MissableObjects: ; entries correspond to HS_* constants (see constants/hide_show_constants) - table_width 3, MissableObjects + table_width 3 ; format: map id, object id, HIDE/SHOW PalletTownHS: diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 454e3260..30b4c0d6 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -1,6 +1,6 @@ ; see also MapHeaderPointers MapHeaderBanks:: - table_width 1, MapHeaderBanks + table_width 1 db BANK(PalletTown_h) db BANK(ViridianCity_h) db BANK(PewterCity_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 0f37b129..cf8e0776 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -1,6 +1,6 @@ ; see also MapHeaderBanks MapHeaderPointers:: - table_width 2, MapHeaderPointers + table_width 2 dw PalletTown_h dw ViridianCity_h dw PewterCity_h diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 7378804e..176cbf31 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -1,5 +1,5 @@ MapSongBanks:: - table_width 2, MapSongBanks + table_width 2 db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 97f76a35..361b24c8 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -1,7 +1,7 @@ ; Valid sprite IDs for each outdoor map. MapSpriteSets: - table_width 1, MapSpriteSets + table_width 1 db SPRITESET_PALLET_VIRIDIAN ; PALLET_TOWN db SPRITESET_PALLET_VIRIDIAN ; VIRIDIAN_CITY db SPRITESET_PEWTER_CERULEAN ; PEWTER_CITY @@ -47,7 +47,7 @@ MapSpriteSets: ; #3: sprite set ID if on the west or north side ; #4: sprite set ID if on the east or south side SplitMapSpriteSets: - table_width 4, SplitMapSpriteSets + table_width 4 db NORTH_SOUTH, 37, SPRITESET_PEWTER_CERULEAN, SPRITESET_PALLET_VIRIDIAN ; SPLITSET_ROUTE_2 db NORTH_SOUTH, 50, SPRITESET_PEWTER_CERULEAN, SPRITESET_LAVENDER ; SPLITSET_ROUTE_10 db EAST_WEST, 57, SPRITESET_VERMILION, SPRITESET_SILENCE_BRIDGE ; SPLITSET_ROUTE_11 @@ -63,7 +63,7 @@ SplitMapSpriteSets: assert_table_length NUM_SPLIT_SETS SpriteSets: - table_width SPRITE_SET_LENGTH, SpriteSets + table_width SPRITE_SET_LENGTH ; SPRITESET_PALLET_VIRIDIAN db SPRITE_PIKACHU diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 5fd77c7c..0f6976ae 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -5,7 +5,7 @@ ENDM ; the appearance of towns and routes in the town map ExternalMapEntries: - table_width 3, ExternalMapEntries + table_width 3 ; x, y, name external_map 2, 11, PalletTownName external_map 2, 8, ViridianCityName |