From d7d348eacafbd9d0410ca9f400cdbe709a6dae9a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:42:26 +0000 Subject: [PATCH] Fix route numbers and add wild data BWAAAAAH ZETAAAA --- constants/landmark_constants.asm | 2 +- constants/map_constants.asm | 4 ++-- data/maps/attributes.asm | 8 ++++---- data/maps/blocks.asm | 6 +++--- data/maps/landmarks.asm | 4 ++-- data/maps/maps.asm | 2 +- data/maps/scripts.asm | 4 ++-- data/wild/nihon_grass.asm | 30 ++++++++++++++++++++++++++++++ data/wild/nihon_water.asm | 11 ++++++++++- maps/Route51.ablk | 1 + maps/{Route53.asm => Route51.asm} | 4 ++-- maps/Route52.ablk | 2 +- maps/Route53.ablk | 1 - 13 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 maps/Route51.ablk rename maps/{Route53.asm => Route51.asm} (79%) delete mode 100644 maps/Route53.ablk diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index d3f7c03..62d1d8d 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -139,8 +139,8 @@ DEF NIHON_LANDMARK EQU const_value const LANDMARK_ROUTE_50 const LANDMARK_SAVOY_CITY const LANDMARK_CORAL_CITY + const LANDMARK_ROUTE_51 const LANDMARK_ROUTE_52 - const LANDMARK_ROUTE_53 const LANDMARK_BLUE_FOREST const LANDMARK_ROUTE_66 const LANDMARK_WHITE_CITY diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 899d276..a1697e3 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -675,8 +675,8 @@ ENDM newgroup CORAL_CITY ; 38 map_const CORAL_CITY, 20, 18 ; 1 - map_const ROUTE_52, 25, 9 ; 2 - map_const ROUTE_53, 10, 27 ; 3 + map_const ROUTE_51, 25, 9 ; 2 + map_const ROUTE_52, 10, 27 ; 3 endgroup newgroup BLUE_FOREST ; 39 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index e76e6c9..1d7e1fd 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -897,12 +897,12 @@ ENDM map_attributes CoralCity, CORAL_CITY, $04, WEST connection west, Route52, ROUTE_52, 0 - map_attributes Route52, ROUTE_52, $05, WEST | EAST - connection west, Route53, ROUTE_53, -18 + map_attributes Route51, ROUTE_51, $05, WEST | EAST + connection west, Route52, ROUTE_52, -18 connection east, CoralCity, CORAL_CITY, 0 - map_attributes Route53, ROUTE_53, $6C, EAST - connection east, Route52, ROUTE_52, 18 + map_attributes Route52, ROUTE_52, $6C, EAST + connection east, Route51, ROUTE_51, 18 map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 5c76c25..8020d1b 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1317,8 +1317,8 @@ SavoyCity_Blocks: CoralCity_Blocks: INCBIN "maps/CoralCity.ablk" +Route51_Blocks: + INCBIN "maps/Route51.ablk" + Route52_Blocks: INCBIN "maps/Route52.ablk" - -Route53_Blocks: - INCBIN "maps/Route53.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index d22931d..550bb1e 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -269,8 +269,8 @@ UnknownName: db "?????@" Route66Name: db "ROUTE 66@" Route49Name: db "ROUTE 49@" Route50Name: db "ROUTE 50@" -Route52Name: db "ROUTE 52@" -Route53Name: db "ROUTE 53@" +Route52Name: db "ROUTE 51@" +Route53Name: db "ROUTE 52@" QuietCaveName: db "QUIET¯CAVE@" OldCityName: db "SEPIA¯CITY@" PokemonPagodaName: db "#MON¯PAGODA@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index b7be623..9f1ef87 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -739,8 +739,8 @@ MapGroup_SavoyCity: MapGroup_CoralCity: table_width MAP_LENGTH, MapGroup_CoralCity map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map Route53, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_53, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_CORAL_CITY_MAPS MapGroup_BlueForest: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index d277758..4a2c4f6 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -636,5 +636,5 @@ INCLUDE "maps/KantoSafariZoneArea3.asm" INCLUDE "maps/SavoyCity.asm" INCLUDE "maps/Route50SavoyCityGate.asm" INCLUDE "maps/CoralCity.asm" -INCLUDE "maps/Route52.asm" -INCLUDE "maps/Route53.asm" \ No newline at end of file +INCLUDE "maps/Route51.asm" +INCLUDE "maps/Route52.asm" \ No newline at end of file diff --git a/data/wild/nihon_grass.asm b/data/wild/nihon_grass.asm index 0d8324e..ce572bd 100644 --- a/data/wild/nihon_grass.asm +++ b/data/wild/nihon_grass.asm @@ -200,4 +200,34 @@ NihonGrassWildMons: dbw 35, SKARMORY end_grass_wildmons + def_grass_wildmons ROUTE_51 + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + ; morn + dbw 30, FEAROW + dbw 31, RAPIDASH + dbw 30, FEAROW + dbw 31, COATL + dbw 32, QATU + dbw 32, TAUROS + dbw 35, WARUCHU + ; day + dbw 30, FEAROW + dbw 31, RAPIDASH + dbw 30, FEAROW + dbw 31, COATL + dbw 32, QATU + dbw 32, TAUROS + dbw 35, WARUCHU + ; nite + dbw 30, MURKROW + dbw 31, FOXFIRE + dbw 30, MURKROW + dbw 31, SNEASEL + dbw 32, ARBOK + dbw 32, NOCTOWL + dbw 35, WARUCHU + end_grass_wildmons + + ; Route 52 has no grass. + db -1 ; end diff --git a/data/wild/nihon_water.asm b/data/wild/nihon_water.asm index ea24fb1..1266fa9 100644 --- a/data/wild/nihon_water.asm +++ b/data/wild/nihon_water.asm @@ -20,5 +20,14 @@ NihonWaterWildMons: dbw 31, MAGIKARP dbw 30, MAGIKARP end_water_wildmons - + + ; Route 52 has no grass + + def_water_wildmons ROUTE_52 + db 4 percent ; encounter rates: morn/day/nite + dbw 30, TENTACOOL + dbw 31, MANTINE + dbw 30, ANGORE + end_water_wildmons + db -1 ; end diff --git a/maps/Route51.ablk b/maps/Route51.ablk new file mode 100644 index 0000000..af04941 --- /dev/null +++ b/maps/Route51.ablk @@ -0,0 +1 @@ +(61    1UUUUUUUUUUUUUUUUUUUUUUWPQQ QQKKQQP UU%' 'Q+)QP%Q'QQ% Q'%Q %'Q'%Q Q#!QP KQQQKKKKQQP MMMMMMMMMMMMMMMMMMMMMMMM   2(( \ No newline at end of file diff --git a/maps/Route53.asm b/maps/Route51.asm similarity index 79% rename from maps/Route53.asm rename to maps/Route51.asm index 432e75b..26be91a 100644 --- a/maps/Route53.asm +++ b/maps/Route51.asm @@ -1,11 +1,11 @@ object_const_def -Route53_MapScripts: +Route51_MapScripts: def_scene_scripts def_callbacks -Route53_MapEvents: +Route51_MapEvents: db 0, 0 ; filler def_warp_events diff --git a/maps/Route52.ablk b/maps/Route52.ablk index af04941..31a579d 100644 --- a/maps/Route52.ablk +++ b/maps/Route52.ablk @@ -1 +1 @@ -(61    1UUUUUUUUUUUUUUUUUUUUUUWPQQ QQKKQQP UU%' 'Q+)QP%Q'QQ% Q'%Q %'Q'%Q Q#!QP KQQQKKKKQQP MMMMMMMMMMMMMMMMMMMMMMMM   2(( \ No newline at end of file +llllllllllmnolllllllijklllllllijkllllllfhglll^]\^]_aeeee`_a_a`_a_aeeee`_a_a`_a_aeeee`_a_a`_a_aeeee`_a[cSSSs`_a?p`_a?p`_a?p`_a?===rSb[c?d((?==;?99qOXWW?p?p?pOYOOO&&&&&&Z \ No newline at end of file diff --git a/maps/Route53.ablk b/maps/Route53.ablk deleted file mode 100644 index 31a579d..0000000 --- a/maps/Route53.ablk +++ /dev/null @@ -1 +0,0 @@ -llllllllllmnolllllllijklllllllijkllllllfhglll^]\^]_aeeee`_a_a`_a_aeeee`_a_a`_a_aeeee`_a_a`_a_aeeee`_a[cSSSs`_a?p`_a?p`_a?p`_a?===rSb[c?d((?==;?99qOXWW?p?p?pOYOOO&&&&&&Z \ No newline at end of file