ref: 9974a2c7014cbe7db3d0e516580fea48001ab3df
parent: b77741ff7020747dbee6b295b87afe6ef0963dd2
parent: abf3fc21378ddc6a4028aa1852d256472bc859e0
author: yenatch <yenatch@gmail.com>
date: Sun Aug 16 20:14:40 EDT 2015
Merge pull request #303 from yenatch/map-objects Add constants for common map object ids.
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -1,4 +1,6 @@
; script vars
+PLAYER EQU 0
+LAST_TALKED EQU -2
const_def
const VAR_STRINGBUFFER2
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -611,9 +611,9 @@
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
- ld [$ffe0], a
+ ld [hLastTalked], a
- ld a, [$ffe0]
+ ld a, [hLastTalked]
call GetMapObject
ld hl, MAPOBJECT_COLOR
add hl, bc
@@ -1094,7 +1094,7 @@
FallIntoMapScript: ; 96c38
newloadmap $f6
playsound SFX_KINESIS
- applymovement $0, MovementData_0x96c48
+ applymovement PLAYER, MovementData_0x96c48
playsound SFX_STRENGTH
scall UnknownScript_0x96c4a
end
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2660,7 +2660,7 @@
Function5582: ; 5582
ld de, ObjectStructs
- ld a, $d
+ ld a, NUM_OBJECT_STRUCTS
.loop
push af
ld hl, OBJECT_04
@@ -2761,7 +2761,7 @@
ld a, [wd459]
bit 7, a
jr z, .ok
- ld a, [$ffe0]
+ ld a, [hLastTalked]
and a
jr z, .ok
call Function5629
@@ -2780,7 +2780,7 @@
; 5629
Function5629: ; 5629
- cp $10
+ cp NUM_OBJECTS
ret nc
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
@@ -2788,7 +2788,7 @@
ld a, [hl]
cp -1
ret z
- cp $d
+ cp NUM_OBJECT_STRUCTS
ret nc
call GetObjectStruct
call GetObjectSprite
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -3167,11 +3167,11 @@
SeenByTrainerScript:: ; 0xbe675
loadtrainerdata
playrammusic
- showemote EMOTE_SHOCK, -2, 30
+ showemote EMOTE_SHOCK, LAST_TALKED, 30
callasm Function831e
applymovement2 MovementBuffer
- writepersonxy -2
- faceperson $0, -2
+ writepersonxy LAST_TALKED
+ faceperson PLAYER, LAST_TALKED
jump StartBattleWithMapTrainerScript
; 0xbe68a
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1046,7 +1046,7 @@
GetScriptPerson: ; 0x971e3
and a
ret z
- cp $fe
+ cp LAST_TALKED
ret z
dec a
ret
@@ -1059,7 +1059,7 @@
call GetScriptByte
call GetScriptPerson
- ld [$ffe0], a
+ ld [hLastTalked], a
ret
; 0x971f3
@@ -1106,7 +1106,7 @@
; parameters:
; data (MovementPointerLabelParam)
- ld a, [$ffe0]
+ ld a, [hLastTalked]
ld c, a
jp ApplyMovement
; 0x9722e
@@ -1114,11 +1114,11 @@
Script_faceplayer: ; 0x9722e
; script command 0x6b
- ld a, [$ffe0]
+ ld a, [hLastTalked]
and a
ret z
ld d, $0
- ld a, [$ffe0]
+ ld a, [hLastTalked]
ld e, a
callba GetRelativeFacing
ld a, d
@@ -1126,7 +1126,7 @@
add a
endr
ld e, a
- ld a, [$ffe0]
+ ld a, [hLastTalked]
ld d, a
call ApplyPersonFacing
ret
@@ -1140,17 +1140,17 @@
call GetScriptByte
call GetScriptPerson
- cp $fe
- jr c, .asm_97254 ; 0x97250 $2
- ld a, [$ffe0]
-.asm_97254
+ cp LAST_TALKED
+ jr c, .ok
+ ld a, [hLastTalked]
+.ok
ld e, a
call GetScriptByte
call GetScriptPerson
- cp $fe
- jr nz, .asm_97261 ; 0x9725d $2
- ld a, [$ffe0]
-.asm_97261
+ cp LAST_TALKED
+ jr nz, .ok2
+ ld a, [hLastTalked]
+.ok2
ld d, a
push de
callba GetRelativeFacing
@@ -1174,10 +1174,10 @@
call GetScriptByte
call GetScriptPerson
- cp $fe
- jr nz, .asm_97280 ; 0x9727c $2
- ld a, [$ffe0]
-.asm_97280
+ cp LAST_TALKED
+ jr nz, .ok
+ ld a, [hLastTalked]
+.ok
ld d, a
call GetScriptByte
rept 2
@@ -1271,10 +1271,10 @@
call GetScriptByte
call GetScriptPerson
- cp -2
- jr nz, .skip ; 0x972f6 $2
- ld a, [$ffe0]
-.skip
+ cp LAST_TALKED
+ jr nz, .ok
+ ld a, [hLastTalked]
+.ok
call DeleteObjectStruct
ld a, [$ffaf]
ld b, 1 ; set
@@ -1354,10 +1354,10 @@
call GetScriptByte
call GetScriptPerson
- cp $fe
- jr nz, .asm_97367 ; 0x97363 $2
- ld a, [$ffe0]
-.asm_97367
+ cp LAST_TALKED
+ jr nz, .ok
+ ld a, [hLastTalked]
+.ok
ld b, a
callba Function80a1
ret
@@ -1405,10 +1405,10 @@
ld [ScriptVar], a
call GetScriptByte
call GetScriptPerson
- cp $fe
- jr z, .asm_973a8 ; 0x973a4 $2
- ld [$ffe0], a
-.asm_973a8
+ cp LAST_TALKED
+ jr z, .ok
+ ld [hLastTalked], a
+.ok
call GetScriptByte
ld [ScriptDelay], a
ld b, BANK(ShowEmoteScript)
@@ -1454,7 +1454,7 @@
; 0x973e6
UnknownScript_0x973e6: ; 973e6
- applymovement $0, wd002
+ applymovement PLAYER, wd002
end
; 973eb
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -108,7 +108,7 @@
farwritetext UnknownText_0x1b01bd
pause 20
special Mobile_HealParty
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
pause 10
special HealParty
playmusic MUSIC_NONE
@@ -116,7 +116,7 @@
special HealMachineAnim
pause 30
special RestartMapMusic
- spriteface $fe, DOWN
+ spriteface LAST_TALKED, DOWN
pause 10
checkphonecall ; elm already called about pokerus
@@ -133,9 +133,9 @@
.done
farwritetext UnknownText_0x1b020b
- spriteface $fe, UP
+ spriteface LAST_TALKED, UP
pause 10
- spriteface $fe, DOWN
+ spriteface LAST_TALKED, DOWN
pause 10
closetext
@@ -308,7 +308,7 @@
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
- applymovement $0, Movement_ContestResults_WalkAfterWarp
+ applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
clearflag ENGINE_BUG_CONTEST_TIMER
--- a/home.asm
+++ b/home.asm
@@ -1457,7 +1457,7 @@
.startbattle
pop de
pop af
- ld [$ffe0], a
+ ld [hLastTalked], a
ld a, b
ld [CurFruit], a
ld a, c
@@ -1474,7 +1474,7 @@
Function367e:: ; 367e
call GetMapScriptHeaderBank
ld [EngineBuffer1], a
- ld a, [$ffe0]
+ ld a, [hLastTalked]
call GetMapObject
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
--- a/home/map.asm
+++ b/home/map.asm
@@ -393,7 +393,7 @@
call SwitchToMapScriptHeaderBank
call Function234f
xor a
- call Function2336
+ call ReadMapEventHeader
ret
; 2317
@@ -402,7 +402,7 @@
call SwitchToMapScriptHeaderBank
call Function234f
ld a, $1
- call Function2336
+ call ReadMapEventHeader
ret
; 2326
@@ -415,7 +415,7 @@
ret
; 2336
-Function2336:: ; 2336
+ReadMapEventHeader:: ; 2336
push af
ld hl, MapEventHeaderPointer
ld a, [hli]
@@ -424,13 +424,13 @@
rept 2
inc hl
endr
- call Function23da
- call Function23f1
- call Function2408
+ call ReadWarps
+ call ReadCoordEvents
+ call ReadSignposts
pop af
and a
ret nz
- call Function241f
+ call ReadObjectEvents
ret
; 234f
@@ -539,7 +539,7 @@
ret
; 23da
-Function23da:: ; 23da
+ReadWarps:: ; 23da
ld a, [hli]
ld c, a
ld [wdbfb], a
@@ -555,7 +555,7 @@
ret
; 23f1
-Function23f1:: ; 23f1
+ReadCoordEvents:: ; 23f1
ld a, [hli]
ld c, a
ld [wCurrentMapXYTriggerCount], a
@@ -571,7 +571,7 @@
ret
; 2408
-Function2408:: ; 2408
+ReadSignposts:: ; 2408
ld a, [hli]
ld c, a
ld [wCurrentMapSignpostCount], a
@@ -587,7 +587,7 @@
ret
; 241f
-Function241f:: ; 241f
+ReadObjectEvents:: ; 241f
push hl
call Function2471
pop de
@@ -651,12 +651,12 @@
Function2471:: ; 2471
ld hl, ObjectStruct1
- ld bc, 40 * 12
+ ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1)
xor a
call ByteFill
ld hl, ObjectStruct1
- ld de, 40
- ld c, $c
+ ld de, OBJECT_STRUCT_LENGTH
+ ld c, NUM_OBJECT_STRUCTS - 1
xor a
.asm_2484
ld [hl], a
--- a/hram.asm
+++ b/hram.asm
@@ -64,6 +64,8 @@
hTileAnimFrame EQU $ffdf
+hLastTalked EQU $ffe0
+
hRandom EQU $ffe1
hRandomAdd EQU $ffe1
hRandomSub EQU $ffe2
--- a/main.asm
+++ b/main.asm
@@ -3671,7 +3671,7 @@
; 831e
Function831e: ; 831e
- ld a, [$ffe0]
+ ld a, [hLastTalked]
call Function1b1e
ld a, $3e
call Function1b3f
@@ -3678,7 +3678,7 @@
ld a, [wd03f]
dec a
jr z, Function833b
- ld a, [$ffe0]
+ ld a, [hLastTalked]
ld b, a
ld c, 0
ld d, 1
@@ -5009,7 +5009,7 @@
special PlayMapMusic
; step into the water
special Function8379 ; (slow_step_x, step_end)
- applymovement $0, MovementBuffer ; PLAYER, MovementBuffer
+ applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer
end
; c9a2
@@ -5301,7 +5301,7 @@
loadmovesprites
playsound SFX_BUBBLEBEAM
.loop
- applymovement $0, WaterfallStep
+ applymovement PLAYER, WaterfallStep
callasm CheckContinueWaterfall
iffalse .loop
end
@@ -5497,13 +5497,13 @@
closetext
loadmovesprites
playsound SFX_WARP_TO
- applymovement $0, MovementData_0xcc59
+ applymovement PLAYER, MovementData_0xcc59
farscall UnknownScript_0x122c1
special WarpToSpawnPoint
writecode VAR_MOVEMENT, $0
newloadmap $f5
playsound SFX_WARP_FROM
- applymovement $0, MovementData_0xcc5d
+ applymovement PLAYER, MovementData_0xcc5d
end
; 0xcc59
@@ -5595,13 +5595,13 @@
reloadmappart
loadmovesprites
playsound SFX_WARP_TO
- applymovement $0, MovementData_0xcce1
+ applymovement PLAYER, MovementData_0xcce1
farscall UnknownScript_0x122c1
special WarpToSpawnPoint
writecode VAR_MOVEMENT, $0
newloadmap $f4
playsound SFX_WARP_FROM
- applymovement $0, MovementData_0xcce3
+ applymovement PLAYER, MovementData_0xcce3
end
; 0xcce1
@@ -6057,7 +6057,7 @@
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
- ld [$ffe0], a
+ ld [hLastTalked], a
call GetMapObject
ld hl, MAPOBJECT_FACING
add hl, bc
@@ -6264,16 +6264,16 @@
scall Script_FishCastRod
callasm Fishing_CheckFacingUp
iffalse .FacingUp
- applymovement $0, MovementData_0xd062
+ applymovement PLAYER, MovementData_0xd062
jump .FightTheHookedPokemon
; 0xd046
.FacingUp: ; 0xd046
- applymovement $0, MovementData_0xd05c
+ applymovement PLAYER, MovementData_0xd05c
.FightTheHookedPokemon: ; 0xd04a
pause 40
- applymovement $0, MovementData_0xd069
+ applymovement PLAYER, MovementData_0xd069
writetext UnknownText_0xd0a4
callasm PutTheRodAway
loadmovesprites
@@ -6328,7 +6328,7 @@
loademote $9
callasm Functionb84b3
loademote $0
- applymovement $0, MovementData_0xd093
+ applymovement PLAYER, MovementData_0xd093
pause 40
end
; 0xd093
@@ -12317,7 +12317,7 @@
FindItemInBallScript:: ; 0x122ce
callasm Function122f8
iffalse NoRoomForItemInBallScript
- disappear $fe
+ disappear LAST_TALKED
loadfont
writetext UnknownText_0x122ee
playsound SFX_ITEM
@@ -12729,22 +12729,22 @@
; 0x12550
UnknownScript_0x12550: ; 0x12550
- applymovement $0, MovementData_0x12564
+ applymovement PLAYER, MovementData_0x12564
end
; 0x12555
UnknownScript_0x12555: ; 0x12555
- applymovement $0, MovementData_0x1256b
+ applymovement PLAYER, MovementData_0x1256b
end
; 0x1255a
UnknownScript_0x1255a: ; 0x1255a
- applymovement $0, MovementData_0x12572
+ applymovement PLAYER, MovementData_0x12572
end
; 0x1255f
UnknownScript_0x1255f: ; 0x1255f
- applymovement $0, MovementData_0x12579
+ applymovement PLAYER, MovementData_0x12579
end
; 0x12564
@@ -25236,7 +25236,7 @@
Function2454f: ; 2454f
ld hl, wd81e
xor a
- ld bc, $10
+ ld bc, NUM_OBJECTS
call ByteFill
nop
ld bc, MapObjects
@@ -25254,13 +25254,13 @@
ld [de], a
inc de
pop bc
- ld hl, $10
+ ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
pop af
inc a
- cp $10
+ cp NUM_OBJECTS
jr nz, .loop
ret
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -28,23 +28,23 @@
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 @@
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 @@
end
UnknownScript_0x1980e5:
- applymovement $0, MovementData_0x198148
+ applymovement PLAYER, MovementData_0x198148
loadfont
writetext UnknownText_0x1985df
keeptextopen
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -105,7 +105,7 @@
domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0
domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x9e571
writebyte $a
special Function170687
@@ -112,7 +112,7 @@
warpsound
disappear $2
stopfollow
- applymovement $0, MovementData_0x9e576
+ applymovement PLAYER, MovementData_0x9e576
warpcheck
end
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -18,7 +18,7 @@
end
UnknownScript_0x9f421:
- applymovement $0, MovementData_0x9e58c
+ applymovement PLAYER, MovementData_0x9e58c
UnknownScript_0x9f425:
writebyte $2
special Function170b44
@@ -40,7 +40,7 @@
warpsound
disappear $2
applymovement $3, MovementData_0x9e59c
- applymovement $0, MovementData_0x9e5a7
+ applymovement PLAYER, MovementData_0x9e5a7
loadfont
writetext UnknownText_0x9ee92
closetext
@@ -57,7 +57,7 @@
iffalse UnknownScript_0x9f483
UnknownScript_0x9f477:
loadmovesprites
- applymovement $0, MovementData_0x9e5a9
+ applymovement PLAYER, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
jump UnknownScript_0x9f425
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -17,20 +17,20 @@
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
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -17,7 +17,7 @@
end
UnknownScript_0x9f5c1:
- follow $2, $0
+ follow $2, PLAYER
callasm Function_0x9f5cb
jump UnknownScript_0x9f5dc
@@ -65,13 +65,13 @@
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
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -32,7 +32,7 @@
return
UnknownScript_0x1809ad:
- applymovement $0, MovementData_0x1809f9
+ applymovement PLAYER, MovementData_0x1809f9
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -53,7 +53,7 @@
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 @@
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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -30,19 +30,19 @@
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
@@ -49,29 +49,29 @@
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
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -57,7 +57,7 @@
writetext UnknownText_0x72345
closetext
loadmovesprites
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
end
.UnknownScript_0x72172
@@ -71,7 +71,7 @@
writetext UnknownText_0x7238a
closetext
loadmovesprites
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
end
UnknownScript_0x72184:
@@ -78,7 +78,7 @@
writetext UnknownText_0x723d9
closetext
loadmovesprites
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
end
CeladonGymGuyScript:
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -48,7 +48,7 @@
waitbutton
special RestartMapMusic
pause 15
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
pause 15
end
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -34,7 +34,7 @@
closetext
loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x19c195
loadfont
writetext GuideGentPokeCenterText
@@ -41,28 +41,28 @@
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 @@
loadmovesprites
stopfollow
special RestartMapMusic
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $2, MovementData_0x19c1cb
playsound SFX_ENTER_DOOR
disappear $2
@@ -101,13 +101,13 @@
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 @@
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
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -28,12 +28,12 @@
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
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -17,7 +17,7 @@
end
DragonShrineTestScript:
- applymovement $0, MovementData_0x18d2bf
+ applymovement PLAYER, MovementData_0x18d2bf
applymovement $2, MovementData_0x18d2c7
loadfont
writetext UnknownText_0x18d2ea
@@ -116,15 +116,15 @@
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 @@
applymovement $2, MovementData_0x18d2ce
spriteface $5, UP
applymovement $2, MovementData_0x18d2d1
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x18d5a3
closetext
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -42,8 +42,8 @@
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
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -75,14 +75,14 @@
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
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -22,7 +22,7 @@
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 @@
writetext UnknownText_0x98f22
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $6, MovementData_0x98ece
playsound SFX_EXIT_BUILDING
disappear $6
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -44,7 +44,7 @@
return
ElmsLab_AutowalkUpToElm:
- applymovement $0, ElmsLab_WalkUpToElmMovement
+ applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, $2, 15
spriteface $2, RIGHT
loadfont
@@ -75,9 +75,9 @@
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 @@
writetext LabWhereGoingText
closetext
loadmovesprites
- applymovement $0, MovementData_0x78f70
+ applymovement PLAYER, MovementData_0x78f70
end
CyndaquilPokeBallScript:
@@ -181,7 +181,7 @@
loadmovesprites
checkcode VAR_FACING
if_equal $3, ElmDirectionsScript
- applymovement $0, AfterCyndaquilMovement
+ applymovement PLAYER, AfterCyndaquilMovement
jump ElmDirectionsScript
TotodilePokeBallScript:
@@ -209,7 +209,7 @@
keeptextopen
givepoke TOTODILE, 5, BERRY, 0
loadmovesprites
- applymovement $0, AfterTotodileMovement
+ applymovement PLAYER, AfterTotodileMovement
jump ElmDirectionsScript
ChikoritaPokeBallScript:
@@ -237,7 +237,7 @@
keeptextopen
givepoke CHIKORITA, 5, BERRY, 0
loadmovesprites
- applymovement $0, AfterChikoritaMovement
+ applymovement PLAYER, AfterChikoritaMovement
jump ElmDirectionsScript
DidntChooseStarterScript:
@@ -247,7 +247,7 @@
end
ElmDirectionsScript:
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext ElmDirectionsText1
closetext
@@ -456,7 +456,7 @@
AideScript_WalkPotions1:
applymovement $3, AideWalksRight1
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
scall AideScript_GivePotions
applymovement $3, AideWalksLeft1
end
@@ -463,7 +463,7 @@
AideScript_WalkPotions2:
applymovement $3, AideWalksRight2
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
scall AideScript_GivePotions
applymovement $3, AideWalksLeft2
end
@@ -481,7 +481,7 @@
AideScript_WalkBalls1:
applymovement $3, AideWalksRight1
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement $3, AideWalksLeft1
end
@@ -488,7 +488,7 @@
AideScript_WalkBalls2:
applymovement $3, AideWalksRight2
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement $3, AideWalksLeft2
end
@@ -544,10 +544,10 @@
end
MeetCopScript2:
- applymovement $0, MeetCopScript2_StepLeft
+ applymovement PLAYER, MeetCopScript2_StepLeft
MeetCopScript:
- applymovement $0, MeetCopScript_WalkUp
+ applymovement PLAYER, MeetCopScript_WalkUp
CopScript:
spriteface $7, LEFT
loadfont
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -22,7 +22,7 @@
.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 @@
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 @@
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
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -38,10 +38,10 @@
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
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -239,7 +239,7 @@
writetext UnknownText_0x56f55
closetext
loadmovesprites
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
end
PokefanMScript_0x56dfc:
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -100,7 +100,7 @@
WhitneyCriesScript:
showemote EMOTE_SHOCK, $4, 15
applymovement $4, BridgetWalksUpMovement
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
loadfont
writetext BridgetWhitneyCriesText
closetext
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -31,12 +31,12 @@
closetext
loadmovesprites
applymovement $2, MovementData_0x55146
- applymovement $0, MovementData_0x5514f
+ applymovement PLAYER, MovementData_0x5514f
writebyte $0
special Special_MagnetTrain
warpcheck
newloadmap $f9
- applymovement $0, MovementData_0x55122
+ applymovement PLAYER, MovementData_0x55122
wait $14
end
@@ -58,7 +58,7 @@
UnknownScript_0x55130:
applymovement $2, MovementData_0x55146
- applymovement $0, MovementData_0x55158
+ applymovement PLAYER, MovementData_0x55158
applymovement $2, MovementData_0x5514b
loadfont
writetext UnknownText_0x5526a
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -23,7 +23,7 @@
appear $3
playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x6105a
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x622f0
closetext
@@ -55,7 +55,7 @@
appear $3
playmusic MUSIC_SHOW_ME_AROUND
applymovement $3, MovementData_0x61065
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x622f0
closetext
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -17,16 +17,16 @@
end
HallOfFameScript:
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, HallOfFame_WalkUpWithLance
stopfollow
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext HallOfFame_LanceText
closetext
loadmovesprites
spriteface $2, UP
- applymovement $0, HallOfFame_SlowlyApproachMachine
+ applymovement PLAYER, HallOfFame_SlowlyApproachMachine
dotrigger $1
pause 15
writebyte 2 ; Machine is in the Hall of Fame
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -448,11 +448,11 @@
closetext
loadmovesprites
pause 20
- showemote EMOTE_SHOCK, $0, 20
+ showemote EMOTE_SHOCK, PLAYER, 20
special Functionc48f
- applymovement $0, MovementData_0x6ef58
+ applymovement PLAYER, MovementData_0x6ef58
pause 30
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
pause 20
clearflag ENGINE_HAVE_EXAMINED_GS_BALL
special Function4989a
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -53,13 +53,13 @@
if_equal SATURDAY, UnknownScript_0x18012b
moveperson $5, $11, $9
appear $5
- spriteface $0, DOWN
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, DOWN
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
applymovement $5, MovementData_0x180164
playmusic MUSIC_RIVAL_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
jump UnknownScript_0x1800ce
UnknownScript_0x180094:
@@ -74,13 +74,13 @@
if_equal FRIDAY, UnknownScript_0x18012b
if_equal SATURDAY, UnknownScript_0x18012b
appear $5
- spriteface $0, DOWN
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, DOWN
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
applymovement $5, MovementData_0x18016b
playmusic MUSIC_RIVAL_ENCOUNTER
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
UnknownScript_0x1800ce:
loadfont
writetext UnknownText_0x1801f5
@@ -123,7 +123,7 @@
writetext UnknownText_0x1802a4
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $5, MovementData_0x180172
disappear $5
dotrigger $0
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -32,7 +32,7 @@
return
UnknownScript_0x180bd6:
- applymovement $0, MovementData_0x180c22
+ applymovement PLAYER, MovementData_0x180c22
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -32,7 +32,7 @@
return
UnknownScript_0x180742:
- applymovement $0, MovementData_0x18078e
+ applymovement PLAYER, MovementData_0x18078e
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -21,7 +21,7 @@
UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, $2, 15
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
checkevent EVENT_GAVE_KURT_APRICORNS
iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -44,7 +44,7 @@
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
if_equal UP, .RunAround
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e466
playsound SFX_EXIT_BUILDING
@@ -54,7 +54,7 @@
end
.RunAround:
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
playsound SFX_EXIT_BUILDING
@@ -292,13 +292,13 @@
showemote EMOTE_SHOCK, $2, 30
checkcode VAR_FACING
if_equal UP, .GSBallRunAround
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e466
jump .KurtHasLeftTheBuilding
.GSBallRunAround:
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement $2, MovementData_0x18e46c
.KurtHasLeftTheBuilding:
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -32,7 +32,7 @@
return
UnknownScript_0x180e53:
- applymovement $0, MovementData_0x180f33
+ applymovement PLAYER, MovementData_0x180f33
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
@@ -45,12 +45,12 @@
UnknownScript_0x180e6a:
special Functionc48f
- applymovement $0, MovementData_0x180f38
+ applymovement PLAYER, MovementData_0x180f38
jump LanceScript_0x180e7b
UnknownScript_0x180e74:
special Functionc48f
- applymovement $0, MovementData_0x180f3c
+ applymovement PLAYER, MovementData_0x180f3c
LanceScript_0x180e7b:
spriteface $2, LEFT
loadfont
@@ -78,7 +78,7 @@
showemote EMOTE_SHOCK, $2, 15
spriteface $2, DOWN
pause 10
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
appear $3
applymovement $3, MovementData_0x180f41
loadfont
@@ -97,18 +97,18 @@
closetext
loadmovesprites
applymovement $3, MovementData_0x180f4c
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
loadfont
writetext UnknownText_0x18134b
closetext
loadmovesprites
applymovement $2, MovementData_0x180f4f
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x18137b
closetext
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
spriteface $3, UP
spriteface $4, UP
applymovement $2, MovementData_0x180f53
@@ -115,9 +115,9 @@
stopfollow
playsound SFX_EXIT_BUILDING
disappear $2
- applymovement $0, MovementData_0x180f55
+ applymovement PLAYER, MovementData_0x180f55
playsound SFX_EXIT_BUILDING
- disappear $0
+ disappear PLAYER
applymovement $3, MovementData_0x180f57
showemote EMOTE_SHOCK, $3, 15
loadfont
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -77,7 +77,7 @@
writetext UnknownText_0x6c549
closetext
loadmovesprites
- follow $4, $0
+ follow $4, PLAYER
applymovement $4, MovementData_0x6c40a
applymovement $2, MovementData_0x6c403
applymovement $4, MovementData_0x6c40e
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -25,10 +25,10 @@
UnknownScript_0x190013:
showemote EMOTE_SHOCK, $2, 15
applymovement $2, MovementData_0x1900a9
- follow $0, $2
- applymovement $0, MovementData_0x1900a7
+ follow PLAYER, $2
+ applymovement PLAYER, MovementData_0x1900a7
stopfollow
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
scall UnknownScript_0x19002f
applymovement $2, MovementData_0x1900ad
end
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -17,8 +17,8 @@
end
UnknownScript_0x7408e:
- spriteface $0, RIGHT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, RIGHT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
applymovement $2, MovementData_0x740f9
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -34,7 +34,7 @@
iffalse .NoDancing
appear $2
appear $3
- applymovement $0, MovementData_0x77121
+ applymovement PLAYER, MovementData_0x77121
pause 15
appear $4
spriteface $2, RIGHT
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -23,7 +23,7 @@
writetext UnknownText_0x196f66
closetext
loadmovesprites
- applymovement $0, MovementData_0x196f5a
+ applymovement PLAYER, MovementData_0x196f5a
loadfont
writetext UnknownText_0x196fa8
keeptextopen
@@ -84,7 +84,7 @@
UnknownScript_0x196ec9:
playmusic MUSIC_PROF_OAK
applymovement $3, MovementData_0x196f5d
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x197185
keeptextopen
@@ -96,7 +96,7 @@
writetext UnknownText_0x1973de
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $3, MovementData_0x196f61
playsound SFX_EXIT_BUILDING
disappear $3
@@ -103,7 +103,7 @@
waitbutton
special RestartMapMusic
pause 15
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x1970ed
closetext
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -30,13 +30,13 @@
writetext UnknownText_0x1a8134
closetext
loadmovesprites
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
applymovement $2, MovementData_0x1a80d4
loadfont
writetext UnknownText_0x1a813e
closetext
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a80e0
stopfollow
loadfont
@@ -53,14 +53,14 @@
writetext UnknownText_0x1a8134
closetext
loadmovesprites
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
applymovement $2, MovementData_0x1a80d9
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x1a813e
closetext
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a80e6
stopfollow
loadfont
@@ -115,14 +115,14 @@
writetext UnknownText_0x1a82cd
closetext
loadmovesprites
- follow $0, $4
- applymovement $0, MovementData_0x1a80ed
+ follow PLAYER, $4
+ applymovement PLAYER, MovementData_0x1a80ed
stopfollow
pause 5
spriteface $4, DOWN
pause 5
playsound SFX_TACKLE
- applymovement $0, MovementData_0x1a80f0
+ applymovement PLAYER, MovementData_0x1a80f0
applymovement $4, MovementData_0x1a80f5
end
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -23,8 +23,8 @@
return
UnknownScript_0x1a8833:
- spriteface $0, LEFT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, LEFT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
playsound SFX_ENTER_DOOR
@@ -36,8 +36,8 @@
writetext UnknownText_0x1a88fa
closetext
loadmovesprites
- applymovement $0, MovementData_0x1a88f4
- spriteface $0, RIGHT
+ applymovement PLAYER, MovementData_0x1a88f4
+ spriteface PLAYER, RIGHT
applymovement $5, MovementData_0x1a88db
dotrigger $1
disappear $5
@@ -47,8 +47,8 @@
end
UnknownScript_0x1a886b:
- spriteface $0, LEFT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, LEFT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
playsound SFX_ENTER_DOOR
@@ -60,8 +60,8 @@
writetext UnknownText_0x1a88fa
closetext
loadmovesprites
- applymovement $0, MovementData_0x1a88f7
- spriteface $0, RIGHT
+ applymovement PLAYER, MovementData_0x1a88f7
+ spriteface PLAYER, RIGHT
applymovement $5, MovementData_0x1a88e8
disappear $5
dotrigger $1
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -17,7 +17,7 @@
end
UnknownScript_0x748b1:
- applymovement $0, MovementData_0x74a32
+ applymovement PLAYER, MovementData_0x74a32
appear $2
dotrigger $0
setevent EVENT_GAVE_KURT_APRICORNS
@@ -37,7 +37,7 @@
playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
- applymovement $0, MovementData_0x74a30
+ applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
special FadeBlackBGMap
waitbutton
@@ -73,7 +73,7 @@
iftrue UnknownScript_0x7498b
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue UnknownScript_0x7498b
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
loadfont
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7494e
@@ -95,7 +95,7 @@
closetext
loadmovesprites
setevent EVENT_RECEIVED_BALLS_FROM_KURT
- applymovement $0, MovementData_0x74a37
+ applymovement PLAYER, MovementData_0x74a37
jump SailorScript_0x748c0
UnknownScript_0x7496d:
@@ -102,7 +102,7 @@
writetext UnknownText_0x74b41
closetext
loadmovesprites
- applymovement $0, MovementData_0x74a34
+ applymovement PLAYER, MovementData_0x74a34
end
UnknownScript_0x74977:
@@ -109,7 +109,7 @@
writetext UnknownText_0x74ba8
closetext
loadmovesprites
- applymovement $0, MovementData_0x74a34
+ applymovement PLAYER, MovementData_0x74a34
end
UnknownScript_0x74981:
@@ -116,7 +116,7 @@
writetext UnknownText_0x74bce
closetext
loadmovesprites
- applymovement $0, MovementData_0x74a34
+ applymovement PLAYER, MovementData_0x74a34
end
UnknownScript_0x7498b:
@@ -132,7 +132,7 @@
writetext UnknownText_0x74af6
closetext
loadmovesprites
- applymovement $0, MovementData_0x74a34
+ applymovement PLAYER, MovementData_0x74a34
end
SailorScript_0x7499c:
@@ -162,11 +162,11 @@
setevent EVENT_RECEIVED_BALLS_FROM_KURT
checkcode VAR_FACING
if_equal $3, UnknownScript_0x749e5
- applymovement $0, MovementData_0x74a3f
+ applymovement PLAYER, MovementData_0x74a3f
jump SailorScript_0x748c0
UnknownScript_0x749e5:
- applymovement $0, MovementData_0x74a49
+ applymovement PLAYER, MovementData_0x74a49
jump SailorScript_0x748c0
UnknownScript_0x749ec:
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -164,7 +164,7 @@
BattleTradeMobile_WalkIn:
applymovement2 MovementData_0x192cce
- applymovement $0, MovementData_0x192ce7
+ applymovement PLAYER, MovementData_0x192ce7
end
LinkReceptionistScript_Battle:
@@ -385,7 +385,7 @@
Script_WalkOutOfMobileTradeRoom:
applymovement $2, MovementData_0x192d0b
- applymovement $0, MovementData_0x192d0f
+ applymovement PLAYER, MovementData_0x192d0f
applymovement $2, MovementData_0x192d14
end
@@ -405,7 +405,7 @@
Script_WalkOutOfMobileBattleRoom:
applymovement $3, MovementData_0x192d0b
- applymovement $0, MovementData_0x192d0f
+ applymovement PLAYER, MovementData_0x192d0f
applymovement $3, MovementData_0x192d14
end
@@ -413,27 +413,27 @@
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
applymovement2 MovementData_0x192cca
- applymovement $0, MovementData_0x192cde
+ applymovement PLAYER, MovementData_0x192cde
end
.Female:
applymovement2 MovementData_0x192cd8
- applymovement $0, MovementData_0x192ce2
+ applymovement PLAYER, MovementData_0x192ce2
loadfont
writetext Text_OhPleaseWait
closetext
loadmovesprites
applymovement2 MovementData_0x192cdc
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
loadfont
writetext Text_ChangeTheLook
closetext
loadmovesprites
playsound SFX_TINGLE
- applymovement $0, MovementData_0x192d17
+ applymovement PLAYER, MovementData_0x192d17
writebyte $80
special Functionc225
- applymovement $0, MovementData_0x192d1c
+ applymovement PLAYER, MovementData_0x192d1c
setflag ENGINE_KRIS_IN_CABLE_CLUB
special Special_ReplaceKrisSprite
loadfont
@@ -440,8 +440,8 @@
writetext Text_LikeTheLook
closetext
loadmovesprites
- showemote EMOTE_SHOCK, $0, 15
- applymovement $0, MovementData_0x192ce5
+ showemote EMOTE_SHOCK, PLAYER, 15
+ applymovement PLAYER, MovementData_0x192ce5
end
Script_CleanUpFemaleFlagAfterTrade:
@@ -448,21 +448,21 @@
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
applymovement $2, MovementData_0x192d04
- applymovement $0, MovementData_0x192cf5
+ applymovement PLAYER, MovementData_0x192cf5
applymovement $2, MovementData_0x192cfe
end
.Female:
applymovement $2, MovementData_0x192d04
- applymovement $0, MovementData_0x192d28
+ applymovement PLAYER, MovementData_0x192d28
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement $0, MovementData_0x192d17
+ applymovement PLAYER, MovementData_0x192d17
writebyte $90
special Functionc225
- applymovement $0, MovementData_0x192d1c
+ applymovement PLAYER, MovementData_0x192d1c
special Special_ReplaceKrisSprite
- applymovement $0, MovementData_0x192d2a
+ applymovement PLAYER, MovementData_0x192d2a
applymovement $2, MovementData_0x192cfe
end
@@ -470,21 +470,21 @@
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
applymovement $3, MovementData_0x192d04
- applymovement $0, MovementData_0x192cf5
+ applymovement PLAYER, MovementData_0x192cf5
applymovement $3, MovementData_0x192cfe
end
.Female:
applymovement $3, MovementData_0x192d04
- applymovement $0, MovementData_0x192d28
+ applymovement PLAYER, MovementData_0x192d28
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement $0, MovementData_0x192d17
+ applymovement PLAYER, MovementData_0x192d17
writebyte $90
special Functionc225
- applymovement $0, MovementData_0x192d1c
+ applymovement PLAYER, MovementData_0x192d1c
special Special_ReplaceKrisSprite
- applymovement $0, MovementData_0x192d2a
+ applymovement PLAYER, MovementData_0x192d2a
applymovement $3, MovementData_0x192cfe
end
@@ -495,17 +495,17 @@
if_equal LEFT, .MaleFacingLeft
if_equal RIGHT, .MaleFacingRight
applymovement2 MovementData_0x192cd2
- applymovement $0, MovementData_0x192cec
+ applymovement PLAYER, MovementData_0x192cec
end
.MaleFacingLeft:
applymovement2 MovementData_0x192cd2
- applymovement $0, MovementData_0x192cef
+ applymovement PLAYER, MovementData_0x192cef
end
.MaleFacingRight:
applymovement2 MovementData_0x192cd5
- applymovement $0, MovementData_0x192cf2
+ applymovement PLAYER, MovementData_0x192cf2
end
.Female:
@@ -513,17 +513,17 @@
if_equal RIGHT, .FemaleFacingRight
if_equal LEFT, .FemaleFacingLeft
applymovement2 MovementData_0x192d33
- applymovement $0, MovementData_0x192d2d
+ applymovement PLAYER, MovementData_0x192d2d
jump .FemaleContinue
.FemaleFacingRight:
applymovement2 MovementData_0x192d36
- applymovement $0, MovementData_0x192d2f
+ applymovement PLAYER, MovementData_0x192d2f
jump .FemaleContinue
.FemaleFacingLeft:
applymovement2 MovementData_0x192d33
- applymovement $0, MovementData_0x192d31
+ applymovement PLAYER, MovementData_0x192d31
.FemaleContinue:
loadfont
writetext Text_OhPleaseWait
@@ -531,7 +531,7 @@
loadmovesprites
checkcode VAR_FACING
if_not_equal UP, .FemaleChangeApperance
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
.FemaleChangeApperance:
loadfont
writetext Text_ChangeTheLook
@@ -538,11 +538,11 @@
closetext
loadmovesprites
playsound SFX_TINGLE
- applymovement $0, MovementData_0x192d17
+ applymovement PLAYER, MovementData_0x192d17
writebyte $80
special Functionc225
- applymovement $0, MovementData_0x192d22
- faceperson $0, $4
+ applymovement PLAYER, MovementData_0x192d22
+ faceperson PLAYER, $4
setflag ENGINE_KRIS_IN_CABLE_CLUB
special Special_ReplaceKrisSprite
loadfont
@@ -549,8 +549,8 @@
writetext Text_LikeTheLook
closetext
loadmovesprites
- showemote EMOTE_SHOCK, $0, 15
- applymovement $0, MovementData_0x192d2d
+ showemote EMOTE_SHOCK, PLAYER, 15
+ applymovement PLAYER, MovementData_0x192d2d
end
Script_LeftTimeCapsule:
@@ -558,21 +558,21 @@
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
applymovement $4, MovementData_0x192d08
- applymovement $0, MovementData_0x192cf9
+ applymovement PLAYER, MovementData_0x192cf9
applymovement $4, MovementData_0x192d01
jump .Done
.Female:
applymovement $4, MovementData_0x192d08
- applymovement $0, MovementData_0x192cfc
+ applymovement PLAYER, MovementData_0x192cfc
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement $0, MovementData_0x192d17
+ applymovement PLAYER, MovementData_0x192d17
writebyte $90
special Functionc225
- applymovement $0, MovementData_0x192d1c
+ applymovement PLAYER, MovementData_0x192d1c
special Special_ReplaceKrisSprite
- applymovement $0, MovementData_0x192cfc
+ applymovement PLAYER, MovementData_0x192cfc
applymovement $4, MovementData_0x192d01
.Done:
dotrigger $0
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -28,12 +28,12 @@
closetext
loadmovesprites
spriteface $2, LEFT
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x188f7f
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $2, MovementData_0x188eda
dotrigger $0
end
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -112,9 +112,9 @@
spriteface $b, RIGHT
checkcode VAR_FACING
if_not_equal $3, UnknownScript_0x5d7be
- applymovement $0, MovementData_0x5d921
+ applymovement PLAYER, MovementData_0x5d921
UnknownScript_0x5d7be:
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x5dedd
closetext
@@ -252,7 +252,7 @@
pause 20
spriteface $b, DOWN
pause 15
- spriteface $0, UP
+ spriteface PLAYER, UP
pause 15
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -74,7 +74,7 @@
end
UnknownScript_0x6006e:
- applymovement $0, MovementData_0x60125
+ applymovement PLAYER, MovementData_0x60125
playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $3, RIGHT
loadfont
@@ -113,7 +113,7 @@
moveperson $2, $c, $0
appear $2
applymovement $2, MovementData_0x6010f
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x605b2
keeptextopen
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -21,12 +21,12 @@
UnknownScript_0x733f3:
showemote EMOTE_SHOCK, $2, 15
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x73496
closetext
loadmovesprites
- applymovement $0, MovementData_0x73405
+ applymovement PLAYER, MovementData_0x73405
end
MovementData_0x73405:
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -21,12 +21,12 @@
UnknownScript_0x73617:
showemote EMOTE_SHOCK, $2, 15
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x7364d
closetext
loadmovesprites
- applymovement $0, MovementData_0x73629
+ applymovement PLAYER, MovementData_0x73629
end
MovementData_0x73629:
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -31,9 +31,9 @@
writetext UnknownText_0x19f006
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $2, MovementData_0x19effa
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, MovementData_0x19f000
disappear $2
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -57,9 +57,9 @@
writetext UnknownText_0x19f006
closetext
loadmovesprites
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $2, MovementData_0x19effd
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, MovementData_0x19f000
disappear $2
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -26,7 +26,7 @@
showemote EMOTE_SHOCK, $a, 15
applymovement $a, MovementData_0x1a0a69
UnknownScript_0x1a088c:
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x1a0a6b
keeptextopen
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -37,7 +37,7 @@
spriteface $2, UP
showemote EMOTE_SHOCK, $2, 15
applymovement $2, MovementData_0x1a108d
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
@@ -44,7 +44,7 @@
yesorno
iffalse UnknownScript_0x1a0fd9
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a109a
stopfollow
loadpokedata RATTATA, 5
@@ -62,7 +62,7 @@
spriteface $2, UP
showemote EMOTE_SHOCK, $2, 15
applymovement $2, MovementData_0x1a1094
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
@@ -69,7 +69,7 @@
yesorno
iffalse UnknownScript_0x1a0fe5
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a10a1
stopfollow
loadpokedata RATTATA, 5
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -77,15 +77,15 @@
UnknownScript_0x1904ab:
spriteface $9, LEFT
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x190790
closetext
loadmovesprites
- follow $0, $9
- applymovement $0, MovementData_0x190789
+ follow PLAYER, $9
+ applymovement PLAYER, MovementData_0x190789
stopfollow
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
scall UnknownScript_0x190470
applymovement $9, MovementData_0x19078c
applymovement $9, MovementData_0x19078e
@@ -110,7 +110,7 @@
UnknownScript_0x1904e9:
spriteface $b, DOWN
- spriteface $0, UP
+ spriteface PLAYER, UP
jump UnknownScript_0x1904f3
FisherScript_0x1904f2:
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -26,11 +26,11 @@
iffalse UnknownScript_0x62d62
showemote EMOTE_SHOCK, $5, 20
spriteface $5, LEFT
- spriteface $0, RIGHT
- follow $0, $5
- applymovement $0, MovementData_0x62d97
+ spriteface PLAYER, RIGHT
+ follow PLAYER, $5
+ applymovement PLAYER, MovementData_0x62d97
stopfollow
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
loadfont
writetext UnknownText_0x62e41
closetext
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -55,7 +55,7 @@
return
Route35NationalParkGate_LeavingContestEarly:
- applymovement $0, MovementData_0x6a2e2
+ applymovement PLAYER, MovementData_0x6a2e2
spriteface $2, RIGHT
loadfont
checkcode VAR_CONTESTMINUTES
@@ -121,11 +121,11 @@
Route35NationalParkgate_EnterContest:
checkcode VAR_FACING
if_equal LEFT, Route35NationalParkgate_FacingLeft
- applymovement $0, MovementData_0x6a2e5
+ applymovement PLAYER, MovementData_0x6a2e5
end
Route35NationalParkgate_FacingLeft:
- applymovement $0, MovementData_0x6a2e9
+ applymovement PLAYER, MovementData_0x6a2e9
end
Route35NationalParkgate_LeaveTheRestBehind:
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -30,13 +30,13 @@
return
UnknownScript_0x19401b:
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $a, MovementData_0x194262
disappear $a
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
pause 10
dotrigger $0
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -56,7 +56,7 @@
return
UnknownScript_0x6ab47:
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
checkcode VAR_CONTESTMINUTES
addvar $1
@@ -72,7 +72,7 @@
scall UnknownScript_0x6ab8c
disappear $2
appear $d
- applymovement $0, MovementData_0x6add1
+ applymovement PLAYER, MovementData_0x6add1
pause 15
special Special_FadeInQuickly
jumpstd bugcontestresults
@@ -81,7 +81,7 @@
writetext UnknownText_0x6b300
closetext
loadmovesprites
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeBlackBGMap
waitbutton
@@ -164,7 +164,7 @@
loadmovesprites
setflag ENGINE_BUG_CONTEST_TIMER
special Special_GiveParkBalls
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeBlackBGMap
waitbutton
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -16,7 +16,7 @@
end
UnknownScript_0x1a9218:
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
applymovement $a, MovementData_0x1a9356
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -39,7 +39,7 @@
end
UnknownScript_0x19abea:
- applymovement $0, MovementData_0x19aca2
+ applymovement PLAYER, MovementData_0x19aca2
showemote EMOTE_SHOCK, $4, 15
applymovement $4, MovementData_0x19acbb
spriteface $3, UP
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -42,7 +42,7 @@
UnknownScript_0x58dd3:
pause 30
earthquake 30
- showemote EMOTE_SHOCK, $0, 20
+ showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
changeblock $4, $0, $30
@@ -66,13 +66,13 @@
setflag ENGINE_UNLOCKED_UNOWNS_3
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement $0, MovementData_0x58e4d
+ applymovement PLAYER, MovementData_0x58e4d
playsound SFX_KINESIS
waitbutton
pause 20
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -43,7 +43,7 @@
UnknownScript_0x58596:
pause 30
earthquake 30
- showemote EMOTE_SHOCK, $0, 20
+ showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
changeblock $4, $0, $30
@@ -67,13 +67,13 @@
setflag ENGINE_UNLOCKED_UNOWNS_4
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement $0, MovementData_0x58610
+ applymovement PLAYER, MovementData_0x58610
playsound SFX_KINESIS
waitbutton
pause 20
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -44,7 +44,7 @@
UnknownScript_0x58751:
pause 30
earthquake 30
- showemote EMOTE_SHOCK, $0, 20
+ showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
changeblock $4, $0, $30
@@ -72,13 +72,13 @@
setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement $0, MovementData_0x587fe
+ applymovement PLAYER, MovementData_0x587fe
playsound SFX_KINESIS
waitbutton
pause 20
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -43,7 +43,7 @@
UnknownScript_0x58c12:
pause 30
earthquake 30
- showemote EMOTE_SHOCK, $0, 20
+ showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
changeblock $4, $0, $30
@@ -67,13 +67,13 @@
setflag ENGINE_UNLOCKED_UNOWNS_2
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
changeblock $2, $2, $18
changeblock $4, $2, $19
reloadmappart
playsound SFX_STRENGTH
earthquake 80
- applymovement $0, MovementData_0x58c8c
+ applymovement PLAYER, MovementData_0x58c8c
playsound SFX_KINESIS
waitbutton
pause 20
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -43,12 +43,12 @@
UnknownScript_0x58031:
spriteface $3, UP
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
jump UnknownScript_0x58044
UnknownScript_0x5803a:
spriteface $3, LEFT
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
jump UnknownScript_0x58044
ScientistScript_0x58043:
@@ -59,11 +59,11 @@
closetext
loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
- follow $3, $0
+ follow $3, PLAYER
applymovement $3, MovementData_0x580ba
disappear $3
stopfollow
- applymovement $0, MovementData_0x580c5
+ applymovement PLAYER, MovementData_0x580c5
domaptrigger GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $1
warpcheck
end
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -31,12 +31,12 @@
closetext
loadmovesprites
applymovement $2, MovementData_0x18a88f
- applymovement $0, MovementData_0x18a898
+ applymovement PLAYER, MovementData_0x18a898
writebyte $1
special Special_MagnetTrain
warpcheck
newloadmap $f9
- applymovement $0, MovementData_0x18a854
+ applymovement PLAYER, MovementData_0x18a854
wait $14
end
@@ -58,7 +58,7 @@
UnknownScript_0x18a862:
applymovement $2, MovementData_0x18a88f
- applymovement $0, MovementData_0x18a8a1
+ applymovement PLAYER, MovementData_0x18a8a1
applymovement $2, MovementData_0x18a894
loadfont
writetext UnknownText_0x18a993
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -39,7 +39,7 @@
moveperson $8, $b, $6
appear $8
applymovement $8, KurtSlowpokeWellVictoryMovementData
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext KurtLeaveSlowpokeWellText
closetext
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -16,8 +16,8 @@
end
UnknownScript_0x184947:
- spriteface $0, UP
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, UP
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
playsound SFX_TACKLE
playsound SFX_ELEVATOR
@@ -26,7 +26,7 @@
playsound SFX_TACKLE
playsound SFX_ELEVATOR
earthquake 79
- applymovement $0, MovementData_0x184a1d
+ applymovement PLAYER, MovementData_0x184a1d
applymovement $8, MovementData_0x184a22
loadfont
writetext UnknownText_0x184a27
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -25,16 +25,16 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $2
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $2
appear $2
@@ -50,16 +50,16 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $3
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $3
appear $2
@@ -75,18 +75,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $7
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement2
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $c, $5
appear $2
applymovement $2, SecurityCameraMovement3
@@ -101,18 +101,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $4, $8
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement4
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $c, $5
appear $2
applymovement $2, SecurityCameraMovement5
@@ -127,18 +127,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $6
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $19, $b
appear $2
applymovement $2, SecurityCameraMovement6
@@ -153,18 +153,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $13, $7
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $19, $c
appear $2
applymovement $2, SecurityCameraMovement7
@@ -179,18 +179,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $11, $10
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $19, $b
appear $2
applymovement $2, SecurityCameraMovement8
@@ -205,18 +205,18 @@
scall PlaySecurityCameraSounds
checkevent EVENT_TEAM_ROCKET_BASE_POPULATION
iftrue NoSecurityCamera
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
moveperson $2, $3, $10
appear $2
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
applymovement $2, SecurityCameraMovement1
scall TrainerCameraGrunt1
if_equal $1, NoSecurityCamera
scall PlaySecurityCameraSounds
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
moveperson $2, $e, $10
appear $2
applymovement $2, SecurityCameraMovement9
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -52,12 +52,12 @@
writetext UnknownText_0x6d2ad
closetext
loadmovesprites
- spriteface $0, DOWN
- showemote EMOTE_SHOCK, $0, 15
- applymovement $0, MovementData_0x6d21f
+ spriteface PLAYER, DOWN
+ showemote EMOTE_SHOCK, PLAYER, 15
+ applymovement PLAYER, MovementData_0x6d21f
playmusic MUSIC_ROCKET_ENCOUNTER
applymovement $3, MovementData_0x6d224
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $2, MovementData_0x6d22f
loadfont
writetext UnknownText_0x6d2c3
@@ -65,7 +65,7 @@
loadmovesprites
cry DRAGONITE
spriteface $3, LEFT
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
appear $5
applymovement $5, MovementData_0x6d236
applymovement $3, MovementData_0x6d23b
@@ -76,7 +76,7 @@
writetext UnknownText_0x6d38c
closetext
loadmovesprites
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
applymovement $3, MovementData_0x6d241
loadfont
writetext UnknownText_0x6d3bd
@@ -115,12 +115,12 @@
closetext
loadmovesprites
applymovement $4, MovementData_0x6d250
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
writetext UnknownText_0x6d64e
closetext
loadmovesprites
- follow $4, $0
+ follow $4, PLAYER
applymovement $4, MovementData_0x6d254
stopfollow
applymovement $4, MovementData_0x6d258
@@ -132,7 +132,7 @@
disappear $4
UnknownScript_0x6d075:
- applymovement $0, MovementData_0x6d271
+ applymovement PLAYER, MovementData_0x6d271
end
UnknownScript_0x6d07a:
@@ -140,15 +140,15 @@
writetext UnknownText_0x6d7ea
closetext
loadmovesprites
- applymovement $0, MovementData_0x6d278
+ applymovement PLAYER, MovementData_0x6d278
end
UnknownScript_0x6d085:
- spriteface $0, UP
+ spriteface PLAYER, UP
jump UnknownScript_0x6d091
UnknownScript_0x6d08b:
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
spriteface $4, LEFT
UnknownScript_0x6d091:
loadfont
@@ -225,7 +225,7 @@
iffalse UnknownScript_0x6d182
returnafterbattle
special PlayMapMusic
- applymovement $0, MovementData_0x6d28c
+ applymovement PLAYER, MovementData_0x6d28c
jump UnknownScript_0x6d184
VoltorbScript_0x6d12c:
@@ -243,7 +243,7 @@
iffalse UnknownScript_0x6d182
returnafterbattle
special PlayMapMusic
- applymovement $0, MovementData_0x6d299
+ applymovement PLAYER, MovementData_0x6d299
jump UnknownScript_0x6d184
VoltorbScript_0x6d157:
@@ -261,7 +261,7 @@
iffalse UnknownScript_0x6d182
returnafterbattle
special PlayMapMusic
- applymovement $0, MovementData_0x6d2a4
+ applymovement PLAYER, MovementData_0x6d2a4
jump UnknownScript_0x6d184
UnknownScript_0x6d182:
@@ -272,7 +272,7 @@
moveperson $4, $12, $6
appear $4
applymovement $4, MovementData_0x6d27a
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x6d809
keeptextopen
@@ -286,7 +286,7 @@
writetext UnknownText_0x6d994
closetext
loadmovesprites
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $4, MovementData_0x6d283
disappear $4
setevent EVENT_CLEARED_ROCKET_HIDEOUT
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -38,7 +38,7 @@
return
LanceScript_0x6dffc:
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
pause 5
spriteface $4, RIGHT
pause 20
@@ -53,12 +53,12 @@
end
UnknownScript_0x6e019:
- spriteface $0, LEFT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, LEFT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
appear $a
applymovement $a, MovementData_0x6e164
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x6e267
@@ -65,7 +65,7 @@
closetext
loadmovesprites
playsound SFX_TACKLE
- applymovement $0, MovementData_0x6e175
+ applymovement PLAYER, MovementData_0x6e175
applymovement $a, MovementData_0x6e16d
disappear $a
dotrigger $2
@@ -76,11 +76,11 @@
jumptextfaceplayer UnknownText_0x6e235
UnknownScript_0x6e04b:
- applymovement $0, MovementData_0x6e133
+ applymovement PLAYER, MovementData_0x6e133
jump UnknownScript_0x6e056
UnknownScript_0x6e052:
- applymovement $0, MovementData_0x6e13a
+ applymovement PLAYER, MovementData_0x6e13a
UnknownScript_0x6e056:
pause 30
showemote EMOTE_SHOCK, $3, 15
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -78,13 +78,13 @@
return
UnknownScript_0x18508f:
- applymovement $0, MovementData_0x1851cb
+ applymovement PLAYER, MovementData_0x1851cb
pause 15
writebyte RAIKOU
special SpecialMonCheck
iftrue UnknownScript_0x1850b6
applymovement $3, MovementData_0x1851d0
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
cry RAIKOU
pause 10
playsound SFX_WARP_FROM
@@ -97,7 +97,7 @@
special SpecialMonCheck
iftrue UnknownScript_0x1850d7
applymovement $4, MovementData_0x1851da
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
cry ENTEI
pause 10
playsound SFX_WARP_FROM
@@ -106,9 +106,9 @@
playsound SFX_EXIT_BUILDING
waitbutton
UnknownScript_0x1850d7:
- spriteface $0, UP
+ spriteface PLAYER, UP
pause 10
- applymovement $0, MovementData_0x1851e8
+ applymovement PLAYER, MovementData_0x1851e8
applymovement $2, MovementData_0x1851e4
cry SUICUNE
pause 20
@@ -128,7 +128,7 @@
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
returnafterbattle
pause 20
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
playsound SFX_ENTER_DOOR
moveperson $5, $a, $f
@@ -149,7 +149,7 @@
moveperson $6, $7, $d
moveperson $7, $9, $d
moveperson $8, $b, $d
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x185203
closetext
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -12,7 +12,7 @@
end
UnknownScript_0x9b38b:
- spriteface $0, UP
+ spriteface PLAYER, UP
loadfont
checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
iftrue UnknownScript_0x9b3f7
@@ -35,7 +35,7 @@
writetext UnknownText_0x9b4a2
closetext
loadmovesprites
- applymovement $0, MovementData_0x9b401
+ applymovement PLAYER, MovementData_0x9b401
loadfont
writetext UnknownText_0x9b587
closetext
@@ -55,7 +55,7 @@
startbattle
returnafterbattle
UnknownScript_0x9b3e8:
- applymovement $0, MovementData_0x9b40f
+ applymovement PLAYER, MovementData_0x9b40f
end
UnknownScript_0x9b3ed:
@@ -62,7 +62,7 @@
writetext UnknownText_0x9b4d6
closetext
loadmovesprites
- applymovement $0, MovementData_0x9b41d
+ applymovement PLAYER, MovementData_0x9b41d
end
UnknownScript_0x9b3f7:
@@ -69,7 +69,7 @@
writetext UnknownText_0x9b51d
closetext
loadmovesprites
- applymovement $0, MovementData_0x9b41d
+ applymovement PLAYER, MovementData_0x9b41d
end
MovementData_0x9b401:
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -78,8 +78,8 @@
jumptextfaceplayer UnknownText_0x7d1d0
UnknownScript_0x7ca80:
- spriteface $0, RIGHT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, RIGHT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
playsound SFX_EXIT_BUILDING
@@ -86,7 +86,7 @@
appear $c
waitbutton
applymovement $c, MovementData_0x7ce87
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
scall UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce92
playsound SFX_EXIT_BUILDING
@@ -97,8 +97,8 @@
end
UnknownScript_0x7caaa:
- spriteface $0, RIGHT
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, RIGHT
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
playsound SFX_EXIT_BUILDING
@@ -105,7 +105,7 @@
appear $c
waitbutton
applymovement $c, MovementData_0x7ce8c
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
scall UnknownScript_0x7cad4
applymovement $c, MovementData_0x7ce97
playsound SFX_EXIT_BUILDING
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -24,7 +24,7 @@
return
UnknownScript_0x74da6:
- applymovement $0, MovementData_0x74ef3
+ applymovement PLAYER, MovementData_0x74ef3
appear $2
dotrigger $0
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
@@ -49,7 +49,7 @@
playsound SFX_EXIT_BUILDING
disappear $2
waitbutton
- applymovement $0, MovementData_0x74ef1
+ applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
special FadeBlackBGMap
waitbutton
@@ -83,7 +83,7 @@
iftrue UnknownScript_0x74e86
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue UnknownScript_0x74e86
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
loadfont
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x74e72
@@ -102,7 +102,7 @@
closetext
loadmovesprites
setevent EVENT_RECEIVED_BALLS_FROM_KURT
- applymovement $0, MovementData_0x74ef8
+ applymovement PLAYER, MovementData_0x74ef8
jump SailorScript_0x74dc4
UnknownScript_0x74e68:
@@ -109,7 +109,7 @@
writetext UnknownText_0x74ff2
closetext
loadmovesprites
- applymovement $0, MovementData_0x74ef5
+ applymovement PLAYER, MovementData_0x74ef5
end
UnknownScript_0x74e72:
@@ -116,7 +116,7 @@
writetext UnknownText_0x75059
closetext
loadmovesprites
- applymovement $0, MovementData_0x74ef5
+ applymovement PLAYER, MovementData_0x74ef5
end
UnknownScript_0x74e7c:
@@ -123,7 +123,7 @@
writetext UnknownText_0x75080
closetext
loadmovesprites
- applymovement $0, MovementData_0x74ef5
+ applymovement PLAYER, MovementData_0x74ef5
end
UnknownScript_0x74e86:
@@ -139,7 +139,7 @@
writetext UnknownText_0x74fa7
closetext
loadmovesprites
- applymovement $0, MovementData_0x74ef5
+ applymovement PLAYER, MovementData_0x74ef5
end
SailorScript_0x74e97:
@@ -164,7 +164,7 @@
closetext
loadmovesprites
setevent EVENT_RECEIVED_BALLS_FROM_KURT
- applymovement $0, MovementData_0x74efe
+ applymovement PLAYER, MovementData_0x74efe
jump SailorScript_0x74dc4
UnknownScript_0x74ed4:
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -17,8 +17,8 @@
UnknownScript_0x74492:
moveperson $2, $12, $b
- spriteface $0, DOWN
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, DOWN
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
appear $2
@@ -31,8 +31,8 @@
end
UnknownScript_0x744b5:
- spriteface $0, DOWN
- showemote EMOTE_SHOCK, $0, 15
+ spriteface PLAYER, DOWN
+ showemote EMOTE_SHOCK, PLAYER, 15
special Functionc48f
pause 15
appear $2
@@ -45,7 +45,7 @@
end
UnknownScript_0x744d4:
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x7455f
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -16,7 +16,7 @@
end
UnknownScript_0x9b9fd:
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
jump UnknownScript_0x9ba04
OfficerScript_0x9ba03:
@@ -30,7 +30,7 @@
writetext UnknownText_0x9ba5f
closetext
loadmovesprites
- applymovement $0, MovementData_0x9ba27
+ applymovement PLAYER, MovementData_0x9ba27
end
UnknownScript_0x9ba19:
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -32,9 +32,9 @@
closetext
loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a842a
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $2, MovementData_0x1a8465
stopfollow
special RestartMapMusic
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -31,7 +31,7 @@
loadmovesprites
checkcode VAR_FACING
if_equal $1, .UnknownScript_0x69511
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $6, MovementData_0x69549
playsound SFX_EXIT_BUILDING
disappear $6
@@ -40,7 +40,7 @@
.UnknownScript_0x69511
applymovement $6, MovementData_0x6954e
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
applymovement $6, MovementData_0x69551
playsound SFX_EXIT_BUILDING
disappear $6
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -32,7 +32,7 @@
return
UnknownScript_0x1804e0:
- applymovement $0, MovementData_0x18052c
+ applymovement PLAYER, MovementData_0x18052c
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -51,12 +51,12 @@
UnknownScript_0x985a3:
spriteface $4, UP
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, $4, 20
- follow $0, $4
- applymovement $0, MovementData_0x98622
+ follow PLAYER, $4
+ applymovement PLAYER, MovementData_0x98622
stopfollow
- spriteface $0, RIGHT
+ spriteface PLAYER, RIGHT
loadfont
writetext UnknownText_0x98712
closetext