diff options
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 30cf27d13..bbcbe9818 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,6 +12,7 @@ #include "constants/weather.h" #include "constants/heal_locations.h" #include "constants/vars.h" +#include "constants/metatile_labels.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -2548,18 +2549,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 playse SE_DOOR - setmetatile 6, 1, 836, 0 - setmetatile 6, 2, 837, 0 - setmetatile 0, 2, 734, 1 - setmetatile 1, 2, 733, 1 - setmetatile 2, 2, 734, 1 - setmetatile 3, 2, 733, 1 - setmetatile 4, 2, 734, 1 - setmetatile 8, 2, 733, 1 - setmetatile 9, 2, 734, 1 - setmetatile 10, 2, 733, 1 - setmetatile 11, 2, 734, 1 - setmetatile 12, 2, 733, 1 + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 special DrawWholeMapView return @@ -2570,12 +2571,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 playse SE_TRACK_DOOR - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 special DrawWholeMapView return @@ -2583,36 +2584,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757 - setmetatile 6, 1, 836, 0 - setmetatile 6, 2, 837, 0 - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 - setmetatile 0, 2, 734, 1 - setmetatile 1, 2, 733, 1 - setmetatile 2, 2, 734, 1 - setmetatile 3, 2, 733, 1 - setmetatile 4, 2, 734, 1 - setmetatile 8, 2, 733, 1 - setmetatile 9, 2, 734, 1 - setmetatile 10, 2, 733, 1 - setmetatile 11, 2, 734, 1 - setmetatile 12, 2, 733, 1 + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 return EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 return SlateportCity_Movement_1A0831:: @ 81A0831 |