diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/EcruteakTinTowerEntrance.asm | 22 | ||||
| -rw-r--r-- | maps/IlexForest.asm | 12 | ||||
| -rw-r--r-- | maps/Route34IlexForestGate.asm | 8 | ||||
| -rw-r--r-- | maps/TinTower1F.asm | 60 | ||||
| -rw-r--r-- | maps/WiseTriosRoom.asm | 12 |
5 files changed, 57 insertions, 57 deletions
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 2dc64249c..5d67a6b74 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -41,27 +41,27 @@ EcruteakTinTowerEntrance_MapScripts: clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE endcallback -EcruteakTinTowerEntrance_CoordEvent1: +EcruteakTinTowerEntranceSageBlocksLeft: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove - applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + iftrue EcruteakTinTowerEntranceAlreadyBlocked + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, EcruteakTinTowerEntranceSageBlocksLeftMovement moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 appear ECRUTEAKTINTOWERENTRANCE_SAGE1 pause 5 disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 end -EcruteakTinTowerEntrance_CoordEvent2: +EcruteakTinTowerEntranceSageBlocksRight: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove - applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + iftrue EcruteakTinTowerEntranceAlreadyBlocked + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, EcruteakTinTowerEntranceSageBlocksRightMovement moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 appear ECRUTEAKTINTOWERENTRANCE_SAGE2 pause 5 disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakTinTowerEntrance_CoordEvent_DontMove: +EcruteakTinTowerEntranceAlreadyBlocked: end EcruteakTinTowerEntranceSageScript: @@ -135,14 +135,14 @@ EcruteakTinTowerEntranceWanderingSageScript: EcruteakTinTowerEntranceGrampsScript: jumptextfaceplayer EcruteakTinTowerEntranceGrampsText -MovementData_0x980c7: +EcruteakTinTowerEntranceSageBlocksLeftMovement: fix_facing big_step LEFT remove_fixed_facing turn_head DOWN step_end -MovementData_0x980cc: +EcruteakTinTowerEntranceSageBlocksRightMovement: fix_facing big_step RIGHT remove_fixed_facing @@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents: warp_event 17, 3, WISE_TRIOS_ROOM, 3 def_coord_events - coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 - coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 + coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksLeft + coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksRight def_bg_events diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 03a721af3..19109bf7e 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -457,7 +457,7 @@ IlexForestShrineScript: pause 20 showemote EMOTE_SHOCK, PLAYER, 20 special FadeOutMusic - applymovement PLAYER, MovementData_0x6ef58 + applymovement PLAYER, IlexForestPlayerStepsDownMovement pause 30 turnobject PLAYER, DOWN pause 20 @@ -470,12 +470,12 @@ IlexForestShrineScript: special CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT - applymovement ILEXFOREST_KURT, MovementData_0x6ef4e + applymovement ILEXFOREST_KURT, IlexForestKurtStepsUpMovement opentext writetext Text_KurtCaughtCelebi waitbutton closetext - applymovement ILEXFOREST_KURT, MovementData_0x6ef53 + applymovement ILEXFOREST_KURT, IlexFOrestKurtStepsDownMovement disappear ILEXFOREST_KURT .DidntCatchCelebi: end @@ -715,21 +715,21 @@ MovementData_Farfetched_Pos9_Pos8_Down: big_step UP step_end -MovementData_0x6ef4e: +IlexForestKurtStepsUpMovement: step UP step UP step UP step UP step_end -MovementData_0x6ef53: +IlexFOrestKurtStepsDownMovement: step DOWN step DOWN step DOWN step DOWN step_end -MovementData_0x6ef58: +IlexForestPlayerStepsDownMovement: fix_facing slow_step DOWN remove_fixed_facing diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 6c84c5646..398c0415b 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -29,14 +29,14 @@ Route34IlexForestGateCelebiEvent: turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT turnobject PLAYER, RIGHT follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2 - applymovement PLAYER, MovementData_0x62d97 + applymovement PLAYER, Route34IlexForestGateTeacherBlocksPlayerMovement stopfollow turnobject PLAYER, DOWN opentext writetext Route34IlexForestGateTeacher_ForestIsRestless waitbutton closetext - applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a + applymovement ROUTE34ILEXFORESTGATE_TEACHER2, Route34IlexForestGateTeacherReturnsMovement .skip: end @@ -76,12 +76,12 @@ Route34IlexForestGateButterfreeScript: Route34IlexForestGateLassScript: jumptextfaceplayer Route34IlexForestGateLassText -MovementData_0x62d97: +Route34IlexForestGateTeacherBlocksPlayerMovement: step UP step UP step_end -MovementData_0x62d9a: +Route34IlexForestGateTeacherReturnsMovement: step DOWN step RIGHT step_end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5a2ef43d6..5ea9b3f7c 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -82,17 +82,17 @@ TinTower1F_MapScripts: endcallback .SuicuneBattle: - applymovement PLAYER, TinTowerPlayerMovement1 + applymovement PLAYER, TinTower1FPlayerEntersMovement pause 15 setval RAIKOU special MonCheck iftrue .Next1 ; if player caught Raikou, it doesn't appear in Tin Tower - applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 + applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouApproachesMovement turnobject PLAYER, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM - applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement2 + applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouLeavesMovement disappear TINTOWER1F_RAIKOU playsound SFX_EXIT_BUILDING waitsfx @@ -100,20 +100,20 @@ TinTower1F_MapScripts: setval ENTEI special MonCheck iftrue .Next2 ; if player caught Entei, it doesn't appear in Tin Tower - applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 + applymovement TINTOWER1F_ENTEI, TinTower1FEnteiApproachesMovement turnobject PLAYER, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM - applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement2 + applymovement TINTOWER1F_ENTEI, TinTower1FEnteiLeavesMovement disappear TINTOWER1F_ENTEI playsound SFX_EXIT_BUILDING waitsfx .Next2: turnobject PLAYER, UP pause 10 - applymovement PLAYER, TinTowerPlayerMovement2 - applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement + applymovement PLAYER, TinTower1FPlayerBacksUpMovement + applymovement TINTOWER1F_SUICUNE, TinTower1FSuicuneApproachesMovement cry SUICUNE pause 20 loadwildmon SUICUNE, 40 @@ -137,28 +137,28 @@ TinTower1F_MapScripts: playsound SFX_ENTER_DOOR moveobject TINTOWER1F_EUSINE, 10, 15 appear TINTOWER1F_EUSINE - applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec + applymovement TINTOWER1F_EUSINE, TinTower1FEusineEntersMovement playsound SFX_ENTER_DOOR moveobject TINTOWER1F_SAGE1, 9, 15 appear TINTOWER1F_SAGE1 - applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 + applymovement TINTOWER1F_SAGE1, TinTower1FSage1EntersMovement playsound SFX_ENTER_DOOR moveobject TINTOWER1F_SAGE2, 9, 15 appear TINTOWER1F_SAGE2 - applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb + applymovement TINTOWER1F_SAGE2, TinTower1FSage2EntersMovement playsound SFX_ENTER_DOOR moveobject TINTOWER1F_SAGE3, 9, 15 appear TINTOWER1F_SAGE3 - applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe + applymovement TINTOWER1F_SAGE3, TinTower1FSage3EntersMovement moveobject TINTOWER1F_SAGE1, 7, 13 moveobject TINTOWER1F_SAGE2, 9, 13 moveobject TINTOWER1F_SAGE3, 11, 13 turnobject PLAYER, RIGHT opentext - writetext TinTowerEusineSuicuneText + writetext TinTower1FEusineSuicuneText waitbutton closetext - applymovement TINTOWER1F_EUSINE, MovementData_0x1851f1 + applymovement TINTOWER1F_EUSINE, TinTower1FEusineLeavesMovement playsound SFX_EXIT_BUILDING disappear TINTOWER1F_EUSINE waitsfx @@ -224,23 +224,23 @@ TinTower1FSage6Script: .FoughtHoOh: jumptextfaceplayer TinTower1FSage6Text2 -TinTowerEusine: - jumptextfaceplayer TinTowerEusineHoOhText +TinTower1FEusine: + jumptextfaceplayer TinTower1FEusineHoOhText -TinTowerPlayerMovement1: +TinTower1FPlayerEntersMovement: slow_step UP slow_step UP slow_step UP slow_step UP step_end -TinTowerRaikouMovement1: +TinTower1FRaikouApproachesMovement: set_sliding fast_jump_step DOWN remove_sliding step_end -TinTowerRaikouMovement2: +TinTower1FRaikouLeavesMovement: set_sliding fast_jump_step DOWN fast_jump_step RIGHT @@ -248,13 +248,13 @@ TinTowerRaikouMovement2: remove_sliding step_end -TinTowerEnteiMovement1: +TinTower1FEnteiApproachesMovement: set_sliding fast_jump_step DOWN remove_sliding step_end -TinTowerEnteiMovement2: +TinTower1FEnteiLeavesMovement: set_sliding fast_jump_step DOWN fast_jump_step LEFT @@ -262,32 +262,32 @@ TinTowerEnteiMovement2: remove_sliding step_end -TinTowerSuicuneMovement: +TinTower1FSuicuneApproachesMovement: set_sliding fast_jump_step DOWN remove_sliding step_end -TinTowerPlayerMovement2: +TinTower1FPlayerBacksUpMovement: fix_facing big_step DOWN remove_fixed_facing step_end -MovementData_0x1851ec: +TinTower1FEusineEntersMovement: step UP step UP step UP turn_head LEFT step_end -MovementData_0x1851f1: +TinTower1FEusineLeavesMovement: step DOWN step DOWN step DOWN step_end -MovementData_0x1851f5: +TinTower1FSage1EntersMovement: step UP step UP step LEFT @@ -295,19 +295,19 @@ MovementData_0x1851f5: turn_head UP step_end -MovementData_0x1851fb: +TinTower1FSage2EntersMovement: step UP step UP step_end -MovementData_0x1851fe: +TinTower1FSage3EntersMovement: step UP step RIGHT step RIGHT step UP step_end -TinTowerEusineSuicuneText: +TinTower1FEusineSuicuneText: text "EUSINE: Awesome!" line "Too awesome, even!" @@ -440,7 +440,7 @@ TinTower1FSage6Text1: cont "and advance." done -TinTowerEusineHoOhText: +TinTower1FEusineHoOhText: text "I knew it." para "I knew you'd get" @@ -536,7 +536,7 @@ TinTower1F_MapEvents: object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTower1FEusine, EVENT_TIN_TOWER_1F_EUSINE object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 31022587d..69ae58e2b 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -55,14 +55,14 @@ WiseTriosRoom_CannotEnterTinTowerScript: turnobject PLAYER, DOWN showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 follow PLAYER, WISETRIOSROOM_SAGE3 - applymovement PLAYER, MovementData_0x98622 + applymovement PLAYER, WiseTriosRoomSageBlocksPlayerMovement stopfollow turnobject PLAYER, RIGHT opentext writetext WiseTriosRoomSage3BlocksExitText waitbutton closetext - applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 + applymovement WISETRIOSROOM_SAGE3, WiseTriosRoomSageReturnsMovement turnobject WISETRIOSROOM_SAGE3, LEFT end @@ -100,7 +100,7 @@ TrainerSageKoji: writetext SageKojiAfterBattleSpeechText waitbutton closetext - applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 + applymovement WISETRIOSROOM_SAGE6, WiseTriosRoomSageAllowsPassageMovement turnobject WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER setscene SCENE_FINISHED @@ -113,17 +113,17 @@ TrainerSageKoji: closetext end -MovementData_0x98622: +WiseTriosRoomSageBlocksPlayerMovement: step LEFT step LEFT step_end -MovementData_0x98625: +WiseTriosRoomSageReturnsMovement: step RIGHT step DOWN step_end -MovementData_0x98628: +WiseTriosRoomSageAllowsPassageMovement: step RIGHT step DOWN step_end |