From 0946334190843b5f416a53bd1a7c85ffa0a28f94 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Fri, 25 Jul 2025 17:01:05 -0400 Subject: [PATCH] ledyba improvements + nihon tweaks (still needs pokegear realignment) --- data/pokemon/evos_attacks_johto.asm | 8 ++++++-- data/tilesets/nihon_birdon_attributes.bin | Bin 1120 -> 1120 bytes data/tilesets/nihon_birdon_collision.asm | 3 +-- data/tilesets/nihon_birdon_metatiles.bin | Bin 1120 -> 1120 bytes data/wild/johto_grass.asm | 12 ++++++------ gfx/pokegear/nihon.bin | Bin 361 -> 361 bytes 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index c7687e1..e990355 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -516,9 +516,11 @@ LedybaEvosAttacks: dbbw EVOLVE_LEVEL, 18, LEDIAN db 0 ; no more evolutions dbw 1, TACKLE + dbw 1, STRING_SHOT + dbw 4, COMET_PUNCH dbw 6, SUPERSONIC dbw 12, QUICK_ATTACK ; SW97 - dbw 17, COMET_PUNCH + dbw 15, MACH_PUNCH ; XY and SV dbw 22, LIGHT_SCREEN dbw 22, REFLECT dbw 27, BATON_PASS @@ -533,9 +535,11 @@ LedybaEvosAttacks: LedianEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE + dbw 1, STRING_SHOT + dbw 4, COMET_PUNCH dbw 6, SUPERSONIC dbw 12, QUICK_ATTACK ; SW97 - dbw 17, COMET_PUNCH + dbw 15, MACH_PUNCH ; XY and SV dbw 24, LIGHT_SCREEN dbw 24, REFLECT dbw 29, BATON_PASS diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin index eff6609ff912cea97e68cefe2b48b1694b2c4262..11bd571554585b598994998a97244839e26a18b9 100644 GIT binary patch delta 19 acmaFB@qlAP6B8Q)11l>7!{!dA8;k%t90e-? delta 16 YcmaFB@qlAP6Vv1gjBJ}bm~Jov06InnMF0Q* diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm index 008635e..a7bd552 100644 --- a/data/tilesets/nihon_birdon_collision.asm +++ b/data/tilesets/nihon_birdon_collision.asm @@ -34,8 +34,7 @@ tilecoll WALL, WALL, DOOR, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 -; tilecoll WALL, WALL, WALL, DIVE_DOWN ; 24 - tilecoll WALL, WALL, WALL, WALL ; Placeholder for above + tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, DOOR, FLOOR, FLOOR ; 26 tilecoll WALL, WALL, FLOOR, FLOOR ; 27 diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin index 7b1231620d963ce914e13219c8257781213b2152..d30f27e8814011b0a0a2237abe8226d3838ff4cc 100644 GIT binary patch delta 19 acmaFB@qlAP6BAoVh@E{%$mR~F8;k%+6$b7A delta 19 acmaFB@qlAP6BC=BzMZ|D{pJp)8;k%%=>~WJ diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 141aa21..21fc667 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1299,15 +1299,15 @@ JohtoGrassWildMons: dbw 3, LEDYBA dbw 3, CATERPIE dbw 4, CATERPIE - dbw 4, GENTLARVA + dbw 4, LEDYBA dbw 3, WEEDLE dbw 4, HOPPIP dbw 5, HOPPIP ; day - dbw 3, PIDGEY + dbw 3, LEDYBA dbw 3, CATERPIE dbw 4, CATERPIE - dbw 4, GENTLARVA + dbw 4, LEDYBA dbw 3, WEEDLE dbw 4, HOPPIP dbw 5, HOPPIP @@ -1331,15 +1331,15 @@ JohtoGrassWildMons: dbw 5, LEDYBA dbw 4, CATERPIE dbw 6, LEDYBA - dbw 4, GENTLARVA + dbw 4, LEDYBA dbw 4, WEEDLE dbw 5, BELLSPROUT dbw 5, HOPPIP ; day - dbw 5, PIDGEY + dbw 5, LEDYBA dbw 4, CATERPIE dbw 5, BELLSPROUT - dbw 4, GENTLARVA + dbw 4, LEDYBA dbw 4, WEEDLE dbw 6, BELLSPROUT dbw 5, HOPPIP diff --git a/gfx/pokegear/nihon.bin b/gfx/pokegear/nihon.bin index eca1a00314fe82fe645e81a47cd54896b5612be6..e86ad886744f192d9d89232ef6da373e33c71e12 100644 GIT binary patch literal 361 zcmZXQTMxn@429Xo+}7a(N@{7mFuXn({r|sC%jRM-PSTKkJ*Nd$O{N{vLaM+eQ2kyr{qI^3{bUmvrr<-Ea`Ark Zd;ZH>G5_C>r^B1;