Merged general and generalWithStairs tilesets

2024-11-16 11:37:40 +01:00 · 2023-11-10 19:24:11 +01:00 · 2023-11-10 19:24:11 +01:00 · 566b8cf939
commit 566b8cf939
parent 965de56fc8
29 changed files with 87 additions and 26 deletions
--- a/data/layouts/BudportCity/map.bin
+++ b/data/layouts/BudportCity/map.bin
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@ -4446,7 +4446,7 @@
      "name": "BudportCity_Layout",
      "width": 46,
      "height": 40,
-      "primary_tileset": "gTileset_GeneralWithStairs",
+      "primary_tileset": "gTileset_General",
      "secondary_tileset": "gTileset_Budport",
      "border_filepath": "data/layouts/BudportCity/border.bin",
      "blockdata_filepath": "data/layouts/BudportCity/map.bin"
--- a/data/maps/BudportCity/map.json
+++ b/data/maps/BudportCity/map.json
@ -3,7 +3,7 @@
  "name": "BudportCity",
  "layout": "LAYOUT_BUDPORT_CITY",
  "music": "MUS_SLATEPORT",
-  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "region_map_section": "MAPSEC_BUDPORT_CITY",
  "requires_flash": false,
  "weather": "WEATHER_NONE",
  "map_type": "MAP_TYPE_NONE",
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@ -128,7 +128,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@ -19,7 +19,9 @@
      "direction": "left"
    }
  ],
-  "object_events": [],
+  "object_events": [
+
+  ],
  "warp_events": [
    {
      "x": 18,
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@ -115,7 +115,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@ -182,7 +182,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@ -412,7 +412,9 @@
      "dest_warp_id": "1"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@ -230,7 +230,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@ -295,7 +295,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@ -100,7 +100,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "hidden_item",
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@ -117,7 +117,13 @@
      "flag": "0"
    }
  ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@ -126,7 +126,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "hidden_item",
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@ -414,7 +414,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@ -348,7 +348,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "secret_base",
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@ -347,7 +347,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@ -206,7 +206,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@ -166,8 +166,12 @@
      "flag": "0"
    }
  ],
-  "warp_events": [],
-  "coord_events": [],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "hidden_item",
--- a/data/maps/Underwater_Route105/map.json
+++ b/data/maps/Underwater_Route105/map.json
@ -19,7 +19,9 @@
      "direction": "emerge"
    }
  ],
-  "object_events": [],
+  "object_events": [
+
+  ],
  "warp_events": [
    {
      "x": 13,
@ -36,6 +38,10 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@ -129,7 +129,9 @@
      "dest_warp_id": "0"
    }
  ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
  "bg_events": [
    {
      "type": "sign",
--- a/data/tilesets/primary/general/metatile_attributes.bin
+++ b/data/tilesets/primary/general/metatile_attributes.bin
--- a/data/tilesets/primary/general/metatiles.bin
+++ b/data/tilesets/primary/general/metatiles.bin
--- a/data/tilesets/primary/general/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@ -1383,7 +1383,7 @@
 #define FLAG_IS_CHAMPION                            (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking.
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)

-#define FLAG_UNUSED_0x881                           (SYSTEM_FLAGS + 0x21) // Unused Flag
+#define FLAG_VISITED_BUDPORT_CITY                   (SYSTEM_FLAGS + 0x21) // Unused Flag
 #define FLAG_UNUSED_0x882                           (SYSTEM_FLAGS + 0x22) // Unused Flag
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@ -92,7 +92,9 @@
 #define MAX_STAT_STAGE    12

 // Shiny odds
-#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
+#define SHINY_ODDS 16 // Actual probability is SHINY_ODDS/65536
+                      // Emerald default is 1/8196 (8/65536)
+                      // Gen VI+ default is 1/4096 (16/65536)

 // Ribbon IDs used by TV and Pokénav
 #define CHAMPION_RIBBON       0
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@ -216,6 +216,9 @@
 #define MAPSEC_TRAINER_HILL                 0xD4
 #define MAPSEC_NONE                         0xD5

+// New MAPSECS
+#define MAPSEC_BUDPORT_CITY                 0xD6
+
 #define METLOC_SPECIAL_EGG                  0xFD
 #define METLOC_IN_GAME_TRADE                0xFE
 #define METLOC_FATEFUL_ENCOUNTER            0xFF
--- a/src/data/region_map/region_map_sections.json
+++ b/src/data/region_map/region_map_sections.json
@ -1,5 +1,13 @@
 {
  "map_sections": [
+    {
+      "map_section": "MAPSEC_BUDPORT_CITY",
+      "name": "BUDPORT CITY",
+      "x": 2,
+      "y": 2,
+      "width": 1,
+      "height": 1
+    },
    {
      "map_section": "MAPSEC_LITTLEROOT_TOWN",
      "name": "LITTLEROOT TOWN",
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@ -71,6 +71,7 @@ static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/map_pop

 static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
 {
+    [MAPSEC_BUDPORT_CITY] = MAPPOPUP_THEME_MARBLE,
    [MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_WOOD,
    [MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_WOOD,
    [MAPSEC_DEWFORD_TOWN] = MAPPOPUP_THEME_WOOD,
--- a/src/region_map.c
+++ b/src/region_map.c
@ -288,6 +288,7 @@ static const u32 sFlyTargetIcons_Gfx[] = INCBIN_U32("graphics/pokenav/region_map

 static const u8 sMapHealLocations[][3] =
 {
+    [MAPSEC_BUDPORT_CITY] = {MAP_GROUP(BUDPORT_CITY), MAP_NUM(BUDPORT_CITY), HEAL_LOCATION_BUDPORT_CITY},
    [MAPSEC_LITTLEROOT_TOWN] = {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
    [MAPSEC_OLDALE_TOWN] = {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
    [MAPSEC_DEWFORD_TOWN] = {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
@ -1178,6 +1179,8 @@ static u8 GetMapsecType(u16 mapSecId)
    {
    case MAPSEC_NONE:
        return MAPSECTYPE_NONE;
+    case MAPSEC_BUDPORT_CITY:
+        return FlagGet(FLAG_VISITED_BUDPORT_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
    case MAPSEC_LITTLEROOT_TOWN:
        return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
    case MAPSEC_OLDALE_TOWN: