Merge branch 'master' of https://github.com/ZetaNull/jep-hack

README.md

@@ -114,7 +114,7 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 - nuuk: Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back)
 - Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly: Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
 	- Gorotora is edited from RacieBeep's Yellow sprite in the Helix Chamber PokeThon ROM Hack. A full list of Helix Chamber sprites are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). Helix Chamber spriters have a "must credit" policy.
-- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
+- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage), Trebir (Mallody), Folage (Silkane)
 - SCMidna: Munchlax
 - SageDeoxys: Iron Bundle, Raging Bolt, Scream Tail, Dudunsparce (both forms)
 - Pokets: Terrados

data/collision/field_move_blocks.asm

@@ -6,6 +6,8 @@ CutTreeBlockPointers:
 	dbw TILESET_KANTO,        .kanto
 	dbw TILESET_PARK,         .park
 	dbw TILESET_FOREST,       .forest
+	dbw TILESET_NIHON_01,		.nihon01
+	dbw TILESET_NIHON_OLD,		.oldCity
 	db -1 ; end
 
 .johto:
@@ -43,6 +45,16 @@ CutTreeBlockPointers:
 	db $0f, $17, 0
 	db -1 ; end
 
+.nihon01:
+; facing block, replacement block, animation
+	db $03, $02, 1 ; grass
+	db $6d, $88, 0 ; tree
+	db -1 ; end
+
+.oldCity:
+; facing block, replacement block, animation
+	db $17, $41, 0 ; tree
+	db -1 ; end
 
 ; these blocks all use COLL_WHIRLPOOL in one quadrant
 WhirlpoolBlockPointers:
@@ -53,3 +65,4 @@ WhirlpoolBlockPointers:
 ; facing block, replacement block, animation
 	db $07, $36, 0
 	db -1 ; end
+

data/maps/outdoor_sprites.asm

@@ -717,6 +717,7 @@ SilentHillsGroupSprites:
 	db SPRITE_BLUE
 	db SPRITE_POKEFAN_M
 	db SPRITE_SUPER_NERD
+	db SPRITE_COOLTRAINER_M
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE

gfx/pokemon/folage/anim.asm

@@ -1 +1,15 @@
+	frame  0, 08
+	frame  1, 15
+	frame  2, 08
+	frame  3, 15
+	frame  4, 08
+	frame  5, 08
+	frame  6, 08
+	frame  5, 08
+	frame  4, 08
+	frame  2, 08
+	frame  1, 08
+	frame  7, 08
+	frame  1, 08
+	frame  7, 08
 	endanim

gfx/pokemon/folage/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 31, 31, 05
+	RGB 28, 10, 05

gfx/pokemon/trebir/anim.asm

@@ -1 +1,15 @@
+	frame  0, 18
+	frame  1, 18
+	frame  2, 10
+	frame  3, 20
+	frame  4, 10
+	frame  5, 10
+	frame  6, 10
+	frame  7, 10
+	frame  8, 10
+	frame  9, 10
+	frame 10, 10
+	frame 11, 10
+	frame  1, 10
+	frame 12, 18
 	endanim

gfx/pokemon/trebir/anim_idle.asm

@@ -1 +1,4 @@
+    frame  0, 18
+	frame  1, 18
+	frame 12, 18
 	endanim

gfx/pokemon/trebir/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 15, 18, 30
+	RGB 31, 06, 04