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

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

16
maps/AzaleaTown.asm
View File

@@ -28,23 +28,23 @@ AzaleaTown_MapScriptHeader:
UnknownScript_0x198018:
moveperson $b, $b, $b
spriteface $0, RIGHT
showemote EMOTE_SHOCK, $0, 15
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x198134
spriteface $0, DOWN
spriteface PLAYER, DOWN
jump UnknownScript_0x198049
UnknownScript_0x198034:
spriteface $0, RIGHT
showemote EMOTE_SHOCK, $0, 15
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x19813c
spriteface $0, UP
spriteface PLAYER, UP
UnknownScript_0x198049:
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -88,7 +88,7 @@ UnknownScript_0x198091:
writetext UnknownText_0x198233
closetext
loadmovesprites
spriteface $0, LEFT
spriteface PLAYER, LEFT
applymovement $b, MovementData_0x198144
playsound SFX_EXIT_BUILDING
disappear $b
@@ -146,7 +146,7 @@ WoosterScript:
end
UnknownScript_0x1980e5:
applymovement $0, MovementData_0x198148
applymovement PLAYER, MovementData_0x198148
loadfont
writetext UnknownText_0x1985df
keeptextopen

4
maps/BattleTower1F.asm
View File

@@ -105,14 +105,14 @@ UnknownScript_0x9e454:
domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger BATTLE_TOWER_ELEVATOR, $0
domaptrigger BATTLE_TOWER_HALLWAY, $0
follow $2, $0
follow $2, PLAYER
applymovement $2, MovementData_0x9e571
writebyte $a
special Function170687
warpsound
disappear $2
stopfollow
applymovement $0, MovementData_0x9e576
applymovement PLAYER, MovementData_0x9e576
warpcheck
end

6
maps/BattleTowerBattleRoom.asm
View File

@@ -18,7 +18,7 @@ UnknownScript_0x9f420:
end
UnknownScript_0x9f421:
applymovement $0, MovementData_0x9e58c
applymovement PLAYER, MovementData_0x9e58c
UnknownScript_0x9f425:
writebyte $2
special Function170b44
@@ -40,7 +40,7 @@ UnknownScript_0x9f425:
warpsound
disappear $2
applymovement $3, MovementData_0x9e59c
applymovement $0, MovementData_0x9e5a7
applymovement PLAYER, MovementData_0x9e5a7
loadfont
writetext UnknownText_0x9ee92
closetext
@@ -57,7 +57,7 @@ UnknownScript_0x9f425:
iffalse UnknownScript_0x9f483
UnknownScript_0x9f477:
loadmovesprites
applymovement $0, MovementData_0x9e5a9
applymovement PLAYER, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
jump UnknownScript_0x9f425

8
maps/BattleTowerElevator.asm
View File

@@ -17,20 +17,20 @@ UnknownScript_0x9f567:
end
UnknownScript_0x9f568:
follow $2, $0
follow $2, PLAYER
applymovement $2, MovementData_0x9f58f
applymovement $0, MovementData_0x9f592
applymovement PLAYER, MovementData_0x9f592
writebyte $a
special Function170687
playsound SFX_ELEVATOR
earthquake 60
waitbutton
follow $2, $0
follow $2, PLAYER
applymovement $2, MovementData_0x9e578
stopfollow
warpsound
disappear $2
applymovement $0, MovementData_0x9e578
applymovement PLAYER, MovementData_0x9e578
warpcheck
end

6
maps/BattleTowerHallway.asm
View File

@@ -17,7 +17,7 @@ UnknownScript_0x9f5c0:
end
UnknownScript_0x9f5c1:
follow $2, $0
follow $2, PLAYER
callasm Function_0x9f5cb
jump UnknownScript_0x9f5dc
@@ -65,13 +65,13 @@ UnknownScript_0x9f618:
jump UnknownScript_0x9f61f
UnknownScript_0x9f61f:
faceperson $0, $2
faceperson PLAYER, $2
loadfont
writetext UnknownText_0x9ec26
closetext
loadmovesprites
stopfollow
applymovement $0, MovementData_0x9e576
applymovement PLAYER, MovementData_0x9e576
warpcheck
end

2
maps/BrunosRoom.asm
View File

@@ -32,7 +32,7 @@ UnknownScript_0x1809ac:
return
UnknownScript_0x1809ad:
applymovement $0, MovementData_0x1809f9
applymovement PLAYER, MovementData_0x1809f9
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80

6
maps/BurnedTower1F.asm
View File

@@ -53,7 +53,7 @@ UnknownScript_0x185c25:
pause 15
spriteface $4, RIGHT
pause 15
applymovement $0, MovementData_0x185ccd
applymovement PLAYER, MovementData_0x185ccd
applymovement $4, MovementData_0x185ccf
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -101,13 +101,13 @@ UnknownScript_0x185c80:
special Functionc48f
pause 15
earthquake 50
showemote EMOTE_SHOCK, $0, 15
showemote EMOTE_SHOCK, PLAYER, 15
playsound SFX_ENTER_DOOR
waitbutton
changeblock $a, $8, $25
reloadmappart
pause 15
applymovement $0, MovementData_0x185cd1
applymovement PLAYER, MovementData_0x185cd1
playsound SFX_KINESIS
showemote EMOTE_SHOCK, $4, 20
loadfont

18
maps/BurnedTowerB1F.asm
View File

@@ -30,48 +30,48 @@ UnknownScript_0x18616b:
playmusic MUSIC_NONE
pause 30
appear $3
spriteface $0, UP
spriteface PLAYER, UP
pause 5
disappear $6
pause 15
cry RAIKOU
appear $4
spriteface $0, UP
spriteface PLAYER, UP
pause 5
disappear $7
pause 15
cry ENTEI
appear $5
spriteface $0, UP
spriteface PLAYER, UP
pause 5
disappear $8
pause 15
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
spriteface $0, LEFT
spriteface PLAYER, LEFT
applymovement $3, MovementData_0x186236
disappear $3
waitbutton
playsound SFX_WARP_FROM
spriteface $0, RIGHT
spriteface PLAYER, RIGHT
applymovement $4, MovementData_0x18623b
disappear $4
waitbutton
pause 15
playsound SFX_WARP_FROM
spriteface $0, UP
spriteface PLAYER, UP
applymovement $5, MovementData_0x186241
playsound SFX_WARP_FROM
spriteface $0, DOWN
spriteface PLAYER, DOWN
applymovement $5, MovementData_0x186248
spriteface $0, UP
spriteface PLAYER, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement $5, MovementData_0x186253
spriteface $0, DOWN
spriteface PLAYER, DOWN
disappear $5
waitbutton
special RestartMapMusic

6
maps/CeladonGameCorner.asm
View File

@@ -57,7 +57,7 @@ FisherScript_0x72144:
writetext UnknownText_0x72345
closetext
loadmovesprites
spriteface $fe, LEFT
spriteface LAST_TALKED, LEFT
end
.UnknownScript_0x72172
@@ -71,14 +71,14 @@ UnknownScript_0x7217b:
writetext UnknownText_0x7238a
closetext
loadmovesprites
spriteface $fe, LEFT
spriteface LAST_TALKED, LEFT
end
UnknownScript_0x72184:
writetext UnknownText_0x723d9
closetext
loadmovesprites
spriteface $fe, LEFT
spriteface LAST_TALKED, LEFT
end
CeladonGymGuyScript:

2
maps/CeruleanGym.asm
View File

@@ -48,7 +48,7 @@ UnknownScript_0x1883de:
waitbutton
special RestartMapMusic
pause 15
spriteface $0, DOWN
spriteface PLAYER, DOWN
pause 15
end

24
maps/CherrygroveCity.asm
View File

@@ -34,35 +34,35 @@ CherrygroveCityGuideGent:
closetext
loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
follow $2, $0
follow $2, PLAYER
applymovement $2, MovementData_0x19c195
loadfont
writetext GuideGentPokeCenterText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c19b
spriteface $0, UP
spriteface PLAYER, UP
loadfont
writetext GuideGentMartText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1a3
spriteface $0, UP
spriteface PLAYER, UP
loadfont
writetext GuideGentRoute30Text
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1ac
spriteface $0, LEFT
spriteface PLAYER, LEFT
loadfont
writetext GuideGentSeaText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1b6
spriteface $0, UP
spriteface PLAYER, UP
pause 60
spriteface $2, LEFT
spriteface $0, RIGHT
spriteface PLAYER, RIGHT
loadfont
writetext GuideGentGiftText
keeptextopen
@@ -76,7 +76,7 @@ CherrygroveCityGuideGent:
loadmovesprites
stopfollow
special RestartMapMusic
spriteface $0, UP
spriteface PLAYER, UP
applymovement $2, MovementData_0x19c1cb
playsound SFX_ENTER_DOOR
disappear $2
@@ -101,13 +101,13 @@ UnknownScript_0x19c0aa:
moveperson $3, $27, $7
UnknownScript_0x19c0ae:
spriteface $0, RIGHT
showemote EMOTE_SHOCK, $0, 15
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
appear $3
applymovement $3, MovementData_0x19c1ce
spriteface $0, RIGHT
spriteface PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x19c4e2
@@ -165,8 +165,8 @@ UnknownScript_0x19c126:
loadmovesprites
UnknownScript_0x19c12f:
playsound SFX_TACKLE
applymovement $0, MovementData_0x19c1d4
spriteface $0, LEFT
applymovement PLAYER, MovementData_0x19c1d4
spriteface PLAYER, LEFT
applymovement $3, MovementData_0x19c1da
disappear $3
dotrigger $0

6
maps/CianwoodCity.asm
View File

@@ -28,12 +28,12 @@ UnknownScript_0x1a001d:
return
UnknownScript_0x1a001e:
spriteface $0, UP
showemote EMOTE_SHOCK, $0, 15
spriteface PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00da
spriteface $0, DOWN
spriteface PLAYER, DOWN
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00e0

10
maps/DragonShrine.asm
View File

@@ -17,7 +17,7 @@ DragonShrine_MapScriptHeader:
end
DragonShrineTestScript:
applymovement $0, MovementData_0x18d2bf
applymovement PLAYER, MovementData_0x18d2bf
applymovement $2, MovementData_0x18d2c7
loadfont
writetext UnknownText_0x18d2ea
@@ -116,15 +116,15 @@ DragonShrineTestScript:
closetext
loadmovesprites
playsound SFX_ENTER_DOOR
showemote EMOTE_SHOCK, $0, 15
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_CLAIR
appear $5
waitbutton
spriteface $0, DOWN
spriteface PLAYER, DOWN
pause 30
applymovement $5, MovementData_0x18d2d4
spriteface $5, RIGHT
spriteface $0, LEFT
spriteface PLAYER, LEFT
spriteface $2, LEFT
loadfont
writetext UnknownText_0x18d916
@@ -171,7 +171,7 @@ DragonShrineTestScript:
applymovement $2, MovementData_0x18d2ce
spriteface $5, UP
applymovement $2, MovementData_0x18d2d1
spriteface $0, UP
spriteface PLAYER, UP
loadfont
writetext UnknownText_0x18d5a3
closetext

4
maps/DragonsDenB1F.asm
View File

@@ -42,8 +42,8 @@ UnknownScript_0x18c8b8:
writetext UnknownText_0x18c9b8
pause 30
loadmovesprites
showemote EMOTE_SHOCK, $0, 15
spriteface $0, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
spriteface PLAYER, LEFT
playmusic MUSIC_CLAIR
applymovement $3, MovementData_0x18c9ae
loadfont

6
maps/EcruteakGym.asm
View File

@@ -75,14 +75,14 @@ EcruteakGymTriggerRockets:
jumpstd radiotowerrockets
UnknownScript_0x99dc6:
applymovement $0, MovementData_0x99e5d
applymovement PLAYER, MovementData_0x99e5d
applymovement $8, MovementData_0x99e63
loadfont
writetext UnknownText_0x9a49c
closetext
loadmovesprites
follow $0, $8
applymovement $0, MovementData_0x99e5f
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
special FadeBlackBGMap
playsound SFX_ENTER_DOOR

4
maps/EcruteakPokeCenter1F.asm
View File

@@ -22,7 +22,7 @@ UnknownScript_0x98e64:
appear $6
waitbutton
applymovement $6, MovementData_0x98ec5
applymovement $0, MovementData_0x98ed4
applymovement PLAYER, MovementData_0x98ed4
spriteface $2, UP
pause 10
spriteface $2, DOWN
@@ -42,7 +42,7 @@ UnknownScript_0x98e95:
writetext UnknownText_0x98f22
closetext
loadmovesprites
spriteface $0, DOWN
spriteface PLAYER, DOWN
applymovement $6, MovementData_0x98ece
playsound SFX_EXIT_BUILDING
disappear $6

28
maps/ElmsLab.asm
View File

@@ -44,7 +44,7 @@ ElmsLab_PutElmAtLaptop:
return
ElmsLab_AutowalkUpToElm:
applymovement $0, ElmsLab_WalkUpToElmMovement
applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, $2, 15
spriteface $2, RIGHT
loadfont
@@ -75,9 +75,9 @@ ElmsLab_ElmGetsEmail:
closetext
loadmovesprites
applymovement $2, ElmsLab_ElmToDefaultPositionMovement1
spriteface $0, UP
spriteface PLAYER, UP
applymovement $2, ElmsLab_ElmToDefaultPositionMovement2
spriteface $0, RIGHT
spriteface PLAYER, RIGHT
loadfont
writetext ElmText_ChooseAPokemon
closetext
@@ -151,7 +151,7 @@ LabTryToLeaveScript:
writetext LabWhereGoingText
closetext
loadmovesprites
applymovement $0, MovementData_0x78f70
applymovement PLAYER, MovementData_0x78f70
end
CyndaquilPokeBallScript:
@@ -181,7 +181,7 @@ CyndaquilPokeBallScript:
loadmovesprites
checkcode VAR_FACING
if_equal $3, ElmDirectionsScript
applymovement $0, AfterCyndaquilMovement
applymovement PLAYER, AfterCyndaquilMovement
jump ElmDirectionsScript
TotodilePokeBallScript:
@@ -209,7 +209,7 @@ TotodilePokeBallScript:
keeptextopen
givepoke TOTODILE, 5, BERRY, 0
loadmovesprites
applymovement $0, AfterTotodileMovement
applymovement PLAYER, AfterTotodileMovement
jump ElmDirectionsScript
ChikoritaPokeBallScript:
@@ -237,7 +237,7 @@ ChikoritaPokeBallScript:
keeptextopen
givepoke CHIKORITA, 5, BERRY, 0
loadmovesprites
applymovement $0, AfterChikoritaMovement
applymovement PLAYER, AfterChikoritaMovement
jump ElmDirectionsScript
DidntChooseStarterScript:
@@ -247,7 +247,7 @@ DidntChooseStarterScript:
end
ElmDirectionsScript:
spriteface $0, UP
spriteface PLAYER, UP
loadfont
writetext ElmDirectionsText1
closetext
@@ -456,14 +456,14 @@ ElmJumpRightScript:
AideScript_WalkPotions1:
applymovement $3, AideWalksRight1
spriteface $0, DOWN
spriteface PLAYER, DOWN
scall AideScript_GivePotions
applymovement $3, AideWalksLeft1
end
AideScript_WalkPotions2:
applymovement $3, AideWalksRight2
spriteface $0, DOWN
spriteface PLAYER, DOWN
scall AideScript_GivePotions
applymovement $3, AideWalksLeft2
end
@@ -481,14 +481,14 @@ AideScript_GivePotions:
AideScript_WalkBalls1:
applymovement $3, AideWalksRight1
spriteface $0, DOWN
spriteface PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement $3, AideWalksLeft1
end
AideScript_WalkBalls2:
applymovement $3, AideWalksRight2
spriteface $0, DOWN
spriteface PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement $3, AideWalksLeft2
end
@@ -544,10 +544,10 @@ AideScript_AfterTheft:
end
MeetCopScript2:
applymovement $0, MeetCopScript2_StepLeft
applymovement PLAYER, MeetCopScript2_StepLeft
MeetCopScript:
applymovement $0, MeetCopScript_WalkUp
applymovement PLAYER, MeetCopScript_WalkUp
CopScript:
spriteface $7, LEFT
loadfont

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

4
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -38,10 +38,10 @@ TwinScript_0x75ebb:
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
disappear $5
applymovement $0, MovementData_0x76004
applymovement PLAYER, MovementData_0x76004
moveperson $4, $3, $13
appear $4
spriteface $0, UP
spriteface PLAYER, UP
spriteface $4, UP
special Special_FadeInQuickly
spriteface $3, DOWN

2
maps/GoldenrodGameCorner.asm
View File

@@ -239,7 +239,7 @@ PharmacistScript_0x56df1:
writetext UnknownText_0x56f55
closetext
loadmovesprites
spriteface $fe, LEFT
spriteface LAST_TALKED, LEFT
end
PokefanMScript_0x56dfc:

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