diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm index 5aef3c46..aba0ac00 100644 --- a/data/maps/dungeon_maps.asm +++ b/data/maps/dungeon_maps.asm @@ -19,6 +19,7 @@ DungeonMaps1: db GARNET_CAVERN_2F db GARNET_CAVERN_1F db GARNET_CAVERN_B1F + db MT_MOON_CRATER db -1 ; end ; GetBattleTransitionID_IsDungeonMap checks if wCurMap diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index ec1e7565..19d5df00 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -11,9 +11,12 @@ MtMoonB1F_Object: warp_event 23, 3, MT_MOON_B2F, 4 warp_event 27, 3, ROUTE_4, 3 warp_event 1, 27, MT_MOON_B2F, 5 - warp_event 1, 9, MT_MOON_SQUARE, 1 + warp_event 1, 13, MT_MOON_SQUARE, 1 warp_event 1, 23, MT_MOON_SQUARE, 4 - warp_event 1, 13, MT_MOON_1F, 6 + warp_event 1, 17, MT_MOON_1F, 6 + warp_event 5, 27, MT_MOON_SQUARE, 2 + warp_event 1, 3, MT_MOON_CRATER, 1 + warp_event 1, 7, ROUTE_4, 4 def_bg_events diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm index 8afbe497..92f06219 100644 --- a/data/maps/objects/MtMoonCrater.asm +++ b/data/maps/objects/MtMoonCrater.asm @@ -2,14 +2,13 @@ MtMoonCrater_Object: db $03 ; border block def_warp_events - warp_event 23, 49, MT_MOON_SQUARE, 2 - warp_event 22, 49, MT_MOON_SQUARE, 2 + warp_event 46, 47, MT_MOON_B1F, 14 def_bg_events def_object_events object_event 33, 17, SPRITE_FOSSIL, STAY, NONE, 1, DOME_FOSSIL - object_event 31, 32, SPRITE_FOSSIL, STAY, NONE, 2, WING_FOSSIL + object_event 32, 32, SPRITE_FOSSIL, STAY, NONE, 2, WING_FOSSIL object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 3, HELIX_FOSSIL object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 4, MAX_ETHER diff --git a/data/maps/objects/MtMoonSquare.asm b/data/maps/objects/MtMoonSquare.asm index ce4550bc..5ab98ad3 100644 --- a/data/maps/objects/MtMoonSquare.asm +++ b/data/maps/objects/MtMoonSquare.asm @@ -3,7 +3,7 @@ MtMoonSquare_Object: def_warp_events warp_event 16, 3, MT_MOON_B1F, 10 - warp_event 22, 1, MT_MOON_CRATER, 1 + warp_event 22, 1, MT_MOON_B1F, 13 warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 1 warp_event 20, 9, MT_MOON_B1F, 11 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 343cc4d0..8b9a5049 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -5,6 +5,7 @@ Route4_Object: warp_event 11, 5, MT_MOON_POKECENTER, 1 warp_event 18, 5, MT_MOON_1F, 1 warp_event 24, 5, MT_MOON_B1F, 8 + warp_event 50, 1, MT_MOON_B1F, 15 def_bg_events bg_event 12, 5, 6 ; PokeCenterSignText diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index f5700d1a..4d06a495 100644 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -14,6 +14,7 @@ DungeonWarpList: db POKEMON_MANSION_1F, 1 db POKEMON_MANSION_1F, 2 db POKEMON_MANSION_2F, 3 + db MT_MOON_CRATER, 1 db -1 ; end @@ -36,6 +37,7 @@ DungeonWarpData: fly_warp POKEMON_MANSION_1F, 16, 14 fly_warp POKEMON_MANSION_1F, 16, 14 fly_warp POKEMON_MANSION_2F, 18, 14 + fly_warp MT_MOON_CRATER, 21, 46 MACRO special_warp_spec diff --git a/gfx/blocksets/cavern.bst b/gfx/blocksets/cavern.bst index e81fe737..66ba2ad5 100644 Binary files a/gfx/blocksets/cavern.bst and b/gfx/blocksets/cavern.bst differ diff --git a/maps/MtMoonB1F.blk b/maps/MtMoonB1F.blk index 88548eaf..1b97036d 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/MtMoonCrater.blk b/maps/MtMoonCrater.blk index 99589287..eacef248 100644 --- a/maps/MtMoonCrater.blk +++ b/maps/MtMoonCrater.blk @@ -1,5 +1,5 @@ AAAAAAAAAAAAAAAAAAAAAAAAAACEEEEEEEEEEEEEEEEEEEE?AAABbCF,5   DD?AABCF// - D@AABF9 ),@ACF,<=========>)@AB)@AK>@AAB)@CF$%,\QQQq@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%_@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CF€D?B@AB@AB 6DFF)DDF<==JAB@AB 5,DE?AAB @AB + D@AABF9 ),@ACF,<=========>)@AB)@AK>@AAB)@CF$%,\QQQQ@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%_@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CF€D?B@AB@AB 6DF)DF<==JAB@AB 5,DE?AAB @AB 6,DD?AB - D?K==========><>@AB,@D?AAAAAAAAAAB@K>@AB|DEDEEEEEEEEESFDGF=>@AB,.}},.@AAAAACF@AB,||)DEEEEEFF@AK=======>Y<=========== \ No newline at end of file + D?K============>@AB,@DE?AACEEE?AAC?K>@AB|DEFDEEFD?CFDGF>@AB,.}},.@ABDGEF.@AB,||)DEEF,g@AK======================A \ No newline at end of file diff --git a/maps/Route4.blk b/maps/Route4.blk index a9fb235b..834aa85b 100644 --- a/maps/Route4.blk +++ b/maps/Route4.blk @@ -1,8 +1,7 @@ -,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,) +,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,) X YY - -X +XY X X @@ -12,8 +11,7 @@ X 1111$WWWW,)|r$*+WWWW% Z/[Y - -X +Z[ X Zaaaaa,)()11 @@ -24,11 +22,10 @@ Zaaaaa,)()11 Y - X -Z/g,)()/[ -Z/o\kkkk,)() +Z/g,)()/[ +Z/o\kkkk,)() diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm index 06af2dd3..9c8cd112 100644 --- a/scripts/MtMoonB1F.asm +++ b/scripts/MtMoonB1F.asm @@ -1,6 +1,13 @@ MtMoonB1F_Script: call EnableAutoTextBoxDrawing - ret + ld a, MT_MOON_CRATER + ld [wDungeonWarpDestinationMap], a + ld hl, MtMoonHolesCoords + jp IsPlayerOnDungeonWarp + +MtMoonHolesCoords: + dbmapcoord 6, 23 + db -1 ; end MtMoonB1F_TextPointers: dw MtMoonText1