From b3364f9f8819a87f562ca612199aaa0d4da7fcee Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 8 May 2021 13:24:33 +0100 Subject: Identify the connections between Routes 22 and 23 as unused --- data/maps/headers/Route22.asm | 2 +- data/maps/headers/Route23.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm index e235efa1..b507e853 100644 --- a/data/maps/headers/Route22.asm +++ b/data/maps/headers/Route22.asm @@ -1,5 +1,5 @@ map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST - connection north, Route23, ROUTE_23, 0 + connection north, Route23, ROUTE_23, 0 ; unused connection east, ViridianCity, VIRIDIAN_CITY, -4 end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm index e1535c9d..12955c3b 100644 --- a/data/maps/headers/Route23.asm +++ b/data/maps/headers/Route23.asm @@ -1,5 +1,5 @@ map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH connection north, IndigoPlateau, INDIGO_PLATEAU, 0 - connection south, Route22, ROUTE_22, 0 + connection south, Route22, ROUTE_22, 0 ; unused end_map_header -- cgit v1.2.3 From d966193d7b5ff1a287a91585d6cee6db446be957 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 8 May 2021 23:20:52 +0100 Subject: Change terminology as per feedback --- data/maps/headers/Route22.asm | 2 +- data/maps/headers/Route23.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm index b507e853..a045838e 100644 --- a/data/maps/headers/Route22.asm +++ b/data/maps/headers/Route22.asm @@ -1,5 +1,5 @@ map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST - connection north, Route23, ROUTE_23, 0 ; unused + connection north, Route23, ROUTE_23, 0 ; unnecessary connection east, ViridianCity, VIRIDIAN_CITY, -4 end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm index 12955c3b..66c2936f 100644 --- a/data/maps/headers/Route23.asm +++ b/data/maps/headers/Route23.asm @@ -1,5 +1,5 @@ map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH connection north, IndigoPlateau, INDIGO_PLATEAU, 0 - connection south, Route22, ROUTE_22, 0 ; unused + connection south, Route22, ROUTE_22, 0 ; unnecessary end_map_header -- cgit v1.2.3 From 8701ef4d61a6a55ee71aa1a964d4f7d10eded87e Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 May 2021 11:46:10 -0400 Subject: Improve some RAM formatting --- data/battle_anims/subanimations.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm index 530192f6..54d346a6 100644 --- a/data/battle_anims/subanimations.asm +++ b/data/battle_anims/subanimations.asm @@ -92,7 +92,7 @@ SubanimationPointers: ; subanim type, count ; REPT count ; db frame block id, base coordinate id, frame block mode -; endr +; ENDR subanim: MACRO db (\1 << 5) | \2 -- cgit v1.2.3 From 7b2eb6b2524db4c441e8c050e5dc703601575b23 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 May 2021 12:37:15 -0400 Subject: Simplify the tileset headers --- data/tilesets/tileset_headers.asm | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'data') diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index fc1f34e8..375b0687 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -1,36 +1,36 @@ tileset: MACRO - db BANK(\2) ; BANK(GFX) - dw \1, \2, \3 ; Block, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; grass tile - db \8 ; animations (TILEANIM_* value) + db BANK(\1_GFX) + dw \1_Block, \1_GFX, \1_Coll + db \2, \3, \4 ; counter tiles + db \5 ; grass tile + db \6 ; animations (TILEANIM_* value) ENDM Tilesets: table_width 12, Tilesets - ; block, gfx, coll, 3 counter tiles, grass tile, animations - tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER - tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, TILEANIM_NONE - tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, TILEANIM_WATER - tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER - tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, TILEANIM_NONE - tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER - tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE - tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, TILEANIM_NONE - tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER - tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, TILEANIM_NONE - tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE - tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, TILEANIM_NONE - tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, TILEANIM_WATER - tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, TILEANIM_WATER + ; name, 3 counter tiles, grass tile, animations + tileset Overworld, -1, -1, -1, $52, TILEANIM_WATER_FLOWER + tileset RedsHouse1, -1, -1, -1, -1, TILEANIM_NONE + tileset Mart, $18,$19,$1E, -1, TILEANIM_NONE + tileset Forest, -1, -1, -1, $20, TILEANIM_WATER + tileset RedsHouse2, -1, -1, -1, -1, TILEANIM_NONE + tileset Dojo, $3A, -1, -1, -1, TILEANIM_WATER_FLOWER + tileset Pokecenter, $18,$19,$1E, -1, TILEANIM_NONE + tileset Gym, $3A, -1, -1, -1, TILEANIM_WATER_FLOWER + tileset House, -1, -1, -1, -1, TILEANIM_NONE + tileset ForestGate, $17,$32, -1, -1, TILEANIM_NONE + tileset Museum, $17,$32, -1, -1, TILEANIM_NONE + tileset Underground, -1, -1, -1, -1, TILEANIM_NONE + tileset Gate, $17,$32, -1, -1, TILEANIM_NONE + tileset Ship, -1, -1, -1, -1, TILEANIM_WATER + tileset ShipPort, -1, -1, -1, -1, TILEANIM_WATER + tileset Cemetery, $12, -1, -1, -1, TILEANIM_NONE + tileset Interior, -1, -1, -1, -1, TILEANIM_NONE + tileset Cavern, -1, -1, -1, -1, TILEANIM_WATER + tileset Lobby, $15,$36, -1, -1, TILEANIM_NONE + tileset Mansion, -1, -1, -1, -1, TILEANIM_NONE + tileset Lab, -1, -1, -1, -1, TILEANIM_NONE + tileset Club, $07,$17, -1, -1, TILEANIM_NONE + tileset Facility, $12, -1, -1, -1, TILEANIM_WATER + tileset Plateau, -1, -1, -1, $45, TILEANIM_WATER assert_table_length NUM_TILESETS -- cgit v1.2.3