From 566b8cf93921012d05fda731556c0cee84e1977d Mon Sep 17 00:00:00 2001
From: Ninjdai <ninjdai@netcourrier.com>
Date: Fri, 10 Nov 2023 19:24:11 +0100
Subject: [PATCH] Merged general and generalWithStairs tilesets

---
 data/layouts/BudportCity/map.bin              | Bin 3680 -> 3680 bytes
 data/layouts/layouts.json                     |   2 +-
 data/maps/BudportCity/map.json                |   2 +-
 data/maps/DewfordTown/map.json                |   4 +++-
 data/maps/EverGrandeCity/map.json             |   4 +++-
 data/maps/FallarborTown/map.json              |   4 +++-
 data/maps/FortreeCity/map.json                |   4 +++-
 data/maps/LilycoveCity/map.json               |   4 +++-
 data/maps/MauvilleCity/map.json               |   4 +++-
 data/maps/Route103/map.json                   |   4 +++-
 data/maps/Route106/map.json                   |   4 +++-
 data/maps/Route107/map.json                   |  12 +++++++++---
 data/maps/Route108/map.json                   |   4 +++-
 data/maps/Route114/map.json                   |   4 +++-
 data/maps/Route115/map.json                   |   4 +++-
 data/maps/Route117/map.json                   |   4 +++-
 data/maps/Route124/map.json                   |   4 +++-
 data/maps/Route128/map.json                   |   8 ++++++--
 data/maps/Underwater_Route105/map.json        |  12 +++++++++---
 data/maps/VerdanturfTown/map.json             |   4 +++-
 .../primary/general/metatile_attributes.bin   | Bin 1024 -> 1024 bytes
 data/tilesets/primary/general/metatiles.bin   | Bin 8192 -> 8192 bytes
 data/tilesets/primary/general/tiles.png       | Bin 7622 -> 7657 bytes
 include/constants/flags.h                     |   2 +-
 include/constants/pokemon.h                   |   4 +++-
 include/constants/region_map_sections.h       |   3 +++
 src/data/region_map/region_map_sections.json  |   8 ++++++++
 src/map_name_popup.c                          |   1 +
 src/region_map.c                              |   3 +++
 29 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/data/layouts/BudportCity/map.bin b/data/layouts/BudportCity/map.bin
index c5fbddc9b5e019244067a335bb80cbd75d59c5d3..9c5c2a030166d3008fd5e5104c635c89b3121184 100644
GIT binary patch
delta 21
ccmaDL^FU@p0~?2jgQtU+gSW%x4z?TY09TO*eE<Le

delta 21
ccmaDL^FU@p0~<$=bBlAUbFcH}4z?TY0Abq*g#Z8m

diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 35f3609de..d68fd6dca 100644
--- 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"
diff --git a/data/maps/BudportCity/map.json b/data/maps/BudportCity/map.json
index fd1af472e..2efb4bb94 100644
--- 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",
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index f073a7436..73aea8287 100644
--- 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",
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 58978b7ff..6e0b5f707 100644
--- 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,
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 4888640a5..f59fd7716 100644
--- 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",
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 007d8b22d..9efc51a7f 100644
--- 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",
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 398cf219e..8d43ea846 100644
--- 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",
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index f4da4222b..eda6ec7fe 100644
--- 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",
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 9bc6fed67..fde327a18 100644
--- 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",
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 5a0a38dc9..8c99ac285 100644
--- 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",
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index ee15509cd..c7ff529db 100644
--- 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": [
+
+  ]
 }
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index 405ae3401..2f580cb04 100644
--- 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",
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 17c483c0f..e7a6ad4c1 100644
--- 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",
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index ee0d71349..7b9f9f9c4 100644
--- 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",
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 80304ddf4..ccf67bbcd 100644
--- 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",
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 21e2ecd06..cd9f5b5cc 100644
--- 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",
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 464aa83fc..3749f30e9 100644
--- 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",
diff --git a/data/maps/Underwater_Route105/map.json b/data/maps/Underwater_Route105/map.json
index 069ccab4d..b276de28d 100644
--- 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": [
+
+  ]
 }
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index ae40730c0..2d1df93ed 100644
--- 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",
diff --git a/data/tilesets/primary/general/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin
index d9cd29016d792fb568494dbf2f820100081a14f8..0b61bf2dbf353dcbd246c340f88b14d3b9af5202 100644
GIT binary patch
delta 49
vcmZqRXyDjT#i-&b;3dE#ARr(L#30}+;3vSqASM8UAmA<FBd~cMV-gbp$fO6Z

delta 49
ocmZqRXyDjT#i$~{z$3sTARr(L#1Oy$1Y!ap2;*;_$C$(f0HCu4^#A|>

diff --git a/data/tilesets/primary/general/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index af899bcc5efa4bdd3ab1f418b371a866441207c9..b369fee08601125d6939c56b4268e9ea78968917 100644
GIT binary patch
delta 119
zcmZp0XmHqYfm`8@Aq2iNgupa|M1wMeLW6gv5IFe*cY;ERL8$=<zXdA#ZTQv@q3EsY
jThrf$lM8qdirxT~yfb_QSM=NPjp-YpX`4Ur2nYiJhgLLo

delta 119
zcmZp0XmHqYfm<QhAkTo0k&m%gpif|~z&wF8gG7TegF*u*180LEgJ6TnAGi|~<OCrQ
zrie*_NrhQ~S%pP`MMXqGL}hXTPl5u-6p%8QqUi=R3?>;&Hegd=R}fPWQ`!81M?e?=
D5HTEK

diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
index 17426ab80e8fe2434bc9ecefbc8e063fd4e6d09a..478d124343e6e97015f6f138be700dce75c94294 100644
GIT binary patch
literal 7657
zcmV<F9Twt=P)<h;3K|Lk000e1NJLTq004jh009650{{R3iPvM40000mP)t-s00030
z|Nqt1)xEvFq@<*SgNs45gQV5PK`}w@)y>|tq`j1joO5%7T3TX3Qgg+m7%15j0013y
zNkl<Zc$|%!Yit}>cIOKtYAnDOfhOhI53zu-y8ZazQOvHkITJ*Z*<G>}V727zsKxy-
z(#*(K%YZ|zqZfhL$^^*3P-a&g1ewKzv=syhHW^k+UMC+0BUY0UCbPjrUDb9%igDC+
zi-Np*#O%5ROd`N;MArV#eN<Odls#8!-mY79e|7G;=bZbfYQs>8g)G2_6$^I3NF|ic
zWh}GM+hb*RGsaYL7p@yLIxh4WrLdT_OE|Rf|Aj61i?X>)Z@xd9?FS&x02|lY9e_{*
zSfMz$1C>p~=-)BeD*#r1Z>~RE?C-VK5(x(9i=|Sh1V{nh&bBkg7Bgd5g-oVop?uD?
z@|j#QleNs<kpz_N{&}-dd<ekMj`_YG)5vEsTacT5JumnypXuq(lnR;NzD!n0P_oRT
zX*~=G0VwnovqrJ6XAAOtuI~lr7yEjF0HnVsw<rLXoj2#Rr4D5q0gD8qWcT%a$uvy^
zd0&rhu=yQD%d|2Xt6=4d2bmP0$DFtG`AwR@n4Qn`K?RvD$a^y8%dBYHP(puiHjgj4
zh`P`;Gp1EA^Qnq4o7+7%7qZ>?f|={@%J=njA&-$*$tq^@S&OdCSp_M<U|+_v4*a16
z#6zg>t<Ck$_3z$o_0AVcgImmewhK7{A}As=xI^3xY9YWDtI*SL*&6V`Ke*_9$gCc8
zHzY0Q@<k(`%?~0cz?_*I+>zPQN7wEsn!Aw|vxAv@;lMi=Bw(Jc9t?(HE!qB()t4_8
zvjwA+&my<u{@!@rEEVj`U`B{uFb^6wG?6Lf3-&t|0a#oeiicK**7|Y(Y%j>BX&GIm
z0yJe2fZ1l=vI_!WnKnZg*w7|i;lMir@W5YPjfcEn<nujf0IVa|XBt}yHsw~iY|ZD)
ztYuk)5>SK$MRc;6gT)>YfS4`XtIRuSWdXpI#bVDO>51}8xjb0R;p)64jK(yJIrtG8
zVVcZR&NR<rdvy&;%w{e0O}0?XiMw?nFPF<_i-jW0HY*&*%$0Iowq@a(B7Dq}I<Vt-
zD7M$~R=;KT=Xd|}m}Q-|Dx)Rk@AGJF(JY9I?NaXGJQQLV3wfOztG2y5WZUsvF5jEY
z<aaOpmrS<5XJE9bL}Wz^S}O=Uu&f-Lw@WCnEXr-<Mtm?HvSW5|E?er&_7tpzZ}j!_
zWCkvF6{Xk=-D=w<Q*>iK2dgbneT(uESjN1+IJCOP<}Is~8SE|fE*#2RMQi^LyOh7P
z`I2oF<afJpkl`2wC5!SBL@*Wudku&osGzUEcW}qTS!>|5HS$C4?>@u*N`-=SW5#{~
zaq!=wyfoNTGUjc2k&zDaz3_nk!pHBta{=jxUD=XoH}mJS1qe;w^9L762ZfSVD2Y6i
zD;W$boQEaa=tMKyv-{)MUw>Ty?7Stt6|zEP`Yu{P3P77EhbRSd=lP*E3g-YId@o)Q
zDTdb<Bmg$20QPP~ojFS+HdnBP5|Q|H)nh&j`A0H7)an%fmA@lS!}MhMvP(>eP$0m3
zF;kR)?(0si?z)~N1Xm}J-u1UAe~%!5ZGT_bgl+#8L?}Q9U$c<+^_0FwfXJ<r<Nw#V
z79wCxPfSiuI#cgze`hPGe?YpfjW)0~NMyb8hm;pfuh31FoWG3);ooOM!<d+ynsSh|
zzcV303Lu*F&g+yHkyAW&{uio$51$4%3`ZsH@4l!YzmpDpA|9wzC@&&Mu~!$hzxQu3
zO98ehe`o%jAP7??0sKYyz=7A17c$662hCWenUC54Lpu}t(JILAyH)7N@d4@&Q-WL5
zLWTIu1Sx=FSxMNR)89in61G6Oy+y?YoxId{ciQpXY4k60Pvz>k7G3x1b#<(-f5NL7
z-bDQa@0u#8x}N9Jr{<x&=GEo#^(t9R;Q4_%*7fVv3D2E)ulBB%!a<#B*K3!{W5;nl
zF^V(KYvALk%j+%-us$(0HRUQ1oN9e~x|%Al)A6+9RDC&-2pXIP(+cne4A^nry$a=B
zbrryItJTZtavWFjr5dWf;2dHo!1k+GCvgsZ=el!E0gz_W<=4R^0FRiM3Zw!5GEtpW
z-3QOSrU28`&T=Ras96GpED8Y#TnX4dF)8jsf2OBvLXXtinGNNx>r|_#7(_?}sJm6E
zLY#NyjjB$ag}2BKgfU6;@PMSUPt|!&(sLdKb$Lzqw0m<}OX^(V<Py|`_es6@kDFgJ
zsEq6LJd7g7nODCl0IbSxN(H&q>&}%>%;j**$UgA@U8h<z7-9ue=XnGX!Z7fd0Ca~l
z3<6xHRzuU5Lmok1=kjbw_F*)=tJBr$wFu!VT9W5cowF$Nd?xGw(lpyGa4s_*3b&3T
zvXAYxtM2v7)3uP_GD0rTqxm5V178_Z#F?v92pu^!x<CLp*~j*)6Yot|eIJz!&h>dT
zGYT5$1pvBv)O4wXMUPEaXVE&`&3PX+U<XZf<qQNs%OSz1;ykAm!WUfkIsv#V0c7cQ
zH>4gG08aMNge_mGgBh}0oPVm$^P@Z>k0hHp>anJa@5;ZgMAXH1hTVq8mRz6Rgz><9
zVR}?C3NZ1T@zH!%pW#g&$A<AOKWNt2bXEI%C;(+Q5alz?CiQ*D8>D&y%ra@pj6?fj
zY;0}$E#GfCj`sJNh%PL<viuq}>^MQlx0C8&#s3ekAX))cz@ruc2<tTlKvnyDNLm6w
zlwXU&$en3Kd^-xM+P`yg1DIt*fMsKA6xBtCI?CT2ai_8?%Re{@y9*lOjqOadfnA|K
z)`<l^04>BP<xAr4EL{kIDF0w9^?4ZG+RnljOpML)TW!F0Z`Rn#q0*aVL9hYQn*c-r
zp!~>9$1}DbrREM}^u7c2vM?n8e6|h%R4T2gO8)LRKH2~!qWlPGxT?(gu+a>oJ5d<2
zYS;mo1|W)>T6*R02p0fE(YFvmk6=LumECDZ(G8Td294m(EUbw9V95c1LjyOR#GByn
z&|<lY@^86;cjOisM)wVGHoSpyMmn5<EkH5T7}Z<=!eC=Oz-0i0L7m;ac61hf!J<2l
z`@F@K4lZ*MmN5|eO=?20F&=OsK?Lni|9QDd!$??uJRk?+tcFgQ;bMV?#)N^fHN=`V
z=!^$Q<*F?IU~3BiKOBA{5KhQg1J$S<7~c>It^>e*^6PXw5WOJFKiGN{vif(1pYTOF
zCK!g%AX^|C5P+jCpZq!<4>*G}HAK0OPJ|N6#^W<&1re(;l0eyj(W(n~Cco~82N3~8
zc|({%866f1{|jgyMa>X4U_9X_@qotr=%!cq8<BM929>)$CM`bHO}-S7J8MgnbC$<z
zIvy|@?@3)ym~>}~2X2jdZjB<32nGaDzJ!VHFtVk(iU&-N_vkPHq&K1*lHnNV>a|9|
zggXaf)G@j+T|R6`I}m=a#(T;<7U_7<^yoOEb7Tu59*_=<u5Vh_i)HfXn<5@GlJQ<l
zK9oC0^`mrmpNbKKeRhW~p}FLj4t<l>5Z?iyCgMRDX#m{~F2_R=501)h6%qde0U*CH
zjAyXmc+s+sp&LCJ4``ea09+twG9GNDo9p=J^D<ci%_X0<_q_<jIm~iZJP?yV(ojUk
zhB~2$2V?@&BW3s(=QoBa9)vKY*X(_VY-@x7@J8H$x{l(O$jR_1B5htS-1%vH?5w?S
z>=aCybP#b^00rxo$T4x@kf6GGIU_fCtvoh%Xk-i%ZSIjbLc_BCB1eNLB2_mp7iRGE
zNM)=%at=!Dj*P8Ggm65Wx{=L?H-@WhvvL+tOn$mjsT?1v9HYsF@D+7olw8Qm!&QH?
za*9H*gUX4s<;uBVmtL{;2v=Q5Ib9s`8)d_#xX>==q8w%>0MDK~dwArS0vP2ZM`_N3
z7$Ebge4{*Uz!6y}kCU8<D1>BI05Fr_UM?RMQLLTA(J*IVOhvII4?Hy&H=jAC>r-hX
z^!V0tl2ARGVQTNNqLMAsKAkfkL#JP7M&NrGB)rC3EJ^naF*Hce*MPx{Nc(gi)IEeu
z%uvMbp{2L5uz<zj)3~=C1^33r#$@D?X(K?c6fr~bI4zYqe@g^S>a6fyHvvrZSprxp
zZ3+Ov;Bv7|5;PDyS`A1*{-*(2F&hEjQ)|sOV207ug#O&ad??aQ_&qsb{MDfiO4Msj
z<Guup3kh1DkYJVomNh_tGqS>d4S)osk9~Tr*#@L^013DToR%sWNHt}j0*JL{T7sk(
zn&?0cux+hI)7+;3@j7EviGUpvM8b2zd-xbhH<nD12++QJunFL&+GI}N1LvcAXtx05
zHvw!a!RQjqAA{NK0s(GmfD)h+upB)MINt`GpaES2`enao2+?lB!xHfGqohK(TY~`J
ztk!|neg|NEu?^6MbiR_L6Budh+L<;5EVGS(@$mfJHXy3IzINx00QwFkMhPGiZMYb|
z4eL3{>2vo4RXnaL5|LJKl+$=&Y)o7LBK}1HvSS)Al8Rrh$WxI9K<H8Uz$jbj08m9*
zd{R#1MFRM)=$!8;2{?cI?<<wNAzy$hPNX9d88Hr<Qi2=bP6XH?Hs!vemDoZP?($J~
z@~&#am`XxXm>$!21l(`yM<-t{ny*ywG59z|-1`!+Pzg2Q_r=<d-}^ne2(O<lmk(pS
zh>b0oY(DdXu`T}$<TJl!+`mKjI64j;EJP>y=v}3Q^D@BxvjR*b|H~WYZ^v7#{+|9`
z>xFG*<<)HE*mFrglMWU*zq_DxaDIU_FscAg)Cqw4v1R6a2D7HMEmwJ_^2}?`8G3%0
z?nc<OcYc8)Spv9D00Lv(5O`QeY<uR_O6AqcbB3NDrU4i+*!cz8S4;p+4Zyk~@UV{9
zW}21CG4nY?&kuziF#0Sg3DN)~k-){e0qcl*A_3-rVvhFqLfV;FumO-r;9{<dbwpL@
z;3eol_|-ULX>XJgq?IUpfdDnkma&d-lU`u#B4e$HJvNr4vqA@*-B?cmST|r$1VGrq
zb4J82UbxW0<n3G{z%WU0?qo>mAqiX>w=sEu63G%ZAd1oey7hNoqRpa6TjCN1n0*AG
zbpx#<w(a7(kWv!7<^AtB7`yu|Z$wD&>Pym;&j@ccu4{l!+xGm{9=?ZvO#v`_dyCy5
zz!5ewOf}D)>;OEz5%Aa^Zhf++F#sjPn_7r}DG8{icBa$Powp-@u_F?FQw&$b08ljM
z4@s~A@I(r*MMZ>j70i|mJr8`81gGf9A0$Bjv;y?2kanhUt|E47#XRs)5{$|5;R%%^
zb%}>o2w4R9j-ls=X$i(QB$7ZyCQ2nG!HE$Hs(OBymY}>L5nyWq=;~8C5J5SaC$=Rx
zF&xL)p;a?KgbBp*+WIoaA+{DSuC2xG^Z=$Kw<7dB5fUs&2>?)2ia1`UjYHb)`Hj}v
zhd-Bfm#My7J@)q+$vn|`i{JengtVjl#PEtm56-M?yaxG@Sol1~-Jg4+dems3{zq*9
z4GiO407f++FH_8XA4^$Jn9B3PQ;=vq445A`WPO9wA_tc74nUR?gotr}8uA$gcnXX-
zZUy8gab%<bYIsirEZp79=d){&fGULa=c%s(&;&2=9^6U+^b92pC}rieW<3x$^cKZm
z&yUw-zW&i>fRV8={6CBT!=I^%Rm@~fY64Uds1|q)W3wjc1p8P~6RUOKOH1Iz>k>dM
zAUg-(O(Pno`uCIlsmdEmZc#~~Zs<LDN=WX-fqdSO0Q!616!U}e@o^2Pc=aV0eIO;M
zdqRdq1zMLnO#{XZ9*$qQe?L-9_;P~)CiOx}f);E*G=aLH-q8dA#8zq8lJ$Q_0!%4E
z%dgi2Ku!R?xJ44w#rA(2pymgv0a^mpjh^U-@F`yq;s;Ws4uGB?2mwL~C@K+JsvBFL
z)J5Eqd8!HRc_0Bs72q@7jjH=X*@EX|rIQW-Qa24JR2Xdl=nBG+gdMa2H1rBPKw5HV
z-PuM8AfB%0l_Ay0kYI-B2VqCSLx66V092|0RG(}imK6e_3Q{7O6Kr9<4WM|rR1<(k
zCxC2WT`J#Od|ndbh_WDfpaEn^M)#5@0k=8<=!ldOWjqLK!lc(a081?eXl#@~DbW>D
zh<LCLjldW+fZk7l1~kCC)uBX)urBWB2T44LWd4x?(EAC{KmurdPB%U;;z7y|2te;A
z7;k$LVCZhdgflUuhvI?EbwCnnBcOtL!9(%jc@+;}%VZb+=Kv~XqB<U|)g|Dcyq|YS
zu>NSk--{tx#{(S$SxdzO6!?I~Ix5q^(g9eI^P108JcuK*JI`kiR6K|uG#UX$Cht*z
zikuXDrs6@o9tC1(TSO!wQ^v@)9DTSPKe#693p+>y?#lW+R`CEs*)nZKV{nZgv~cHS
za9zJ<G`Jz`APvwn#W*%Gyqh$<$Lnj0%VK;EqxA3|@;K(&4t%awsY(E@gG>Tk!AQSi
z$D)~@|1mBUxdyN_0L{q%u3T^bhXj!SjlFvd=8yn5mp|@y{aciai1fA>bpTHCys5W6
z^d8d6XW5k%+Z1!7Pg(d&dQwICW`Mi=wh4e(F%Ia>kG*^Mng!F|E3R?<``o#FpK=NC
zE1iIRmY;r!?)&P%sXl5+&$HIbin(fvSMH3c=6{Td?Jp@Gqlol2TNq6NPI7b4&riSh
zA36WUD+6bxE=NcOdu@7^h@L21`IvkDeagiY5DSY+8t{qPGEcwCEsMW2@D-`U?~)2u
zRwSV1y1$HENP!&7+c%BhXKX<(!-XB3jM#1S)ag$?;d=(2Rl6UVcrT@b=!HhB@!tv1
z-D>=SFvoLHX&S)!C)O#^4Fk{q8f#`UGwiQ-?)<gp&gM?BA<@8CC;)Oy<i^-Z#yXl{
zwE*CaMr+{No&U%(8TQwioopvk<{zcUHW&dY7rPv1&vkU;Np9`=J1v0(WHLK<wgF4C
z@4Ez`oRV>7<YZ?zLVc&j4&45MUHta0+x%}#td01tCG+;CfK&U<MIC@oEbFwKqz~-6
zZSJ}~%l~GVND|O$yzhx#Ku*c{-Q38@PE!Uz7{JJYxgpUt7eD@`&;jLA2R-}FrFwz3
zYT5v->~7!Yrp`A7ocTs>M6X8l0^@|(fjN9`GYM#3Nq}u~dU(M&^JLE}T7q=ao`|&u
zW69jQ+}_2Zp`AWwGT+E0fc661u=iCCNq{%$T>f0ZlRM;vm?I^^e)T){ar-d6$7gh3
zopPL8n*qke=S(JZNbMCF$G)mJw{MKR@>=DU*U<gO(&VJ$G#&=f&`uu!p42DO0MUe9
z&+jst6OdpgY2jvo9c>9hl@bX|qd7HM-An?E36^TYj?J2o=pd>&PEAgw+lx;Dp!XMz
zM@o?N0&iZg*7?ItKu9k?3`j|!?chk%^!z)9HuWz6q$JRQZXV5q!<zx*=TQ<UgMfV;
z<@$O3rhrp}n@d3ci<C1`X>&ksa|t-Qa3dhy3p6H(ap9CXxTyrUcQwrN(@%E*=s80g
zCV;2S+!yGeoiMZeaY~#w#piV1v_H2O9tF^8#4>ZbZD|SgHxU`s2GGQN|L|j_z&G2<
zJe|)a5`=n+!J$MU3A9f8*&5(odI+#}#7Y38?Ol(1Qkolw9|36l1Vkukz}YrnMCxNB
zAZfywnBvg~A{4Z;9%}>6ZYsgV#FGyLjPjX8+wGm7@+m37NC)7L|M*FLor(ui3yFoD
zJuE}&@eu%IZ)^&9Z0yY>9vEurD88L3AExie%ljW8!PlQ`>rS~d3t4|JJ+@wkqnz1y
zn3{9^(EdkA(EDTKu{Slq5c9;41uJ`bKm+V@2SD0HC*V&qPo@EJxg0}+*s|8S9O6@e
z^U5ANd!hefKp3x>=H5L~v;m-JXdAlme>?>EFwSQ(*?67aHcA7=Bw#EJfII(B4M^g_
zVqEO&$*rs}6QHaC<?<P65BoO&{we|Jc(A;>qnIlWtqUcdJ}jQ@R*nyp&-I{3kN2HO
z13Jb9#DaKi?0d#?(WJNW_ev$cC?)vj{_>gcK7IV~fBwq;v^#f<Oi1E^Wn8j~Ija!E
z4kBuTFr-8B>5eq<R3(Uis2yam+D2N==lXhz*;u@qfF@8Jqb8K3Q5PNscwEfUu=*0e
zPbivumsw{MO2@Ll>HNiCJ_OLsn3aL&mO;Nypx-6PJ&|@Vl#W@B^P4ZxtJaTEg``QU
z7iPu7;LEp+hE2~RZ8=vwqk91oyb1ySq79(u&Gcyl{`J$~z4stNjsV4j+LWad_iG*G
z9tn8=U&258GXRP?ED`g?T*TM8F|tp@hO>vxmgU1<^U)Ga(FOnk3YbOYN;x6H)-gH7
z94il}#)ZuRms?A-v($tl{Wu`^pW>C6UI#DGj|)mzVWjLu01nyhB#b~yuv{cjbL-17
zy<h(Q!m9_6?Ty#J5Fn=74FY5frF?FE5i3J_KfUrg0rswK1Z>zUr#CYx4a1q}75<^M
zP)MKw$;NL2NE?$%;++)4gHp+|<H%no9UOS)_3uL^@j5demD+%&04#pEYUPJw#{A_K
zB2fLk>+Dwml$&>G>a-lMT7{uFVry&5D;BB9LjAS1F9d8Yhj+>Xup+cB9+fOpkF1NA
z0Dc7t#0w`zpxjF5|LROl$e$ogOa#-;crZOBzf;+yGk$-=c_RvHqN2`!;7m+h3Tom4
z<UhIC{*J%SPwr1T>GR_TkD9Zbo*Q3m&T7EKrKY^crRL9ma3%SEl>oTF(dV5j%~{O-
zqS~ZLmull0FmXxVV&Y2e2af(uIRJm;5TS<4@a0mC0Cjai{U>dJD!Wn#AUQ7p_aTCF
zr7q&hPcGICet$BUP&%2M8drb`RptaZPR<Jezd$ksRR2#e@W9}IG}XRf@=y7v8vvhn
z0^Wy^7c>Bx3yk}dQ<qe)T)GMot~yil`-JGWi|E$Wd1st7ePLqa;?E`~E>PzgZ>YCF
zqA*&Z$N%&lWwb3K;v{Y)eiRb?OfEFF4Ny?0a-*UMT;!vCK@q5OC;<+=eh+&P0Br*V
zs5>>!s4U=W)QTkOq?G54pKb(PxY!gjXd4j23a#F8wGiR1%tzJZ=NYcr;HWlSxNuR3
zplu`#c!O#zsQj)HVG}@I0fb#t0iYjd05FP*qZI`jRRFQKL~U?X8%Tc=AiI^`EfzZ%
zdbO>eoJ%cMPD&38C17fj089ax>|w`A06$fLpNcypE{rlYX^%oj5$Ii$pGknW5eYzI
z^z5#s_KvrE$y1Gvq}Ks7si3f<^<dBsRJ}$Rs;41dw|a)4o|4HF5Fiq2jpKCy_F7XU
zg8+2XLx`Fe)%`?*I=*+SV^1B6+po7JAiW4nl(N_9v4OZ}x42^vY){L8<Bd(w24;vh
zLxOIvuB8<~W2v5ML){CNWzwGRiUN=xL<{JO?dpatc}EW?+HJtGs2whI+7-4yAU_~I
z7+TJ5^(;v#(-+G1qDY<gH#UI^Ne_?gKGD6A_zlXY-AHCEl;~8W8G0`{aNU_EpLSRj
zz5FHDXHCkTst?I=>?ThH{s5oxu%7%g99W)yCpluF)8O2;Yi!1w4eg>Ec#MwSS~6DN
z$7dT)0j{8$ekU1!Z^Do5qTj5$J}R=C^?>2n^%H<6L`VVXw>|ouWTd5;kSYQYpdzCm
z?S;1OwMXl^5TVru(7TBGon(3+ZH5s54GK^(n06uE%Uym75O!+8K%0}_WYGI)GjvBb
z4XrTSuDfpF&%fMtFb(L`0?m2<k8Kx=G&49DxOJZZHyzKN0RY+;bE?!fKt1f#0!e_A
zUAFx)u7m2DVPtnX&g@bcz1-#28eMe45PuXvYJn;@3BbgQEv`#1Qi!+NAhzCo+$`yR
zh5!5R)gMi`6GI7ra{9qpdiV0tfItB3342WxPz3=%`eMM`*Z+hbnf&&TN~<;ix)K3u
zzY^f<?_LFAu234vS^3=pKuz#fQ@#k`7k(SUTf67Y!s<}TJeUBe{r?SP#TNmvM1t^U
zb~QT`$E(?ciMvv|P_JDO&8dGL05kfDd~VT>*<!48kN}XhJ|3xqum8xR?qe}s6-WOc
Xadw3NI+Mq+00000NkvXXu0mjfa4unw

literal 7622
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

diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7e38f2b64..0479e46e9 100644
--- 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
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index e3dd15000..6162cf5c2 100644
--- 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
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 5b8029acf..529524b31 100644
--- 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
diff --git a/src/data/region_map/region_map_sections.json b/src/data/region_map/region_map_sections.json
index 8fa007911..e82cdcb02 100644
--- 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",
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 07e4f9870..184e3e968 100644
--- 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,
diff --git a/src/region_map.c b/src/region_map.c
index 7d5fe9365..14d363057 100644
--- 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: