From 425990b82bdcd9123e189beee860e6160a1b1924 Mon Sep 17 00:00:00 2001 From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:06:09 -0600 Subject: [PATCH 1/3] syntax fixes --- data/pokemon/base_stats/gyopin.asm | 2 +- data/pokemon/base_stats/purakkusu.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/pokemon/base_stats/gyopin.asm b/data/pokemon/base_stats/gyopin.asm index f1a1d074..65fb693a 100644 --- a/data/pokemon/base_stats/gyopin.asm +++ b/data/pokemon/base_stats/gyopin.asm @@ -20,5 +20,5 @@ SUBSTITUTE, SURF ; end - ddb BANK(GyopinPicFront) + db BANK(GyopinPicFront) assert BANK(GyopinPicFront) == BANK(GyopinPicBack) diff --git a/data/pokemon/base_stats/purakkusu.asm b/data/pokemon/base_stats/purakkusu.asm index 76324a5a..a6f28083 100644 --- a/data/pokemon/base_stats/purakkusu.asm +++ b/data/pokemon/base_stats/purakkusu.asm @@ -20,5 +20,5 @@ REST, SUBSTITUTE, CUT, STRENGTH ; end - ddb BANK(PurakkusuPicFront) + db BANK(PurakkusuPicFront) assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack) From 2e5e5914e53615c1545fc975e1c64cceee883355 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 31 Aug 2022 22:32:09 +0100 Subject: [PATCH 2/3] Para now has a correctly sized back sprite --- gfx/pokemon/back/parab.png | Bin 575 -> 473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/back/parab.png b/gfx/pokemon/back/parab.png index e7979555315eaef5d7c0655e5fbd66b365f2dac1..7b2ff01bd4bca9cd2770ef88ec330641501ce8a3 100644 GIT binary patch delta 334 zcmdnba+6uHGr-TCmrII^fq{Y7)59eQNGpIa6Odq#S!mliQ8BZglaWE5X_leIOrY2q zPZ!4!iOaR;t+@_42ryg_4a}aX@PxxmPI30JYaNnDw{AGEDwMzA!My{l#;w}}j%aOl z_gMabJ@C5Z; zOx8Sfq)XjTkk?hNQfT4Aq!Xs!MPJ?Mx_rqsaVb-^!$2^fBDXFOnh+Z zi*AWQ2M4=u@cf6b9Ht!O;b={0xU?xqHAjj0!s2hr2N@nN{Gz~HIoGOYWAT9=iQkq7 zHbnd^{`Y{lY|0u|Ri5T&6BkH{Tk0AZh8P%F85>#|7-<_ATNxNEd@FEl;zcQCEK(OX Rtf&Hok*BMl%Q~loCIDJqfTsWe delta 439 zcmcb~yq`s}Gr-TCmrII^fq{Y7)59eQNXvjQ6Odq#y*A_JM8!-o4tW7aqo0~{+kj$> z`9*#qjOQ1X&zhXgC?#&8Yit-|Xl7+#Xk}ulZD3$!U?7^B7B_hgqf|W>xfF|gkAQ|m zrABzB`T8hhHK1yME@Ki#s0XSA0S_Ps z>W0wrLElXn80s1Jd%8G=a9r0tXWMlsK;-C0xuneQcHsS`pWprS=8EIi$8}4KA7;A$ zP1AcNFMWR9t9@HvF__C4{uW#JJMmau!)3c|Z;E8n6y4*S4u5D5ySzzCa^9-r3eOE$ z{-;=S@`hb`qGEhw=ZcQ27gROAhI%nhUDK@<+MN2V^H!7n)yWUCVz+yIE$_Xzj`@>q dsj=d(sqFeS1&*6NbKF5b^mO%eS?83{1ONj&i1h#f From 466a6d30c2dcbd84d5296cd809e20ae8e5c093dd Mon Sep 17 00:00:00 2001 From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com> Date: Wed, 31 Aug 2022 16:00:22 -0600 Subject: [PATCH 3/3] Encounters Finished routes, Rock Tunnel and Lavender Tower --- data/wild/maps/PokemonTower3F.asm | 4 ++-- data/wild/maps/PokemonTower4F.asm | 4 ++-- data/wild/maps/PokemonTower5F.asm | 6 +++--- data/wild/maps/PokemonTower6F.asm | 4 ++-- data/wild/maps/PokemonTower7F.asm | 6 +++--- data/wild/maps/RockTunnel1F.asm | 4 ++-- data/wild/maps/RockTunnelB1F.asm | 12 ++++++------ data/wild/maps/Route10.asm | 20 +++++++++---------- data/wild/maps/Route12.asm | 28 +++++++++++++-------------- data/wild/maps/Route13.asm | 16 ++++++++-------- data/wild/maps/Route14.asm | 32 ++++++++++++++++--------------- data/wild/maps/Route15.asm | 16 ++++++++-------- data/wild/maps/Route16.asm | 8 ++++---- data/wild/maps/Route17.asm | 12 ++++++------ data/wild/maps/Route18.asm | 12 ++++++------ data/wild/maps/Route21.asm | 32 +++++++++++++++---------------- data/wild/maps/Route23.asm | 28 +++++++++++++-------------- data/wild/maps/Route7.asm | 22 ++++++++++----------- data/wild/maps/Route8.asm | 24 +++++++++++------------ data/wild/maps/Route9.asm | 24 +++++++++++------------ data/wild/maps/SeaRoutes.asm | 18 ++++++++--------- 21 files changed, 167 insertions(+), 165 deletions(-) diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index 0d4440cb..662240eb 100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -5,8 +5,8 @@ PokemonTower3FWildMons: db 22, GASTLY db 23, GASTLY db 19, GASTLY - db 18, GASTLY - db 24, GASTLY + db 18, VULPIX + db 24, VULPIX db 20, CUBONE db 22, CUBONE db 25, HAUNTER diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index de278221..18a2e51e 100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -5,11 +5,11 @@ PokemonTower4FWildMons: db 22, GASTLY db 23, GASTLY db 19, GASTLY - db 18, GASTLY + db 23, VULPIX db 25, HAUNTER db 20, CUBONE db 22, CUBONE - db 24, GASTLY + db 24, VULPIX end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 507dba26..cfec68b0 100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -4,12 +4,12 @@ PokemonTower5FWildMons: db 21, GASTLY db 22, GASTLY db 23, GASTLY - db 19, GASTLY - db 18, GASTLY + db 23, VULPIX + db 24, VULPIX db 25, HAUNTER db 20, CUBONE db 22, CUBONE - db 24, GASTLY + db 24, VULPIX end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index f0197631..6dcf3ffa 100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -4,8 +4,8 @@ PokemonTower6FWildMons: db 22, GASTLY db 23, GASTLY db 24, GASTLY - db 20, GASTLY - db 19, GASTLY + db 23, VULPIX + db 24, VULPIX db 26, HAUNTER db 22, CUBONE db 24, CUBONE diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 2b3d952b..bf294434 100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -3,13 +3,13 @@ PokemonTower7FWildMons: db 21, GASTLY db 22, GASTLY db 23, GASTLY - db 24, GASTLY - db 20, GASTLY + db 24, VULPIX + db 25, VULPIX db 28, HAUNTER db 22, CUBONE db 24, CUBONE db 28, HAUNTER - db 30, HAUNTER + db 30, GENGAR end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 6ca947c0..da11358b 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -5,8 +5,8 @@ RockTunnel1FWildMons: db 17, GEODUDE db 15, MACHOP db 16, GEODUDE - db 18, ZUBAT - db 15, ZUBAT + db 18, CHARMANDER + db 15, BITTYBAT db 17, MACHOP db 13, ONIX db 15, ONIX diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 4edd716c..09eeb93b 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -2,14 +2,14 @@ RockTunnelB1FWildMons: def_grass_wildmons 15 ; encounter rate db 16, ZUBAT db 17, ZUBAT - db 17, GEODUDE + db 17, RIBBITO db 15, MACHOP - db 16, GEODUDE - db 18, ZUBAT + db 16, SLOWPOKE + db 18, BITTYBAT db 17, MACHOP - db 17, ONIX - db 13, ONIX - db 18, GEODUDE + db 17, PSYDUCK + db 13, CROCKY + db 18, CROCKY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index f2d1b8f6..4b221f6c 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,25 +1,25 @@ Route10WildMons: def_grass_wildmons 15 ; encounter rate - db 16, VOLTORB - db 16, SPEAROW + db 16, MAGNEMITE + db 16, KOTORA db 14, VOLTORB IF DEF(_RED) db 11, EKANS db 13, SPEAROW db 15, EKANS - db 17, VOLTORB - db 17, SPEAROW - db 13, EKANS - db 17, EKANS + db 17, BETOBEBII + db 20, FEAROW + db 13, SANDSHREW + db 17, SANDSHREW ENDC IF DEF(_BLUE) db 11, SANDSHREW db 13, SPEAROW db 15, SANDSHREW - db 17, VOLTORB - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW + db 17, BETOBEBII + db 20, FEAROW + db 13, EKANS + db 17, EKANS ENDC end_grass_wildmons diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index 4c9388d3..9b416b8d 100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -2,25 +2,25 @@ Route12WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) db 24, ODDISH - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT - db 26, ODDISH - db 27, PIDGEY + db 25, PIDGEOTTO + db 23, BLASTYKE + db 24, BELLSPROUT + db 22, SQUIRTLE + db 26, BARUNDA + db 26, WEEPINBELL + db 27, FARFETCHD db 28, GLOOM db 30, GLOOM ENDC IF DEF(_BLUE) db 24, BELLSPROUT - db 25, PIDGEY - db 23, PIDGEY - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT - db 27, PIDGEY + db 25, PIDGEOTTO + db 23, BLASTYKE + db 24, ODDISH + db 22, SQUIRTLE + db 26, BARUNDA + db 26, GLOOM + db 27, FARFETCHD db 28, WEEPINBELL db 30, WEEPINBELL ENDC diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index c6196233..694fcf86 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -2,24 +2,24 @@ Route13WildMons: def_grass_wildmons 20 ; encounter rate IF DEF(_RED) db 24, ODDISH - db 25, PIDGEY - db 27, PIDGEY + db 25, FARFETCHD + db 27, PIDGEOTTO db 24, VENONAT db 22, ODDISH - db 26, VENONAT - db 26, ODDISH + db 26, KRABBY + db 26, BELLSPROUT db 25, DITTO db 28, GLOOM db 30, GLOOM ENDC IF DEF(_BLUE) db 24, BELLSPROUT - db 25, PIDGEY - db 27, PIDGEY + db 25, FARFETCHD + db 27, PIDGEOTTO db 24, VENONAT db 22, BELLSPROUT - db 26, VENONAT - db 26, BELLSPROUT + db 26, KRABBY + db 26, ODDISH db 25, DITTO db 28, WEEPINBELL db 30, WEEPINBELL diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index dbc218fb..10d03049 100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,27 +1,29 @@ Route14WildMons: def_grass_wildmons 15 ; encounter rate IF DEF(_RED) - db 24, ODDISH - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, ODDISH - db 26, VENONAT db 26, ODDISH - db 30, GLOOM + db 28, PIDGEOTTO + db 25, DITTO + db 26, TANGELA + db 24, BELLSPROUT + db 28, VENOMOTH + db 28, GLOOM + db 32, WEEPINBELL + db 30, PIDGEOTTO + db 32, SCYTHER ENDC IF DEF(_BLUE) - db 24, BELLSPROUT - db 26, PIDGEY - db 23, DITTO - db 24, VENONAT - db 22, BELLSPROUT - db 26, VENONAT db 26, BELLSPROUT - db 30, WEEPINBELL -ENDC db 28, PIDGEOTTO + db 25, DITTO + db 26, TANGELA + db 24, ODDISH + db 28, VENOMOTH + db 28, WEEPINBELL + db 32, GLOOM db 30, PIDGEOTTO + db 32, PINSIR +ENDC end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index c437a97d..afed1d96 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -3,25 +3,25 @@ Route15WildMons: IF DEF(_RED) db 24, ODDISH db 26, DITTO - db 23, PIDGEY + db 23, PIDGEOTTO db 26, VENONAT db 22, ODDISH - db 28, VENONAT - db 26, ODDISH + db 28, DEER + db 26, BELLSPROUT db 30, GLOOM ENDC IF DEF(_BLUE) db 24, BELLSPROUT db 26, DITTO - db 23, PIDGEY + db 23, PIDGEOTTO db 26, VENONAT db 22, BELLSPROUT - db 28, VENONAT - db 26, BELLSPROUT + db 28, DEER + db 26, ODDISH db 30, WEEPINBELL ENDC - db 28, PIDGEOTTO - db 30, PIDGEOTTO + db 28, GAOTORA + db 30, GAOTORA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index 15ef2bf1..99374a58 100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -1,13 +1,13 @@ Route16WildMons: def_grass_wildmons 25 ; encounter rate db 20, SPEAROW - db 22, SPEAROW - db 18, RATTATA + db 22, FEAROW + db 18, GRIMER db 20, DODUO - db 20, RATTATA + db 20, GRIMER db 18, DODUO db 22, DODUO - db 22, RATTATA + db 22, RATICATE db 23, RATICATE db 25, RATICATE end_grass_wildmons diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index b3b2b672..0e53be88 100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,15 +1,15 @@ Route17WildMons: def_grass_wildmons 25 ; encounter rate - db 20, SPEAROW - db 22, SPEAROW + db 25, FEAROW + db 27, RATICATE db 25, RATICATE - db 24, DODUO + db 24, PUCHIKOON db 27, RATICATE db 26, DODUO db 28, DODUO - db 29, RATICATE - db 25, FEAROW - db 27, FEAROW + db 29, GRIMER + db 25, EEVEE + db 27, DODRIO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index d2a1269a..ec35aa5c 100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm @@ -1,15 +1,15 @@ Route18WildMons: def_grass_wildmons 25 ; encounter rate - db 20, SPEAROW - db 22, SPEAROW + db 27, FEAROW + db 29, FEAROW db 25, RATICATE - db 24, DODUO - db 25, FEAROW + db 24, GRIMER + db 25, GRIMER db 26, DODUO db 28, DODUO db 29, RATICATE - db 27, FEAROW - db 29, FEAROW + db 27, GAOTORA + db 29, GAOTORA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 99cddd60..f68d2735 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,26 +1,26 @@ Route21WildMons: def_grass_wildmons 25 ; encounter rate - db 21, RATTATA - db 23, PIDGEY - db 30, RATICATE - db 23, RATTATA - db 21, PIDGEY - db 30, PIDGEOTTO - db 32, PIDGEOTTO + db 21, RATICATE + db 23, PIDGEOTTO + db 30, BARUNDA + db 30, MR. MIME + db 29, MR. MIME + db 29, GLOOM + db 29, WEEPINBELL db 28, TANGELA db 30, TANGELA db 32, TANGELA end_grass_wildmons def_water_wildmons 5 ; encounter rate - db 5, TENTACOOL - db 10, TENTACOOL - db 15, TENTACOOL - db 5, TENTACOOL - db 10, TENTACOOL - db 15, TENTACOOL - db 20, TENTACOOL db 30, TENTACOOL - db 35, TENTACOOL - db 40, TENTACOOL + db 30, TENTACOOL + db 35, BLOTTLE + db 35, BLOTTLE + db 30, TENTACOOL + db 35, BARUNDA + db 30, TENTACOOL + db 35, TENTACRUEL + db 35, PENDRAKEN + db 40, PENDRAKEN end_water_wildmons diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index a2cde010..34068b84 100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -1,25 +1,25 @@ Route23WildMons: def_grass_wildmons 10 ; encounter rate -IF DEF(_RED) - db 26, EKANS -ENDC -IF DEF(_BLUE) - db 26, SANDSHREW -ENDC - db 33, DITTO - db 26, SPEAROW - db 38, FEAROW - db 38, DITTO - db 38, FEAROW IF DEF(_RED) db 41, ARBOK ENDC IF DEF(_BLUE) db 41, SANDSLASH ENDC - db 43, DITTO - db 41, FEAROW - db 43, FEAROW + db 43, ANIMON + db 38, FEAROW + db 38, RHYHORN + db 38, EXEGGCUTE + db 40, PRIMEAPE +IF DEF(_RED) + db 41, SCYTHER +ENDC +IF DEF(_BLUE) + db 41, PINSIR +ENDC + db 43, EXEGGCUTE + db 41, ZUDUCK + db 38, TAUROS end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 51f78880..a91b2b03 100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,27 +1,27 @@ Route7WildMons: def_grass_wildmons 15 ; encounter rate - db 19, PIDGEY + db 22, PIDGEOTTO IF DEF(_RED) db 19, ODDISH db 17, MANKEY - db 22, ODDISH - db 22, PIDGEY - db 18, MANKEY + db 22, BELLSPROUT + db 19, HINAAZU + db 18, MEOWTH db 18, GROWLITHE db 20, GROWLITHE - db 19, MANKEY - db 20, MANKEY + db 19, VULPIX + db 20, VULPIX ENDC IF DEF(_BLUE) db 19, BELLSPROUT db 17, MEOWTH - db 22, BELLSPROUT - db 22, PIDGEY - db 18, MEOWTH + db 22, ODDISH + db 19, HINAAZU + db 18, MANKEY db 18, VULPIX db 20, VULPIX - db 19, MEOWTH - db 20, MEOWTH + db 19, GROWLITHE + db 20, GROWLITHE ENDC end_grass_wildmons diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 52995d1b..ca5b57d9 100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -1,27 +1,27 @@ Route8WildMons: def_grass_wildmons 15 ; encounter rate - db 18, PIDGEY + db 20, PIDGEOTTO IF DEF(_RED) db 18, MANKEY db 17, EKANS db 16, GROWLITHE - db 20, PIDGEY - db 20, MANKEY + db 18, BULBASAUR + db 20, SANDSHREW db 19, EKANS - db 17, GROWLITHE - db 15, GROWLITHE - db 18, GROWLITHE + db 17, VULPIX + db 18, VULPIX + db 15, KADABRA ENDC IF DEF(_BLUE) db 18, MEOWTH db 17, SANDSHREW db 16, VULPIX - db 20, PIDGEY - db 20, MEOWTH - db 19, SANDSHREW - db 17, VULPIX - db 15, VULPIX - db 18, VULPIX + db 18, BULBASAUR + db 20, EKANS + db 19, MANKEY + db 17, GROWLITHE + db 18, GROWLITHE + db 15, KADABRA ENDC end_grass_wildmons diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index e771040a..9a3e968d 100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -5,21 +5,21 @@ Route9WildMons: db 14, RATTATA IF DEF(_RED) db 11, EKANS - db 13, SPEAROW - db 15, EKANS - db 17, RATTATA - db 17, SPEAROW - db 13, EKANS - db 17, EKANS + db 13, CUBONE + db 15, CACTUS + db 17, RATICATE + db 20, FEAROW + db 13, SANDSHREW + db 17, SANDSHREW ENDC IF DEF(_BLUE) db 11, SANDSHREW - db 13, SPEAROW - db 15, SANDSHREW - db 17, RATTATA - db 17, SPEAROW - db 13, SANDSHREW - db 17, SANDSHREW + db 13, CUBONE + db 15, CACTUS + db 17, RATICATE + db 20, FEAROW + db 13, EKANS + db 17, EKANS ENDC end_grass_wildmons diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm index 7ec50889..13b74049 100644 --- a/data/wild/maps/SeaRoutes.asm +++ b/data/wild/maps/SeaRoutes.asm @@ -3,14 +3,14 @@ SeaRoutesWildMons: end_grass_wildmons def_water_wildmons 5 ; encounter rate - db 5, TENTACOOL - db 10, TENTACOOL - db 15, TENTACOOL - db 5, TENTACOOL - db 10, TENTACOOL - db 15, TENTACOOL - db 20, TENTACOOL + db 25, TENTACOOL db 30, TENTACOOL - db 35, TENTACOOL - db 40, TENTACOOL + db 35, BLOTTLE + db 35, BLOTTLE + db 30, CHEEP + db 30, CHEEP + db 30, TENTACRUEL + db 35, TENTACRUEL + db 35, PENDRAKEN + db 40, PENDRAKEN end_water_wildmons