diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index a989a295..495fb5ab 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -10,6 +10,8 @@ MtMoonB1F_Object: warp_event 13, 27, MT_MOON_B2F, 3 warp_event 23, 3, MT_MOON_B2F, 4 warp_event 27, 3, LAST_MAP, 3 + warp_event 1, 27, MT_MOON_B2F, 5 + warp_event 1, 23, MT_MOON_CRATER, 1 def_bg_events diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db88..c49171d2 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -6,6 +6,7 @@ MtMoonB2F_Object: warp_event 21, 17, MT_MOON_B1F, 5 warp_event 15, 27, MT_MOON_B1F, 6 warp_event 5, 7, MT_MOON_B1F, 7 + warp_event 29, 7, MT_MOON_B1F, 9 def_bg_events @@ -13,11 +14,11 @@ MtMoonB2F_Object: object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1 object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 - object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 + object_event 34, 25, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP - object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH + object_event 21, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm index 350d5990..71c66d43 100644 --- a/data/maps/objects/MtMoonCrater.asm +++ b/data/maps/objects/MtMoonCrater.asm @@ -2,8 +2,8 @@ MtMoonCrater_Object: db $0 ; border block def_warp_events - warp_event 23, 49, 0, LAST_MAP - warp_event 22, 49, 0, LAST_MAP + warp_event 23, 49, 10, LAST_MAP + warp_event 22, 49, 10, LAST_MAP def_bg_events diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 7fa47e1c..b844f151 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -751,13 +751,13 @@ _KabutopsDexEntry:: ; new entry dex _HorseaDexEntry:: ; new entry - text "When endangered," - next "it spits black" - next "ink. In spring," + text "Spits black ink" + next "when threatened." + next "It lays thousands" - page "it lays thousands" - next "of eggs, but many" - next "of them are eaten" + page "of eggs in spring" + next "but many are" + next "eaten by GOLDEEN" dex _SeadraDexEntry:: diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 1bfdf219..bcc2ffb8 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -748,6 +748,36 @@ _MelmetalDexEntry:: next "iron from nothing" dex +_SirfetchdDexEntry:: + text "FARFETCH'D that" + next "wield huge leeks" + next "evolve into this" + + page "form. It guards" + next "attacks using" + next "its leaf shield" + dex + +_MrRimeDexEntry:: + text "As it tap-dances" + next "around, it waves" + next "its icy cane in" + + page "perfect time," + next "conjuring potent" + next "psychic energy" + dex + +_PerrserkerDexEntry:: + text "A savage #MON" + next "with a body of" + next "iron. It uses its" + + page "dagger-like claws" + next "to tear into" + next "foes in battle" + dex + _ArticunoGDexEntry:: text "From its eyes," next "it fires beams" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 877b0bfc..48e6ad90 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -174,7 +174,7 @@ MonsterPalettes: db PAL_GREYMON ; RHYDON db PAL_BROWNMON ; RHYPERIOR db PAL_GREENMON ; SCYTHER - db PAL_GREENMON ; SCIZOR + db PAL_REDMON ; SCIZOR db PAL_BROWNMON ; KLEAVOR db PAL_BROWNMON ; PINSIR db PAL_BROWNMON ; PURAKKUSU diff --git a/gfx/pokemon/back/meltanb.png b/gfx/pokemon/back/meltanb.png new file mode 100644 index 00000000..efdad8d1 Binary files /dev/null and b/gfx/pokemon/back/meltanb.png differ diff --git a/gfx/pokemon/back/mr.rimeb.png b/gfx/pokemon/back/mr.rimeb.png new file mode 100644 index 00000000..0e698988 Binary files /dev/null and b/gfx/pokemon/back/mr.rimeb.png differ diff --git a/gfx/pokemon/back/scizorb.png b/gfx/pokemon/back/scizorb.png index 91ebfc85..639b18a1 100644 Binary files a/gfx/pokemon/back/scizorb.png and b/gfx/pokemon/back/scizorb.png differ diff --git a/gfx/pokemon/back/sirfetchdb.png b/gfx/pokemon/back/sirfetchdb.png new file mode 100644 index 00000000..f9c88c00 Binary files /dev/null and b/gfx/pokemon/back/sirfetchdb.png differ diff --git a/gfx/pokemon/front/melmetal.png b/gfx/pokemon/front/melmetal.png new file mode 100644 index 00000000..9285935b Binary files /dev/null and b/gfx/pokemon/front/melmetal.png differ diff --git a/gfx/pokemon/front/meltan.png b/gfx/pokemon/front/meltan.png new file mode 100644 index 00000000..712d64a1 Binary files /dev/null and b/gfx/pokemon/front/meltan.png differ diff --git a/gfx/pokemon/front/mr.rime.png b/gfx/pokemon/front/mr.rime.png new file mode 100644 index 00000000..e021e976 Binary files /dev/null and b/gfx/pokemon/front/mr.rime.png differ diff --git a/gfx/pokemon/front/scizor.png b/gfx/pokemon/front/scizor.png index 119f49f5..a6cdfea1 100644 Binary files a/gfx/pokemon/front/scizor.png and b/gfx/pokemon/front/scizor.png differ diff --git a/gfx/pokemon/front/sirfetchd.png b/gfx/pokemon/front/sirfetchd.png new file mode 100644 index 00000000..e08bf848 Binary files /dev/null and b/gfx/pokemon/front/sirfetchd.png differ diff --git a/maps/MtMoonB1F.blk b/maps/MtMoonB1F.blk index ee1aa030..e9eede3d 100644 --- a/maps/MtMoonB1F.blk +++ b/maps/MtMoonB1F.blk @@ -1 +1 @@ -??????<==??????=<?????????=<???????< \ No newline at end of file +??????<==??????=<?????????=<??<???????<< \ No newline at end of file diff --git a/maps/MtMoonB2F.blk b/maps/MtMoonB2F.blk index 216fe705..c0ae79d0 100644 --- a/maps/MtMoonB2F.blk +++ b/maps/MtMoonB2F.blk @@ -1 +1 @@ -..................//......../fED/AB.@AB../=/)/333)+/> .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file +..................//......../fED/AB.@AB../=/=/333)+/>- .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk index 18908b8b..ec8f76c8 100644 Binary files a/maps/MtMoonCrater.blk and b/maps/MtMoonCrater.blk differ