Mt. Moon Crater Guard

Guard is implemented.
This commit is contained in:
emaskyesmogon 2023-06-17 17:07:54 -06:00
parent 2a1173c7d6
commit 15be9046a7
6 changed files with 35 additions and 5 deletions

View file

@ -255,7 +255,7 @@ MapHSPointers:
dw RockTunnelB1FHS
dw GiovannisRoomHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square
dw MtMoonSquareHS ; Mt Moon Square
dw NoHS ; Mt Moon Square House
dw NoHS ; Celeste Hill Cave
dw NoHS ; Celeste Hill Outside
@ -431,7 +431,6 @@ MtMoonB2FHS:
db MT_MOON_B2F, $08, SHOW ; HS_MT_MOON_B2F_FOSSIL_2
db MT_MOON_B2F, $09, SHOW ; HS_MT_MOON_B2F_ITEM_1
db MT_MOON_B2F, $0A, SHOW ; HS_MT_MOON_B2F_ITEM_2
db MT_MOON_B2F, $0B, HIDE ; HS_MT_MOON_CRATER_GUARD
SSAnne2FHS:
db SS_ANNE_2F, $02, HIDE ; HS_SS_ANNE_2F_RIVAL
SSAnne1FRoomsHS:
@ -612,5 +611,7 @@ RockTunnelB1FHS:
db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX
db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER
db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING
MtMoonSquareHS:
db MT_MOON_SQUARE, $04, SHOW ; HS_MT_MOON_CRATER_GUARD
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

View file

@ -21,6 +21,5 @@ MtMoonB2F_Object:
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
object_event 35, 6, SPRITE_FOSSIL, STAY, NONE, 10, WING_FOSSIL
object_event 29, 8, SPRITE_SCIENTIST, STAY, NONE, 11, ; Crater Guard
def_warps_to MT_MOON_B2F

View file

@ -7,11 +7,12 @@ MtMoonSquare_Object:
warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 1
def_bg_events
bg_event 15, 5, 4 ; Sign
bg_event 15, 5, 5 ; Sign
def_object_events
object_event 7, 5, SPRITE_FAIRY, WALK, ANY_DIR, 1 ; person
object_event 5, 4, SPRITE_FAIRY, WALK, ANY_DIR, 2 ; person
object_event 4, 6, SPRITE_FAIRY, WALK, ANY_DIR, 3 ; person
object_event 22, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person
def_warps_to MT_MOON_SQUARE

View file

@ -5,6 +5,7 @@ MtMoonSquare_TextPointers:
dw MtMoonSquareClefairy
dw MtMoonSquareClefairy
dw MtMoonSquareClefairy
dw MtMoonSquareResearcher
dw MtMoonSquareSign
MtMoonSquareClefairy:
@ -14,9 +15,13 @@ MtMoonSquareClefairy:
call PlayCry
jp TextScriptEnd
MtMoonSquareResearcher:
text_far _MtMoonSquareText1
text_end
MtMoonSquareSign:
text "MT MOON SQUARE"
line "Please don't"
cont "litter. Put trash"
cont "where it belongs!"
done
done

View file

@ -294,6 +294,7 @@ INCLUDE "text/GarnetCavernB1F.asm"
INCLUDE "text/GarnetCavern2F.asm"
INCLUDE "text/GiovannisRoom.asm"
INCLUDE "text/CitrineCity.asm"
INCLUDE "text/MtMoonSquare.asm"
SECTION "Pokédex Text", ROMX

23
text/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,23 @@
_MtMoonSquareText1::
text "Our expedition"
line "team has been"
cont "researching the"
cont "#MON found in"
cont "MT. MOON CRATER."
para "They appear to be"
line "primitive and"
cont "very aggressive!"
para "...or at least"
line "that's what this"
cont "book I found in"
cont "the PEWTER MUSEUM"
cont "has to say."
para "Anyways, until our"
line "research is done,"
cont "only authorized"
cont "individuals may"
cont "enter the crater."
done