diff options
Diffstat (limited to 'maps/MountMoonSquare.asm')
| -rw-r--r-- | maps/MountMoonSquare.asm | 100 |
1 files changed, 40 insertions, 60 deletions
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index c4a64a986..111b1284b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,11 +1,11 @@ -MountMoonSquare_MapScriptHeader: ; 0x77086 - ; trigger count +MountMoonSquare_MapScriptHeader: +.MapTriggers: db 1 ; triggers dw UnknownScript_0x77092, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -13,29 +13,25 @@ MountMoonSquare_MapScriptHeader: ; 0x77086 dbw 5, UnknownScript_0x77093 dbw 2, UnknownScript_0x77097 -; 0x77092 -UnknownScript_0x77092: ; 0x77092 +UnknownScript_0x77092: end -; 0x77093 -UnknownScript_0x77093: ; 0x77093 - setevent $00ec +UnknownScript_0x77093: + setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE return -; 0x77097 -UnknownScript_0x77097: ; 0x77097 +UnknownScript_0x77097: disappear $4 return -; 0x7709a -UnknownScript_0x7709a: ; 0x7709a - checkflag $0058 - iftrue UnknownScript_0x77117 - checkcode $b - if_not_equal MONDAY, UnknownScript_0x77117 +UnknownScript_0x7709a: + checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY + iftrue .NoDancing + checkcode VAR_WEEKDAY + if_not_equal MONDAY, .NoDancing checknite - iffalse UnknownScript_0x77117 + iffalse .NoDancing appear $2 appear $3 applymovement $0, MovementData_0x77121 @@ -63,7 +59,7 @@ UnknownScript_0x7709a: ; 0x7709a stopfollow spriteface $2, DOWN pause 10 - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN cry CLEFAIRY pause 15 @@ -72,72 +68,59 @@ UnknownScript_0x7709a: ; 0x7709a disappear $2 disappear $3 stopfollow - clearevent $00ec - setflag $0058 + clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE + setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY end -; 0x77117 -UnknownScript_0x77117: ; 0x77117 +.NoDancing: end -; 0x77118 -MapMountMoonSquareSignpostItem0: ; 0x77118 - dw $00ec - db MOON_STONE +MapMountMoonSquareSignpostItem0: + dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE -; 0x7711b -MapMountMoonSquareSignpost1Script: ; 0x7711b +MapMountMoonSquareSignpost1Script: jumptext UnknownText_0x7713b -; 0x7711e MtMoonSquareRock: jumpstd smashrock -MovementData_0x77121: ; 0x77121 +MovementData_0x77121: step_up step_end -; 0x77123 -MovementData_0x77123: ; 0x77123 +MovementData_0x77123: slow_step_down slow_jump_step_down step_end -; 0x77126 -MovementData_0x77126: ; 0x77126 +MovementData_0x77126: slow_jump_step_right step_end -; 0x77128 -MovementData_0x77128: ; 0x77128 +MovementData_0x77128: slow_step_up slow_jump_step_up step_end -; 0x7712b -MovementData_0x7712b: ; 0x7712b +MovementData_0x7712b: slow_jump_step_left step_end -; 0x7712d -MovementData_0x7712d: ; 0x7712d +MovementData_0x7712d: slow_step_down slow_jump_step_down step_end -; 0x77130 -MovementData_0x77130: ; 0x77130 +MovementData_0x77130: slow_step_down step_end -; 0x77132 -MovementData_0x77132: ; 0x77132 +MovementData_0x77132: slow_step_right step_end -; 0x77134 -MovementData_0x77134: ; 0x77134 +MovementData_0x77134: step_right step_right step_right @@ -145,36 +128,33 @@ MovementData_0x77134: ; 0x77134 step_right step_right step_end -; 0x7713b -UnknownText_0x7713b: ; 0x7713b +UnknownText_0x7713b: text "MT.MOON SQUARE" line "DON'T LITTER" done -; 0x77158 -MountMoonSquare_MapEventHeader: ; 0x77158 +MountMoonSquare_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $14, 5, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $b, $16, 6, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $7, $d, 1, GROUP_MOUNT_MOON_GIFT_SHOP, MAP_MOUNT_MOON_GIFT_SHOP - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0 - ; signposts +.Signposts: db 2 - signpost 7, 7, $7, MapMountMoonSquareSignpostItem0 - signpost 7, 17, $0, MapMountMoonSquareSignpost1Script + signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 + signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, $0778 -; 0x771a6 + person_event SPRITE_FAIRY, 10, 10, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_FAIRY, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_ROCK, 11, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK |