diff --git a/data/pokemon/dex_entries/calflac.asm b/data/pokemon/dex_entries/calflac.asm index 503cc86..bdb3b2f 100644 --- a/data/pokemon/dex_entries/calflac.asm +++ b/data/pokemon/dex_entries/calflac.asm @@ -1,10 +1,10 @@ db "CALF@" ; species name - dw 404, 458 ; height, weight + dw 311, 350 ; height, weight - db "Formed when" - next "BIPULLA's two" - next "halves joined" + db "Both of BIPULLA's" + next "halves joined to" + next "become CALFLAC." - page "together. However," - next "they still strug-" - next "gle to cooperate.@" + page "However, its two" + next "brains struggle" + next "to cooperate.@" diff --git a/data/pokemon/dex_entries/stromen.asm b/data/pokemon/dex_entries/stromen.asm index 5eeae21..a9e838c 100644 --- a/data/pokemon/dex_entries/stromen.asm +++ b/data/pokemon/dex_entries/stromen.asm @@ -1,5 +1,5 @@ db "CURSE@" ; species name - dw 8, 19 ; height, weight + dw 100, 20 ; height, weight db "It lives quietly" next "in places no one" diff --git a/data/pokemon/dex_entries/terrados.asm b/data/pokemon/dex_entries/terrados.asm index a883611..51f7f80 100644 --- a/data/pokemon/dex_entries/terrados.asm +++ b/data/pokemon/dex_entries/terrados.asm @@ -3,8 +3,8 @@ db "It blindly tunnels" next "through the earth," - next "feasting on any," + next "crushing rocks in" - page "unfortunate GRAVELER" - next "or ONIX that it" - next "comes across.@" + page "its jaws. GRAVELER" + next "and ONIX are its" + next "favorite prey.@" diff --git a/gfx/pics.asm b/gfx/pics.asm index 9a0a7c3..9e13e73 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -742,18 +742,6 @@ TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" -; RBY/unused trainer Pics -ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz" -CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz" -EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz" -RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz" -TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz" -FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz" -TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz" -PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" -SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" -SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" - SECTION "Pics 20", ROMX @@ -1046,3 +1034,17 @@ ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz" ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz" ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz" ElderPic: INCBIN "gfx/trainers/elder.2bpp.lz" + +SECTION "Pics 26", ROMX + +; RBY/unused trainer Pics +ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz" +CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz" +EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz" +RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz" +TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz" +FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz" +TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz" +PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" +SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" +SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" diff --git a/gfx/pokemon/bipulla/shiny.pal b/gfx/pokemon/bipulla/shiny.pal index 7253e17..7e646f4 100644 --- a/gfx/pokemon/bipulla/shiny.pal +++ b/gfx/pokemon/bipulla/shiny.pal @@ -1,2 +1,2 @@ - RGB 16, 17, 30 - RGB 05, 07, 11 \ No newline at end of file + RGB 28, 00, 29 + RGB 16, 09, 28 \ No newline at end of file diff --git a/gfx/pokemon/calflac/back.png b/gfx/pokemon/calflac/back.png index c7216be..94f854e 100644 Binary files a/gfx/pokemon/calflac/back.png and b/gfx/pokemon/calflac/back.png differ diff --git a/gfx/pokemon/calflac/front.png b/gfx/pokemon/calflac/front.png index ae993b2..5ae97b5 100644 Binary files a/gfx/pokemon/calflac/front.png and b/gfx/pokemon/calflac/front.png differ diff --git a/gfx/pokemon/calflac/shiny.pal b/gfx/pokemon/calflac/shiny.pal index 5c88669..b25726e 100644 --- a/gfx/pokemon/calflac/shiny.pal +++ b/gfx/pokemon/calflac/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 19, 00 + RGB 16, 09, 28 + diff --git a/gfx/pokemon/folage/back.png b/gfx/pokemon/folage/back.png index 311e1e9..f2aa059 100644 Binary files a/gfx/pokemon/folage/back.png and b/gfx/pokemon/folage/back.png differ diff --git a/gfx/pokemon/munchlax/back.png b/gfx/pokemon/munchlax/back.png index 0600d59..6fa3309 100644 Binary files a/gfx/pokemon/munchlax/back.png and b/gfx/pokemon/munchlax/back.png differ diff --git a/gfx/pokemon/munchlax/front.png b/gfx/pokemon/munchlax/front.png index 51f3950..d26f77a 100644 Binary files a/gfx/pokemon/munchlax/front.png and b/gfx/pokemon/munchlax/front.png differ diff --git a/gfx/pokemon/munchlax/shiny.pal b/gfx/pokemon/munchlax/shiny.pal index 5c88669..9a3ed5d 100644 --- a/gfx/pokemon/munchlax/shiny.pal +++ b/gfx/pokemon/munchlax/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 27, 22, 11 + RGB 09, 07, 31 + diff --git a/gfx/pokemon/stromen/back.png b/gfx/pokemon/stromen/back.png index 7ba5c3c..2fd9a48 100644 Binary files a/gfx/pokemon/stromen/back.png and b/gfx/pokemon/stromen/back.png differ diff --git a/gfx/pokemon/terrados/front.png b/gfx/pokemon/terrados/front.png index 7b758b2..c8ec4dd 100644 Binary files a/gfx/pokemon/terrados/front.png and b/gfx/pokemon/terrados/front.png differ diff --git a/gfx/pokemon/terrados/shiny.pal b/gfx/pokemon/terrados/shiny.pal index 5c88669..d059972 100644 --- a/gfx/pokemon/terrados/shiny.pal +++ b/gfx/pokemon/terrados/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 25, 20, 08 + RGB 27, 10, 05 + diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png index 5ba63b6..6303a7c 100644 Binary files a/gfx/trainers/blaine.png and b/gfx/trainers/blaine.png differ diff --git a/gfx/trainers/channeler.png b/gfx/trainers/channeler.png index 3fd174a..9b4b50a 100644 Binary files a/gfx/trainers/channeler.png and b/gfx/trainers/channeler.png differ diff --git a/gfx/trainers/cue_ball.png b/gfx/trainers/cue_ball.png index 6d3ae76..fbc7add 100644 Binary files a/gfx/trainers/cue_ball.png and b/gfx/trainers/cue_ball.png differ diff --git a/gfx/trainers/firefighter.png b/gfx/trainers/firefighter.png index f0a3617..803f4f3 100644 Binary files a/gfx/trainers/firefighter.png and b/gfx/trainers/firefighter.png differ diff --git a/gfx/trainers/rocker.png b/gfx/trainers/rocker.png index 70ecf4e..608341b 100644 Binary files a/gfx/trainers/rocker.png and b/gfx/trainers/rocker.png differ diff --git a/gfx/trainers/tamer.png b/gfx/trainers/tamer.png index 14fe7a5..d15db3b 100644 Binary files a/gfx/trainers/tamer.png and b/gfx/trainers/tamer.png differ