ref: c00949dddf8498eb6483487792332f10dd074386
parent: d6f7dc320612eccf9397df3d0777fcea9c589b4d
author: yenatch <yenatch@gmail.com>
date: Fri Jun 26 19:24:55 EDT 2015
Labels for the heal machine; spriteface constants.
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -2469,7 +2469,7 @@
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
jr nz, .asm_3cfe8
- predef Functionc658
+ predef HealParty
.asm_3cfe8
ld a, [wc2cc]
bit 0, a
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -43,7 +43,7 @@
add_special Function135db
add_special Functionfbb32
add_special Functionfbcd2
- add_special Functionc658
+ add_special HealParty
add_special Function1559a
add_special Functionc2e7
add_special Function166d6
@@ -78,7 +78,7 @@
add_special WaitSFX
add_special PlayMapMusic
add_special RestartMapMusic
- add_special Function12324
+ add_special HealMachineAnim
add_special Function8379
add_special Functionc25a
add_special Functionc268
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -110,10 +110,10 @@
special Function1060a2
spriteface $fe, LEFT
pause 10
- special Functionc658
+ special HealParty
playmusic MUSIC_NONE
writebyte 0
- special Function12324
+ special HealMachineAnim
pause 30
special RestartMapMusic
spriteface $fe, DOWN
--- a/main.asm
+++ b/main.asm
@@ -4082,7 +4082,7 @@
add_predef LearnMove ; $0
add_predef Predef1
- add_predef Functionc658
+ add_predef HealParty
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
@@ -4491,7 +4491,7 @@
; c658
-Functionc658: ; c658
+HealParty: ; c658
xor a
ld [CurPartyMon], a
ld hl, PartySpecies
@@ -4503,7 +4503,7 @@
jr z, .next
push hl
- call Functionc677
+ call HealPartyMon
pop hl
.next
@@ -4516,7 +4516,7 @@
ret
; c677
-Functionc677: ; c677
+HealPartyMon: ; c677
ld a, PartyMon1Species - PartyMon1
call GetPartyParamLocation
ld d, h
@@ -8824,7 +8824,7 @@
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
- callba Functionc677
+ callba HealPartyMon
ld a, [CurPartyLevel]
ld d, a
callab Function50e47
@@ -12447,7 +12447,7 @@
ret
; 12324
-Function12324: ; 12324
+HealMachineAnim: ; 12324
ld a, [PartyCount]
and a
ret z
@@ -12720,7 +12720,7 @@
closetext
special Function8c084
pause 40
- special Functionc658
+ special HealParty
checkflag $0011
iftrue .script_64f2
callasm HalveMoney
@@ -49489,7 +49489,7 @@
; 50821
UnknownScript_0x50821: ; 0x50821
- special Functionc658
+ special HealParty
reloadmappart
playsound SFX_WARP_TO
special Function8c084
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -28,23 +28,23 @@
UnknownScript_0x198018:
moveperson $b, $b, $b
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x198134
- spriteface $0, $0
+ spriteface $0, DOWN
jump UnknownScript_0x198049
UnknownScript_0x198034:
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x19813c
- spriteface $0, $1
+ spriteface $0, UP
UnknownScript_0x198049:
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -88,7 +88,7 @@
writetext UnknownText_0x198233
closetext
loadmovesprites
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $b, MovementData_0x198144
playsound SFX_EXIT_BUILDING
disappear $b
@@ -150,13 +150,13 @@
loadfont
writetext UnknownText_0x1985df
keeptextopen
- spriteface $d, $3
+ spriteface $d, RIGHT
writetext UnknownText_0x19860b
keeptextopen
writetext UnknownText_0x198628
closetext
verbosegiveitem GS_BALL, 1
- spriteface $d, $2
+ spriteface $d, LEFT
setflag $0064
clearevent $06ed
setevent $06eb
@@ -169,7 +169,7 @@
loadfont
writetext UnknownText_0x198628
closetext
- spriteface $d, $2
+ spriteface $d, LEFT
loadmovesprites
end
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -191,10 +191,10 @@
if_equal $a, UnknownScript_0x9e3fc
if_not_equal $0, UnknownScript_0x9e550
writetext UnknownText_0x9e9eb
- spriteface $2, $2
+ spriteface $2, LEFT
writetext UnknownText_0x9ea1b
closetext
- spriteface $2, $0
+ spriteface $2, DOWN
loadmovesprites
end
; 0x9e4ea
@@ -273,7 +273,7 @@
writetext UnknownText_0x9f264
closetext
loadmovesprites
- spriteface $3, $3
+ spriteface $3, RIGHT
end
; 0x9e568
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -41,7 +41,7 @@
; 0x185c0d
UnknownScript_0x185c0d: ; 0x185c0d
- spriteface $3, $0
+ spriteface $3, DOWN
showemote $0, $3, 15
applymovement $3, MovementData_0x185cd3
loadfont
@@ -57,7 +57,7 @@
showemote $0, $4, 15
special Functionc48f
pause 15
- spriteface $4, $3
+ spriteface $4, RIGHT
pause 15
applymovement $0, MovementData_0x185ccd
applymovement $4, MovementData_0x185ccf
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -34,19 +34,19 @@
playmusic MUSIC_NONE
pause 30
appear $3
- spriteface $0, $1
+ spriteface $0, UP
pause 5
disappear $6
pause 15
cry RAIKOU
appear $4
- spriteface $0, $1
+ spriteface $0, UP
pause 5
disappear $7
pause 15
cry ENTEI
appear $5
- spriteface $0, $1
+ spriteface $0, UP
pause 5
disappear $8
pause 15
@@ -53,29 +53,29 @@
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $3, MovementData_0x186236
disappear $3
waitbutton
playsound SFX_WARP_FROM
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $4, MovementData_0x18623b
disappear $4
waitbutton
pause 15
playsound SFX_WARP_FROM
- spriteface $0, $1
+ spriteface $0, UP
applymovement $5, MovementData_0x186241
playsound SFX_WARP_FROM
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $5, MovementData_0x186248
- spriteface $0, $1
+ spriteface $0, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement $5, MovementData_0x186253
- spriteface $0, $0
+ spriteface $0, DOWN
disappear $5
waitbutton
special RestartMapMusic
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -25,7 +25,7 @@
writetext UnknownText_0x7313a
closetext
loadmovesprites
- spriteface $3, $2
+ spriteface $3, LEFT
end
; 0x73062
@@ -39,7 +39,7 @@
writetext UnknownText_0x73178
closetext
loadmovesprites
- spriteface $4, $3
+ spriteface $4, RIGHT
end
; 0x73073
@@ -53,7 +53,7 @@
writetext UnknownText_0x731bd
closetext
loadmovesprites
- spriteface $5, $3
+ spriteface $5, RIGHT
end
; 0x73084
@@ -69,7 +69,7 @@
writetext UnknownText_0x73212
closetext
loadmovesprites
- spriteface $6, $2
+ spriteface $6, LEFT
end
; 0x7309a
@@ -78,12 +78,12 @@
writetext UnknownText_0x73254
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
loadfont
writetext UnknownText_0x73278
closetext
loadmovesprites
- spriteface $6, $2
+ spriteface $6, LEFT
end
; 0x730ad
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -21,7 +21,7 @@
writetext UnknownText_0x70d86
closetext
loadmovesprites
- spriteface $4, $0
+ spriteface $4, DOWN
end
GameboyKidScript_0x70d3f:
@@ -30,7 +30,7 @@
writetext UnknownText_0x70dc7
closetext
loadmovesprites
- spriteface $5, $0
+ spriteface $5, DOWN
end
SuperNerdScript_0x70d4a:
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -20,7 +20,7 @@
writetext UnknownText_0x72215
closetext
loadmovesprites
- spriteface $4, $2
+ spriteface $4, LEFT
end
; 0x7212e
@@ -30,7 +30,7 @@
writetext UnknownText_0x72242
closetext
loadmovesprites
- spriteface $5, $3
+ spriteface $5, RIGHT
end
; 0x72139
@@ -40,7 +40,7 @@
writetext UnknownText_0x72295
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
end
; 0x72144
@@ -63,7 +63,7 @@
writetext UnknownText_0x72345
closetext
loadmovesprites
- spriteface $fe, $2
+ spriteface $fe, LEFT
end
; 0x72172
@@ -80,7 +80,7 @@
writetext UnknownText_0x7238a
closetext
loadmovesprites
- spriteface $fe, $2
+ spriteface $fe, LEFT
end
; 0x72184
@@ -88,7 +88,7 @@
writetext UnknownText_0x723d9
closetext
loadmovesprites
- spriteface $fe, $2
+ spriteface $fe, LEFT
end
; 0x7218d
@@ -102,7 +102,7 @@
writetext UnknownText_0x724ad
closetext
loadmovesprites
- spriteface $a, $2
+ spriteface $a, LEFT
end
; 0x7219b
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -45,7 +45,7 @@
writetext UnknownText_0x1841fa
closetext
loadmovesprites
- spriteface $5, $2
+ spriteface $5, LEFT
loadfont
writetext UnknownText_0x184229
closetext
@@ -109,7 +109,7 @@
playsound SFX_TRANSACTION
waitbutton
showemote $0, $7, 15
- spriteface $7, $2
+ spriteface $7, LEFT
loadfont
writetext UnknownText_0x1842ee
closetext
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -51,7 +51,7 @@
waitbutton
special RestartMapMusic
pause 15
- spriteface $0, $0
+ spriteface $0, DOWN
pause 15
end
; 0x188432
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -41,28 +41,28 @@
closetext
loadmovesprites
applymovement $2, MovementData_0x19c19b
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext GuideGentMartText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1a3
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext GuideGentRoute30Text
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1ac
- spriteface $0, $2
+ spriteface $0, LEFT
loadfont
writetext GuideGentSeaText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1b6
- spriteface $0, $1
+ spriteface $0, UP
pause 60
- spriteface $2, $2
- spriteface $0, $3
+ spriteface $2, LEFT
+ spriteface $0, RIGHT
loadfont
writetext GuideGentGiftText
keeptextopen
@@ -76,7 +76,7 @@
loadmovesprites
stopfollow
special RestartMapMusic
- spriteface $0, $1
+ spriteface $0, UP
applymovement $2, MovementData_0x19c1cb
playsound SFX_ENTER_DOOR
disappear $2
@@ -101,13 +101,13 @@
moveperson $3, $27, $7
UnknownScript_0x19c0ae:
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $3
applymovement $3, MovementData_0x19c1ce
- spriteface $0, $3
+ spriteface $0, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x19c4e2
@@ -166,11 +166,11 @@
UnknownScript_0x19c12f:
playsound SFX_TACKLE
applymovement $0, MovementData_0x19c1d4
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $3, MovementData_0x19c1da
disappear $3
dotrigger $0
- special Functionc658
+ special HealParty
playmapmusic
end
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -28,12 +28,12 @@
return
UnknownScript_0x1a001e:
- spriteface $0, $1
+ spriteface $0, UP
showemote $0, $0, 15
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00da
- spriteface $0, $0
+ spriteface $0, DOWN
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00e0
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -14,7 +14,7 @@
writetext UnknownText_0x9d6f9
closetext
loadmovesprites
- spriteface $2, $3
+ spriteface $2, RIGHT
loadfont
writetext UnknownText_0x9d76f
closetext
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -93,12 +93,12 @@
iftrue UnknownScript_0x18d049
UnknownScript_0x18d0cb: ; 0x18d0cb
loadmovesprites
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x18d7f6
closetext
loadmovesprites
- spriteface $2, $0
+ spriteface $2, DOWN
loadfont
writetext UnknownText_0x18d816
closetext
@@ -124,12 +124,12 @@
playmusic MUSIC_CLAIR
appear $5
waitbutton
- spriteface $0, $0
+ spriteface $0, DOWN
pause 30
applymovement $5, MovementData_0x18d2d4
- spriteface $5, $3
- spriteface $0, $2
- spriteface $2, $2
+ spriteface $5, RIGHT
+ spriteface $0, LEFT
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x18d916
closetext
@@ -146,7 +146,7 @@
closetext
loadmovesprites
applymovement $2, MovementData_0x18d2c9
- spriteface $5, $1
+ spriteface $5, UP
loadfont
writetext UnknownText_0x18d520
closetext
@@ -173,9 +173,9 @@
closetext
loadmovesprites
applymovement $2, MovementData_0x18d2ce
- spriteface $5, $1
+ spriteface $5, UP
applymovement $2, MovementData_0x18d2d1
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x18d5a3
closetext
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -49,7 +49,7 @@
pause 30
loadmovesprites
showemote $0, $0, 15
- spriteface $0, $2
+ spriteface $0, LEFT
playmusic MUSIC_CLAIR
applymovement $3, MovementData_0x18c9ae
loadfont
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -40,7 +40,7 @@
writetext UnknownText_0x68dda
closetext
loadmovesprites
- spriteface $4, $0
+ spriteface $4, DOWN
end
; 0x68a91
@@ -50,7 +50,7 @@
writetext UnknownText_0x68e07
closetext
loadmovesprites
- spriteface $5, $0
+ spriteface $5, DOWN
end
; 0x68a9c
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -26,15 +26,15 @@
waitbutton
applymovement $6, MovementData_0x98ec5
applymovement $0, MovementData_0x98ed4
- spriteface $2, $1
+ spriteface $2, UP
pause 10
- spriteface $2, $0
+ spriteface $2, DOWN
pause 30
- spriteface $2, $1
+ spriteface $2, UP
pause 10
- spriteface $2, $0
+ spriteface $2, DOWN
pause 20
- spriteface $6, $0
+ spriteface $6, DOWN
pause 10
loadfont
writetext UnknownText_0x98ed8
@@ -46,7 +46,7 @@
writetext UnknownText_0x98f22
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $6, MovementData_0x98ece
playsound SFX_EXIT_BUILDING
disappear $6
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -54,7 +54,7 @@
UnknownScript_0x78b8c: ; 0x78b8c
applymovement $0, MovementData_0x78f67
showemote $0, $2, 15
- spriteface $2, $3
+ spriteface $2, RIGHT
loadfont
writetext UnknownText_0x78fb6
UnknownScript_0x78b9b: ; 0x78b9b
@@ -73,20 +73,20 @@
playsound SFX_GLASS_TING
pause 30
showemote $0, $2, 10
- spriteface $2, $0
+ spriteface $2, DOWN
loadfont
writetext UnknownText_0x791ae
closetext
loadmovesprites
loadfont
- spriteface $2, $3
+ spriteface $2, RIGHT
writetext UnknownText_0x791df
closetext
loadmovesprites
applymovement $2, MovementData_0x78fa0
- spriteface $0, $1
+ spriteface $0, UP
applymovement $2, MovementData_0x78fa2
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x792ff
closetext
@@ -159,7 +159,7 @@
; 0x78c65
LabTryToLeaveScript: ; 0x78c65
- spriteface $2, $0
+ spriteface $2, DOWN
loadfont
writetext LabWhereGoingText
closetext
@@ -171,7 +171,7 @@
CyndaquilPokeBallScript: ; 0x78c73
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- spriteface $2, $0
+ spriteface $2, DOWN
refreshscreen $0
pokepic CYNDAQUIL
cry CYNDAQUIL
@@ -202,7 +202,7 @@
TotodilePokeBallScript: ; 0x78cb5
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- spriteface $2, $0
+ spriteface $2, DOWN
refreshscreen $0
pokepic TOTODILE
cry TOTODILE
@@ -231,7 +231,7 @@
ChikoritaPokeBallScript: ; 0x78cf1
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- spriteface $2, $0
+ spriteface $2, DOWN
refreshscreen $0
pokepic CHIKORITA
cry CHIKORITA
@@ -265,7 +265,7 @@
; 0x78d33
ElmDirectionsScript: ; 0x78d33
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext ElmDirectionsText1
closetext
@@ -277,12 +277,12 @@
waitbutton
closetext
loadmovesprites
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext ElmDirectionsText2
closetext
loadmovesprites
- spriteface $2, $0
+ spriteface $2, DOWN
loadfont
writetext ElmDirectionsText3
closetext
@@ -328,10 +328,10 @@
UnknownScript_0x78d8a: ; 0x78d8a
special Function1060a2
- special Functionc658
+ special HealParty
playmusic MUSIC_NONE
writebyte $1
- special Function12324
+ special HealMachineAnim
pause 30
special RestartMapMusic
loadmovesprites
@@ -494,7 +494,7 @@
UnknownScript_0x78e7f: ; 0x78e7f
applymovement $3, MovementData_0x78f7e
- spriteface $0, $0
+ spriteface $0, DOWN
scall UnknownScript_0x78e9d
applymovement $3, MovementData_0x78f87
end
@@ -502,7 +502,7 @@
UnknownScript_0x78e8e: ; 0x78e8e
applymovement $3, MovementData_0x78f82
- spriteface $0, $0
+ spriteface $0, DOWN
scall UnknownScript_0x78e9d
applymovement $3, MovementData_0x78f8b
end
@@ -522,7 +522,7 @@
UnknownScript_0x78ead: ; 0x78ead
applymovement $3, MovementData_0x78f7e
- spriteface $0, $0
+ spriteface $0, DOWN
scall UnknownScript_0x78ecb
applymovement $3, MovementData_0x78f87
end
@@ -530,7 +530,7 @@
UnknownScript_0x78ebc: ; 0x78ebc
applymovement $3, MovementData_0x78f82
- spriteface $0, $0
+ spriteface $0, DOWN
scall UnknownScript_0x78ecb
applymovement $3, MovementData_0x78f8b
end
@@ -598,7 +598,7 @@
MeetCopScript: ; 0x78f16
applymovement $0, MovementData_0x78f74
CopScript: ; 0x78f1a
- spriteface $7, $2
+ spriteface $7, LEFT
loadfont
writetext UnknownText_0x7a0f0
keeptextopen
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -144,7 +144,7 @@
writetext UnknownText_0x75412
closetext
loadmovesprites
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $5, MovementData_0x75222
disappear $5
dotrigger $0
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -191,7 +191,7 @@
loadtrainer SAILOR, STANLY
startbattle
reloadmap
- special Functionc658
+ special HealParty
setevent $057d
loadfont
writetext UnknownText_0x758b1
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -29,7 +29,7 @@
; 0x75ebb
TwinScript_0x75ebb: ; 0x75ebb
- spriteface $5, $3
+ spriteface $5, RIGHT
loadfont
writetext UnknownText_0x761e0
closetext
@@ -45,13 +45,13 @@
applymovement $0, MovementData_0x76004
moveperson $4, $3, $13
appear $4
- spriteface $0, $1
- spriteface $4, $1
+ spriteface $0, UP
+ spriteface $4, UP
special Function8c0ab
- spriteface $3, $0
+ spriteface $3, DOWN
showemote $0, $3, 15
applymovement $4, MovementData_0x7600c
- spriteface $3, $3
+ spriteface $3, RIGHT
checkflag $0063
iftrue UnknownScript_0x75f03
loadfont
@@ -67,7 +67,7 @@
closetext
loadmovesprites
UnknownScript_0x75f09: ; 0x75f09
- spriteface $5, $0
+ spriteface $5, DOWN
applymovement $3, MovementData_0x76010
loadfont
writetext UnknownText_0x76143
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -140,7 +140,7 @@
special Function8c0b6
special Functiond91
special Function1060a2
- special Functionc658
+ special HealParty
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -200,7 +200,7 @@
writetext UnknownText_0x198d2a
closetext
loadmovesprites
- spriteface $9, $1
+ spriteface $9, UP
end
RocketScript_0x198a29:
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -24,7 +24,7 @@
writetext UnknownText_0x55f74
closetext
loadmovesprites
- spriteface $5, $0
+ spriteface $5, DOWN
end
GoldenrodDeptStore4FDirectory:
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -55,7 +55,7 @@
writetext UnknownText_0x567d2
closetext
loadmovesprites
- spriteface $4, $1
+ spriteface $4, UP
end
; 0x56754
@@ -68,12 +68,12 @@
writetext UnknownText_0x56867
closetext
loadmovesprites
- spriteface $6, $1
+ spriteface $6, UP
loadfont
writetext UnknownText_0x56871
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
end
; 0x5676a
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -30,7 +30,7 @@
; 0x5538f
UnknownScript_0x5538f: ; 0x5538f
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x5552e
closetext
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -37,7 +37,7 @@
writetext UnknownText_0x5718a
closetext
loadmovesprites
- spriteface $d, $3
+ spriteface $d, RIGHT
end
; 0x56c25
@@ -262,7 +262,7 @@
writetext UnknownText_0x56f55
closetext
loadmovesprites
- spriteface $fe, $2
+ spriteface $fe, LEFT
end
; 0x56dfc
@@ -272,7 +272,7 @@
writetext UnknownText_0x56f9e
closetext
loadmovesprites
- spriteface $7, $3
+ spriteface $7, RIGHT
end
; 0x56e07
@@ -282,7 +282,7 @@
writetext UnknownText_0x56ff4
closetext
loadmovesprites
- spriteface $8, $2
+ spriteface $8, LEFT
end
; 0x56e12
@@ -292,7 +292,7 @@
writetext UnknownText_0x5702b
closetext
loadmovesprites
- spriteface $9, $3
+ spriteface $9, RIGHT
end
; 0x56e1d
@@ -306,7 +306,7 @@
writetext UnknownText_0x570b1
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
end
; 0x56e2b
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -127,7 +127,7 @@
WhitneyCriesScript: ; 0x540a0
showemote $0, $4, 15
applymovement $4, BridgetWalksUpMovement
- spriteface $0, $0
+ spriteface $0, DOWN
loadfont
writetext BridgetWhitneyCriesText
closetext
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -26,7 +26,7 @@
appear $3
playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x6105a
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x622f0
closetext
@@ -60,7 +60,7 @@
appear $3
playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x61065
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x622f0
closetext
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -23,17 +23,17 @@
follow $2, $0
applymovement $2, MovementData_0x181499
stopfollow
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x1814a6
closetext
loadmovesprites
- spriteface $2, $1
+ spriteface $2, UP
applymovement $0, MovementData_0x1814a4
dotrigger $1
pause 15
writebyte $2
- special Function12324
+ special HealMachineAnim
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY
setevent EVENT_RIVAL_SPROUT_TOWER
@@ -41,7 +41,7 @@
setevent $0737
clearevent $0738
domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1
- special Functionc658
+ special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue UnknownScript_0x181497
specialphonecall $5
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -526,7 +526,7 @@
special Functionc48f
applymovement $0, MovementData_0x6ef58
pause 30
- spriteface $0, $0
+ spriteface $0, DOWN
pause 20
clearflag $0064
special Function4989a
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -56,13 +56,13 @@
if_equal SATURDAY, UnknownScript_0x18012b
moveperson $5, $11, $9
appear $5
- spriteface $0, $0
+ spriteface $0, DOWN
showemote $0, $0, 15
special Functionc48f
pause 15
applymovement $5, MovementData_0x180164
playmusic MUSIC_RIVAL_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
jump UnknownScript_0x1800ce
; 0x180094
@@ -78,13 +78,13 @@
if_equal FRIDAY, UnknownScript_0x18012b
if_equal SATURDAY, UnknownScript_0x18012b
appear $5
- spriteface $0, $0
+ spriteface $0, DOWN
showemote $0, $0, 15
special Functionc48f
pause 15
applymovement $5, MovementData_0x18016b
playmusic MUSIC_RIVAL_ENCOUNTER
- spriteface $0, $2
+ spriteface $0, LEFT
UnknownScript_0x1800ce: ; 0x1800ce
loadfont
writetext UnknownText_0x1801f5
@@ -130,7 +130,7 @@
writetext UnknownText_0x1802a4
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $5, MovementData_0x180172
disappear $5
dotrigger $0
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -25,7 +25,7 @@
UnknownScript_0x7a4db: ; 0x7a4db
playmusic MUSIC_MOM
showemote $0, $2, 15
- spriteface $0, $2
+ spriteface $0, LEFT
checkevent $0000
iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc
@@ -105,7 +105,7 @@
UnknownScript_0x7a56b: ; 0x7a56b
special RestartMapMusic
- spriteface $2, $2
+ spriteface $2, LEFT
end
; 0x7a572
@@ -196,7 +196,7 @@
writetext NeighborText
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
end
TVScript:
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -47,7 +47,7 @@
setevent $06fa
checkcode $9
if_equal $1, UnknownScript_0x18e1ab
- spriteface $0, $0
+ spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e466
playsound SFX_EXIT_BUILDING
@@ -58,7 +58,7 @@
; 0x18e1ab
UnknownScript_0x18e1ab: ; 0x18e1ab
- spriteface $0, $0
+ spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
playsound SFX_EXIT_BUILDING
@@ -324,7 +324,7 @@
showemote $0, $2, 30
checkcode $9
if_equal $1, UnknownScript_0x18e3a2
- spriteface $0, $0
+ spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e466
jump UnknownScript_0x18e3ac
@@ -331,7 +331,7 @@
; 0x18e3a2
UnknownScript_0x18e3a2: ; 0x18e3a2
- spriteface $0, $0
+ spriteface $0, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
UnknownScript_0x18e3ac: ; 0x18e3ac
@@ -355,7 +355,7 @@
writetext UnknownText_0x18e7d8
closetext
loadmovesprites
- spriteface $5, $1
+ spriteface $5, UP
end
; 0x18e3d4
@@ -363,7 +363,7 @@
writetext UnknownText_0x18e863
closetext
loadmovesprites
- spriteface $5, $1
+ spriteface $5, UP
setevent $00bb
end
; 0x18e3e0
@@ -371,7 +371,7 @@
UnknownScript_0x18e3e0: ; 0x18e3e0
writetext UnknownText_0x18e934
closetext
- spriteface $5, $1
+ spriteface $5, UP
writetext UnknownText_0x18e949
closetext
loadmovesprites
@@ -428,7 +428,7 @@
writetext KurtsGranddaughterHelpText
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
end
.GSBall
@@ -435,7 +435,7 @@
writetext KurtsGranddaughterGSBallText
closetext
loadmovesprites
- spriteface $6, $3
+ spriteface $6, RIGHT
end
KurtsGranddaughterFunScript: ; 0x18e448
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -58,7 +58,7 @@
special Functionc48f
applymovement $0, MovementData_0x180f3c
LanceScript_0x180e7b: ; 0x180e7b
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x180f67
closetext
@@ -82,9 +82,9 @@
musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10
pause 30
showemote $0, $2, 15
- spriteface $2, $0
+ spriteface $2, DOWN
pause 10
- spriteface $0, $0
+ spriteface $0, DOWN
appear $3
applymovement $3, MovementData_0x180f41
loadfont
@@ -96,27 +96,27 @@
follow $3, $4
applymovement $3, MovementData_0x180f49
stopfollow
- spriteface $4, $1
- spriteface $2, $2
+ spriteface $4, UP
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x18121b
closetext
loadmovesprites
applymovement $3, MovementData_0x180f4c
- spriteface $0, $2
+ spriteface $0, LEFT
loadfont
writetext UnknownText_0x18134b
closetext
loadmovesprites
applymovement $2, MovementData_0x180f4f
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x18137b
closetext
loadmovesprites
follow $2, $0
- spriteface $3, $1
- spriteface $4, $1
+ spriteface $3, UP
+ spriteface $4, UP
applymovement $2, MovementData_0x180f53
stopfollow
playsound SFX_EXIT_BUILDING
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -100,7 +100,7 @@
reloadmappart
loadmovesprites
setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
- spriteface $4, $2
+ spriteface $4, LEFT
loadfont
writetext UnknownText_0x6c5ba
closetext
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -28,7 +28,7 @@
follow $0, $2
applymovement $0, MovementData_0x1900a7
stopfollow
- spriteface $0, $3
+ spriteface $0, RIGHT
scall UnknownScript_0x19002f
applymovement $2, MovementData_0x1900ad
end
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -49,7 +49,7 @@
refreshscreen $0
UnknownScript_0x19360d: ; 0x19360d
special Function1060a2
- special Functionc658
+ special HealParty
special Function10383c
iftrue UnknownScript_0x193624
UnknownScript_0x193619: ; 0x193619
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -20,7 +20,7 @@
; 0x7408e
UnknownScript_0x7408e: ; 0x7408e
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -41,7 +41,7 @@
applymovement $0, MovementData_0x77121
pause 15
appear $4
- spriteface $2, $3
+ spriteface $2, RIGHT
cry CLEFAIRY
waitbutton
pause 30
@@ -61,10 +61,10 @@
follow $2, $3
applymovement $2, MovementData_0x77132
stopfollow
- spriteface $2, $0
+ spriteface $2, DOWN
pause 10
showemote $0, $2, 15
- spriteface $2, $0
+ spriteface $2, DOWN
cry CLEFAIRY
pause 15
follow $2, $3
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -21,7 +21,7 @@
UnknownScript_0x196e56: ; 0x196e56
showemote $0, $2, 15
- spriteface $2, $0
+ spriteface $2, DOWN
loadfont
writetext UnknownText_0x196f66
closetext
@@ -40,11 +40,11 @@
blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
writetext UnknownText_0x196feb
keeptextopen
- spriteface $2, $3
+ spriteface $2, RIGHT
writetext UnknownText_0x197092
keeptextopen
- spriteface $2, $0
- spriteface $3, $2
+ spriteface $2, DOWN
+ spriteface $3, LEFT
writetext UnknownText_0x1970b7
closetext
loadmovesprites
@@ -92,7 +92,7 @@
UnknownScript_0x196ec9: ; 0x196ec9
playmusic MUSIC_PROF_OAK
applymovement $3, MovementData_0x196f5d
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x197185
keeptextopen
@@ -104,7 +104,7 @@
writetext UnknownText_0x1973de
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $3, MovementData_0x196f61
playsound SFX_EXIT_BUILDING
disappear $3
@@ -111,7 +111,7 @@
waitbutton
special RestartMapMusic
pause 15
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x1970ed
closetext
@@ -120,7 +120,7 @@
special Functiond91
playmusic MUSIC_HEAL
special Function1060a2
- special Functionc658
+ special HealParty
pause 60
special Function8c0ab
special RestartMapMusic
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -60,7 +60,7 @@
writetext UnknownText_0x5c42a
closetext
loadmovesprites
- spriteface $e, $0
+ spriteface $e, DOWN
end
; 0x5c042
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -25,12 +25,12 @@
UnknownScript_0x1a8016:
playmusic MUSIC_MOM
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x1a8134
closetext
loadmovesprites
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $2, MovementData_0x1a80d4
loadfont
writetext UnknownText_0x1a813e
@@ -48,14 +48,14 @@
UnknownScript_0x1a8041:
playmusic MUSIC_MOM
- spriteface $2, $2
+ spriteface $2, LEFT
loadfont
writetext UnknownText_0x1a8134
closetext
loadmovesprites
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $2, MovementData_0x1a80d9
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x1a813e
closetext
@@ -110,7 +110,7 @@
writetext UnknownText_0x1a82a6
closetext
loadmovesprites
- spriteface $4, $2
+ spriteface $4, LEFT
loadfont
writetext UnknownText_0x1a82cd
closetext
@@ -119,7 +119,7 @@
applymovement $0, MovementData_0x1a80ed
stopfollow
pause 5
- spriteface $4, $0
+ spriteface $4, DOWN
pause 5
playsound SFX_TACKLE
applymovement $0, MovementData_0x1a80f0
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -23,7 +23,7 @@
return
UnknownScript_0x1a8833:
- spriteface $0, $2
+ spriteface $0, LEFT
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -37,7 +37,7 @@
closetext
loadmovesprites
applymovement $0, MovementData_0x1a88f4
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $5, MovementData_0x1a88db
dotrigger $1
disappear $5
@@ -47,7 +47,7 @@
end
UnknownScript_0x1a886b:
- spriteface $0, $2
+ spriteface $0, LEFT
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -61,7 +61,7 @@
closetext
loadmovesprites
applymovement $0, MovementData_0x1a88f7
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $5, MovementData_0x1a88e8
disappear $5
dotrigger $1
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -33,9 +33,9 @@
writetext UnknownText_0x60dea
closetext
loadmovesprites
- spriteface $2, $3
+ spriteface $2, RIGHT
pause 15
- spriteface $3, $2
+ spriteface $3, LEFT
loadfont
playmusic MUSIC_HEAL
writetext UnknownText_0x60e44
@@ -51,13 +51,13 @@
writetext UnknownText_0x60f3d
closetext
loadmovesprites
- spriteface $3, $3
+ spriteface $3, RIGHT
pause 10
- spriteface $3, $2
+ spriteface $3, LEFT
pause 10
- spriteface $3, $3
+ spriteface $3, RIGHT
pause 10
- spriteface $3, $2
+ spriteface $3, LEFT
pause 10
faceplayer
loadfont
@@ -90,9 +90,9 @@
writetext UnknownText_0x60edf
closetext
loadmovesprites
- spriteface $2, $3
+ spriteface $2, RIGHT
pause 15
- spriteface $3, $2
+ spriteface $3, LEFT
loadfont
writetext UnknownText_0x60ef1
closetext
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -36,7 +36,7 @@
writetext UnknownText_0x74a55
closetext
loadmovesprites
- spriteface $2, $0
+ spriteface $2, DOWN
pause 10
playsound SFX_EXIT_BUILDING
disappear $2
@@ -74,12 +74,12 @@
; 0x7491f
UnknownScript_0x7491f: ; 0x7491f
- spriteface $4, $3
+ spriteface $4, RIGHT
checkevent $0000
iftrue UnknownScript_0x7498b
checkevent $0001
iftrue UnknownScript_0x7498b
- spriteface $0, $2
+ spriteface $0, LEFT
loadfont
checkevent $0030
iffalse UnknownScript_0x7494e
@@ -215,7 +215,7 @@
writetext UnknownText_0x74bf4
closetext
loadmovesprites
- spriteface $5, $1
+ spriteface $5, UP
end
; 0x74a0c
@@ -225,7 +225,7 @@
writetext UnknownText_0x74c35
closetext
loadmovesprites
- spriteface $6, $1
+ spriteface $6, UP
end
; 0x74a17
@@ -235,7 +235,7 @@
writetext UnknownText_0x74c76
closetext
loadmovesprites
- spriteface $7, $0
+ spriteface $7, DOWN
end
; 0x74a22
@@ -245,7 +245,7 @@
writetext UnknownText_0x74ca2
closetext
loadmovesprites
- spriteface $8, $0
+ spriteface $8, DOWN
end
; 0x74a2d
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -475,7 +475,7 @@
closetext
loadmovesprites
applymovement2 MovementData_0x192cdc
- spriteface $0, $2
+ spriteface $0, LEFT
loadfont
writetext UnknownText_0x193278
closetext
@@ -592,7 +592,7 @@
loadmovesprites
checkcode $9
if_not_equal $1, UnknownScript_0x192c20
- spriteface $0, $2
+ spriteface $0, LEFT
UnknownScript_0x192c20: ; 0x192c20
loadfont
writetext UnknownText_0x193278
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -24,19 +24,19 @@
waitbutton
pause 30
applymovement $2, MovementData_0x188ed5
- spriteface $3, $0
- spriteface $4, $0
+ spriteface $3, DOWN
+ spriteface $4, DOWN
loadfont
writetext UnknownText_0x188f22
closetext
loadmovesprites
- spriteface $2, $2
- spriteface $0, $3
+ spriteface $2, LEFT
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x188f7f
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $2, MovementData_0x188eda
dotrigger $0
end
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -189,17 +189,17 @@
writetext UnknownText_0x5de84
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
checkcode $9
if_not_equal $3, UnknownScript_0x5d7be
applymovement $0, MovementData_0x5d921
UnknownScript_0x5d7be: ; 0x5d7be
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x5dedd
closetext
loadmovesprites
- spriteface $b, $0
+ spriteface $b, DOWN
refreshscreen $0
special SpecialBuenasPassword
loadmovesprites
@@ -215,7 +215,7 @@
playsound SFX_TRANSACTION
setflag $0060
pause 20
- spriteface $b, $3
+ spriteface $b, RIGHT
loadfont
writetext UnknownText_0x5e054
closetext
@@ -242,7 +242,7 @@
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d81a: ; 0x5d81a
- spriteface $b, $3
+ spriteface $b, RIGHT
end
; 0x5d81e
@@ -250,7 +250,7 @@
writetext UnknownText_0x5df29
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
special Functionc48f
pause 20
special RestartMapMusic
@@ -266,7 +266,7 @@
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d83f: ; 0x5d83f
- spriteface $b, $3
+ spriteface $b, RIGHT
pause 10
end
; 0x5d845
@@ -277,13 +277,13 @@
writetext UnknownText_0x5e01c
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
pause 20
loadfont
writetext UnknownText_0x5e054
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
special Functionc48f
pause 20
special RestartMapMusic
@@ -306,7 +306,7 @@
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d87b: ; 0x5d87b
- spriteface $b, $3
+ spriteface $b, RIGHT
end
; 0x5d87f
@@ -319,7 +319,7 @@
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d88f: ; 0x5d88f
- spriteface $b, $3
+ spriteface $b, RIGHT
end
; 0x5d893
@@ -339,9 +339,9 @@
checkcellnum $25
iftrue UnknownScript_0x5d8fe
pause 20
- spriteface $b, $0
+ spriteface $b, DOWN
pause 15
- spriteface $0, $1
+ spriteface $0, UP
pause 15
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
@@ -367,7 +367,7 @@
writetext UnknownText_0x5e310
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
addcellnum $25
end
; 0x5d8ed
@@ -376,7 +376,7 @@
writetext UnknownText_0x5e33c
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
end
; 0x5d8f6
@@ -384,7 +384,7 @@
writetext UnknownText_0x5e35e
closetext
loadmovesprites
- spriteface $b, $3
+ spriteface $b, RIGHT
UnknownScript_0x5d8fe: ; 0x5d8fe
end
; 0x5d8ff
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -24,7 +24,7 @@
; 0x60011
UnknownScript_0x60011: ; 0x60011
- spriteface $2, $1
+ spriteface $2, UP
showemote $0, $2, 15
loadfont
writetext UnknownText_0x60128
@@ -100,7 +100,7 @@
UnknownScript_0x6006e: ; 0x6006e
applymovement $0, MovementData_0x60125
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $3, $3
+ spriteface $3, RIGHT
loadfont
writetext UnknownText_0x603d1
closetext
@@ -137,7 +137,7 @@
moveperson $2, $c, $0
appear $2
applymovement $2, MovementData_0x6010f
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x605b2
keeptextopen
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -25,7 +25,7 @@
UnknownScript_0x733f3: ; 0x733f3
showemote $0, $2, 15
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x73496
closetext
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -25,7 +25,7 @@
UnknownScript_0x73617: ; 0x73617
showemote $0, $2, 15
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x7364d
closetext
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -22,12 +22,12 @@
showemote $4, $2, 15
pause 30
showemote $0, $3, 10
- spriteface $2, $0
+ spriteface $2, DOWN
applymovement $3, MovementData_0x19efe8
disappear $3
pause 15
playmusic MUSIC_BEAUTY_ENCOUNTER
- spriteface $2, $1
+ spriteface $2, UP
pause 10
applymovement $2, MovementData_0x19efed
loadfont
@@ -34,9 +34,9 @@
writetext UnknownText_0x19f006
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $2, MovementData_0x19effa
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, MovementData_0x19f000
disappear $2
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -49,12 +49,12 @@
showemote $4, $2, 15
pause 30
showemote $0, $3, 10
- spriteface $2, $0
+ spriteface $2, DOWN
applymovement $3, MovementData_0x19efea
disappear $3
pause 15
playmusic MUSIC_BEAUTY_ENCOUNTER
- spriteface $2, $1
+ spriteface $2, UP
pause 10
applymovement $2, MovementData_0x19eff4
loadfont
@@ -61,9 +61,9 @@
writetext UnknownText_0x19f006
closetext
loadmovesprites
- spriteface $0, $1
+ spriteface $0, UP
applymovement $2, MovementData_0x19effd
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, MovementData_0x19f000
disappear $2
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -16,7 +16,7 @@
special Functiond91
special Function1060a2
playmusic MUSIC_HEAL
- special Functionc658
+ special HealParty
pause 60
special Function8c0ab
special RestartMapMusic
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -19,7 +19,7 @@
; 0x1a0873
UnknownScript_0x1a0873: ; 0x1a0873
- spriteface $a, $2
+ spriteface $a, LEFT
showemote $0, $a, 15
applymovement $a, MovementData_0x1a0a66
jump UnknownScript_0x1a088c
@@ -26,11 +26,11 @@
; 0x1a0881
UnknownScript_0x1a0881: ; 0x1a0881
- spriteface $a, $2
+ spriteface $a, LEFT
showemote $0, $a, 15
applymovement $a, MovementData_0x1a0a69
UnknownScript_0x1a088c: ; 0x1a088c
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x1a0a6b
keeptextopen
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -36,10 +36,10 @@
return
UnknownScript_0x1a0f6d: ; 0x1a0f6d
- spriteface $2, $1
+ spriteface $2, UP
showemote $0, $2, 15
applymovement $2, MovementData_0x1a108d
- spriteface $0, $2
+ spriteface $0, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
@@ -51,7 +51,7 @@
stopfollow
loadpokedata RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- spriteface $2, $1
+ spriteface $2, UP
loadfont
writetext UnknownText_0x1a114d
closetext
@@ -62,10 +62,10 @@
; 0x1a0fa3
UnknownScript_0x1a0fa3: ; 0x1a0fa3
- spriteface $2, $1
+ spriteface $2, UP
showemote $0, $2, 15
applymovement $2, MovementData_0x1a1094
- spriteface $0, $2
+ spriteface $0, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
@@ -77,7 +77,7 @@
stopfollow
loadpokedata RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- spriteface $2, $1
+ spriteface $2, UP
loadfont
writetext UnknownText_0x1a114d
closetext
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -19,7 +19,7 @@
faceplayer
writetext UnknownText_0x1a181c
closetext
- spriteface $2, $1
+ spriteface $2, UP
loadmovesprites
playsound SFX_TACKLE
applymovement $7, MovementData_0x1a1802
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -76,8 +76,8 @@
end
UnknownScript_0x1904ab:
- spriteface $9, $2
- spriteface $0, $3
+ spriteface $9, LEFT
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x190790
closetext
@@ -85,7 +85,7 @@
follow $0, $9
applymovement $0, MovementData_0x190789
stopfollow
- spriteface $0, $0
+ spriteface $0, DOWN
scall UnknownScript_0x190470
applymovement $9, MovementData_0x19078c
applymovement $9, MovementData_0x19078e
@@ -109,8 +109,8 @@
end
UnknownScript_0x1904e9:
- spriteface $b, $0
- spriteface $0, $1
+ spriteface $b, DOWN
+ spriteface $0, UP
jump UnknownScript_0x1904f3
FisherScript_0x1904f2:
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -28,12 +28,12 @@
checkevent $00c0
iffalse UnknownScript_0x62d62
showemote $0, $5, 20
- spriteface $5, $2
- spriteface $0, $3
+ spriteface $5, LEFT
+ spriteface $0, RIGHT
follow $0, $5
applymovement $0, MovementData_0x62d97
stopfollow
- spriteface $0, $0
+ spriteface $0, DOWN
loadfont
writetext UnknownText_0x62e41
closetext
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -64,7 +64,7 @@
UnknownScript_0x6a1d1: ; 0x6a1d1
applymovement $0, MovementData_0x6a2e2
- spriteface $2, $3
+ spriteface $2, RIGHT
loadfont
checkcode $11
addvar $1
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -35,10 +35,10 @@
showemote $0, $0, 15
pause 15
playsound SFX_WARP_FROM
- spriteface $0, $1
+ spriteface $0, UP
applymovement $a, MovementData_0x194262
disappear $a
- spriteface $0, $0
+ spriteface $0, DOWN
pause 10
dotrigger $0
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -64,7 +64,7 @@
; 0x6ab47
UnknownScript_0x6ab47: ; 0x6ab47
- spriteface $0, $1
+ spriteface $0, UP
loadfont
checkcode $11
addvar $1
@@ -90,7 +90,7 @@
writetext UnknownText_0x6b300
closetext
loadmovesprites
- spriteface $0, $2
+ spriteface $0, LEFT
playsound SFX_EXIT_BUILDING
special Function8c084
waitbutton
@@ -175,7 +175,7 @@
loadmovesprites
setflag $0011
special Function135db
- spriteface $0, $2
+ spriteface $0, LEFT
playsound SFX_EXIT_BUILDING
special Function8c084
waitbutton
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -14,7 +14,7 @@
writetext UnknownText_0x9cd2e
closetext
loadmovesprites
- spriteface $2, $3
+ spriteface $2, RIGHT
end
; 0x9cc87
@@ -22,7 +22,7 @@
writetext UnknownText_0x9cd5a
closetext
loadmovesprites
- spriteface $2, $3
+ spriteface $2, RIGHT
end
; 0x9cc90
@@ -34,7 +34,7 @@
writetext UnknownText_0x9cd2e
closetext
loadmovesprites
- spriteface $3, $2
+ spriteface $3, LEFT
end
; 0x9cca1
@@ -42,7 +42,7 @@
writetext UnknownText_0x9cd5a
closetext
loadmovesprites
- spriteface $3, $2
+ spriteface $3, LEFT
end
; 0x9ccaa
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -48,7 +48,7 @@
applymovement $0, MovementData_0x19aca2
showemote $0, $4, 15
applymovement $4, MovementData_0x19acbb
- spriteface $3, $1
+ spriteface $3, UP
showemote $0, $3, 15
applymovement $3, MovementData_0x19aca4
loadfont
@@ -84,7 +84,7 @@
UnknownScript_0x19ac38: ; 0x19ac38
showemote $0, $3, 15
applymovement $3, MovementData_0x19acaf
- spriteface $4, $0
+ spriteface $4, DOWN
showemote $0, $4, 15
applymovement $4, MovementData_0x19acc7
loadfont
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -111,7 +111,7 @@
writetext UnknownText_0x588f5
closetext
loadmovesprites
- spriteface $3, $1
+ spriteface $3, UP
end
; 0x587c9
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -49,14 +49,14 @@
; 0x58031
UnknownScript_0x58031: ; 0x58031
- spriteface $3, $1
- spriteface $0, $0
+ spriteface $3, UP
+ spriteface $0, DOWN
jump UnknownScript_0x58044
; 0x5803a
UnknownScript_0x5803a: ; 0x5803a
- spriteface $3, $2
- spriteface $0, $3
+ spriteface $3, LEFT
+ spriteface $0, RIGHT
jump UnknownScript_0x58044
; 0x58043
@@ -108,7 +108,7 @@
writetext UnknownText_0x5848e
closetext
loadmovesprites
- spriteface $6, $1
+ spriteface $6, UP
end
; 0x58089
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -45,7 +45,7 @@
pause 30
playsound SFX_TRANSACTION
pause 30
- spriteface $4, $0
+ spriteface $4, DOWN
loadfont
writetext UnknownText_0x59278
closetext
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -29,7 +29,7 @@
pause 15
special Function8c0ab
pause 30
- special Functionc658
+ special HealParty
refreshscreen $0
credits
end
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -76,7 +76,7 @@
moveperson $8, $b, $6
appear $8
applymovement $8, KurtSlowpokeWellVictoryMovementData
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext KurtLeaveSlowpokeWellText
closetext
@@ -94,7 +94,7 @@
clearevent $06fd
clearevent $073e
special Function8c084
- special Functionc658
+ special HealParty
pause 15
warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3
end
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -19,7 +19,7 @@
; 0x184947
UnknownScript_0x184947: ; 0x184947
- spriteface $0, $1
+ spriteface $0, UP
showemote $0, $0, 15
special Functionc48f
playsound SFX_TACKLE
@@ -36,7 +36,7 @@
closetext
loadmovesprites
showemote $0, $8, 15
- spriteface $8, $0
+ spriteface $8, DOWN
pause 15
applymovement $8, MovementData_0x184a24
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -44,7 +44,7 @@
writetext UnknownText_0x184aec
closetext
loadmovesprites
- spriteface $8, $1
+ spriteface $8, UP
loadfont
writetext UnknownText_0x184bc8
pause 15
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -32,7 +32,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $2
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -58,7 +58,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $3
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -84,7 +84,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $7
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement2
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -91,7 +91,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $c, $5
appear $2
applymovement $2, SecurityCameraMovement3
@@ -111,7 +111,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $8
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement4
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -118,7 +118,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $c, $5
appear $2
applymovement $2, SecurityCameraMovement5
@@ -138,7 +138,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $6
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -145,7 +145,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $19, $b
appear $2
applymovement $2, SecurityCameraMovement6
@@ -165,7 +165,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $7
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -172,7 +172,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $19, $c
appear $2
applymovement $2, SecurityCameraMovement7
@@ -192,7 +192,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $11, $10
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -199,7 +199,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $19, $b
appear $2
applymovement $2, SecurityCameraMovement8
@@ -219,7 +219,7 @@
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $3, $10
appear $2
- spriteface $0, $2
+ spriteface $0, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
@@ -226,7 +226,7 @@
scall PlaySecurityCameraSounds
showemote $0, $0, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, $3
+ spriteface $0, RIGHT
moveperson $2, $e, $10
appear $2
applymovement $2, SecurityCameraMovement9
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -60,12 +60,12 @@
writetext UnknownText_0x6d2ad
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
showemote $0, $0, 15
applymovement $0, MovementData_0x6d21f
playmusic MUSIC_ROCKET_ENCOUNTER
applymovement $3, MovementData_0x6d224
- spriteface $0, $1
+ spriteface $0, UP
applymovement $2, MovementData_0x6d22f
loadfont
writetext UnknownText_0x6d2c3
@@ -72,8 +72,8 @@
closetext
loadmovesprites
cry DRAGONITE
- spriteface $3, $2
- spriteface $0, $2
+ spriteface $3, LEFT
+ spriteface $0, LEFT
appear $5
applymovement $5, MovementData_0x6d236
applymovement $3, MovementData_0x6d23b
@@ -84,7 +84,7 @@
writetext UnknownText_0x6d38c
closetext
loadmovesprites
- spriteface $0, $3
+ spriteface $0, RIGHT
applymovement $3, MovementData_0x6d241
loadfont
writetext UnknownText_0x6d3bd
@@ -117,13 +117,13 @@
special Function8c0ab
dotrigger $2
clearevent $06d6
- spriteface $4, $0
+ spriteface $4, DOWN
loadfont
writetext UnknownText_0x6d5d8
closetext
loadmovesprites
applymovement $4, MovementData_0x6d250
- spriteface $0, $1
+ spriteface $0, UP
loadfont
writetext UnknownText_0x6d64e
closetext
@@ -155,13 +155,13 @@
; 0x6d085
UnknownScript_0x6d085: ; 0x6d085
- spriteface $0, $1
+ spriteface $0, UP
jump UnknownScript_0x6d091
; 0x6d08b
UnknownScript_0x6d08b: ; 0x6d08b
- spriteface $0, $3
- spriteface $4, $2
+ spriteface $0, RIGHT
+ spriteface $4, LEFT
UnknownScript_0x6d091: ; 0x6d091
loadfont
writetext UnknownText_0x6da97
@@ -170,7 +170,7 @@
special Function8c084
special Function1060a2
playsound SFX_FULL_HEAL
- special Functionc658
+ special HealParty
special Function8c079
loadfont
writetext UnknownText_0x6daf7
@@ -344,7 +344,7 @@
moveperson $4, $12, $6
appear $4
applymovement $4, MovementData_0x6d27a
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x6d809
keeptextopen
@@ -353,12 +353,12 @@
writetext UnknownText_0x6d8f8
closetext
loadmovesprites
- spriteface $4, $0
+ spriteface $4, DOWN
loadfont
writetext UnknownText_0x6d994
closetext
loadmovesprites
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $4, MovementData_0x6d283
disappear $4
setevent EVENT_CLEARED_ROCKET_HIDEOUT
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -45,9 +45,9 @@
; 0x6dffc
LanceScript_0x6dffc: ; 0x6dffc
- spriteface $0, $2
+ spriteface $0, LEFT
pause 5
- spriteface $4, $3
+ spriteface $4, RIGHT
pause 20
applymovement $2, MovementData_0x6e12a
loadfont
@@ -61,12 +61,12 @@
; 0x6e019
UnknownScript_0x6e019: ; 0x6e019
- spriteface $0, $2
+ spriteface $0, LEFT
showemote $0, $0, 15
special Functionc48f
appear $a
applymovement $a, MovementData_0x6e164
- spriteface $0, $2
+ spriteface $0, LEFT
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x6e267
@@ -96,7 +96,7 @@
pause 30
showemote $0, $3, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $3, $0
+ spriteface $3, DOWN
loadfont
writetext UnknownText_0x6e400
closetext
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -93,7 +93,7 @@
special SpecialMonCheck
iftrue UnknownScript_0x1850b6
applymovement $3, MovementData_0x1851d0
- spriteface $0, $2
+ spriteface $0, LEFT
cry RAIKOU
pause 10
playsound SFX_WARP_FROM
@@ -106,7 +106,7 @@
special SpecialMonCheck
iftrue UnknownScript_0x1850d7
applymovement $4, MovementData_0x1851da
- spriteface $0, $3
+ spriteface $0, RIGHT
cry ENTEI
pause 10
playsound SFX_WARP_FROM
@@ -115,7 +115,7 @@
playsound SFX_EXIT_BUILDING
waitbutton
UnknownScript_0x1850d7: ; 0x1850d7
- spriteface $0, $1
+ spriteface $0, UP
pause 10
applymovement $0, MovementData_0x1851e8
applymovement $2, MovementData_0x1851e4
@@ -137,7 +137,7 @@
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
returnafterbattle
pause 20
- spriteface $0, $0
+ spriteface $0, DOWN
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
playsound SFX_ENTER_DOOR
moveperson $5, $a, $f
@@ -158,7 +158,7 @@
moveperson $6, $7, $d
moveperson $7, $9, $d
moveperson $8, $b, $d
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x185203
closetext
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -14,7 +14,7 @@
; 0x9b38b
UnknownScript_0x9b38b: ; 0x9b38b
- spriteface $0, $1
+ spriteface $0, UP
loadfont
checkflag $0057
iftrue UnknownScript_0x9b3f7
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -84,7 +84,7 @@
; 0x7ca80
UnknownScript_0x7ca80: ; 0x7ca80
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -92,7 +92,7 @@
appear $c
waitbutton
applymovement $c, MovementData_0x7ce87
- spriteface $0, $3
+ spriteface $0, RIGHT
scall UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce92
playsound SFX_EXIT_BUILDING
@@ -104,7 +104,7 @@
; 0x7caaa
UnknownScript_0x7caaa: ; 0x7caaa
- spriteface $0, $3
+ spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -112,7 +112,7 @@
appear $c
waitbutton
applymovement $c, MovementData_0x7ce8c
- spriteface $0, $3
+ spriteface $0, RIGHT
scall UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce97
playsound SFX_EXIT_BUILDING
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -44,7 +44,7 @@
writetext UnknownText_0x74f06
closetext
loadmovesprites
- spriteface $2, $0
+ spriteface $2, DOWN
pause 10
playsound SFX_EXIT_BUILDING
disappear $2
@@ -78,12 +78,12 @@
end
UnknownScript_0x74e20:
- spriteface $3, $3
+ spriteface $3, RIGHT
checkevent $0000
iftrue UnknownScript_0x74e86
checkevent $0001
iftrue UnknownScript_0x74e86
- spriteface $0, $2
+ spriteface $0, LEFT
loadfont
checkcode $b
if_equal MONDAY, UnknownScript_0x74e72
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -20,7 +20,7 @@
UnknownScript_0x74492: ; 0x74492
moveperson $2, $12, $b
- spriteface $0, $0
+ spriteface $0, DOWN
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -35,7 +35,7 @@
; 0x744b5
UnknownScript_0x744b5: ; 0x744b5
- spriteface $0, $0
+ spriteface $0, DOWN
showemote $0, $0, 15
special Functionc48f
pause 15
@@ -50,7 +50,7 @@
; 0x744d4
UnknownScript_0x744d4: ; 0x744d4
- spriteface $0, $0
+ spriteface $0, DOWN
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x7455f
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -19,7 +19,7 @@
; 0x9b9fd
UnknownScript_0x9b9fd: ; 0x9b9fd
- spriteface $0, $2
+ spriteface $0, LEFT
jump UnknownScript_0x9ba04
; 0x9ba03
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -34,7 +34,7 @@
playmusic MUSIC_SHOW_ME_AROUND
follow $2, $0
applymovement $2, MovementData_0x1a842a
- spriteface $0, $1
+ spriteface $0, UP
applymovement $2, MovementData_0x1a8465
stopfollow
special RestartMapMusic
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -33,7 +33,7 @@
loadmovesprites
checkcode $9
if_equal $1, .UnknownScript_0x69511
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $6, MovementData_0x69549
playsound SFX_EXIT_BUILDING
disappear $6
@@ -42,7 +42,7 @@
.UnknownScript_0x69511 ; 0x69511
applymovement $6, MovementData_0x6954e
- spriteface $0, $0
+ spriteface $0, DOWN
applymovement $6, MovementData_0x69551
playsound SFX_EXIT_BUILDING
disappear $6
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -59,19 +59,19 @@
; 0x985a3
UnknownScript_0x985a3: ; 0x985a3
- spriteface $4, $1
- spriteface $0, $0
+ spriteface $4, UP
+ spriteface $0, DOWN
showemote $0, $4, 20
follow $0, $4
applymovement $0, MovementData_0x98622
stopfollow
- spriteface $0, $3
+ spriteface $0, RIGHT
loadfont
writetext UnknownText_0x98712
closetext
loadmovesprites
applymovement $4, MovementData_0x98625
- spriteface $4, $2
+ spriteface $4, LEFT
end
; 0x985c6
@@ -163,7 +163,7 @@
closetext
loadmovesprites
applymovement $7, MovementData_0x98628
- spriteface $7, $1
+ spriteface $7, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
dotrigger $1
end
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -22778,12 +22778,12 @@
xor a
ld [InLinkBattle], a
callba Function1060a2
- callba Functionc658
+ callba HealParty
call Function1702b7
call Function170bf7
predef StartBattle
callba Function1500c
- callba Functionc658
+ callba HealParty
ld a, [wd0ee]
ld [ScriptVar], a
and a