Unify directional movement macros

This commit is contained in:
pikalaxalt
2016-05-14 13:46:14 -04:00
parent 3108c9fa6a
commit 1fa6aecbfc
95 changed files with 1914 additions and 2093 deletions

View File

@@ -219,36 +219,36 @@ AzaleaTownHiddenFullHeal:
AzaleaTownRivalBattleApproachMovement1:
step_left
step_left
step_left
step_left
step_left
step_left
turn_head_up
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
turn_head UP
step_end
AzaleaTownRivalBattleApproachMovement2:
step_left
step_left
step_left
step_left
step_left
step_left
turn_head_down
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
turn_head DOWN
step_end
AzaleaTownRivalBattleExitMovement:
step_left
step_left
step_left
step LEFT
step LEFT
step LEFT
step_end
Movement_PlayerWalksOutOfKurtsHouse:
step_left
step_left
step_up
turn_head_left
step LEFT
step LEFT
step UP
turn_head LEFT
step_end
AzaleaTownRivalBeforeText:

View File

@@ -268,87 +268,87 @@ GrannyScript_0x9e56e:
jumptextfaceplayer Text_BattleTowerGranny
MovementData_BattleTower1FWalkToElevator:
step_up
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step UP
MovementData_BattleTowerHallwayPlayerEntersBattleRoom:
step_up
step UP
step_end
MovementData_BattleTowerElevatorExitElevator:
step_down
step DOWN
step_end
MovementData_BattleTowerHallwayWalkTo1020Room:
step_right
step_right
step RIGHT
step RIGHT
MovementData_BattleTowerHallwayWalkTo3040Room:
step_right
step_right
step_up
step_right
turn_head_left
step RIGHT
step RIGHT
step UP
step RIGHT
turn_head LEFT
step_end
MovementData_BattleTowerHallwayWalkTo90100Room:
step_left
step_left
step LEFT
step LEFT
MovementData_BattleTowerHallwayWalkTo7080Room:
step_left
step_left
step LEFT
step LEFT
MovementData_BattleTowerHallwayWalkTo5060Room:
step_left
step_left
step_up
step_left
turn_head_right
step LEFT
step LEFT
step UP
step LEFT
turn_head RIGHT
step_end
MovementData_BattleTowerBattleRoomPlayerWalksIn:
step_up
step_up
step_up
step_up
turn_head_right
step UP
step UP
step UP
step UP
turn_head RIGHT
step_end
MovementData_BattleTowerBattleRoomOpponentWalksIn:
slow_step_down
slow_step_down
slow_step_down
turn_head_left
slow_step DOWN
slow_step DOWN
slow_step DOWN
turn_head LEFT
step_end
MovementData_BattleTowerBattleRoomOpponentWalksOut:
turn_head_up
slow_step_up
slow_step_up
slow_step_up
turn_head UP
slow_step UP
slow_step UP
slow_step UP
step_end
MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer:
slow_step_right
slow_step_right
slow_step_up
slow_step_up
slow_step RIGHT
slow_step RIGHT
slow_step UP
slow_step UP
step_end
MovementData_BattleTowerBattleRoomReceptionistWalksAway:
slow_step_down
slow_step_down
slow_step_left
slow_step_left
turn_head_right
slow_step DOWN
slow_step DOWN
slow_step LEFT
slow_step LEFT
turn_head RIGHT
step_end
MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist:
turn_head_down
turn_head DOWN
step_end
MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent:
turn_head_right
turn_head RIGHT
step_end
Text_BattleTowerWelcomesYou: ; 0x9e5ab

View File

@@ -38,12 +38,12 @@ BattleTowerElevator_MapScriptHeader:
end
MovementData_BattleTowerElevatorReceptionistWalksIn:
step_right
turn_head_down
step RIGHT
turn_head DOWN
step_end
MovementData_BattleTowerElevatorPlayerWalksIn:
turn_head_down
turn_head DOWN
step_end
BattleTowerElevator_MapEventHeader:

View File

@@ -79,10 +79,10 @@ UnknownScript_0x1809f3:
end
MovementData_0x1809f9:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
UnknownText_0x1809fe:

View File

@@ -147,11 +147,11 @@ BurnedTower1FHPUp:
itemball HP_UP
BurnedTowerMovement_PlayerWalksToSilver:
step_left
step LEFT
step_end
BurnedTowerMovement_SilverWalksToPlayer:
step_right
step RIGHT
step_end
BurnedTower1FMovement_PlayerStartsToFall:
@@ -159,11 +159,11 @@ BurnedTower1FMovement_PlayerStartsToFall:
step_end
BurnedTower1FEusineMovement:
step_down
step_left
step_left
step_left
step_down
step DOWN
step LEFT
step LEFT
step LEFT
step DOWN
step_end
BurnedTowerSilver_BeforeText:

View File

@@ -131,70 +131,70 @@ BurnedTowerB1FBoulder:
BurnedTowerRaikouMovement:
set_sliding
fast_jump_step_down
fast_jump_step_left
fast_jump_step DOWN
fast_jump_step LEFT
remove_sliding
step_end
BurnedTowerEnteiMovement:
set_sliding
fast_jump_step_right
fast_jump_step_down
fast_jump_step_right
fast_jump_step RIGHT
fast_jump_step DOWN
fast_jump_step RIGHT
remove_sliding
step_end
BurnedTowerSuicuneMovement1:
set_sliding
fast_jump_step_right
fast_jump_step_down
fast_jump_step_down
fast_jump_step_left
fast_jump_step RIGHT
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step LEFT
remove_sliding
step_end
BurnedTowerSuicuneMovement2:
set_sliding
fast_jump_step_left
fast_jump_step_up
big_step_up
fast_jump_step_right
fast_jump_step LEFT
fast_jump_step UP
big_step UP
fast_jump_step RIGHT
remove_sliding
step_end
MovementData_0x18624f:
set_sliding
big_step_down
big_step DOWN
remove_sliding
step_end
BurnedTowerSuicuneMovement3:
set_sliding
big_step_up
fast_jump_step_right
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
big_step UP
fast_jump_step RIGHT
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step DOWN
remove_sliding
step_end
BurnedTowerB1FEusineMovement2:
step_left
step_left
step_down
step_down
step_left
step_down
step LEFT
step LEFT
step DOWN
step DOWN
step LEFT
step DOWN
step_end
BurnedTowerB1FEusineMovement1:
step_down
step_left
step_left
step_left
step_down
step_down
step DOWN
step LEFT
step LEFT
step LEFT
step DOWN
step DOWN
step_end
BurnedTowerB1FEusineText:

View File

@@ -145,8 +145,8 @@ MapCeladonGameCornerSignpost9Script:
MovementData_0x721cd:
; Unreferenced.
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
UnknownText_0x721d0:

View File

@@ -58,18 +58,18 @@ CeladonEusine:
end
.Movement2:
step_left
step_down
step_down
step_down
step_down
step LEFT
step DOWN
step DOWN
step DOWN
step DOWN
step_end
.Movement1:
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x71e70:

View File

@@ -167,36 +167,36 @@ CeruleanGymStatue:
jumpstd gymstatue2
MovementData_0x1884e3:
big_step_down
big_step_down
big_step_down
big_step_down
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
step_end
MovementData_0x1884e8:
big_step_right
big_step_down
big_step RIGHT
big_step DOWN
step_end
MovementData_0x1884eb:
fix_facing
db $39 ; movement
jump_step_up
jump_step UP
db $38 ; movement
remove_fixed_facing
step_sleep 8
step_sleep 8
step_down
step_down
step DOWN
step DOWN
step_end
MovementData_0x1884f5:
big_step_down
big_step DOWN
step_end
MovementData_0x1884f7:
fix_facing
slow_step_up
slow_step UP
remove_fixed_facing
step_end

View File

@@ -242,101 +242,101 @@ CherrygroveCityMartSign:
jumpstd martsign
GuideGentMovement1:
step_left
step_left
step_up
step_left
turn_head_up
step LEFT
step LEFT
step UP
step LEFT
turn_head UP
step_end
GuideGentMovement2:
step_left
step_left
step_left
step_left
step_left
step_left
turn_head_up
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
turn_head UP
step_end
GuideGentMovement3:
step_left
step_left
step_left
step_left
step_left
step_left
step_left
turn_head_up
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
turn_head UP
step_end
GuideGentMovement4:
step_left
step_left
step_left
step_down
step_left
step_left
step_left
step_down
turn_head_left
step LEFT
step LEFT
step LEFT
step DOWN
step LEFT
step LEFT
step LEFT
step DOWN
turn_head LEFT
step_end
GuideGentMovement5:
step_down
step_down
step_right
step_right
step_right
step_right
step_right
step_right
step_right
step_right
step_right
step_right
step_down
step_down
step_right
step_right
step_right
step_right
step_right
turn_head_up
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
turn_head UP
step_end
GuideGentMovement6:
step_up
step_up
step UP
step UP
step_end
CherrygroveCity_RivalWalksToYou:
step_left
step_left
step_left
step_left
step_left
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
CherrygroveCity_RivalPushesYouOutOfTheWay:
big_step_down
turn_head_up
big_step DOWN
turn_head UP
step_end
CherrygroveCity_UnusedMovementData:
step_left
turn_head_down
step LEFT
turn_head DOWN
step_end
CherrygroveCity_RivalExitsStageLeft:
big_step_left
big_step_left
big_step_left
big_step_left
big_step_up
big_step_up
big_step_left
big_step_left
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step LEFT
big_step LEFT
step_end
GuideGentIntroText:

View File

@@ -156,33 +156,33 @@ CianwoodCityHiddenMaxEther:
MovementData_0x1a00da:
db $39 ; movement
fast_jump_step_down
fast_jump_step_down
fast_jump_step_right
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step RIGHT
db $38 ; movement
step_end
MovementData_0x1a00e0:
db $39 ; movement
fast_jump_step_right
fast_jump_step_up
fast_jump_step_right
fast_jump_step_right
fast_jump_step RIGHT
fast_jump_step UP
fast_jump_step RIGHT
fast_jump_step RIGHT
db $38 ; movement
step_end
MovementData_0x1a00e7:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
MovementData_0x1a00ec:
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x1a00f1:

View File

@@ -143,9 +143,9 @@ CianwoodGymStatue:
CianwoodGymMovement_ChuckChucksBoulder:
set_sliding
big_step_left
big_step_up
fast_jump_step_right
big_step LEFT
big_step UP
fast_jump_step RIGHT
remove_sliding
step_end

View File

@@ -192,15 +192,15 @@ CopycatsHouse2FBookshelf:
jumpstd picturebookshelf
CopycatSpinAroundMovementData:
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
step_end
CopycatText_Male_1:

View File

@@ -344,66 +344,66 @@ MenuData2_0x18d2ad:
MovementData_0x18d2bf:
slow_step_up
slow_step_up
slow_step_up
slow_step_right
slow_step_up
slow_step_up
slow_step_up
slow_step UP
slow_step UP
slow_step UP
slow_step RIGHT
slow_step UP
slow_step UP
slow_step UP
step_end
MovementData_0x18d2c7:
slow_step_down
slow_step DOWN
step_end
MovementData_0x18d2c9:
slow_step_left
slow_step_left
slow_step_left
turn_head_down
slow_step LEFT
slow_step LEFT
slow_step LEFT
turn_head DOWN
step_end
MovementData_0x18d2ce:
slow_step_right
slow_step_right
slow_step RIGHT
slow_step RIGHT
step_end
MovementData_0x18d2d1:
slow_step_right
turn_head_down
slow_step RIGHT
turn_head DOWN
step_end
MovementData_0x18d2d4:
slow_step_up
slow_step_up
slow_step_up
slow_step_up
slow_step_up
slow_step UP
slow_step UP
slow_step UP
slow_step UP
slow_step UP
step_end
MovementData_0x18d2da:
fix_facing
big_step_left
big_step LEFT
step_end
MovementData_0x18d2dd:
slow_step_left
slow_step LEFT
remove_fixed_facing
step_end
MovementData_0x18d2e0:
slow_step_right
slow_step_right
slow_step RIGHT
slow_step RIGHT
step_end
MovementData_0x18d2e3:
step_down
step_down
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x18d2ea:

View File

@@ -197,17 +197,17 @@ DragonsDenB1FHiddenMaxElixer:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
MovementDragonsDen_ClairWalksToYou:
slow_step_right
slow_step_right
slow_step_right
slow_step_right
slow_step RIGHT
slow_step RIGHT
slow_step RIGHT
slow_step RIGHT
step_end
MovementDragonsDen_ClairWalksAway:
slow_step_left
slow_step_left
slow_step_left
slow_step_left
slow_step LEFT
slow_step LEFT
slow_step LEFT
slow_step LEFT
step_end
ClairText_Wait:

View File

@@ -149,19 +149,19 @@ AcademyBookshelf:
jumpstd difficultbookshelf
MovementData_0x68b2d:
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
step_end
UnknownText_0x68b3b:

View File

@@ -168,17 +168,17 @@ EcruteakGymStatue:
jumpstd gymstatue2
MovementData_0x99e5d:
step_up
step UP
step_end
MovementData_0x99e5f:
fix_facing
slow_step_down
slow_step DOWN
remove_fixed_facing
step_end
MovementData_0x99e63:
slow_step_down
slow_step DOWN
step_end
UnknownText_0x99e65:

View File

@@ -144,16 +144,16 @@ GrampsScript_0x980c4:
MovementData_0x980c7:
fix_facing
big_step_left
big_step LEFT
remove_fixed_facing
turn_head_down
turn_head DOWN
step_end
MovementData_0x980cc:
fix_facing
big_step_right
big_step RIGHT
remove_fixed_facing
turn_head_down
turn_head DOWN
step_end
UnknownText_0x980d1:

View File

@@ -77,28 +77,28 @@ EcruteakPokeCenter1FGymGuyScript:
jumptextfaceplayer EcruteakPokeCenter1FGymGuyText
EcruteakPokeCenter1FBillMovement1:
step_up
step_up
step_up
step_up
step_right
step_right
step_right
turn_head_up
step UP
step UP
step UP
step UP
step RIGHT
step RIGHT
step RIGHT
turn_head UP
step_end
EcruteakPokeCenter1FBillMovement2:
step_right
step_down
step_down
step_down
step_down
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step_end
EcruteakPokeCenter1FPlayerMovement1:
step_up
step_up
step_up
step UP
step UP
step UP
step_end
EcruteakPokeCenter1F_BillText1:

View File

@@ -616,118 +616,118 @@ ElmsLabBookshelf:
jumpstd difficultbookshelf
ElmsLab_WalkUpToElmMovement:
step_up
step_up
step_up
step_up
step_up
step_up
step_up
turn_head_left
step UP
step UP
step UP
step UP
step UP
step UP
step UP
turn_head LEFT
step_end
MovementData_0x78f70:
step_up
step UP
step_end
MeetCopScript2_StepLeft:
step_left
step LEFT
step_end
MeetCopScript_WalkUp:
step_up
step_up
turn_head_right
step UP
step UP
turn_head RIGHT
step_end
OfficerLeavesMovement:
step_down
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
AideWalksRight1:
step_right
step_right
turn_head_up
step RIGHT
step RIGHT
turn_head UP
step_end
AideWalksRight2:
step_right
step_right
step_right
turn_head_up
step RIGHT
step RIGHT
step RIGHT
turn_head UP
step_end
AideWalksLeft1:
step_left
step_left
turn_head_down
step LEFT
step LEFT
turn_head DOWN
step_end
AideWalksLeft2:
step_left
step_left
step_left
turn_head_down
step LEFT
step LEFT
step LEFT
turn_head DOWN
step_end
ElmJumpUpMovement:
fix_facing
big_step_up
big_step UP
remove_fixed_facing
step_end
ElmJumpDownMovement:
fix_facing
big_step_down
big_step DOWN
remove_fixed_facing
step_end
ElmJumpLeftMovement:
fix_facing
big_step_left
big_step LEFT
remove_fixed_facing
step_end
ElmJumpRightMovement:
fix_facing
big_step_right
big_step RIGHT
remove_fixed_facing
step_end
ElmsLab_ElmToDefaultPositionMovement1:
step_up
step UP
step_end
ElmsLab_ElmToDefaultPositionMovement2:
step_right
step_right
step_up
turn_head_down
step RIGHT
step RIGHT
step UP
turn_head DOWN
step_end
AfterCyndaquilMovement:
step_left
step_up
turn_head_up
step LEFT
step UP
turn_head UP
step_end
AfterTotodileMovement:
step_left
step_left
step_up
turn_head_up
step LEFT
step LEFT
step UP
turn_head UP
step_end
AfterChikoritaMovement:
step_left
step_left
step_left
step_up
turn_head_up
step LEFT
step LEFT
step LEFT
step UP
turn_head UP
step_end
ElmText_Intro:

Some files were not shown because too many files have changed in this diff Show More