Merge remote-tracking branch 'origin/master' into modern_ld

41 files changed, 2 insertions, 2 deletions

diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 66cf634e9..e1902c6e4 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -977,7 +977,7 @@ CableClub_EventScript_WirelessBerryCrush:: @ 81BBD35
 	msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
-	special CheckHasAtLeastOneBerry
+	special HasAtLeastOneBerry
 	compare VAR_RESULT, FALSE
 	goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush
 	setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH
diff --git a/data/specials.inc b/data/specials.inc
index aa7eced1a..2bc4a2a43 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -419,7 +419,7 @@ gSpecials:: @ 815FD60
 	def_special HelpSystem_Disable
 	def_special HelpSystem_Enable
 	def_special SetPostgameFlags
-	def_special CheckHasAtLeastOneBerry
+	def_special HasAtLeastOneBerry
 	def_special DisplayBerryPowderVendorMenu
 	def_special RemoveBerryPowderVendorMenu
 	def_special Script_HasEnoughBerryPowder
diff --git a/data/tilesets/primary/general/anim/flower/0.png b/data/tilesets/primary/general/anim/flower/0.png
new file mode 100644
index 000000000..d445b4045
--- /dev/null
+++ b/data/tilesets/primary/general/anim/flower/0.png
diff --git a/data/tilesets/primary/general/anim/flower/1.png b/data/tilesets/primary/general/anim/flower/1.png
new file mode 100644
index 000000000..1aed594f6
--- /dev/null
+++ b/data/tilesets/primary/general/anim/flower/1.png
diff --git a/data/tilesets/primary/general/anim/flower/2.png b/data/tilesets/primary/general/anim/flower/2.png
new file mode 100644
index 000000000..5e58c29a9
--- /dev/null
+++ b/data/tilesets/primary/general/anim/flower/2.png
diff --git a/data/tilesets/primary/general/anim/flower/3.png b/data/tilesets/primary/general/anim/flower/3.png
new file mode 100644
index 000000000..bac3d26ff
--- /dev/null
+++ b/data/tilesets/primary/general/anim/flower/3.png
diff --git a/data/tilesets/primary/general/anim/flower/4.png b/data/tilesets/primary/general/anim/flower/4.png
new file mode 100644
index 000000000..8e589150a
--- /dev/null
+++ b/data/tilesets/primary/general/anim/flower/4.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/0.png b/data/tilesets/primary/general/anim/sandwatersedge/0.png
new file mode 100644
index 000000000..0ade81d73
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/0.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/1.png b/data/tilesets/primary/general/anim/sandwatersedge/1.png
new file mode 100644
index 000000000..8dac0eba7
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/1.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/2.png b/data/tilesets/primary/general/anim/sandwatersedge/2.png
new file mode 100644
index 000000000..ba6e93bc4
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/2.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/3.png b/data/tilesets/primary/general/anim/sandwatersedge/3.png
new file mode 100644
index 000000000..9436601c1
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/3.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/4.png b/data/tilesets/primary/general/anim/sandwatersedge/4.png
new file mode 100644
index 000000000..5b74a16fa
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/4.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/5.png b/data/tilesets/primary/general/anim/sandwatersedge/5.png
new file mode 100644
index 000000000..6c72f4e0e
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/5.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/6.png b/data/tilesets/primary/general/anim/sandwatersedge/6.png
new file mode 100644
index 000000000..f56c55b04
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/6.png
diff --git a/data/tilesets/primary/general/anim/sandwatersedge/7.png b/data/tilesets/primary/general/anim/sandwatersedge/7.png
new file mode 100644
index 000000000..549c44410
--- /dev/null
+++ b/data/tilesets/primary/general/anim/sandwatersedge/7.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png
new file mode 100644
index 000000000..ce16ac050
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png
new file mode 100644
index 000000000..7e41494c5
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png
new file mode 100644
index 000000000..5765ac477
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png
new file mode 100644
index 000000000..dbc111a7f
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png
new file mode 100644
index 000000000..a8ee69c1e
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png
new file mode 100644
index 000000000..318c7b796
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png
new file mode 100644
index 000000000..c31713d34
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png
diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png
new file mode 100644
index 000000000..e01c91449
--- /dev/null
+++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png
diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/0.png b/data/tilesets/secondary/celadon_city/anim/fountain/0.png
new file mode 100644
index 000000000..c5783f481
--- /dev/null
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/0.png
diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/1.png b/data/tilesets/secondary/celadon_city/anim/fountain/1.png
new file mode 100644
index 000000000..7d1f6fb2e
--- /dev/null
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/1.png
diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/2.png b/data/tilesets/secondary/celadon_city/anim/fountain/2.png
new file mode 100644
index 000000000..91b54ad6e
--- /dev/null
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/2.png
diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/3.png b/data/tilesets/secondary/celadon_city/anim/fountain/3.png
new file mode 100644
index 000000000..45f2e40ad
--- /dev/null
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/3.png
diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/4.png b/data/tilesets/secondary/celadon_city/anim/fountain/4.png
new file mode 100644
index 000000000..dd9a94d47
--- /dev/null
+++ b/data/tilesets/secondary/celadon_city/anim/fountain/4.png
diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/0.png b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png
new file mode 100644
index 000000000..eabff7d8a
--- /dev/null
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png
diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/1.png b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png
new file mode 100644
index 000000000..fd9eb53f7
--- /dev/null
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png
diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/2.png b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png
new file mode 100644
index 000000000..a3edd7ccd
--- /dev/null
+++ b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png
diff --git a/data/tilesets/secondary/mt_ember/anim/steam/0.png b/data/tilesets/secondary/mt_ember/anim/steam/0.png
new file mode 100644
index 000000000..ab0ca2c69
--- /dev/null
+++ b/data/tilesets/secondary/mt_ember/anim/steam/0.png
diff --git a/data/tilesets/secondary/mt_ember/anim/steam/1.png b/data/tilesets/secondary/mt_ember/anim/steam/1.png
new file mode 100644
index 000000000..1324c7ad5
--- /dev/null
+++ b/data/tilesets/secondary/mt_ember/anim/steam/1.png
diff --git a/data/tilesets/secondary/mt_ember/anim/steam/2.png b/data/tilesets/secondary/mt_ember/anim/steam/2.png
new file mode 100644
index 000000000..310aa1ebd
--- /dev/null
+++ b/data/tilesets/secondary/mt_ember/anim/steam/2.png
diff --git a/data/tilesets/secondary/mt_ember/anim/steam/3.png b/data/tilesets/secondary/mt_ember/anim/steam/3.png
new file mode 100644
index 000000000..a6ec412cf
--- /dev/null
+++ b/data/tilesets/secondary/mt_ember/anim/steam/3.png
diff --git a/data/tilesets/secondary/silph_co/anim/fountain/0.png b/data/tilesets/secondary/silph_co/anim/fountain/0.png
new file mode 100644
index 000000000..09714447b
--- /dev/null
+++ b/data/tilesets/secondary/silph_co/anim/fountain/0.png
diff --git a/data/tilesets/secondary/silph_co/anim/fountain/1.png b/data/tilesets/secondary/silph_co/anim/fountain/1.png
new file mode 100644
index 000000000..5063c1476
--- /dev/null
+++ b/data/tilesets/secondary/silph_co/anim/fountain/1.png
diff --git a/data/tilesets/secondary/silph_co/anim/fountain/2.png b/data/tilesets/secondary/silph_co/anim/fountain/2.png
new file mode 100644
index 000000000..eb46683ea
--- /dev/null
+++ b/data/tilesets/secondary/silph_co/anim/fountain/2.png
diff --git a/data/tilesets/secondary/silph_co/anim/fountain/3.png b/data/tilesets/secondary/silph_co/anim/fountain/3.png
new file mode 100644
index 000000000..e582fbce2
--- /dev/null
+++ b/data/tilesets/secondary/silph_co/anim/fountain/3.png
diff --git a/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png
new file mode 100644
index 000000000..a17ad6f5e
--- /dev/null
+++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png
diff --git a/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png
new file mode 100644
index 000000000..bfddebccd
--- /dev/null
+++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png