diff options
Diffstat (limited to 'maps/OlivineCity.asm')
| -rw-r--r-- | maps/OlivineCity.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index a3d67a068..000049011 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -3,8 +3,8 @@ OlivineCity_MapScriptHeader: db 2 ; triggers - dw .Trigger1, $0000 - dw .Trigger2, $0000 + dw .Trigger1, NONE + dw .Trigger2, NONE .MapCallbacks: db 1 @@ -320,7 +320,7 @@ OlivineCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_SAILOR, 27, 26, $4, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 21, 17, $2, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 11, 10, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY + person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, 0, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x1a88a6, -1 + person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_02, 1, 1, -1, -1, 0, 0, 0, SailorScript_0x1a88ba, -1 + person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY |