diff options
Diffstat (limited to 'maps/RockTunnel1F.asm')
-rw-r--r-- | maps/RockTunnel1F.asm | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 7e4af31bf..3eeeb7a18 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,36 +1,29 @@ -RockTunnel1F_MapScriptHeader: ; 0x743b3 - ; trigger count +RockTunnel1F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x743b5 -ItemFragment_0x743b5: ; 0x743b5 +ItemFragment_0x743b5: db ELIXER, 1 -; 0x743b7 -ItemFragment_0x743b7: ; 0x743b7 - db TM_47, 1 -; 0x743b9 +ItemFragment_0x743b7: + db TM_STEEL_WING, 1 -MapRockTunnel1FSignpostItem0: ; 0x743b9 - dw $00e7 - db X_ACCURACY +MapRockTunnel1FSignpostItem0: + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY -; 0x743bc -MapRockTunnel1FSignpostItem1: ; 0x743bc - dw $00e8 - db X_DEFEND +MapRockTunnel1FSignpostItem1: + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND -; 0x743bf -RockTunnel1F_MapEventHeader: ; 0x743bf +RockTunnel1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $3, $f, 1, GROUP_ROUTE_9, MAP_ROUTE_9 warp_def $19, $b, 1, GROUP_ROUTE_10_SOUTH, MAP_ROUTE_10_SOUTH @@ -39,16 +32,15 @@ RockTunnel1F_MapEventHeader: ; 0x743bf warp_def $3, $1b, 4, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F warp_def $d, $1b, 1, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 24, $7, MapRockTunnel1FSignpostItem0 - signpost 15, 21, $7, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 + signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f -; 0x74407 + person_event SPRITE_POKE_BALL, 22, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER + person_event SPRITE_POKE_BALL, 19, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING |