Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge yenatch:map-objects

Browse Source
This commit is contained in:
PikalaxALT
2015-07-25 20:18:59 -04:00
parent 6c3000efd2 ec10d9dd6f
commit 594253eb30
85 changed files with 423 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/FastShip1F.asm
View File

@@ -22,7 +22,7 @@ FastShip1F_MapScriptHeader:
.PriorityJump2:
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75217
applymovement PLAYER, MovementData_0x75217
applymovement $2, MovementData_0x75211
pause 30
playsound SFX_BOAT
@@ -88,12 +88,12 @@ SailorScript_0x75160:
checkcode VAR_FACING
if_equal RIGHT, .YouAreFacingRight
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75235
applymovement PLAYER, MovementData_0x75235
end
.YouAreFacingRight:
applymovement $2, MovementData_0x75214
applymovement $0, MovementData_0x75238
applymovement PLAYER, MovementData_0x75238
end
SailorScript_0x751d0:
@@ -122,13 +122,13 @@ UnknownScript_0x751eb:
appear $5
applymovement $5, MovementData_0x7521b
playsound SFX_TACKLE
applymovement $0, MovementData_0x7522e
applymovement PLAYER, MovementData_0x7522e
applymovement $5, MovementData_0x75220
loadfont
writetext UnknownText_0x75412
closetext
loadmovesprites
spriteface $0, RIGHT
spriteface PLAYER, RIGHT
applymovement $5, MovementData_0x75222
disappear $5
dotrigger $0