diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 749e0e23..0455600f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -48,7 +48,7 @@ DEF FIRST_ROUTE_MAP EQU const_value mapconst ROUTE_16, 9, 20 ; $1B mapconst ROUTE_17, 72, 10 ; $1C mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 33, 10 ; $1E + mapconst ROUTE_19, 27, 10 ; $1E mapconst ROUTE_20, 15, 50 ; $1F mapconst ROUTE_21, 45, 10 ; $20 mapconst ROUTE_22, 9, 20 ; $21 diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm index 9ea5f159..913517c6 100644 --- a/data/maps/headers/Route19.asm +++ b/data/maps/headers/Route19.asm @@ -1,4 +1,4 @@ map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST connection north, FuchsiaCity, FUCHSIA_CITY, -5 - connection west, Route20, ROUTE_20, 18 + connection west, Route20, ROUTE_20, 12 end_map_header diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm index cc9ffbc7..9fabd201 100644 --- a/data/maps/headers/Route20.asm +++ b/data/maps/headers/Route20.asm @@ -1,4 +1,4 @@ map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST connection west, CinnabarIsland, CINNABAR_ISLAND, 0 - connection east, Route19, ROUTE_19, -18 + connection east, Route19, ROUTE_19, -12 end_map_header diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 10195040..1de5b57f 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -217,11 +217,11 @@ MonPartyData: nybble ICON_MON ; Gyaoon nybble ICON_MON ; Omega nybble ICON_MON ; Snorlax + nybble ICON_FAIRY ; Scream Tail + nybble ICON_BALL ; Sandy Shocks nybble ICON_SNAKE ; Dratini nybble ICON_SNAKE ; Dragonair nybble ICON_SNAKE ; Dragonite - nybble ICON_FAIRY ; Scream Tail - nybble ICON_BALL ; Sandy Shocks nybble ICON_BIRD ; Articuno nybble ICON_BIRD ; Articuno-G nybble ICON_BIRD ; Zapdos diff --git a/gfx/pokemon/back/blisseyb.png b/gfx/pokemon/back/blisseyb.png index 7068eb39..6f63aa52 100644 Binary files a/gfx/pokemon/back/blisseyb.png and b/gfx/pokemon/back/blisseyb.png differ diff --git a/gfx/pokemon/back/lickilickyb.png b/gfx/pokemon/back/lickilickyb.png index c1086ca0..09aad09a 100644 Binary files a/gfx/pokemon/back/lickilickyb.png and b/gfx/pokemon/back/lickilickyb.png differ diff --git a/gfx/pokemon/back/porygon2b.png b/gfx/pokemon/back/porygon2b.png index ebff7455..7f30c75e 100644 Binary files a/gfx/pokemon/back/porygon2b.png and b/gfx/pokemon/back/porygon2b.png differ diff --git a/gfx/pokemon/back/porygonzb.png b/gfx/pokemon/back/porygonzb.png index 1b082621..722e1f01 100644 Binary files a/gfx/pokemon/back/porygonzb.png and b/gfx/pokemon/back/porygonzb.png differ diff --git a/gfx/pokemon/front/blissey.png b/gfx/pokemon/front/blissey.png index cc60b014..7c3d7fbe 100644 Binary files a/gfx/pokemon/front/blissey.png and b/gfx/pokemon/front/blissey.png differ diff --git a/gfx/pokemon/front/lickilicky.png b/gfx/pokemon/front/lickilicky.png index be3d5d5c..40f419b0 100644 Binary files a/gfx/pokemon/front/lickilicky.png and b/gfx/pokemon/front/lickilicky.png differ diff --git a/gfx/pokemon/front/porygon2.png b/gfx/pokemon/front/porygon2.png index 5a74de81..8b094a7d 100644 Binary files a/gfx/pokemon/front/porygon2.png and b/gfx/pokemon/front/porygon2.png differ diff --git a/gfx/pokemon/front/porygonz.png b/gfx/pokemon/front/porygonz.png index 7054db81..297008a2 100644 Binary files a/gfx/pokemon/front/porygonz.png and b/gfx/pokemon/front/porygonz.png differ diff --git a/maps/Route19.blk b/maps/Route19.blk index 981b46ef..0bd469e7 100644 --- a/maps/Route19.blk +++ b/maps/Route19.blk @@ -1 +1 @@ -(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file +(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/text/CeladonUniversityOutside.asm b/text/CeladonUniversityOutside.asm index d71851b9..4be97a2b 100644 --- a/text/CeladonUniversityOutside.asm +++ b/text/CeladonUniversityOutside.asm @@ -24,12 +24,11 @@ _CeladonUniversityOutsideAfterBattleText1:: _CeladonUniversityOutsideYesNo2:: text "I've been working" line "on a digital" + cont "#MON." - para "on a digital" - line "#MON. Want to" - - para "help me test it" - line "for my thesis?" + para "Want to help me" + line "test it for my" + cont "thesis?" done diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm index d931fc6a..4dd4c7ed 100644 --- a/text/CeladonUniversityPokecenter.asm +++ b/text/CeladonUniversityPokecenter.asm @@ -1,11 +1,13 @@ _CeladonUniversityPokecenterText4:: - text "I think PORYGON" - line "should be" - cont "improved." - - para "We need more" + text "Thanks to recent" line "funding from" - cont "SILPH CO.!" + cont "SILPH CO., we" + cont "can upgrade" + cont "PORYGON now!" + + para "I wonder if" + line "we'll ever see" + cont "PORYGON3?" done