Rename generic building tilesets, SAFFRON_CITY_CLASSIC
This commit is contained in:
GriffinR
@@ -278,7 +278,7 @@ gStdScriptsEnd::
|
||||
.include "data/maps/CinnabarIsland/scripts.inc"
|
||||
.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
|
||||
.include "data/maps/SaffronCity/scripts.inc"
|
||||
.include "data/maps/SaffronCity_Classic/scripts.inc"
|
||||
.include "data/maps/SaffronCity_Connection/scripts.inc"
|
||||
.include "data/maps/OneIsland/scripts.inc"
|
||||
.include "data/maps/TwoIsland/scripts.inc"
|
||||
.include "data/maps/ThreeIsland/scripts.inc"
|
||||
|
||||
+19
-19
@@ -16463,27 +16463,27 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
|
||||
.incbin "graphics/berry_fix/window.bin.lz"
|
||||
|
||||
.align 2
|
||||
gTilesetPalettes_Building1:: @ 8EA97F4
|
||||
.incbin "data/tilesets/secondary/building1/palettes/0.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/1.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/2.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/3.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/4.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/5.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/6.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/7.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/8.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/9.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/10.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/11.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/12.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/13.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/14.gbapal"
|
||||
.incbin "data/tilesets/secondary/building1/palettes/15.gbapal"
|
||||
gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
|
||||
|
||||
.align 2
|
||||
gTilesetTiles_Building1:: @ 8EA99F4
|
||||
.incbin "data/tilesets/secondary/building1/tiles.4bpp.lz"
|
||||
gTilesetTiles_GenericBuilding1:: @ 8EA99F4
|
||||
.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gTilesetPalettes_DepartmentStore:: @ 8EA9D88
|
||||
|
||||
+29
-29
@@ -9,7 +9,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin"
|
||||
},
|
||||
@@ -21,7 +21,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
|
||||
},
|
||||
@@ -33,7 +33,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
|
||||
"blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
|
||||
},
|
||||
@@ -45,7 +45,7 @@
|
||||
"border_width": 0,
|
||||
"border_height": 0,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
|
||||
},
|
||||
@@ -69,7 +69,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/House1/border.bin",
|
||||
"blockdata_filepath": "data/layouts/House1/map.bin"
|
||||
},
|
||||
@@ -81,7 +81,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/House2/border.bin",
|
||||
"blockdata_filepath": "data/layouts/House2/map.bin"
|
||||
},
|
||||
@@ -129,7 +129,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/House3/border.bin",
|
||||
"blockdata_filepath": "data/layouts/House3/map.bin"
|
||||
},
|
||||
@@ -153,7 +153,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/House4/border.bin",
|
||||
"blockdata_filepath": "data/layouts/House4/map.bin"
|
||||
},
|
||||
@@ -249,7 +249,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/House5/border.bin",
|
||||
"blockdata_filepath": "data/layouts/House5/map.bin"
|
||||
},
|
||||
@@ -859,16 +859,16 @@
|
||||
"blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
|
||||
},
|
||||
{
|
||||
"id": "LAYOUT_SAFFRON_CITY_CLASSIC",
|
||||
"name": "SaffronCity_Classic_Layout",
|
||||
"id": "LAYOUT_SAFFRON_CITY_CONNECTION",
|
||||
"name": "SaffronCity_Connection_Layout",
|
||||
"width": 48,
|
||||
"height": 40,
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_General",
|
||||
"secondary_tileset": "gTileset_SaffronCity",
|
||||
"border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
|
||||
"border_filepath": "data/layouts/SaffronCity_Connection/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_Connection/map.bin"
|
||||
},
|
||||
{
|
||||
"id": "LAYOUT_ROUTE1",
|
||||
@@ -1874,7 +1874,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin",
|
||||
"blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin"
|
||||
},
|
||||
@@ -1911,7 +1911,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin"
|
||||
},
|
||||
@@ -1995,7 +1995,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/CeruleanCity_House1/border.bin",
|
||||
"blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin"
|
||||
},
|
||||
@@ -2295,7 +2295,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin"
|
||||
},
|
||||
@@ -2307,7 +2307,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin"
|
||||
},
|
||||
@@ -2439,7 +2439,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Entrance_2F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Entrance_2F/map.bin"
|
||||
},
|
||||
@@ -2451,7 +2451,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Route2_Entrance/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Route2_Entrance/map.bin"
|
||||
},
|
||||
@@ -2463,7 +2463,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Route22_NorthEntrance/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin"
|
||||
},
|
||||
@@ -2475,7 +2475,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin"
|
||||
},
|
||||
@@ -2487,7 +2487,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/Entrance_1F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/Entrance_1F/map.bin"
|
||||
},
|
||||
@@ -2511,7 +2511,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
|
||||
},
|
||||
@@ -2523,7 +2523,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building1",
|
||||
"secondary_tileset": "gTileset_GenericBuilding1",
|
||||
"border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
|
||||
},
|
||||
@@ -2967,7 +2967,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin"
|
||||
},
|
||||
@@ -2979,7 +2979,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin",
|
||||
"blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin"
|
||||
},
|
||||
@@ -3111,7 +3111,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/ViridianCity_House1/border.bin",
|
||||
"blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin"
|
||||
},
|
||||
@@ -3495,7 +3495,7 @@
|
||||
"border_width": 2,
|
||||
"border_height": 2,
|
||||
"primary_tileset": "gTileset_Building",
|
||||
"secondary_tileset": "gTileset_Building2",
|
||||
"secondary_tileset": "gTileset_GenericBuilding2",
|
||||
"border_filepath": "data/layouts/CeruleanCity_House5/border.bin",
|
||||
"blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin"
|
||||
},
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
"direction": "up"
|
||||
},
|
||||
{
|
||||
"map": "MAP_SAFFRON_CITY_CLASSIC",
|
||||
"map": "MAP_SAFFRON_CITY_CONNECTION",
|
||||
"offset": 0,
|
||||
"direction": "down"
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
"battle_scene": "BATTLE_SCENE_0",
|
||||
"connections": [
|
||||
{
|
||||
"map": "MAP_SAFFRON_CITY_CLASSIC",
|
||||
"map": "MAP_SAFFRON_CITY_CONNECTION",
|
||||
"offset": 0,
|
||||
"direction": "up"
|
||||
},
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
"direction": "left"
|
||||
},
|
||||
{
|
||||
"map": "MAP_SAFFRON_CITY_CLASSIC",
|
||||
"map": "MAP_SAFFRON_CITY_CONNECTION",
|
||||
"offset": -10,
|
||||
"direction": "right"
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
"battle_scene": "BATTLE_SCENE_0",
|
||||
"connections": [
|
||||
{
|
||||
"map": "MAP_SAFFRON_CITY_CLASSIC",
|
||||
"map": "MAP_SAFFRON_CITY_CONNECTION",
|
||||
"offset": -10,
|
||||
"direction": "left"
|
||||
},
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
SaffronCity_Classic_MapScripts:: @ 8167483
|
||||
.byte 0
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"id": "MAP_SAFFRON_CITY_CLASSIC",
|
||||
"name": "SaffronCity_Classic",
|
||||
"layout": "LAYOUT_SAFFRON_CITY_CLASSIC",
|
||||
"id": "MAP_SAFFRON_CITY_CONNECTION",
|
||||
"name": "SaffronCity_Connection",
|
||||
"layout": "LAYOUT_SAFFRON_CITY_CONNECTION",
|
||||
"music": "MUS_NIBI",
|
||||
"region_map_section": "MAPSEC_SAFFRON_CITY",
|
||||
"requires_flash": false,
|
||||
@@ -0,0 +1,2 @@
|
||||
SaffronCity_Connection_MapScripts:: @ 8167483
|
||||
.byte 0
|
||||
@@ -250,7 +250,7 @@
|
||||
"CinnabarIsland",
|
||||
"IndigoPlateau_Exterior",
|
||||
"SaffronCity",
|
||||
"SaffronCity_Classic",
|
||||
"SaffronCity_Connection",
|
||||
"OneIsland",
|
||||
"TwoIsland",
|
||||
"ThreeIsland",
|
||||
@@ -567,7 +567,7 @@
|
||||
"CinnabarIsland",
|
||||
"IndigoPlateau_Exterior",
|
||||
"SaffronCity",
|
||||
"SaffronCity_Classic",
|
||||
"SaffronCity_Connection",
|
||||
"OneIsland",
|
||||
"TwoIsland",
|
||||
"ThreeIsland",
|
||||
|
||||
+19
-19
@@ -896,27 +896,27 @@ gTilesetPalettes_CeruleanCave:: @ 828E3A4
|
||||
.incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal"
|
||||
|
||||
.align 2
|
||||
gTilesetTiles_Building2:: @ 828E5A4
|
||||
.incbin "data/tilesets/secondary/building2/tiles.4bpp.lz"
|
||||
gTilesetTiles_GenericBuilding2:: @ 828E5A4
|
||||
.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gTilesetPalettes_Building2:: @ 828EC70
|
||||
.incbin "data/tilesets/secondary/building2/palettes/0.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/1.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/2.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/3.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/4.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/5.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/6.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/7.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/8.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/9.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/10.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/11.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/12.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/13.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/14.gbapal"
|
||||
.incbin "data/tilesets/secondary/building2/palettes/15.gbapal"
|
||||
gTilesetPalettes_GenericBuilding2:: @ 828EC70
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
|
||||
.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
|
||||
|
||||
.align 2
|
||||
gTilesetTiles_PowerPlant:: @ 828EE70
|
||||
|
||||
+10
-10
@@ -220,15 +220,15 @@ gTileset_BikeShop::
|
||||
.4byte gMetatileAttributes_BikeShop
|
||||
|
||||
.align 2
|
||||
gTileset_Building1::
|
||||
gTileset_GenericBuilding1::
|
||||
.byte TRUE @ is compressed
|
||||
.byte TRUE @ is secondary
|
||||
.2byte 0 @ padding
|
||||
.4byte gTilesetTiles_Building1
|
||||
.4byte gTilesetPalettes_Building1
|
||||
.4byte gMetatiles_Building1
|
||||
.4byte gTilesetTiles_GenericBuilding1
|
||||
.4byte gTilesetPalettes_GenericBuilding1
|
||||
.4byte gMetatiles_GenericBuilding1
|
||||
.4byte 0x0
|
||||
.4byte gMetatileAttributes_Building1
|
||||
.4byte gMetatileAttributes_GenericBuilding1
|
||||
|
||||
.align 2
|
||||
gTileset_Lab::
|
||||
@@ -462,15 +462,15 @@ gTileset_DepartmentStore::
|
||||
.4byte gMetatileAttributes_DepartmentStore
|
||||
|
||||
.align 2
|
||||
gTileset_Building2::
|
||||
gTileset_GenericBuilding2::
|
||||
.byte TRUE @ is compressed
|
||||
.byte TRUE @ is secondary
|
||||
.2byte 0 @ padding
|
||||
.4byte gTilesetTiles_Building2
|
||||
.4byte gTilesetPalettes_Building2
|
||||
.4byte gMetatiles_Building2
|
||||
.4byte gTilesetTiles_GenericBuilding2
|
||||
.4byte gTilesetPalettes_GenericBuilding2
|
||||
.4byte gMetatiles_GenericBuilding2
|
||||
.4byte 0x0
|
||||
.4byte gMetatileAttributes_Building2
|
||||
.4byte gMetatileAttributes_GenericBuilding2
|
||||
|
||||
.align 2
|
||||
gTileset_PowerPlant::
|
||||
|
||||
@@ -207,12 +207,12 @@ gMetatileAttributes_PokemonCenter:: @ 82B4A50
|
||||
.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
|
||||
|
||||
.align 1
|
||||
gMetatiles_Building1:: @ 82B4E4C
|
||||
.incbin "data/tilesets/secondary/building1/metatiles.bin"
|
||||
gMetatiles_GenericBuilding1:: @ 82B4E4C
|
||||
.incbin "data/tilesets/secondary/generic_building1/metatiles.bin"
|
||||
|
||||
.align 1
|
||||
gMetatileAttributes_Building1:: @ 82B4FCC
|
||||
.incbin "data/tilesets/secondary/building1/metatile_attributes.bin"
|
||||
gMetatileAttributes_GenericBuilding1:: @ 82B4FCC
|
||||
.incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin"
|
||||
|
||||
.align 1
|
||||
gMetatiles_Cave:: @ 82B502C
|
||||
@@ -319,12 +319,12 @@ gMetatileAttributes_DepartmentStore:: @ 82BEB3C
|
||||
.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
|
||||
|
||||
.align 1
|
||||
gMetatiles_Building2:: @ 82BEF14
|
||||
.incbin "data/tilesets/secondary/building2/metatiles.bin"
|
||||
gMetatiles_GenericBuilding2:: @ 82BEF14
|
||||
.incbin "data/tilesets/secondary/generic_building2/metatiles.bin"
|
||||
|
||||
.align 1
|
||||
gMetatileAttributes_Building2:: @ 82BFA94
|
||||
.incbin "data/tilesets/secondary/building2/metatile_attributes.bin"
|
||||
gMetatileAttributes_GenericBuilding2:: @ 82BFA94
|
||||
.incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin"
|
||||
|
||||
.align 1
|
||||
gMetatiles_PowerPlant:: @ 82BFD74
|
||||
|
||||
|
Before Width: | Height: | Size: 748 B After Width: | Height: | Size: 748 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -71,7 +71,7 @@
|
||||
#define LAYOUT_FUCHSIA_CITY 85
|
||||
#define LAYOUT_CINNABAR_ISLAND 86
|
||||
#define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
|
||||
#define LAYOUT_SAFFRON_CITY_CLASSIC 88
|
||||
#define LAYOUT_SAFFRON_CITY_CONNECTION 88
|
||||
#define LAYOUT_ROUTE1 89
|
||||
#define LAYOUT_ROUTE2 90
|
||||
#define LAYOUT_ROUTE3 91
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
#define MAP_CINNABAR_ISLAND (8 | (3 << 8))
|
||||
#define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8))
|
||||
#define MAP_SAFFRON_CITY (10 | (3 << 8))
|
||||
#define MAP_SAFFRON_CITY_CLASSIC (11 | (3 << 8))
|
||||
#define MAP_SAFFRON_CITY_CONNECTION (11 | (3 << 8))
|
||||
#define MAP_ONE_ISLAND (12 | (3 << 8))
|
||||
#define MAP_TWO_ISLAND (13 | (3 << 8))
|
||||
#define MAP_THREE_ISLAND (14 | (3 << 8))
|
||||
|
||||
+2
-2
@@ -36,7 +36,7 @@ $(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
|
||||
$(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 318
|
||||
|
||||
$(TILESETGFXDIR)/secondary/building2/tiles.4bpp: %.4bpp: %.png
|
||||
$(TILESETGFXDIR)/secondary/generic_building2/tiles.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 152
|
||||
|
||||
$(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
|
||||
@@ -120,7 +120,7 @@ $(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
|
||||
$(TILESETGFXDIR)/secondary/dummy1/tiles.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 2
|
||||
|
||||
$(TILESETGFXDIR)/secondary/building1/tiles.4bpp: %.4bpp: %.png
|
||||
$(TILESETGFXDIR)/secondary/generic_building1/tiles.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 63
|
||||
|
||||
$(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
|
||||
|
||||
Reference in New Issue
Block a user