diff --git a/data/maps/names.asm b/data/maps/names.asm index 805c57c9..2599f0c4 100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm @@ -37,7 +37,7 @@ Route25Name: db "ROUTE 25@" ViridianForestName: db "VIRIDIAN FOREST@" MountMoonName: db "MT.MOON@" RockTunnelName: db "ROCK TUNNEL@" -SeaCottageName: db "SEA COTTAGE@" +SeaCottageName: db "BILL's LIGHTHOUSE@" SSAnneName: db "S.S.ANNE@" PokemonLeagueName: db "#MON LEAGUE@" UndergroundPathName: db "UNDERGROUND PATH@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 3bfedc76..6363967a 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -145,7 +145,7 @@ MonsterPalettes: db PAL_PINKMON ; CHANSEY db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; TANGELA - db PAL_BLUEMON ; TANGROWTH + db PAL_CYANMON ; TANGROWTH db PAL_GREENMON ; DECILLA db PAL_GREENMON ; GYAOON db PAL_GREYMON ; OMEGA diff --git a/gfx/player/red.png b/gfx/player/red.png index 9098fc76..dff68167 100644 Binary files a/gfx/player/red.png and b/gfx/player/red.png differ diff --git a/gfx/trainer_card/badges.png b/gfx/trainer_card/badges.png index 8b0fc516..46e7add3 100644 Binary files a/gfx/trainer_card/badges.png and b/gfx/trainer_card/badges.png differ diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png index fc8f2378..8b33e8b9 100644 Binary files a/gfx/trainers/brock.png and b/gfx/trainers/brock.png differ diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png index ea2e655a..a7fdd6bc 100644 Binary files a/gfx/trainers/misty.png and b/gfx/trainers/misty.png differ diff --git a/gfx/trainers/rival1.png b/gfx/trainers/rival1.png index 6b94fd27..4a0ba97c 100644 Binary files a/gfx/trainers/rival1.png and b/gfx/trainers/rival1.png differ diff --git a/gfx/trainers/rival2.png b/gfx/trainers/rival2.png index df9b2524..e8718589 100644 Binary files a/gfx/trainers/rival2.png and b/gfx/trainers/rival2.png differ diff --git a/gfx/trainers/rival3.png b/gfx/trainers/rival3.png index 5e6fc5ff..08e22813 100644 Binary files a/gfx/trainers/rival3.png and b/gfx/trainers/rival3.png differ diff --git a/maps/Route25.blk b/maps/Route25.blk index 49c98815..a928a9f8 100644 --- a/maps/Route25.blk +++ b/maps/Route25.blk @@ -1,19 +1,29 @@ -,,,,+WWWWWWWWWWWWWWWW%89$WWWW%WWWW%n +,,,,+WWWWWWWWWWWWWWWWWW%QQ$WW%WWWW%n n n -`ttttMwwV<=wwwRCC +`ttt +l6CCCd eCC LLL -nlnttntttttUUUU +nlnttnt -MCCLlL +nCCCduveCCLlL mln -ttottttttUUUU +ttottt -MCC11111ml +6CCdhieCC11111ml mL -ttmttttTTMCCQQQQQQQQQQQQQQQQQQQeCCTTCCdMCC?????????????????;RRRRRRRRROCC,,,,,,,,,,,,,,,,,)CC,,,,,,,,,,,,,,,,,)CCCCCCCCCCCC \ No newline at end of file +ttmtt + + + +l6-hi.CCQQQQQQQQQQQQQQQQQ +oooL +l|~eC??????????????????;m + +tt +eC,,,,,,,,,,,,,,,,,,)C-.C,,,,,,,,,,,,,,,,,,)kkkkkkkkkk \ No newline at end of file diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index d0884a39..53ef0355 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -144,9 +144,9 @@ _CeruleanCityText_19730:: done _CeruleanCityText_19735:: - text "SLOWBRO punch!" - line "No! You blew it" - cont "again!" + text "SLOWBRO, use MEGA" + line "PUNCH! No! You" + cont "blew it again!" done _CeruleanCityText_1973a:: @@ -191,16 +191,13 @@ _CeruleanCityText9:: cont "get dirty!" done -_CeruleanCityText10:: - text "This is CERULEAN" - line "CAVE! Horribly" - cont "strong #MON" - cont "live in there!" +_CeruleanCityText10:: ; changed to be more ambiguous just in case this script needs reusing + text "Hey! This is a" + line "restricted area." - para "The #MON LEAGUE" - line "champion is the" - cont "only person who" - cont "is allowed in!" + para "I'm sorry, but" + line "I cannot allow" + cont "you to enter." done _CeruleanCityText12:: diff --git a/text/Route25.asm b/text/Route25.asm index 325ab348..5ccc7019 100644 --- a/text/Route25.asm +++ b/text/Route25.asm @@ -118,8 +118,8 @@ _Route25AfterBattleText7:: _Route25BattleText8:: text "I'm off to see a" - line "#MON collector" - cont "at the cape!" + line "collector at" + cont "the lighthouse!" done _Route25EndBattleText8:: @@ -151,6 +151,5 @@ _Route25AfterBattleText9:: done _Route25Text11:: - text "SEA COTTAGE" - line "BILL lives here!" + text "BILL's LIGHTHOUSE" done