fixes #1537 #1528

also fixes feet layering of gold with grass. Unifies gen1/gen2 grass layering into a single system

tools/make_gold_manifest.py

@@ -668,7 +668,7 @@ REQUIRED_SYMBOLS = {
     # Wild encounters (data/wild/*)
     "JohtoGrassWildMons", "JohtoWaterWildMons",
     "KantoGrassWildMons", "KantoWaterWildMons",
-    "FishGroups", "TreeMons", "TreeMonMaps",
+    "FishGroups", "TimeFishGroups", "TreeMons", "TreeMonMaps",
     # data/wild/treemon_maps.asm RockMonMaps: the four maps whose smashable
     # rocks roll TREEMON_SET_ROCK, read by RockMonEncounter.
     "RockMonMaps",
@@ -785,6 +785,7 @@ REQUIRED_SYMBOLS = {
     # Emote bubbles (data/sprites/emotes.asm): showemote's ! over a trainer
     # who just spotted the player, and the other faces scripts use.
     "ShockEmote", "QuestionEmote", "HappyEmote", "SadEmote",
+    "HeartEmote", "BoltEmote", "SleepEmote", "FishEmote",
     # The Pokecenter heal machine's OBJ art (engine/events/
     # heal_machine_anim.asm): two tiles -- the machine's light ($7c) and the
     # ball ($7d) -- plus the CGB palette .LoadPalettes copies over

tools/rom_manifest_gold.json

@@ -16096,6 +16096,22 @@
       5,
       17417
     ],
+    "HeartEmote": [
+      5,
+      17673
+    ],
+    "BoltEmote": [
+      5,
+      17737
+    ],
+    "SleepEmote": [
+      5,
+      17801
+    ],
+    "FishEmote": [
+      5,
+      17865
+    ],
     "Shrink1Pic": [
       62,
       30142
@@ -16512,6 +16528,10 @@
       5,
       22206
     ],
+    "TimeFishGroups": [
+      36,
+      27614
+    ],
     "TitleScreenGFX1": [
       38,
       16384