diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-06-15 14:08:24 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-06-15 14:08:24 -0400 |
| commit | e9b6a2fc6220cc047faef958528140454b8297fa (patch) | |
| tree | e7c3bae2583366743d93dc933a172618e94621ca /maps | |
| parent | 54bbefeed1b14e13fcf7850dea125d99a23c507b (diff) | |
Miscellaneous cleanups.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/EcruteakTinTowerEntrance.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 5356757e..49d99157 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -18,7 +18,7 @@ EcruteakTinTowerEntrance_MapScripts: end EcruteakTinTowerEntrance_CoordEvent1: - checkevent EVENT_RANG_CLEAR_BELL_2 + checkevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 @@ -28,7 +28,7 @@ EcruteakTinTowerEntrance_CoordEvent1: end EcruteakTinTowerEntrance_CoordEvent2: - checkevent EVENT_RANG_CLEAR_BELL_1 + checkevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 @@ -158,7 +158,7 @@ EcruteakTinTowerEntrance_MapEvents: db 0 ; bg events db 4 ; object events - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_1 - object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_2 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT + object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceWanderingSageScript, -1 object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, -1 |