diff options
Diffstat (limited to 'maps/BattleTowerOutside.asm')
| -rw-r--r-- | maps/BattleTowerOutside.asm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index eeb4bf93b..9cf15d915 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,13 +5,11 @@ const_value set 2 const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_OBJECTS, .Callback2 @@ -139,16 +137,16 @@ BattleTowerOutside_MapEventHeader: warp_def $9, $8, 1, BATTLE_TOWER_1F warp_def $9, $9, 2, BATTLE_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script + bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 - person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 |