diff --git a/README.md b/README.md index 082f91f..23a0fb1 100644 --- a/README.md +++ b/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 diff --git a/gfx/pokemon/feraligatr/anim.asm b/gfx/pokemon/feraligatr/anim.asm index 8156896..b81a0ee 100644 --- a/gfx/pokemon/feraligatr/anim.asm +++ b/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 diff --git a/gfx/pokemon/feraligatr/front.png b/gfx/pokemon/feraligatr/front.png index c3057a8..9e5d53c 100644 Binary files a/gfx/pokemon/feraligatr/front.png and b/gfx/pokemon/feraligatr/front.png differ diff --git a/gfx/pokemon/stricheel/anim.asm b/gfx/pokemon/stricheel/anim.asm index 875f7be..a54362e 100644 --- a/gfx/pokemon/stricheel/anim.asm +++ b/gfx/pokemon/stricheel/anim.asm @@ -1 +1,21 @@ - endanim \ No newline at end of file + 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 diff --git a/gfx/pokemon/stricheel/anim_idle.asm b/gfx/pokemon/stricheel/anim_idle.asm index 875f7be..e69de29 100644 --- a/gfx/pokemon/stricheel/anim_idle.asm +++ b/gfx/pokemon/stricheel/anim_idle.asm @@ -1 +0,0 @@ - endanim \ No newline at end of file diff --git a/gfx/pokemon/stricheel/back.png b/gfx/pokemon/stricheel/back.png index c7216be..3cf90fe 100644 Binary files a/gfx/pokemon/stricheel/back.png and b/gfx/pokemon/stricheel/back.png differ diff --git a/gfx/pokemon/stricheel/front.png b/gfx/pokemon/stricheel/front.png index e0a9da9..662ff0e 100644 Binary files a/gfx/pokemon/stricheel/front.png and b/gfx/pokemon/stricheel/front.png differ diff --git a/gfx/pokemon/stricheel/shiny.pal b/gfx/pokemon/stricheel/shiny.pal index 5c88669..d5f4763 100644 --- a/gfx/pokemon/stricheel/shiny.pal +++ b/gfx/pokemon/stricheel/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 11, 19, 31 + RGB 30, 13, 0 \ No newline at end of file diff --git a/gfx/pokemon/warfurs/anim.asm b/gfx/pokemon/warfurs/anim.asm index f5892eb..a074f83 100644 --- a/gfx/pokemon/warfurs/anim.asm +++ b/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 diff --git a/gfx/pokemon/warfurs/anim_idle.asm b/gfx/pokemon/warfurs/anim_idle.asm index cef5799..9162b61 100644 --- a/gfx/pokemon/warfurs/anim_idle.asm +++ b/gfx/pokemon/warfurs/anim_idle.asm @@ -4,4 +4,4 @@ frame 3, 06 frame 2, 06 frame 1, 09 - endanim \ No newline at end of file + endanim diff --git a/gfx/pokemon/warfurs/front.png b/gfx/pokemon/warfurs/front.png index 3e0648c..c81407a 100644 Binary files a/gfx/pokemon/warfurs/front.png and b/gfx/pokemon/warfurs/front.png differ diff --git a/gfx/pokemon/wearlycan/anim.asm b/gfx/pokemon/wearlycan/anim.asm index 875f7be..afa8211 100644 --- a/gfx/pokemon/wearlycan/anim.asm +++ b/gfx/pokemon/wearlycan/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + 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 diff --git a/gfx/pokemon/wearlycan/anim_idle.asm b/gfx/pokemon/wearlycan/anim_idle.asm index 875f7be..dd02e67 100644 --- a/gfx/pokemon/wearlycan/anim_idle.asm +++ b/gfx/pokemon/wearlycan/anim_idle.asm @@ -1 +1 @@ - endanim \ No newline at end of file + endanim diff --git a/gfx/pokemon/wearlycan/back.png b/gfx/pokemon/wearlycan/back.png index 6333623..d9fec1b 100644 Binary files a/gfx/pokemon/wearlycan/back.png and b/gfx/pokemon/wearlycan/back.png differ diff --git a/gfx/pokemon/wearlycan/front.png b/gfx/pokemon/wearlycan/front.png index 2acd120..fe9e9dc 100644 Binary files a/gfx/pokemon/wearlycan/front.png and b/gfx/pokemon/wearlycan/front.png differ diff --git a/gfx/pokemon/wearlycan/shiny.pal b/gfx/pokemon/wearlycan/shiny.pal index 520ac39..20c5ccd 100644 --- a/gfx/pokemon/wearlycan/shiny.pal +++ b/gfx/pokemon/wearlycan/shiny.pal @@ -1,2 +1,2 @@ RGB 25, 17, 11 - RGB 10, 7, 6 \ No newline at end of file + RGB 10, 7, 6 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index cb0e7d4..0fc8f2d 100644 --- a/maps/BurnedTower1F.asm +++ b/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 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index f8ab6b1..a551ff9 100644 --- a/maps/BurnedTowerB1F.asm +++ b/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