diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
| commit | 0add51451cda9d4221af137f83e2429d3577310c (patch) | |
| tree | fd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /maps/TimeCapsule.asm | |
| parent | da87d2a929b1d58175efe063833c124d8ba702c9 (diff) | |
| parent | 2a263629a40e201b1702e2f4e65f1c61360cc2b2 (diff) | |
Merge pull request #330 from PikalaxALT/scriptmacrorenaming
Scriptmacrorenaming
Diffstat (limited to 'maps/TimeCapsule.asm')
| -rw-r--r-- | maps/TimeCapsule.asm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3d9237d63..e543c352f 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,10 +1,14 @@ +const_value set 2 + const TIMECAPSULE_CHRIS1 + const TIMECAPSULE_CHRIS2 + TimeCapsule_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -13,23 +17,23 @@ TimeCapsule_MapScriptHeader: dbw 2, TimeCapsule_SetWhichChris -.Trigger1: +.Trigger0: priorityjump TimeCapsule_Initialize end -.Trigger2: +.Trigger1: end TimeCapsule_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear TIMECAPSULE_CHRIS2 + appear TIMECAPSULE_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear TIMECAPSULE_CHRIS1 + appear TIMECAPSULE_CHRIS2 return TimeCapsule_Initialize: @@ -43,10 +47,10 @@ MapTimeCapsuleSignpost1Script: end ChrisScript_0x19351a: - loadfont + opentext writetext UnknownText_0x193521 + waitbutton closetext - loadmovesprites end UnknownText_0x193521: |