diff options
Diffstat (limited to 'maps/WiseTriosRoom.asm')
| -rw-r--r-- | maps/WiseTriosRoom.asm | 73 |
1 files changed, 33 insertions, 40 deletions
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ef30655c2..46dc964f2 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3 @@ -7,13 +7,11 @@ const_value set 2 const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: @@ -53,23 +51,23 @@ WiseTriosRoomSage3Script: jumptextfaceplayer WiseTriosRoomSage3Text UnknownScript_0x985a3: - spriteface WISETRIOSROOM_SAGE3, UP - spriteface PLAYER, DOWN + objectface WISETRIOSROOM_SAGE3, UP + objectface PLAYER, DOWN showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 follow PLAYER, WISETRIOSROOM_SAGE3 applymovement PLAYER, MovementData_0x98622 stopfollow - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext UnknownText_0x98712 waitbutton closetext applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 - spriteface WISETRIOSROOM_SAGE3, LEFT + objectface WISETRIOSROOM_SAGE3, LEFT end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script + trainer SAGE, GAKU, EVENT_BEAT_SAGE_GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script .Script: opentext @@ -79,7 +77,7 @@ TrainerSageGaku: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script + trainer SAGE, MASA, EVENT_BEAT_SAGE_MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script .Script: opentext @@ -89,7 +87,7 @@ TrainerSageMasa: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script + trainer SAGE, KOJI, EVENT_BEAT_SAGE_KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script .Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER @@ -103,9 +101,9 @@ TrainerSageKoji: waitbutton closetext applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 - spriteface WISETRIOSROOM_SAGE6, UP + objectface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - setscene 1 + setscene SCENE_FINISHED end UnknownScript_0x9861b: @@ -345,27 +343,22 @@ UnknownText_0x98db5: done WiseTriosRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 7, 4, 4, ECRUTEAK_CITY - warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_HOUSE - -.CoordEvents: - db 1 - coord_event 7, 4, 0, UnknownScript_0x985a3 - -.BGEvents: - db 0 - -.ObjectEvents: - db 6 - object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 7, 4, ECRUTEAK_CITY, 4 + warp_event 7, 5, ECRUTEAK_CITY, 5 + warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 + + db 1 ; coord events + coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3 + + db 0 ; bg events + + db 6 ; object events + object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 |