pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07: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
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: .Action:
push af push af
callba Function80422 callba StopPlayerForEvent
pop af pop af
scf scf
ret ret

4
engine/map_objects.asm
View File

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

16
engine/player_object.asm
View File

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

6
engine/std_scripts.asm
View File

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

16
event/forced_movement.asm
View File

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

2
event/overworld.asm
View File

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

24
home/movement.asm
View File

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

323
macros/movement.asm
View File

@ -1,285 +1,104 @@
enum_start enum_start
enum movement_turn_head_down enum movement_turn_head
turn_head_down: macro turn_head: macro
db movement_turn_head_down ; $00 db movement_turn_head | \1 ; $00
endm endm
enum movement_turn_head_up __enum__ SET $4
turn_head_up: macro
db movement_turn_head_up ; $01 enum movement_turn_step
turn_step: macro
db movement_turn_step | \1 ; $04
endm endm
enum movement_turn_head_left __enum__ SET $8
turn_head_left: macro
db movement_turn_head_left ; $02 enum movement_slow_step
slow_step: macro
db movement_slow_step | \1; $08
endm endm
enum movement_turn_head_right __enum__ SET $c
turn_head_right: macro
db movement_turn_head_right ; $03 enum movement_step
step: macro
db movement_step | \1 ; $0c
endm endm
enum movement_turn_step_down __enum__ SET $10
turn_step_down: macro
db movement_turn_step_down ; $04 enum movement_big_step
big_step: macro
db movement_big_step | \1 ; $10
endm endm
enum movement_turn_step_up __enum__ SET $14
turn_step_up: macro
db movement_turn_step_up ; $05 enum movement_slow_slide_step
slow_slide_step: macro
db movement_slow_slide_step | \1 ; $14
endm endm
enum movement_turn_step_left __enum__ SET $18
turn_step_left: macro
db movement_turn_step_left ; $06 enum movement_slide_step
slide_step: macro
db movement_slide_step | \1 ; $18
endm endm
enum movement_turn_step_right __enum__ SET $1c
turn_step_right: macro
db movement_turn_step_right ; $07 enum movement_fast_slide_step
fast_slide_step: macro
db movement_fast_slide_step | \1 ; $1c
endm endm
enum movement_slow_step_down __enum__ SET $20
slow_step_down: macro
db movement_slow_step_down ; $08 enum movement_turn_away
turn_away: macro
db movement_turn_away | \1 ; $20
endm endm
enum movement_slow_step_up __enum__ SET $24
slow_step_up: macro
db movement_slow_step_up ; $09 enum movement_turn_in
turn_in: macro
db movement_turn_in | \1 ; $24
endm endm
enum movement_slow_step_left __enum__ SET $28
slow_step_left: macro
db movement_slow_step_left ; $0a enum movement_turn_waterfall
turn_waterfall: macro
db movement_turn_waterfall | \1 ; $28
endm endm
enum movement_slow_step_right __enum__ SET $2c
slow_step_right: macro
db movement_slow_step_right ; $0b enum movement_slow_jump_step
slow_jump_step: macro
db movement_slow_jump_step | \1 ; $2c
endm endm
enum movement_step_down __enum__ SET $30
step_down: macro
db movement_step_down ; $0c enum movement_jump_step
jump_step: macro
db movement_jump_step | \1 ; $30
endm endm
enum movement_step_up __enum__ SET $34
step_up: macro
db movement_step_up ; $0d enum movement_fast_jump_step
fast_jump_step: macro
db movement_fast_jump_step | \1 ; $34
endm endm
enum movement_step_left ; Control
step_left: macro __enum__ SET $38
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
enum movement_remove_sliding enum movement_remove_sliding
remove_sliding: macro remove_sliding: macro
@ -311,6 +130,8 @@ hide_person: macro
db movement_hide_person ; $3d db movement_hide_person ; $3d
endm endm
; Sleep
enum movement_step_sleep enum movement_step_sleep
step_sleep: macro step_sleep: macro
if \1 <= 8 if \1 <= 8

42
maps/AzaleaTown.asm
View File

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

94
maps/BattleTower1F.asm
View File

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

6
maps/BattleTowerElevator.asm
View File

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

8
maps/BrunosRoom.asm
View File

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

14
maps/BurnedTower1F.asm
View File

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

64
maps/BurnedTowerB1F.asm
View File

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

4
maps/CeladonGameCorner.asm
View File

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

18
maps/CeladonPokeCenter1F.asm
View File

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

22
maps/CeruleanGym.asm
View File

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

136
maps/CherrygroveCity.asm
View File

@ -242,101 +242,101 @@ CherrygroveCityMartSign:
jumpstd martsign jumpstd martsign
GuideGentMovement1: GuideGentMovement1:
step_left step LEFT
step_left step LEFT
step_up step UP
step_left step LEFT
turn_head_up turn_head UP
step_end step_end
GuideGentMovement2: GuideGentMovement2:
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
turn_head_up turn_head UP
step_end step_end
GuideGentMovement3: GuideGentMovement3:
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
turn_head_up turn_head UP
step_end step_end
GuideGentMovement4: GuideGentMovement4:
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_down step DOWN
turn_head_left turn_head LEFT
step_end step_end
GuideGentMovement5: GuideGentMovement5:
step_down step DOWN
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_right step RIGHT
step_right step RIGHT
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_right step RIGHT
step_right step RIGHT
step_right step RIGHT
turn_head_up turn_head UP
step_end step_end
GuideGentMovement6: GuideGentMovement6:
step_up step UP
step_up step UP
step_end step_end
CherrygroveCity_RivalWalksToYou: CherrygroveCity_RivalWalksToYou:
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_left step LEFT
step_end step_end
CherrygroveCity_RivalPushesYouOutOfTheWay: CherrygroveCity_RivalPushesYouOutOfTheWay:
big_step_down big_step DOWN
turn_head_up turn_head UP
step_end step_end
CherrygroveCity_UnusedMovementData: CherrygroveCity_UnusedMovementData:
step_left step LEFT
turn_head_down turn_head DOWN
step_end step_end
CherrygroveCity_RivalExitsStageLeft: CherrygroveCity_RivalExitsStageLeft:
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_up big_step UP
big_step_up big_step UP
big_step_left big_step LEFT
big_step_left big_step LEFT
step_end step_end
GuideGentIntroText: GuideGentIntroText:

30
maps/CianwoodCity.asm
View File

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

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