diff --git a/README.md b/README.md index d93cc4d..af376f3 100644 --- a/README.md +++ b/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 diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm index 444be14..aebd007 100644 --- a/data/collision/field_move_blocks.asm +++ b/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 + diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index fa19737..7d835ea 100644 --- a/data/maps/outdoor_sprites.asm +++ b/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 diff --git a/gfx/pokemon/folage/anim.asm b/gfx/pokemon/folage/anim.asm index 875f7be..63eb280 100644 --- a/gfx/pokemon/folage/anim.asm +++ b/gfx/pokemon/folage/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + 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 diff --git a/gfx/pokemon/folage/back.png b/gfx/pokemon/folage/back.png index c7216be..311e1e9 100644 Binary files a/gfx/pokemon/folage/back.png and b/gfx/pokemon/folage/back.png differ diff --git a/gfx/pokemon/folage/front.png b/gfx/pokemon/folage/front.png index e0a9da9..a837af0 100644 Binary files a/gfx/pokemon/folage/front.png and b/gfx/pokemon/folage/front.png differ diff --git a/gfx/pokemon/folage/shiny.pal b/gfx/pokemon/folage/shiny.pal index 5c88669..9cc43a6 100644 --- a/gfx/pokemon/folage/shiny.pal +++ b/gfx/pokemon/folage/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 31, 31, 05 + RGB 28, 10, 05 \ No newline at end of file diff --git a/gfx/pokemon/trebir/anim.asm b/gfx/pokemon/trebir/anim.asm index 875f7be..7df014f 100644 --- a/gfx/pokemon/trebir/anim.asm +++ b/gfx/pokemon/trebir/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + 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 diff --git a/gfx/pokemon/trebir/anim_idle.asm b/gfx/pokemon/trebir/anim_idle.asm index 875f7be..7836f83 100644 --- a/gfx/pokemon/trebir/anim_idle.asm +++ b/gfx/pokemon/trebir/anim_idle.asm @@ -1 +1,4 @@ + frame 0, 18 + frame 1, 18 + frame 12, 18 endanim \ No newline at end of file diff --git a/gfx/pokemon/trebir/back.png b/gfx/pokemon/trebir/back.png index c7216be..dc25ab4 100644 Binary files a/gfx/pokemon/trebir/back.png and b/gfx/pokemon/trebir/back.png differ diff --git a/gfx/pokemon/trebir/front.png b/gfx/pokemon/trebir/front.png index e0a9da9..97d7048 100644 Binary files a/gfx/pokemon/trebir/front.png and b/gfx/pokemon/trebir/front.png differ diff --git a/gfx/pokemon/trebir/shiny.pal b/gfx/pokemon/trebir/shiny.pal index 5c88669..6cdb6fc 100644 --- a/gfx/pokemon/trebir/shiny.pal +++ b/gfx/pokemon/trebir/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 15, 18, 30 + RGB 31, 06, 04 \ No newline at end of file diff --git a/maps/OldCity.ablk b/maps/OldCity.ablk index 5e98a67..ec410ef 100644 Binary files a/maps/OldCity.ablk and b/maps/OldCity.ablk differ