diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
| commit | 1c1fe276ca59726bb0008c60006c6b48cd093573 (patch) | |
| tree | 817fb9c92dd798e89a891c3924bda3df955344e0 /maps/TimeCapsule.asm | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
| parent | 2faa4a0f70edd91bde908139b3fd5b6b5aebf017 (diff) | |
Merge pull request #324 from PikalaxALT/master
Movement and map objects
Diffstat (limited to 'maps/TimeCapsule.asm')
| -rw-r--r-- | maps/TimeCapsule.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c568f3f3a..32d52bb77 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,8 +3,8 @@ TimeCapsule_MapScriptHeader: db 2 ; triggers - dw .Trigger1, $0000 - dw .Trigger2, $0000 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT |