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

README.md

@@ -118,7 +118,7 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 
 ### Unaffiliated
 - nuuk: Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Mamoswine, 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, Pockle (Shuqlour, edited by Martha), Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
+- 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, Pockle (Shuqlour, edited by Martha), Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj, Stricheel, SW99 Feraligatr (edited by Plague von Karma)
 	- 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), Trebir (Mallody), Folage (Silkane)
 - SCMidna: Munchlax

gfx/pokemon/feraligatr/anim.asm

@@ -1,6 +1,14 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 16
-	frame 3, 36
-	frame 2, 12
+	frame  0, 02
+	frame  1, 07
+	frame  2, 05
+	frame  3, 05
+	frame  4, 05
+	frame  5, 21
+	frame  4, 07
+	frame  5, 24
+	frame  0, 03
+	frame  1, 07
+	frame  0, 03
+	frame  1, 03
+	frame  0, 21
 	endanim

gfx/pokemon/stricheel/anim.asm

@@ -1 +1,21 @@
-	endanim
+	frame  0, 06
+	frame  1, 07
+	frame  2, 07
+	frame  3, 07
+	frame  4, 07
+	frame  5, 03
+	frame  6, 12
+	frame  5, 05
+	frame  7, 07
+	frame  8, 18
+	frame  7, 03
+	frame  9, 03
+	frame 10, 05
+	frame 11, 05
+	frame 10, 05
+	frame  9, 03
+	frame  3, 07
+	frame  2, 07
+	frame  1, 07
+	frame  0, 06
+	endanim

gfx/pokemon/stricheel/anim_idle.asm

@@ -1 +0,0 @@
-	endanim

gfx/pokemon/stricheel/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 11, 19, 31
+	RGB 30, 13, 0

gfx/pokemon/warfurs/anim.asm

@@ -1,21 +1,21 @@
 	frame  0, 06
-	frame  1, 10
-	frame  2, 06
-	frame  3, 06
-	frame  4, 10
-	frame  3, 12
-	frame  4, 10
-	frame  3, 12
-	frame  5, 04
-	frame  6, 10
-	frame  5, 04
-	frame  3, 10
-	frame  5, 04
-	frame  7, 10
-	frame  8, 04
-	frame  9, 04
-	frame 10, 12
-	frame  9, 04
-	frame 11, 30
+	frame  0, 09
 	frame  1, 06
+	frame  2, 06
+	frame  3, 09
+	frame  2, 12
+	frame  3, 09
+	frame  2, 12
+	frame  4, 03
+	frame  5, 09
+	frame  4, 03
+	frame  2, 09
+	frame  4, 03
+	frame  6, 09
+	frame  7, 03
+	frame  8, 03
+	frame  9, 12
+	frame  8, 03
+	frame 10, 29
+	frame  0, 06
 	endanim

gfx/pokemon/warfurs/anim_idle.asm

@@ -4,4 +4,4 @@
 	frame  3, 06
 	frame  2, 06
 	frame  1, 09
-	endanim
+	endanim

gfx/pokemon/wearlycan/anim.asm

@@ -1 +1,15 @@
-	endanim
+	frame  0, 07
+	frame  1, 10
+	frame  2, 07
+	frame  3, 07
+	frame  4, 10
+	frame  5, 07
+	frame  6, 03
+	frame  7, 03
+	frame  8, 07
+	frame  7, 07
+	frame  8, 14
+	frame  2, 07
+	frame  1, 07
+	frame  0, 07
+	endanim

gfx/pokemon/wearlycan/anim_idle.asm

@@ -1 +1 @@
-	endanim
+	endanim

gfx/pokemon/wearlycan/shiny.pal

@@ -1,2 +1,2 @@
 	RGB 25, 17, 11
-	RGB 10,  7,  6
+	RGB 10,  7,  6

maps/BurnedTower1F.asm

@@ -282,7 +282,7 @@ BurnedTower1F_MapEvents:
 	warp_event  9, 15, ECRUTEAK_CITY, 13
 	warp_event 10, 15, ECRUTEAK_CITY, 13
 	warp_event 10,  9, BURNED_TOWER_B1F, 1
-;	warp_event  5,  5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event  5,  5, BURNED_TOWER_B1F, 3
 ;	warp_event  5,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
 ;	warp_event  4,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
 ;	warp_event 15,  4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S

maps/BurnedTowerB1F.asm

@@ -232,11 +232,11 @@ BurnedTowerB1F_MapEvents:
 
 	def_warp_events
 	warp_event 10,  9, BURNED_TOWER_1F, 3
-	warp_event 17,  7, BURNED_TOWER_1F, 7
+;	warp_event 17,  7 , BURNED_TOWER_1F, 7 gsc leftover
 	warp_event 10,  8, BURNED_TOWER_1F, 9
-	warp_event  3, 13, BURNED_TOWER_1F, 10
-	warp_event 17, 14, BURNED_TOWER_1F, 12
-	warp_event  7, 15, BURNED_TOWER_1F, 14
+;	warp_event  3, 13 , BURNED_TOWER_1F, 10 gsc leftover
+;	warp_event 17, 14 , BURNED_TOWER_1F, 12 gsc leftover
+	warp_event  7, 15, BURNED_TOWER_1F, 4
 
 	def_coord_events
 	coord_event 10,  6, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS, ReleaseTheBeasts