Mt. Moon Crater improvements

- Made the warp down to the crater an actual hole instead of a cave entrance

- Added a path below the water section to prevent softlocks
This commit is contained in:
Martha Schilling 2023-12-21 11:33:16 +00:00
parent 43de80f43c
commit e3b924a0ed
5 changed files with 41 additions and 6 deletions

View file

@ -1,5 +1,5 @@
MtMoonCrater_Object:
db $03 ; border block
db $41 ; border block
def_warp_events
warp_event 46, 47, MT_MOON_B1F, 14

Binary file not shown.

View file

@ -1,5 +1,5 @@
AAAAAAAAAAAAAAAAAAAAAAAAAACEEEEEEEEEEEEEEEEEEEE?AAABbCF,5 
 DD?AABCF//
 D@AABF9 ),@ACF,<=========>)@AB<JCEEE?AAAAK>)@AK><JCF}}DEEEE?K>@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
 D@AABF9 ),@ACF,<=========>)@AB<JCEEE?AAAAK>)@AK><JCF}}DEEEE?K>@AAB)@CF$%,\QQQQ@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%<12>@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,@DE?AACEEE?AAC?K>@AB|DEFDEEFD?CFDGF>@AB,.}},.@ABDGEF.@AB,||)DEEF,g@AK======================A

View file

@ -2024,7 +2024,8 @@ wCeruleanCityCurScript:: db
wCelesteHillOutsideCurScript:: db
wCelesteHillCaveCurScript:: db
wBrunswickGladeCurScript:: db
ds 2
wMtMoonB1FCurScript:: db
ds 1
wSSAnneBowCurScript:: db
wViridianForestCurScript:: db
wMuseum1FCurScript:: db

View file

@ -1,14 +1,48 @@
MtMoonB1F_Script:
call EnableAutoTextBoxDrawing
ld de, MtMoonB1F_ScriptPointers
ld a, [wMtMoonB1FCurScript]
call ExecuteCurMapScriptInTable
ld [wMtMoonB1FCurScript], a
ret
MtMoonB1F_ScriptPointers:
dw MtMoonB1FScript0
MtMoonB1FScript0:
ld hl, CoordsData_Crater
call MtMoonB1FScript_5225b
ld a, [wWhichDungeonWarp]
and a
ld a, MT_MOON_CRATER
ld [wDungeonWarpDestinationMap], a
ld hl, MtMoonHolesCoords
jp IsPlayerOnDungeonWarp
ret
MtMoonHolesCoords:
CoordsData_Crater:
dbmapcoord 6, 23
db -1 ; end
MtMoonB1FScript_5225b:
xor a
ld [wWhichDungeonWarp], a
ld a, [wd72d]
bit 4, a
ret nz
call ArePlayerCoordsInArray
ret nc
ld a, [wCoordIndex]
ld [wWhichDungeonWarp], a
ld hl, wd72d
set 4, [hl]
ld hl, wd732
set 4, [hl]
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_AREA_ZERO
call PlayMusic
ret
MtMoonB1F_TextPointers:
dw MtMoonText1