diff options
Diffstat (limited to 'maps/TinTower5F.asm')
| -rw-r--r-- | maps/TinTower5F.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 95549a257..06e56eaf7 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,47 +1,40 @@ -TinTower5F_MapScriptHeader: ; 0x185aa7 - ; trigger count +TinTower5F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x185aa9 -ItemFragment_0x185aa9: ; 0x185aa9 +ItemFragment_0x185aa9: db RARE_CANDY, 1 -; 0x185aab -MapTinTower5FSignpostItem0: ; 0x185aab - dw $007e - db FULL_RESTORE +MapTinTower5FSignpostItem0: + dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE -; 0x185aae -MapTinTower5FSignpostItem1: ; 0x185aae - dw $007f - db CARBOS +MapTinTower5FSignpostItem1: + dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS -; 0x185ab1 -TinTower5F_MapEventHeader: ; 0x185ab1 +TinTower5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $f, $b, 2, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F warp_def $4, $2, 1, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $e, $2, 3, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $f, $11, 4, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 14, 16, $7, MapTinTower5FSignpostItem0 - signpost 15, 3, $7, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 + signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f -; 0x185ae2 + person_event SPRITE_POKE_BALL, 13, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY |