pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Unify directional movement macros

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/events.asm
View File

@ -547,7 +547,7 @@ OWPlayerInput: ; 96974
.Action:
push af
callba Function80422
callba StopPlayerForEvent
pop af
scf
ret

4
engine/map_objects.asm
View File

@ -1995,7 +1995,7 @@ ApplyMovementToFollower: ; 54b8
ret z
cp movement_step_bump
ret z
cp movement_turn_step_right + 1
cp movement_slow_step
ret c
push af
ld hl, wFollowerMovementQueueLength
@ -2509,7 +2509,7 @@ RefreshPlayerSprite: ; 579d
ld [wPlayerNextMovement], a
ld [wPlayerMovement], a
xor a
ld [wd04e], a
ld [wPlayerTurningDirection], a
ld [PlayerObjectStepFrame], a
call .TryResetPlayerAction
callba CheckWarpFacingDown

94
engine/player_movement.asm
View File

@ -233,12 +233,12 @@ DoPlayerMovement:: ; 80000
; If the player is turning, change direction first. This also lets
; the player change facing without moving by tapping a direction.
ld a, [wd04e]
ld a, [wPlayerTurningDirection]
cp 0
jr nz, .asm_80169
jr nz, .not_turning
ld a, [WalkingDirection]
cp STANDING
jr z, .asm_80169
jr z, .not_turning
ld e, a
ld a, [PlayerDirection]
@ -246,7 +246,7 @@ DoPlayerMovement:: ; 80000
rrca
and 3
cp e
jr z, .asm_80169
jr z, .not_turning
ld a, STEP_TURN
call .DoStep
@ -254,7 +254,7 @@ DoPlayerMovement:: ; 80000
scf
ret
.asm_80169
.not_turning
xor a
ret
; 8016b
@ -465,10 +465,10 @@ DoPlayerMovement:: ; 80000
ld a, [hl]
ld [MovementAnimation], a
ld hl, .InPlace
ld hl, .FinishFacing
add hl, de
ld a, [hl]
ld [wd04e], a
ld [wPlayerTurningDirection], a
ld a, 4
ret
@ -481,53 +481,53 @@ DoPlayerMovement:: ; 80000
dw .SlideStep
dw .TurningStep
dw .BackJumpStep
dw .InPlace
dw .FinishFacing
.SlowStep:
slow_step_down
slow_step_up
slow_step_left
slow_step_right
slow_step DOWN
slow_step UP
slow_step LEFT
slow_step RIGHT
.NormalStep:
step_down
step_up
step_left
step_right
step DOWN
step UP
step LEFT
step RIGHT
.FastStep:
big_step_down
big_step_up
big_step_left
big_step_right
big_step DOWN
big_step UP
big_step LEFT
big_step RIGHT
.JumpStep:
jump_step_down
jump_step_up
jump_step_left
jump_step_right
jump_step DOWN
jump_step UP
jump_step LEFT
jump_step RIGHT
.SlideStep:
fast_slide_step_down
fast_slide_step_up
fast_slide_step_left
fast_slide_step_right
fast_slide_step DOWN
fast_slide_step UP
fast_slide_step LEFT
fast_slide_step RIGHT
.BackJumpStep:
jump_step_up
jump_step_down
jump_step_right
jump_step_left
jump_step UP
jump_step DOWN
jump_step RIGHT
jump_step LEFT
.TurningStep:
turn_step_down
turn_step_up
turn_step_left
turn_step_right
.InPlace:
db $80 + movement_turn_head_down
db $80 + movement_turn_head_up
db $80 + movement_turn_head_left
db $80 + movement_turn_head_right
turn_step DOWN
turn_step UP
turn_step LEFT
turn_step RIGHT
.FinishFacing:
db $80 + DOWN
db $80 + UP
db $80 + LEFT
db $80 + RIGHT
; 802b3
.StandInPlace: ; 802b3
ld a, 0
ld [wd04e], a
ld [wPlayerTurningDirection], a
ld a, movement_step_sleep
ld [MovementAnimation], a
xor a
@ -536,7 +536,7 @@ DoPlayerMovement:: ; 80000
._WalkInPlace: ; 802bf
ld a, 0
ld [wd04e], a
ld [wPlayerTurningDirection], a
ld a, movement_step_bump
ld [MovementAnimation], a
xor a
@ -549,7 +549,7 @@ DoPlayerMovement:: ; 80000
call CheckStandingOnIce
ret nc
ld a, [wd04e]
ld a, [wPlayerTurningDirection]
cp 0
ret z
@ -812,7 +812,7 @@ DoPlayerMovement:: ; 80000
; 80404
CheckStandingOnIce:: ; 80404
ld a, [wd04e]
ld a, [wPlayerTurningDirection]
cp 0
jr z, .not_ice
cp $f0
@ -833,7 +833,7 @@ CheckStandingOnIce:: ; 80404
ret
; 80422
Function80422:: ; 80422
StopPlayerForEvent:: ; 80422
ld hl, wPlayerNextMovement
ld a, movement_step_sleep
cp [hl]
@ -841,6 +841,6 @@ Function80422:: ; 80422
ld [hl], a
ld a, 0
ld [wd04e], a
ld [wPlayerTurningDirection], a
ret
; 80430

16
engine/player_object.asm
View File

@ -598,10 +598,10 @@ Special_SurfStartStep: ; 8379
ret
.movement_data
slow_step_down
slow_step_up
slow_step_left
slow_step_right
slow_step DOWN
slow_step UP
slow_step LEFT
slow_step RIGHT
FollowNotExact:: ; 839e
push bc
@ -827,12 +827,12 @@ QueueFollowerFirstStep: ; 848a
jr z, .check_y
jr c, .left
and a
ld a, movement_step_right
ld a, movement_step + RIGHT
ret
.left
and a
ld a, movement_step_left
ld a, movement_step + LEFT
ret
.check_y
@ -843,12 +843,12 @@ QueueFollowerFirstStep: ; 848a
jr z, .same_xy
jr c, .up
and a
ld a, movement_step_down
ld a, movement_step + DOWN
ret
.up
and a
ld a, movement_step_up
ld a, movement_step + UP
ret
.same_xy

6
engine/std_scripts.asm
View File

@ -1907,8 +1907,8 @@ HappinessCheckScript:
end
Movement_ContestResults_WalkAfterWarp: ; bcea1
step_right
step_down
turn_head_up
step RIGHT
step DOWN
turn_head UP
step_end
; bcea5

16
event/forced_movement.asm
View File

@ -29,32 +29,32 @@ Script_ForcedMovement:: ; 0x1253d
.MovementData_up: ; 0x12564
step_dig 16
turn_in_down
turn_in DOWN
step_dig 16
turn_head_down
turn_head DOWN
step_end
; 0x1256b
.MovementData_down: ; 0x1256b
step_dig 16
turn_in_up
turn_in UP
step_dig 16
turn_head_up
turn_head UP
step_end
; 0x12572
.MovementData_right: ; 0x12572
step_dig 16
turn_in_left
turn_in LEFT
step_dig 16
turn_head_left
turn_head LEFT
step_end
; 0x12579
.MovementData_left: ; 0x12579
step_dig 16
turn_in_right
turn_in RIGHT
step_dig 16
turn_head_right
turn_head RIGHT
step_end
; 0x12580

2
event/overworld.asm
View File

@ -751,7 +751,7 @@ Script_UsedWaterfall: ; 0xcb20
ret
.WaterfallStep: ; cb4f
turn_waterfall_up
turn_waterfall UP
step_end
.Text_UsedWaterfall: ; 0xcb51

24
home/movement.asm
View File

@ -121,18 +121,18 @@ ComputePathToWalkToPlayer:: ; 1b5f
; 1ba5
.MovementData:
slow_step_down
slow_step_up
slow_step_left
slow_step_right
step_down
step_up
step_left
step_right
big_step_down
big_step_up
big_step_left
big_step_right
slow_step DOWN
slow_step UP
slow_step LEFT
slow_step RIGHT
step DOWN
step UP
step LEFT
step RIGHT
big_step DOWN
big_step UP
big_step LEFT
big_step RIGHT
; 1bb1
SetMenuAttributes:: ; 1bb1

323
macros/movement.asm
View File

@ -1,285 +1,104 @@
enum_start
enum movement_turn_head_down
turn_head_down: macro
db movement_turn_head_down ; $00
enum movement_turn_head
turn_head: macro
db movement_turn_head | \1 ; $00
endm
enum movement_turn_head_up
turn_head_up: macro
db movement_turn_head_up ; $01
__enum__ SET $4
enum movement_turn_step
turn_step: macro
db movement_turn_step | \1 ; $04
endm
enum movement_turn_head_left
turn_head_left: macro
db movement_turn_head_left ; $02
__enum__ SET $8
enum movement_slow_step
slow_step: macro
db movement_slow_step | \1; $08
endm
enum movement_turn_head_right
turn_head_right: macro
db movement_turn_head_right ; $03
__enum__ SET $c
enum movement_step
step: macro
db movement_step | \1 ; $0c
endm
enum movement_turn_step_down
turn_step_down: macro
db movement_turn_step_down ; $04
__enum__ SET $10
enum movement_big_step
big_step: macro
db movement_big_step | \1 ; $10
endm
enum movement_turn_step_up
turn_step_up: macro
db movement_turn_step_up ; $05
__enum__ SET $14
enum movement_slow_slide_step
slow_slide_step: macro
db movement_slow_slide_step | \1 ; $14
endm
enum movement_turn_step_left
turn_step_left: macro
db movement_turn_step_left ; $06
__enum__ SET $18
enum movement_slide_step
slide_step: macro
db movement_slide_step | \1 ; $18
endm
enum movement_turn_step_right
turn_step_right: macro
db movement_turn_step_right ; $07
__enum__ SET $1c
enum movement_fast_slide_step
fast_slide_step: macro
db movement_fast_slide_step | \1 ; $1c
endm
enum movement_slow_step_down
slow_step_down: macro
db movement_slow_step_down ; $08
__enum__ SET $20
enum movement_turn_away
turn_away: macro
db movement_turn_away | \1 ; $20
endm
enum movement_slow_step_up
slow_step_up: macro
db movement_slow_step_up ; $09
__enum__ SET $24
enum movement_turn_in
turn_in: macro
db movement_turn_in | \1 ; $24
endm
enum movement_slow_step_left
slow_step_left: macro
db movement_slow_step_left ; $0a
__enum__ SET $28
enum movement_turn_waterfall
turn_waterfall: macro
db movement_turn_waterfall | \1 ; $28
endm
enum movement_slow_step_right
slow_step_right: macro
db movement_slow_step_right ; $0b
__enum__ SET $2c
enum movement_slow_jump_step
slow_jump_step: macro
db movement_slow_jump_step | \1 ; $2c
endm
enum movement_step_down
step_down: macro
db movement_step_down ; $0c
__enum__ SET $30
enum movement_jump_step
jump_step: macro
db movement_jump_step | \1 ; $30
endm
enum movement_step_up
step_up: macro
db movement_step_up ; $0d
__enum__ SET $34
enum movement_fast_jump_step
fast_jump_step: macro
db movement_fast_jump_step | \1 ; $34
endm
enum movement_step_left
step_left: macro
db movement_step_left ; $0e
endm
enum movement_step_right
step_right: macro
db movement_step_right ; $0f
endm
enum movement_big_step_down
big_step_down: macro
db movement_big_step_down ; $10
endm
enum movement_big_step_up
big_step_up: macro
db movement_big_step_up ; $11
endm
enum movement_big_step_left
big_step_left: macro
db movement_big_step_left ; $12
endm
enum movement_big_step_right
big_step_right: macro
db movement_big_step_right ; $13
endm
enum movement_slow_slide_step_down
slow_slide_step_down: macro
db movement_slow_slide_step_down ; $14
endm
enum movement_slow_slide_step_up
slow_slide_step_up: macro
db movement_slow_slide_step_up ; $15
endm
enum movement_slow_slide_step_left
slow_slide_step_left: macro
db movement_slow_slide_step_left ; $16
endm
enum movement_slow_slide_step_right
slow_slide_step_right: macro
db movement_slow_slide_step_right ; $17
endm
enum movement_slide_step_down
slide_step_down: macro
db movement_slide_step_down ; $18
endm
enum movement_slide_step_up
slide_step_up: macro
db movement_slide_step_up ; $19
endm
enum movement_slide_step_left
slide_step_left: macro
db movement_slide_step_left ; $1a
endm
enum movement_slide_step_right
slide_step_right: macro
db movement_slide_step_right ; $1b
endm
enum movement_fast_slide_step_down
fast_slide_step_down: macro
db movement_fast_slide_step_down ; $1c
endm
enum movement_fast_slide_step_up
fast_slide_step_up: macro
db movement_fast_slide_step_up ; $1d
endm
enum movement_fast_slide_step_left
fast_slide_step_left: macro
db movement_fast_slide_step_left ; $1e
endm
enum movement_fast_slide_step_right
fast_slide_step_right: macro
db movement_fast_slide_step_right ; $1f
endm
enum movement_turn_away_down
turn_away_down: macro
db movement_turn_away_down ; $20
endm
enum movement_turn_away_up
turn_away_up: macro
db movement_turn_away_up ; $21
endm
enum movement_turn_away_left
turn_away_left: macro
db movement_turn_away_left ; $22
endm
enum movement_turn_away_right
turn_away_right: macro
db movement_turn_away_right ; $23
endm
enum movement_turn_in_down
turn_in_down: macro
db movement_turn_in_down ; $24
endm
enum movement_turn_in_up
turn_in_up: macro
db movement_turn_in_up ; $25
endm
enum movement_turn_in_left
turn_in_left: macro
db movement_turn_in_left ; $26
endm
enum movement_turn_in_right
turn_in_right: macro
db movement_turn_in_right ; $27
endm
enum movement_turn_waterfall_down
turn_waterfall_down: macro
db movement_turn_waterfall_down ; $28
endm
enum movement_turn_waterfall_up
turn_waterfall_up: macro
db movement_turn_waterfall_up ; $29
endm
enum movement_turn_waterfall_left
turn_waterfall_left: macro
db movement_turn_waterfall_left ; $2a
endm
enum movement_turn_waterfall_right
turn_waterfall_right: macro
db movement_turn_waterfall_right ; $2b
endm
enum movement_slow_jump_step_down
slow_jump_step_down: macro
db movement_slow_jump_step_down ; $2c
endm
enum movement_slow_jump_step_up
slow_jump_step_up: macro
db movement_slow_jump_step_up ; $2d
endm
enum movement_slow_jump_step_left
slow_jump_step_left: macro
db movement_slow_jump_step_left ; $2e
endm
enum movement_slow_jump_step_right
slow_jump_step_right: macro
db movement_slow_jump_step_right ; $2f
endm
enum movement_jump_step_down
jump_step_down: macro
db movement_jump_step_down ; $30
endm
enum movement_jump_step_up
jump_step_up: macro
db movement_jump_step_up ; $31
endm
enum movement_jump_step_left
jump_step_left: macro
db movement_jump_step_left ; $32
endm
enum movement_jump_step_right
jump_step_right: macro
db movement_jump_step_right ; $33
endm
enum movement_fast_jump_step_down
fast_jump_step_down: macro
db movement_fast_jump_step_down ; $34
endm
enum movement_fast_jump_step_up
fast_jump_step_up: macro
db movement_fast_jump_step_up ; $35
endm
enum movement_fast_jump_step_left
fast_jump_step_left: macro
db movement_fast_jump_step_left ; $36
endm
enum movement_fast_jump_step_right
fast_jump_step_right: macro
db movement_fast_jump_step_right ; $37
endm
; Control
__enum__ SET $38
enum movement_remove_sliding
remove_sliding: macro
@ -311,6 +130,8 @@ hide_person: macro
db movement_hide_person ; $3d
endm
; Sleep
enum movement_step_sleep
step_sleep: macro
if \1 <= 8

42
maps/AzaleaTown.asm
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:

94
maps/BattleTower1F.asm
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

6
maps/BattleTowerElevator.asm
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:

8
maps/BrunosRoom.asm
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:

14
maps/BurnedTower1F.asm
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:

64
maps/BurnedTowerB1F.asm
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:

4
maps/CeladonGameCorner.asm
View File

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

18
maps/CeladonPokeCenter1F.asm
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:

22
maps/CeruleanGym.asm
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

136
maps/CherrygroveCity.asm
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:

30
maps/CianwoodCity.asm
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:

6
maps/CianwoodGym.asm
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

18
maps/CopycatsHouse2F.asm
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:

62
maps/DragonShrine.asm
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:

16
maps/DragonsDenB1F.asm
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:

26
maps/EarlsPokemonAcademy.asm
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:

6
maps/EcruteakGym.asm
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:

8
maps/EcruteakHouse.asm
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:

32
maps/EcruteakPokeCenter1F.asm
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:

106
maps/ElmsLab.asm
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:

66
maps/FastShip1F.asm
View File

@ -141,72 +141,72 @@ WorriedGrandpaTriggerLeft:
end
MovementData_0x7520e:
slow_step_left
turn_head_right
slow_step LEFT
turn_head RIGHT
step_end
MovementData_0x75211:
slow_step_right
turn_head_down
slow_step RIGHT
turn_head DOWN
step_end
MovementData_0x75214:
slow_step_down
turn_head_up
slow_step DOWN
turn_head UP
step_end
MovementData_0x75217:
step_down
step_down
turn_head_down
step DOWN
step DOWN
turn_head DOWN
step_end
MovementData_0x7521b:
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_0x75220:
step_right
step RIGHT
step_end
MovementData_0x75222:
big_step_down
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_down
big_step_down
big_step_down
big_step_down
big_step DOWN
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
step_end
MovementData_0x7522e:
big_step_right
turn_head_left
big_step RIGHT
turn_head LEFT
step_end
MovementData_0x75231:
step_up
step UP
step_end
MovementData_0x75233:
step_down
step DOWN
step_end
MovementData_0x75235:
step_up
step_up
step UP
step UP
step_end
MovementData_0x75238:
step_right
step_up
step RIGHT
step UP
step_end
UnknownText_0x7523b:

8
maps/FastShipB1F.asm
View File

@ -210,16 +210,16 @@ FashShipB1FTrashcan:
MovementData_0x76871:
fix_facing
big_step_right
big_step RIGHT
remove_fixed_facing
turn_head_down
turn_head DOWN
step_end
MovementData_0x76876:
fix_facing
big_step_left
big_step LEFT
remove_fixed_facing
turn_head_down
turn_head DOWN
step_end
UnknownText_0x7687b:

20
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -118,19 +118,19 @@ FastShipCabins_NNW_NNE_NETrashcan:
jumpstd trashcan
MovementData_0x75637:
step_left
step_left
step_up
step_up
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x7563c:
step_down
step_left
step_left
step_up
step_up
step_up
step DOWN
step LEFT
step LEFT
step UP
step UP
step UP
step_end
CooltrainermSeanSeenText:

22
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -221,23 +221,23 @@ FastShipCaptainsCabinTrashcan:
jumpstd trashcan
MovementData_0x76004:
big_step_right
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_0x7600c:
step_up
step_up
turn_head_left
step UP
step UP
turn_head LEFT
step_end
MovementData_0x76010:
step_down
step DOWN
step_end
UnknownText_0x76012:

26
maps/FuchsiaGym.asm
View File

@ -220,19 +220,19 @@ FuchsiaGymStatue:
jumpstd gymstatue2
MovementData_0x195f27:
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_0x195f35:

26
maps/FuchsiaPokeCenter1F.asm
View File

@ -47,19 +47,19 @@ JanineImpersonatorScript_0x196462:
end
MovementData_0x196486:
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_0x196494:

16
maps/GoldenrodCity.asm
View File

@ -275,17 +275,17 @@ GoldenrodCityFlowerShopSign:
jumptext GoldenrodCityFlowerShopSignText
MovementData_0x198a5f:
step_right
step_right
step_up
step RIGHT
step RIGHT
step UP
step_end
MovementData_0x198a63:
step_down
step_right
step_right
step_up
step_up
step DOWN
step RIGHT
step RIGHT
step UP
step UP
step_end
UnknownText_0x198a69:

8
maps/GoldenrodGym.asm
View File

@ -177,13 +177,13 @@ GoldenrodGymStatue:
jumpstd gymstatue2
BridgetWalksUpMovement:
step_left
turn_head_up
step LEFT
turn_head UP
step_end
BridgetWalksAwayMovement:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
UnknownText_0x54122:

46
maps/GoldenrodMagnetTrainStation.asm
View File

@ -45,7 +45,7 @@ OfficerScript_0x550ec:
end
.MovementBoardTheTrain:
turn_head_down
turn_head DOWN
step_end
.PassNotInBag:
@ -74,37 +74,37 @@ GentlemanScript_0x55143:
jumptextfaceplayer UnknownText_0x552a3
MovementData_0x55146:
step_up
step_up
step_right
turn_head_left
step UP
step UP
step RIGHT
turn_head LEFT
step_end
MovementData_0x5514b:
step_left
step_down
step_down
step LEFT
step DOWN
step DOWN
step_end
MovementData_0x5514f:
step_up
step_up
step_up
step_left
step_left
step_left
step_up
step_up
step UP
step UP
step UP
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x55158:
step_left
step_left
step_down
step_down
step_down
step_down
turn_head_up
step LEFT
step LEFT
step DOWN
step DOWN
step DOWN
step DOWN
turn_head UP
step_end
UnknownText_0x55160:

40
maps/GoldenrodPokeCenter1F.asm
View File

@ -120,35 +120,35 @@ UnknownScript_0x61051:
end
MovementData_0x6105a:
step_up
step_right
step_right
step_right
turn_head_down
step UP
step RIGHT
step RIGHT
step RIGHT
turn_head DOWN
step_end
MovementData_0x61060:
step_left
step_left
step_left
step_down
step LEFT
step LEFT
step LEFT
step DOWN
step_end
MovementData_0x61065:
step_up
step_right
step_right
step_right
step_right
turn_head_down
step UP
step RIGHT
step RIGHT
step RIGHT
step RIGHT
turn_head DOWN
step_end
MovementData_0x6106c:
step_left
step_left
step_left
step_left
step_down
step LEFT
step LEFT
step LEFT
step LEFT
step DOWN
step_end
; unused

22
maps/HallOfFame.asm
View File

@ -50,20 +50,20 @@ HallOfFameScript:
end
HallOfFame_WalkUpWithLance:
step_up
step_up
step_up
step_up
step_up
step_up
step_up
step_up
step_right
turn_head_left
step UP
step UP
step UP
step UP
step UP
step UP
step UP
step UP
step RIGHT
turn_head LEFT
step_end
HallOfFame_SlowlyApproachMachine:
slow_step_up
slow_step UP
step_end
HallOfFame_LanceText:

326
maps/IlexForest.asm
View File

@ -489,257 +489,257 @@ MapIlexForestSignpost4Script:
end
MovementData_Farfetchd_Pos1_Pos2:
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetchd_Pos2_Pos3:
big_step_up
big_step_up
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_down
big_step UP
big_step UP
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step DOWN
step_end
MovementData_Farfetchd_Pos2_Pos8:
big_step_down
big_step_down
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_Farfetchd_Pos3_Pos4:
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_Farfetchd_Pos3_Pos2:
big_step_up
big_step_left
big_step_left
big_step_left
big_step_left
big_step UP
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
step_end
MovementData_Farfetchd_Pos4_Pos5:
big_step_down
big_step_down
big_step_down
big_step_down
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_Farfetchd_Pos4_Pos3:
big_step_left
jump_step_left
big_step_left
big_step_left
big_step LEFT
jump_step LEFT
big_step LEFT
big_step LEFT
step_end
MovementData_Farfetchd_Pos5_Pos6:
big_step_down
big_step_down
big_step_down
big_step_down
big_step_down
big_step_left
big_step_left
big_step_left
big_step_left
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
step_end
MovementData_Farfetchd_Pos5_Pos7:
big_step_left
big_step_left
big_step_left
big_step_left
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
step_end
MovementData_Farfetched_Pos5_Pos4_Up:
big_step_up
big_step_up
big_step_up
big_step_right
big_step_up
big_step UP
big_step UP
big_step UP
big_step RIGHT
big_step UP
step_end
MovementData_Farfetched_Pos5_Pos4_Right:
big_step_right
turn_head_up
big_step RIGHT
turn_head UP
step_sleep 1
turn_head_down
turn_head DOWN
step_sleep 1
turn_head_up
turn_head UP
step_sleep 1
big_step_down
big_step_down
big_step DOWN
big_step DOWN
fix_facing
jump_step_up
jump_step UP
step_sleep 8
step_sleep 8
remove_fixed_facing
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos6_Pos7:
big_step_left
big_step_left
big_step_left
big_step_up
big_step_up
big_step_right
big_step_up
big_step_up
big_step LEFT
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step RIGHT
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos6_Pos5:
big_step_right
big_step_right
big_step_right
big_step_right
big_step_up
big_step_up
big_step_up
big_step_up
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos7_Pos8:
big_step_up
big_step_up
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
big_step LEFT
big_step LEFT
big_step LEFT
step_end
MovementData_Farfetched_Pos7_Pos6:
big_step_down
big_step_down
big_step_left
big_step_down
big_step_down
big_step_right
big_step_right
big_step_right
big_step DOWN
big_step DOWN
big_step LEFT
big_step DOWN
big_step DOWN
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_Farfetched_Pos7_Pos5:
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_Farfetched_Pos8_Pos9:
big_step_down
big_step_left
big_step_down
big_step_down
big_step_down
big_step_down
big_step_down
big_step DOWN
big_step LEFT
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
step_end
MovementData_Farfetched_Pos8_Pos7:
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_Farfetched_Pos8_Pos2:
big_step_up
big_step_up
big_step_up
big_step_up
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos9_Pos10:
big_step_left
big_step_left
big_step LEFT
big_step LEFT
fix_facing
jump_step_right
jump_step RIGHT
step_sleep 8
step_sleep 8
remove_fixed_facing
big_step_left
big_step_left
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos9_Pos8_Right:
big_step_right
big_step_right
big_step_right
big_step_right
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_Farfetched_Pos9_Pos8_Down:
big_step_left
big_step_left
big_step LEFT
big_step LEFT
fix_facing
jump_step_right
jump_step RIGHT
step_sleep 8
step_sleep 8
remove_fixed_facing
big_step_right
big_step_right
big_step_right
big_step_right
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
step_end
MovementData_0x6ef4e:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
MovementData_0x6ef53:
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step_end
MovementData_0x6ef58:
fix_facing
slow_step_down
slow_step DOWN
remove_fixed_facing
step_end

34
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -183,29 +183,29 @@ AbraScript:
end
PlateauRivalMovement1:
step_up
step_up
step_up
step_up
step_up
turn_head_left
step UP
step UP
step UP
step UP
step UP
turn_head LEFT
step_end
PlateauRivalMovement2:
step_up
step_up
step_up
step_up
step_up
turn_head_right
step UP
step UP
step UP
step UP
step UP
turn_head RIGHT
step_end
PlateauRivalLeavesMovement:
step_down
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x180178:

8
maps/KarensRoom.asm
View File

@ -79,10 +79,10 @@ UnknownScript_0x180c1c:
end
MovementData_0x180c22:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
UnknownText_0x180c27:

8
maps/KogasRoom.asm
View File

@ -79,10 +79,10 @@ UnknownScript_0x180788:
end
MovementData_0x18078e:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
UnknownText_0x180793:

8
maps/KrissHouse1F.asm
View File

@ -199,19 +199,19 @@ FridgeScript:
jumptext FridgeText
MovementData_0x7a5fc:
turn_head_right
turn_head RIGHT
step_end
MovementData_0x7a5fe:
slow_step_right
slow_step RIGHT
step_end
MovementData_0x7a600:
turn_head_left
turn_head LEFT
step_end
MovementData_0x7a602:
slow_step_left
slow_step LEFT
step_end
UnknownText_0x7a604:

22
maps/KurtsHouse.asm
View File

@ -437,20 +437,20 @@ KurtsHouseRadio:
jumpstd radio2
MovementData_0x18e466:
big_step_down
big_step_down
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_0x18e46c:
big_step_right
big_step_down
big_step_down
big_step_down
big_step_down
big_step_down
big_step RIGHT
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
big_step DOWN
step_end
UnknownText_0x18e473:

80
maps/LancesRoom.asm
View File

@ -136,79 +136,79 @@ LanceScript_0x180e7b:
end
LancesRoom_PlayerWalksInMovementData:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
MovementData_ApproachLanceFromLeft:
step_up
step_up
turn_head_right
step UP
step UP
turn_head RIGHT
step_end
MovementData_ApproachLanceFromRight:
step_up
step_left
step_up
turn_head_right
step UP
step LEFT
step UP
turn_head RIGHT
step_end
LancesRoomMovementData_MaryRushesIn:
big_step_up
big_step_up
big_step_up
turn_head_down
big_step UP
big_step UP
big_step UP
turn_head DOWN
step_end
LancesRoomMovementData_OakWalksIn:
step_up
step_up
step UP
step UP
step_end
LancesRoomMovementData_MaryYieldsToOak:
step_left
turn_head_right
step LEFT
turn_head RIGHT
step_end
LancesRoomMovementData_MaryInterviewChampion:
big_step_up
turn_head_right
big_step UP
turn_head RIGHT
step_end
LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway:
step_up
step_left
turn_head_down
step UP
step LEFT
turn_head DOWN
step_end
LancesRoomMovementData_LanceLeadsPlayerToHallOfFame:
step_up
step UP
step_end
LancesRoomMovementData_PlayerExits:
step_up
step UP
step_end
LancesRoomMovementData_MaryTriesToFollow:
step_up
step_right
turn_head_up
step UP
step RIGHT
turn_head UP
step_end
LancesRoomMovementData_MaryRunsBackAndForth:
big_step_right
big_step_right
big_step_left
big_step_left
big_step_left
big_step_right
big_step_right
big_step_right
big_step_left
big_step_left
turn_head_up
big_step RIGHT
big_step RIGHT
big_step LEFT
big_step LEFT
big_step LEFT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step LEFT
big_step LEFT
turn_head UP
step_end
LanceBattleIntroText:

34
maps/MahoganyMart1F.asm
View File

@ -119,46 +119,46 @@ GrannyScript_0x6c3ee:
MovementData_0x6c3f6:
fix_facing
big_step_left
big_step_right
big_step LEFT
big_step RIGHT
remove_fixed_facing
step_end
MovementData_0x6c3fb:
fix_facing
big_step_left
big_step LEFT
remove_fixed_facing
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
step_end
MovementData_0x6c403:
fix_facing
big_step_left
big_step LEFT
remove_fixed_facing
step_end
MovementData_0x6c407:
slow_step_left
turn_head_down
slow_step LEFT
turn_head DOWN
step_end
MovementData_0x6c40a:
slow_step_right
slow_step_up
slow_step_up
slow_step RIGHT
slow_step UP
slow_step UP
step_end
MovementData_0x6c40e:
slow_step_up
slow_step_right
slow_step_right
slow_step UP
slow_step RIGHT
slow_step RIGHT
step_end
MovementData_0x6c412:
slow_step_right
slow_step RIGHT
step_end
UnknownText_0x6c414:

18
maps/MahoganyTown.asm
View File

@ -126,22 +126,22 @@ MahoganyTownPokeCenterSign:
jumpstd pokecentersign
MovementData_0x1900a4:
step_down
big_step_up
turn_head_down
step DOWN
big_step UP
turn_head DOWN
MovementData_0x1900a7:
step_left
step LEFT
step_end
MovementData_0x1900a9:
step_right
step_down
turn_head_left
step RIGHT
step DOWN
turn_head LEFT
step_end
MovementData_0x1900ad:
step_up
turn_head_down
step UP
turn_head DOWN
step_end
UnknownText_0x1900b0:

20
maps/MountMoon.asm
View File

@ -74,19 +74,19 @@ MountMoon_MapScriptHeader:
end
MountMoonSilverMovementBefore:
step_left
step_left
step_left
step LEFT
step LEFT
step LEFT
step_end
MountMoonSilverMovementAfter:
step_right
step_right
step_down
step_down
step_down
step_down
step_down
step RIGHT
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
MountMoonSilverTextBefore:

83
maps/MountMoonSquare.asm
View File

@ -8,25 +8,24 @@ MountMoonSquare_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x77092, 0
dw .Trigger0, 0
.MapCallbacks:
db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x77093
dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone
dbw MAPCALLBACK_OBJECTS, .DisappearRock
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77097
UnknownScript_0x77092:
.Trigger0:
end
UnknownScript_0x77093:
.DisappearMoonStone:
setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
return
UnknownScript_0x77097:
.DisappearRock:
disappear MOUNTMOONSQUARE_ROCK
return
@ -39,7 +38,7 @@ ClefairyDance:
iffalse .NoDancing
appear MOUNTMOONSQUARE_FAIRY1
appear MOUNTMOONSQUARE_FAIRY2
applymovement PLAYER, MovementData_0x77121
applymovement PLAYER, PlayerWalksUpToDancingClefairies
pause 15
appear MOUNTMOONSQUARE_ROCK
spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT
@ -48,19 +47,19 @@ ClefairyDance:
pause 30
follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
cry CLEFAIRY
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77123
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep1
cry CLEFAIRY
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77126
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep2
cry CLEFAIRY
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77128
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep3
cry CLEFAIRY
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712b
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep4
cry CLEFAIRY
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712d
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep5
stopfollow
applymovement MOUNTMOONSQUARE_FAIRY2, MovementData_0x77130
applymovement MOUNTMOONSQUARE_FAIRY2, ClefairyDanceStep6
follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77132
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
stopfollow
spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
pause 10
@ -69,7 +68,7 @@ ClefairyDance:
cry CLEFAIRY
pause 15
follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77134
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyFleeMovement
disappear MOUNTMOONSQUARE_FAIRY1
disappear MOUNTMOONSQUARE_FAIRY2
stopfollow
@ -90,48 +89,48 @@ DontLitterSign:
MtMoonSquareRock:
jumpstd smashrock
MovementData_0x77121:
step_up
PlayerWalksUpToDancingClefairies:
step UP
step_end
MovementData_0x77123:
slow_step_down
slow_jump_step_down
ClefairyDanceStep1:
slow_step DOWN
slow_jump_step DOWN
step_end
MovementData_0x77126:
slow_jump_step_right
ClefairyDanceStep2:
slow_jump_step RIGHT
step_end
MovementData_0x77128:
slow_step_up
slow_jump_step_up
ClefairyDanceStep3:
slow_step UP
slow_jump_step UP
step_end
MovementData_0x7712b:
slow_jump_step_left
ClefairyDanceStep4:
slow_jump_step LEFT
step_end
MovementData_0x7712d:
slow_step_down
slow_jump_step_down
ClefairyDanceStep5:
slow_step DOWN
slow_jump_step DOWN
step_end
MovementData_0x77130:
slow_step_down
ClefairyDanceStep6:
slow_step DOWN
step_end
MovementData_0x77132:
slow_step_right
ClefairyDanceStep7:
slow_step RIGHT
step_end
MovementData_0x77134:
step_right
step_right
step_right
jump_step_right
step_right
step_right
ClefairyFleeMovement:
step RIGHT
step RIGHT
step RIGHT
jump_step RIGHT
step RIGHT
step RIGHT
step_end
DontLitterSignText:

16
maps/MrPokemonsHouse.asm
View File

@ -157,20 +157,20 @@ MapMrPokemonsHouseSignpost4Script:
jumptext MrPokemonsHouse_StrangeCoinsText
MrPokemonsHouse_PlayerWalksToMrPokemon:
step_right
step_up
step RIGHT
step UP
step_end
MrPokemonsHouse_OakWalksToPlayer:
step_down
step_left
step_left
step DOWN
step LEFT
step LEFT
step_end
MrPokemonsHouse_OakExits:
step_down
step_left
turn_head_down
step DOWN
step LEFT
turn_head DOWN
db $3f ; movement
step_end

52
maps/NewBarkTown.asm
View File

@ -144,52 +144,52 @@ MapNewBarkTownSignpost3Script:
jumptext ElmsHouseSignText
Movement_TeacherRunsToYou1_NBT:
step_left
step_left
step_left
step_left
step LEFT
step LEFT
step LEFT
step LEFT
step_end
Movement_TeacherRunsToYou2_NBT:
step_left
step_left
step_left
step_left
step_left
turn_head_down
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
turn_head DOWN
step_end
Movement_TeacherBringsYouBack1_NBT:
step_right
step_right
step_right
step_right
turn_head_left
step RIGHT
step RIGHT
step RIGHT
step RIGHT
turn_head LEFT
step_end
Movement_TeacherBringsYouBack2_NBT:
step_right
step_right
step_right
step_right
step_right
turn_head_left
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
turn_head LEFT
step_end
Movement_SilverPushesYouAway_NBT:
turn_head_up
step_down
turn_head UP
step DOWN
step_end
Movement_SilverShovesYouOut_NBT:
turn_head_up
turn_head UP
fix_facing
jump_step_down
jump_step DOWN
remove_fixed_facing
step_end
Movement_SilverReturnsToTheShadows_NBT:
step_right
step RIGHT
step_end
Text_GearIsImpressive:

68
maps/OlivineCity.asm
View File

@ -120,55 +120,55 @@ OlivineCityMartSign:
jumpstd martsign
MovementData_0x1a88d2:
step_down
step_right
step_right
step DOWN
step RIGHT
step RIGHT
step_end
MovementData_0x1a88d6:
step_down
step_down
step_right
step_right
step DOWN
step DOWN
step RIGHT
step RIGHT
step_end
MovementData_0x1a88db:
step_right
step_right
step_right
step_right
step_right
step_right
step_up
step_up
step_up
step_up
step_up
step_up
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step UP
step UP
step UP
step UP
step UP
step UP
step_end
MovementData_0x1a88e8:
step_right
step_right
step_right
step_right
step_right
step_right
step_up
step_up
step_up
step_up
step_up
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step UP
step UP
step UP
step UP
step UP
step_end
MovementData_0x1a88f4:
step_down
turn_head_up
step DOWN
turn_head UP
step_end
MovementData_0x1a88f7:
step_up
turn_head_down
step UP
turn_head DOWN
step_end
UnknownText_0x1a88fa:

38
maps/OlivineLighthouse6F.asm
View File

@ -131,33 +131,33 @@ OlivineLighthouse6FSuperPotion:
itemball SUPER_POTION
MovementData_0x60c68:
slow_step_up
slow_step_up
slow_step_right
slow_step_up
slow_step_up
slow_step UP
slow_step UP
slow_step RIGHT
slow_step UP
slow_step UP
step_sleep 8
step_sleep 8
step_end
MovementData_0x60c70:
slow_step_down
slow_step_right
slow_step_right
slow_step_right
slow_step_up
slow_step_right
slow_step_right
slow_step_right
slow_step DOWN
slow_step RIGHT
slow_step RIGHT
slow_step RIGHT
slow_step UP
slow_step RIGHT
slow_step RIGHT
slow_step RIGHT
step_end
MovementData_0x60c79:
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 RIGHT
slow_step UP
slow_step UP
slow_step UP
step_sleep 8
step_end

62
maps/OlivinePort.asm
View File

@ -240,52 +240,52 @@ OlivinePortHiddenProtein:
MovementData_0x74a30:
step_down
step DOWN
step_end
MovementData_0x74a32:
step_up
step UP
step_end
MovementData_0x74a34:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
MovementData_0x74a37:
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 DOWN
step DOWN
step_end
MovementData_0x74a3f:
step_right
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
MovementData_0x74a49:
step_up
step_right
step_right
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step UP
step RIGHT
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x74a55:

156
maps/PokeCenter2F.asm
View File

@ -625,180 +625,180 @@ OfficerScript_0x192c9a:
end
PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight:
slow_step_up
slow_step_left
turn_head_right
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown:
slow_step_up
slow_step_left
turn_head_down
slow_step UP
slow_step LEFT
turn_head DOWN
step_end
PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown:
slow_step_left
turn_head_down
slow_step LEFT
turn_head DOWN
step_end
PokeCenter2FMovementData_ReceptionistStepsRightLooksDown:
slow_step_right
turn_head_down
slow_step RIGHT
turn_head DOWN
step_end
PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2:
slow_step_up
slow_step_left
turn_head_right
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMovementData_ReceptionistLooksRight:
turn_head_right
turn_head RIGHT
step_end
PokeCenter2FMovementData_PlayerTakesThreeStepsUp:
step_up
step_up
step_up
step UP
step UP
step UP
step_end
PokeCenter2FMovementData_PlayerTakesTwoStepsUp:
step_up
step_up
step UP
step UP
step_end
PokeCenter2FMovementData_PlayerTakesOneStepUp:
step_up
step UP
step_end
PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom:
step_up
step_up
step_right
step_up
step UP
step UP
step RIGHT
step UP
step_end
PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2:
step_up
step_up
step UP
step UP
step_end
PokeCenter2FMovementData_PlayerWalksLeftAndUp:
step_left
step_up
step LEFT
step UP
step_end
PokeCenter2FMovementData_PlayerWalksRightAndUp:
step_right
step_up
step RIGHT
step UP
step_end
PokeCenter2FMovementData_PlayerTakesThreeStepsDown:
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step_end
PokeCenter2FMovementData_PlayerTakesTwoStepsDown:
step_down
step_down
step DOWN
step DOWN
step_end
PokeCenter2FMovementData_PlayerTakesOneStepDown:
step_down
step DOWN
step_end
PokeCenter2FMovementData_ReceptionistStepsRightAndDown:
slow_step_right
slow_step_down
slow_step RIGHT
slow_step DOWN
step_end
PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2:
slow_step_right
turn_head_down
slow_step RIGHT
turn_head DOWN
step_end
PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3:
slow_step_up
slow_step_left
turn_head_right
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight:
slow_step_left
turn_head_right
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft:
slow_step_up
slow_step_left
turn_head_right
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom:
step_down
step_left
step_down
step_down
step DOWN
step LEFT
step DOWN
step DOWN
step_end
PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown:
slow_step_right
slow_step_down
slow_step RIGHT
slow_step DOWN
step_end
PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight:
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
step_end
PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft:
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_left
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head LEFT
step_end
PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown:
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
step_end
PokeCenter2FMovementData_PlayerTakesOneStepDown_2:
step_down
step DOWN
step_end
PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2:
step_down
step_down
step DOWN
step DOWN
step_end
PokeCenter2FMovementData_PlayerTakesOneStepUp_2:
step_up
step UP
step_end
PokeCenter2FMovementData_PlayerTakesOneStepRight:
step_right
step RIGHT
step_end
PokeCenter2FMovementData_PlayerTakesOneStepLeft:
step_left
step LEFT
step_end
PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2:
slow_step_left
turn_head_right
slow_step LEFT
turn_head RIGHT
step_end
PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2:
slow_step_right
turn_head_left
slow_step RIGHT
turn_head LEFT
step_end
Text_BattleReceptionistMobile:

18
maps/PowerPlant.asm
View File

@ -202,18 +202,18 @@ PowerPlantBookshelf:
jumpstd difficultbookshelf
MovementData_0x188ed5:
step_right
step_right
step_up
step_up
step RIGHT
step RIGHT
step UP
step UP
step_end
MovementData_0x188eda:
step_down
step_down
step_left
step_left
turn_head_down
step DOWN
step DOWN
step LEFT
step LEFT
turn_head DOWN
step_end
UnknownText_0x188ee0:

8
maps/RadioTower1F.asm
View File

@ -203,13 +203,13 @@ MapRadioTower1FSignpost1Script:
jumptext UnknownText_0x5d631
MovementData_0x5ce71:
step_right
turn_head_up
step RIGHT
turn_head UP
step_end
MovementData_0x5ce74:
step_left
turn_head_up
step LEFT
turn_head UP
step_end
UnknownText_0x5ce77:

4
maps/RadioTower2F.asm
View File

@ -339,8 +339,8 @@ RadioTower2FBookshelf:
jumpstd magazinebookshelf
MovementData_0x5d921:
slow_step_down
slow_step_right
slow_step DOWN
slow_step RIGHT
step_end
UnknownText_0x5d924:

54
maps/RadioTower5F.asm
View File

@ -156,42 +156,42 @@ RadioTower5FBookshelf:
jumpstd magazinebookshelf
FakeDirectorMovement:
step_left
step_left
step_left
step_up
step_up
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
RadioTower5FDirectorWalksIn:
step_down
step_down
step_right
step_right
step_right
step_right
step_down
step_down
step_down
step_left
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step DOWN
step DOWN
step DOWN
step LEFT
step_end
RadioTower5FDirectorWalksOut:
step_right
step_up
step_up
step_up
step_left
step_left
step_left
step_left
step_up
step_up
step RIGHT
step UP
step UP
step UP
step LEFT
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x60125:
step_left
step_left
step LEFT
step LEFT
step_end
FakeDirectorTextBefore1:

4
maps/Route16Gate.asm
View File

@ -33,8 +33,8 @@ UnknownScript_0x733f3:
end
MovementData_0x73405:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
UnknownText_0x73408:

4
maps/Route1718Gate.asm
View File

@ -33,8 +33,8 @@ UnknownScript_0x73617:
end
MovementData_0x73629:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
UnknownText_0x7362c:

46
maps/Route25.asm
View File

@ -197,47 +197,47 @@ Route25HiddenPotion:
MovementData_0x19efe8:
big_step_down
big_step DOWN
step_end
MovementData_0x19efea:
big_step_down
big_step_down
big_step DOWN
big_step DOWN
step_end
MovementData_0x19efed:
step_up
step_up
step_up
step_left
step_left
step_left
step UP
step UP
step UP
step LEFT
step LEFT
step LEFT
step_end
MovementData_0x19eff4:
step_up
step_up
step_left
step_left
step_left
step UP
step UP
step LEFT
step LEFT
step LEFT
step_end
MovementData_0x19effa:
step_down
step_left
step DOWN
step LEFT
step_end
MovementData_0x19effd:
step_up
step_left
step UP
step LEFT
step_end
MovementData_0x19f000:
step_left
step_left
step_left
step_left
step_left
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
UnknownText_0x19f006:

6
maps/Route27.asm
View File

@ -310,12 +310,12 @@ Route27RareCandy:
itemball RARE_CANDY
MovementData_0x1a0a66:
step_left
step_left
step LEFT
step LEFT
step_end
MovementData_0x1a0a69:
step_left
step LEFT
step_end
UnknownText_0x1a0a6b:

44
maps/Route29.asm
View File

@ -220,37 +220,37 @@ Route29Potion:
itemball POTION
DudeMovementData1a:
step_up
step_up
step_up
step_up
step_right
step_right
step UP
step UP
step UP
step UP
step RIGHT
step RIGHT
step_end
DudeMovementData2a:
step_up
step_up
step_up
step_right
step_right
step UP
step UP
step UP
step RIGHT
step RIGHT
step_end
DudeMovementData1b:
step_left
step_left
step_down
step_down
step_down
step_down
step LEFT
step LEFT
step DOWN
step DOWN
step DOWN
step DOWN
step_end
DudeMovementData2b:
step_left
step_left
step_down
step_down
step_down
step LEFT
step LEFT
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x1a10a7:

8
maps/Route30.asm
View File

@ -253,14 +253,14 @@ Route30HiddenPotion:
Route30_JoeysRattataAttacksMovement:
fix_facing
big_step_up
big_step_down
big_step UP
big_step DOWN
step_end
Route30_MikeysRattataAttacksMovement:
fix_facing
big_step_down
big_step_up
big_step DOWN
big_step UP
step_end
Text_UseTackle:

8
maps/Route32.asm
View File

@ -519,16 +519,16 @@ Route32HiddenSuperPotion:
Movement_Route32CooltrainerMPushesYouBackToViolet:
step_up
step_up
step UP
step UP
step_end
Movement_Route32CooltrainerMReset1:
step_down
step DOWN
step_end
Movement_Route32CooltrainerMReset2:
step_right
step RIGHT
step_end
Route32CooltrainerMText_WhatsTheHurry:

16
maps/Route34.asm
View File

@ -499,17 +499,17 @@ Route34HiddenSuperPotion:
Route34MovementData_DayCareManWalksBackInside:
slow_step_left
slow_step_left
slow_step_up
slow_step LEFT
slow_step LEFT
slow_step UP
step_end
Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer:
slow_step_down
slow_step_left
slow_step_left
slow_step_up
slow_step_up
slow_step DOWN
slow_step LEFT
slow_step LEFT
slow_step UP
slow_step UP
step_end
YoungsterSamuelSeenText:

8
maps/Route34IlexForestGate.asm
View File

@ -82,13 +82,13 @@ LassScript_0x62d94:
jumptextfaceplayer UnknownText_0x62e97
MovementData_0x62d97:
step_up
step_up
step UP
step UP
step_end
MovementData_0x62d9a:
step_down
step_right
step DOWN
step RIGHT
step_end
UnknownText_0x62d9d:

12
maps/Route35NationalParkgate.asm
View File

@ -216,18 +216,18 @@ Route35NationalParkgate_GetDayOfWeek:
end
MovementData_0x6a2e2:
step_down
turn_head_left
step DOWN
turn_head LEFT
step_end
MovementData_0x6a2e5:
step_right
step_up
step_up
step RIGHT
step UP
step UP
step_end
MovementData_0x6a2e9:
step_up
step UP
step_end
UnknownText_0x6a2eb:

52
maps/Route36.asm
View File

@ -376,42 +376,42 @@ SudowoodoShakeMovement:
step_end
WeirdTreeMovement_Flee:
fast_jump_step_up
fast_jump_step_up
fast_jump_step UP
fast_jump_step UP
step_end
FloriaMovement1:
step_down
step_down
step_down
step_left
step_left
step_left
step_left
step_left
step_left
step DOWN
step DOWN
step DOWN
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
FloriaMovement2:
step_left
step_down
step_down
step_down
step_left
step_left
step_left
step_left
step_left
step LEFT
step DOWN
step DOWN
step DOWN
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
Route36SuicuneMovement:
set_sliding
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
fast_jump_step_right
fast_jump_step_right
fast_jump_step_right
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step DOWN
fast_jump_step RIGHT
fast_jump_step RIGHT
fast_jump_step RIGHT
remove_sliding
step_end

6
maps/Route36NationalParkgate.asm
View File

@ -475,9 +475,9 @@ UnknownScript_0x6adce:
jumptext UnknownText_0x6b84c
MovementData_0x6add1:
big_step_down
big_step_right
turn_head_up
big_step DOWN
big_step RIGHT
turn_head UP
step_end
UnknownText_0x6add5:

32
maps/Route40.asm
View File

@ -141,28 +141,28 @@ Route40HiddenHyperPotion:
dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
MovementData_0x1a621c:
step_right
step_up
step_up
step_up
step_up
step_up
step_up
step RIGHT
step UP
step UP
step UP
step UP
step UP
step UP
step_end
MovementData_0x1a6224:
step_up
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step UP
step_end
MovementData_0x1a622a:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
SwimmermSimonSeenText:

12
maps/Route42.asm
View File

@ -219,12 +219,12 @@ Route42HiddenMaxPotion:
MovementData_0x1a9356:
db $39 ; movement
fast_jump_step_up
fast_jump_step_up
fast_jump_step_up
fast_jump_step_right
fast_jump_step_right
fast_jump_step_right
fast_jump_step UP
fast_jump_step UP
fast_jump_step UP
fast_jump_step RIGHT
fast_jump_step RIGHT
fast_jump_step RIGHT
db $38 ; movement
step_end

78
maps/Route43Gate.asm
View File

@ -132,69 +132,69 @@ UnknownScript_0x19aca0:
end
MovementData_0x19aca2:
step_down
step DOWN
step_end
MovementData_0x19aca4:
big_step_up
big_step_up
big_step_right
big_step_right
turn_head_up
big_step UP
big_step UP
big_step RIGHT
big_step RIGHT
turn_head UP
step_end
MovementData_0x19acaa:
big_step_left
big_step_left
big_step_down
big_step_down
big_step LEFT
big_step LEFT
big_step DOWN
big_step DOWN
step_end
MovementData_0x19acaf:
big_step_down
big_step_down
big_step_right
big_step_right
turn_head_down
big_step DOWN
big_step DOWN
big_step RIGHT
big_step RIGHT
turn_head DOWN
step_end
MovementData_0x19acb5:
big_step_left
big_step_left
big_step_up
big_step_up
turn_head_down
big_step LEFT
big_step LEFT
big_step UP
big_step UP
turn_head DOWN
step_end
MovementData_0x19acbb:
big_step_up
big_step_up
big_step_left
big_step_left
turn_head_up
big_step UP
big_step UP
big_step LEFT
big_step LEFT
turn_head UP
step_end
MovementData_0x19acc1:
big_step_right
big_step_right
big_step_down
big_step_down
turn_head_up
big_step RIGHT
big_step RIGHT
big_step DOWN
big_step DOWN
turn_head UP
step_end
MovementData_0x19acc7:
big_step_down
big_step_down
big_step_left
big_step_left
turn_head_down
big_step DOWN
big_step DOWN
big_step LEFT
big_step LEFT
turn_head DOWN
step_end
MovementData_0x19accd:
big_step_right
big_step_right
big_step_up
big_step_up
big_step RIGHT
big_step RIGHT
big_step UP
big_step UP
step_end
UnknownText_0x19acd2:

22
maps/RuinsofAlphOutside.asm
View File

@ -140,20 +140,20 @@ MapRuinsofAlphOutsideSignpost2Script:
jumptext UnknownText_0x58362
MovementData_0x580ba:
step_right
step_right
step_right
step_right
step_up
step_up
step_right
step_right
step_up
step_up
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step UP
step UP
step RIGHT
step RIGHT
step UP
step UP
step_end
MovementData_0x580c5:
step_up
step UP
step_end
UnknownText_0x580c7:

12
maps/RuinsofAlphResearchCenter.asm
View File

@ -181,18 +181,18 @@ MapRuinsofAlphResearchCenterSignpost0Script:
jumptext UnknownText_0x59886
MovementData_0x5926f:
step_up
step_up
step_left
turn_head_up
step UP
step UP
step LEFT
turn_head UP
step_end
MovementData_0x59274:
step_down
step DOWN
step_end
MovementData_0x59276:
step_up
step UP
step_end
UnknownText_0x59278:

46
maps/SaffronTrainStation.asm
View File

@ -47,7 +47,7 @@ OfficerScript_0x18a81e:
end
.MovementBoardTheTrain:
turn_head_down
turn_head DOWN
step_end
.PassNotInBag:
@ -95,37 +95,37 @@ LassScript_0x18a88c:
jumptextfaceplayer UnknownText_0x18ab20
MovementData_0x18a88f:
step_up
step_up
step_right
turn_head_left
step UP
step UP
step RIGHT
turn_head LEFT
step_end
MovementData_0x18a894:
step_left
step_down
step_down
step LEFT
step DOWN
step DOWN
step_end
MovementData_0x18a898:
step_up
step_up
step_up
step_left
step_left
step_left
step_up
step_up
step UP
step UP
step UP
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x18a8a1:
step_left
step_left
step_down
step_down
step_down
step_down
turn_head_up
step LEFT
step LEFT
step DOWN
step DOWN
step DOWN
step DOWN
turn_head UP
step_end
UnknownText_0x18a8a9:

18
maps/SlowpokeWellB1F.asm
View File

@ -127,21 +127,21 @@ SlowpokeWellB1FSuperPotion:
itemball SUPER_POTION
KurtSlowpokeWellVictoryMovementData:
step_left
step_left
step_left
step_left
step_up
step LEFT
step LEFT
step LEFT
step LEFT
step UP
step_sleep 8
step_sleep 8
step_sleep 8
step_left
step_up
step_up
step LEFT
step UP
step UP
step_sleep 8
step_sleep 8
step_sleep 8
turn_head_left
turn_head LEFT
step_end
UnknownText_0x5a6b5:

14
maps/SproutTower3F.asm
View File

@ -140,19 +140,19 @@ SproutTower3FEscapeRope:
itemball ESCAPE_ROPE
MovementData_0x184a1d:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
MovementData_0x184a22:
step_up
step UP
step_end
MovementData_0x184a24:
step_right
step_down
step RIGHT
step DOWN
step_end
UnknownText_0x184a27:

120
maps/TeamRocketBaseB1F.asm
View File

@ -549,91 +549,91 @@ TeamRocketBaseB1FHiddenRevive:
SecurityCameraMovement1:
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
SecurityCameraMovement2:
big_step_up
big_step_right
big_step_up
big_step_up
big_step_up
big_step_up
turn_head_right
big_step UP
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step UP
turn_head RIGHT
step_end
SecurityCameraMovement3:
big_step_left
big_step_left
big_step_left
big_step_up
big_step_up
big_step_up
big_step_left
big_step_left
big_step LEFT
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step UP
big_step LEFT
big_step LEFT
step_end
SecurityCameraMovement4:
; he jumps over a trap
jump_step_up
big_step_right
big_step_up
big_step_up
big_step_up
turn_head_right
jump_step UP
big_step RIGHT
big_step UP
big_step UP
big_step UP
turn_head RIGHT
step_end
SecurityCameraMovement5:
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 UP
big_step UP
big_step LEFT
big_step LEFT
step_end
SecurityCameraMovement6:
big_step_up
big_step_up
big_step_right
big_step_up
big_step_up
big_step_up
big_step_left
big_step UP
big_step UP
big_step RIGHT
big_step UP
big_step UP
big_step UP
big_step LEFT
step_end
SecurityCameraMovement7:
big_step_up
big_step_up
big_step_up
big_step_right
big_step_up
big_step_up
big_step_left
big_step UP
big_step UP
big_step UP
big_step RIGHT
big_step UP
big_step UP
big_step LEFT
step_end
SecurityCameraMovement8:
big_step_down
big_step_down
big_step_right
big_step_down
big_step_down
big_step_down
big_step_left
big_step_left
big_step_left
big_step DOWN
big_step DOWN
big_step RIGHT
big_step DOWN
big_step DOWN
big_step DOWN
big_step LEFT
big_step LEFT
big_step LEFT
step_end
SecurityCameraMovement9:
big_step_left
big_step_left
big_step_left
big_step_left
big_step_left
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
step_end
CameraGrunt1SeenText:

250
maps/TeamRocketBaseB2F.asm
View File

@ -367,204 +367,204 @@ TeamRocketBaseB2FHiddenFullHeal:
MovementData_0x6d212:
step_right
step_right
step_right
step_right
step_right
step_right
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step_end
MovementData_0x6d219:
step_right
step_right
step_right
step_right
step_right
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step_end
MovementData_0x6d21f:
step_down
step_down
step_down
turn_head_right
step DOWN
step DOWN
step DOWN
turn_head RIGHT
step_end
MovementData_0x6d224:
big_step_left
big_step_left
big_step_up
big_step_up
big_step_up
big_step_left
big_step_left
big_step_left
big_step_left
turn_head_down
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step UP
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
turn_head DOWN
step_end
MovementData_0x6d22f:
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 UP
big_step UP
big_step LEFT
big_step LEFT
step_end
MovementData_0x6d236:
big_step_right
big_step_right
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
step_end
MovementData_0x6d23b:
fix_facing
db $39 ; movement
jump_step_right
jump_step RIGHT
db $38 ; movement
remove_fixed_facing
step_end
MovementData_0x6d241:
slow_step_down
turn_head_left
slow_step DOWN
turn_head LEFT
step_end
MovementData_0x6d244:
step_right
step_right
step_right
step RIGHT
step RIGHT
step RIGHT
step_end
MovementData_0x6d248:
big_step_left
big_step LEFT
step_end
MovementData_0x6d24a:
big_step_left
big_step LEFT
step_end
MovementData_0x6d24c:
big_step_left
big_step_up
turn_head_left
big_step LEFT
big_step UP
turn_head LEFT
step_end
MovementData_0x6d250:
step_right
step_right
turn_head_down
step RIGHT
step RIGHT
turn_head DOWN
step_end
MovementData_0x6d254:
step_up
step_up
step_up
step UP
step UP
step UP
step_end
MovementData_0x6d258:
step_sleep 8
step_left
step_left
turn_head_up
step LEFT
step LEFT
turn_head UP
step_sleep 8
step_right
step_right
step_right
step_right
turn_head_up
step RIGHT
step RIGHT
step RIGHT
step RIGHT
turn_head UP
step_sleep 8
step_left
step_left
turn_head_down
step LEFT
step LEFT
turn_head DOWN
step_end
MovementData_0x6d267:
step_right
step_right
step_right
step_right
step_up
step_up
step_up
step_up
step_up
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step UP
step UP
step UP
step UP
step UP
step_end
MovementData_0x6d271:
step_up
step_left
step_left
step_left
step_left
turn_head_up
step UP
step LEFT
step LEFT
step LEFT
step LEFT
turn_head UP
step_end
MovementData_0x6d278:
step_left
step LEFT
step_end
MovementData_0x6d27a:
step_down
step_down
step_down
step_down
step_down
step_left
step_left
step_left
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step LEFT
step LEFT
step LEFT
step_end
MovementData_0x6d283:
step_down
step_down
step_left
step_left
step_left
step_left
step_left
step_left
step DOWN
step DOWN
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
MovementData_0x6d28c:
step_right
step_right
step_down
step_down
step_down
step_down
step_down
step_down
step_right
step_right
step_right
step_right
step RIGHT
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step_end
MovementData_0x6d299:
step_right
step_right
step_down
step_down
step_down
step_down
step_right
step_right
step_right
step_right
step RIGHT
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step_end
MovementData_0x6d2a4:
step_right
step_right
step_down
step_down
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_end
UnknownText_0x6d2ad:

126
maps/TeamRocketBaseB3F.asm
View File

@ -226,101 +226,101 @@ TeamRocketBaseB3FUltraBall:
itemball ULTRA_BALL
MovementData_0x6e12a:
step_right
step RIGHT
step_end
MovementData_0x6e12c:
step_down
step_left
step_left
step_left
step_left
step_left
step DOWN
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step_end
MovementData_0x6e133:
step_up
step_up
step_up
step_left
step_left
turn_head_up
step UP
step UP
step UP
step LEFT
step LEFT
turn_head UP
step_end
MovementData_0x6e13a:
step_up
step_up
step_left
step_up
step_left
step_left
turn_head_up
step UP
step UP
step LEFT
step UP
step LEFT
step LEFT
turn_head UP
step_end
MovementData_0x6e142:
step_down
step DOWN
step_end
MovementData_0x6e144:
big_step_right
big_step_right
big_step RIGHT
big_step RIGHT
step_end
MovementData_0x6e147:
fix_facing
fast_jump_step_left
fast_jump_step LEFT
remove_fixed_facing
step_sleep 8
step_sleep 8
slow_step_right
big_step_down
big_step_down
big_step_down
big_step_right
big_step_down
big_step_down
big_step_down
big_step_left
big_step_left
big_step_left
big_step_left
big_step_left
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_up
big_step_left
big_step_left
slow_step RIGHT
big_step DOWN
big_step DOWN
big_step DOWN
big_step RIGHT
big_step DOWN
big_step DOWN
big_step DOWN
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step UP
big_step LEFT
big_step LEFT
step_end
RocketBaseRivalEnterMovement:
step_down
step_down
step_down
step_down
step_down
step_right
step_right
step_right
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step_end
RocketBaseRivalLeaveMovement:
step_left
step_left
step_up
step_up
step_up
step_up
step_up
step LEFT
step LEFT
step UP
step UP
step UP
step UP
step UP
step_end
RocketBaseRivalShovesPlayerMovement:
fix_facing
big_step_right
big_step RIGHT
remove_fixed_facing
step_end

64
maps/TinTower1F.asm
View File

@ -236,83 +236,83 @@ TinTowerEusine:
jumptextfaceplayer TinTowerEusineHoOhText
TinTowerPlayerMovement1:
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
TinTowerRaikouMovement1:
set_sliding
fast_jump_step_down
fast_jump_step DOWN
remove_sliding
step_end
TinTowerRaikouMovement2:
set_sliding
fast_jump_step_down
fast_jump_step_right
fast_jump_step_down
fast_jump_step DOWN
fast_jump_step RIGHT
fast_jump_step DOWN
remove_sliding
step_end
TinTowerEnteiMovement1:
set_sliding
fast_jump_step_down
fast_jump_step DOWN
remove_sliding
step_end
TinTowerEnteiMovement2:
set_sliding
fast_jump_step_down
fast_jump_step_left
fast_jump_step_down
fast_jump_step DOWN
fast_jump_step LEFT
fast_jump_step DOWN
remove_sliding
step_end
TinTowerSuicuneMovement:
set_sliding
fast_jump_step_down
fast_jump_step DOWN
remove_sliding
step_end
TinTowerPlayerMovement2:
fix_facing
big_step_down
big_step DOWN
remove_fixed_facing
step_end
MovementData_0x1851ec:
step_up
step_up
step_up
turn_head_left
step UP
step UP
step UP
turn_head LEFT
step_end
MovementData_0x1851f1:
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step_end
MovementData_0x1851f5:
step_up
step_up
step_left
step_left
turn_head_up
step UP
step UP
step LEFT
step LEFT
turn_head UP
step_end
MovementData_0x1851fb:
step_up
step_up
step UP
step UP
step_end
MovementData_0x1851fe:
step_up
step_right
step_right
step_up
step UP
step RIGHT
step RIGHT
step UP
step_end
TinTowerEusineSuicuneText:

56
maps/TrainerHouseB1F.asm
View File

@ -77,40 +77,40 @@ TrainerHouseReceptionistScript:
end
Movement_EnterTrainerHouseBattleRoom:
step_left
step_left
step_left
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step_down
step_left
turn_head_right
step LEFT
step LEFT
step LEFT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step LEFT
turn_head RIGHT
step_end
Movement_ExitTrainerHouseBattleRoom:
step_up
step_up
step_up
step_right
step_up
step_up
step_up
step_up
step_up
step_right
step_right
step_right
step_right
step UP
step UP
step UP
step RIGHT
step UP
step UP
step UP
step UP
step UP
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step_end
Movement_TrainerHouseTurnBack:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
TrainerHouseB1FIntroText:

36
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -643,33 +643,33 @@ UndergroundPathSwitchRoomEntrancesHiddenRevive:
UndergroundSilverApproachMovement1:
step_down
step_left
step_left
step_left
step DOWN
step LEFT
step LEFT
step LEFT
step_end
UndergroundSilverApproachMovement2:
step_down
step_down
step_left
step_left
step_left
step DOWN
step DOWN
step LEFT
step LEFT
step LEFT
step_end
UndergroundSilverRetreatMovement1:
step_right
step_right
step_right
step_up
step RIGHT
step RIGHT
step RIGHT
step UP
step_end
UndergroundSilverRetreatMovement2:
step_right
step_right
step_right
step_up
step_up
step RIGHT
step RIGHT
step RIGHT
step UP
step UP
step_end
UndergroundSilverBeforeText:

32
maps/VermilionPort.asm
View File

@ -203,34 +203,34 @@ VermilionPortHiddenIron:
MovementData_0x74ef1:
step_down
step DOWN
step_end
MovementData_0x74ef3:
step_up
step UP
step_end
MovementData_0x74ef5:
step_right
turn_head_left
step RIGHT
turn_head LEFT
step_end
MovementData_0x74ef8:
step_down
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
MovementData_0x74efe:
step_right
step_down
step_down
step_down
step_down
step_down
step_down
step RIGHT
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x74f06:

68
maps/VictoryRoad.asm
View File

@ -122,49 +122,49 @@ VictoryRoadHiddenFullHeal:
MovementData_0x74539:
step_left
step_left
step_left
step_left
step_left
step_left
step_up
step_up
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x74542:
step_up
step_up
step_left
step_left
step_left
step_left
step_left
step_up
step_up
step UP
step UP
step LEFT
step LEFT
step LEFT
step LEFT
step LEFT
step UP
step UP
step_end
MovementData_0x7454c:
step_down
step_down
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
step RIGHT
step_end
MovementData_0x74555:
step_down
step_down
step_right
step_right
step_right
step_right
step_right
step_down
step_down
step DOWN
step DOWN
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step RIGHT
step DOWN
step DOWN
step_end
UnknownText_0x7455f:

2
maps/VictoryRoadGate.asm
View File

@ -52,7 +52,7 @@ BlackBeltScript_0x9ba24:
jumptextfaceplayer UnknownText_0x9bb37
MovementData_0x9ba27:
step_down
step DOWN
step_end
UnknownText_0x9ba29:

140
maps/VioletCity.asm
View File

@ -103,82 +103,82 @@ VioletCityHiddenHyperPotion:
dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
VioletCityFollowEarl_MovementData:
big_step_down
big_step_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
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
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
big_step_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
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
big_step_right
turn_head_right
turn_head_down
turn_head_left
turn_head_up
turn_head_right
turn_head_down
turn_head_left
turn_head_up
big_step_up
turn_head_down
big_step DOWN
big_step 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
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
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
big_step 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
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
big_step RIGHT
turn_head RIGHT
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
turn_head DOWN
turn_head LEFT
turn_head UP
big_step UP
turn_head DOWN
step_end
VioletCityFinishFollowEarl_MovementData:
step_up
step UP
step_end
VioletCitySpinningEarl_MovementData:
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
Text_EarlAsksIfYouBeatFalkner:

18
maps/VioletPokeCenter1F.asm
View File

@ -88,21 +88,21 @@ YoungsterScript_0x69546:
jumptextfaceplayer UnknownText_0x698b8
MovementData_AideWalksStraightOutOfPokecenter:
step_down
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step DOWN
step_end
MovementData_AideWalksLeftToExitPokecenter:
step_left
step_down
step LEFT
step DOWN
step_end
MovementData_AideFinishesLeavingPokecenter:
step_down
step_down
step_down
step DOWN
step DOWN
step DOWN
step_end
UnknownText_0x69555:

8
maps/WillsRoom.asm
View File

@ -79,10 +79,10 @@ UnknownScript_0x180526:
end
MovementData_0x18052c:
step_up
step_up
step_up
step_up
step UP
step UP
step UP
step UP
step_end
UnknownText_0x180531:

12
maps/WiseTriosRoom.asm
View File

@ -121,18 +121,18 @@ UnknownScript_0x9861b:
end
MovementData_0x98622:
step_left
step_left
step LEFT
step LEFT
step_end
MovementData_0x98625:
step_right
step_down
step RIGHT
step DOWN
step_end
MovementData_0x98628:
step_right
step_down
step RIGHT
step DOWN
step_end
UnknownText_0x9862b:

5
wram.asm
View File

@ -1702,8 +1702,9 @@ wScriptAfterPointer:: ds 2
wRunningTrainerBattleScript:: ds 1
MenuItemsListEnd::
wTempTrainerHeaderEnd::
wd04e:: ds 24
wTMHMMoveNameBackup:: ds MOVE_NAME_LENGTH
wPlayerTurningDirection:: ; d04e
ds 24
wTMHMMoveNameBackup:: ds MOVE_NAME_LENGTH ; d066
StringBuffer1:: ; d073
ds 19