Add constants for common map object ids.

constants/script_constants.asm

@@ -1,4 +1,6 @@
 ; script vars
+PLAYER      EQU  0
+LAST_TALKED EQU -2
 
 	const_def
 	const VAR_STRINGBUFFER2

engine/events.asm

@@ -611,9 +611,9 @@ TryObjectEvent: ; 969b5
 	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 @@ WarpToNewMapScript: ; 96c34
 FallIntoMapScript: ; 96c38
 	newloadmap $f6
 	playsound SFX_KINESIS
-	applymovement $0, MovementData_0x96c48
+	applymovement PLAYER, MovementData_0x96c48
 	playsound SFX_STRENGTH
 	scall UnknownScript_0x96c4a
 	end

engine/map_objects.asm

@@ -2761,7 +2761,7 @@ Function5602: ; 5602
 	ld a, [wd459]
 	bit 7, a
 	jr z, .ok
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
 	and a
 	jr z, .ok
 	call Function5629

engine/phone_scripts.asm

@@ -3167,11 +3167,11 @@ TalkToTrainerScript:: ; 0xbe66a
 SeenByTrainerScript:: ; 0xbe675
 	loadtrainerdata
 	playrammusic
-	showemote EMOTE_SHOCK, -2, 30
+	showemote EMOTE_SHOCK, LAST_TALKED, 30
 	callasm Function831e
 	applymovement2 MovementBuffer
-	writepersonxy -2
+	writepersonxy LAST_TALKED
-	faceperson $0, -2
+	faceperson PLAYER, LAST_TALKED
 	jump StartBattleWithMapTrainerScript
 ; 0xbe68a
 

engine/scripting.asm

@@ -1046,7 +1046,7 @@ Script_cry: ; 0x971d1
 GetScriptPerson: ; 0x971e3
 	and a
 	ret z
-	cp $fe
+	cp LAST_TALKED
 	ret z
 	dec a
 	ret
@@ -1059,7 +1059,7 @@ Script_setlasttalked: ; 0x971ea
 
 	call GetScriptByte
 	call GetScriptPerson
-	ld [$ffe0], a
+	ld [hLastTalked], a
 	ret
 ; 0x971f3
 
@@ -1106,7 +1106,7 @@ Script_applymovement2: ; 0x97228
 ; parameters:
 ;     data (MovementPointerLabelParam)
 
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
 	ld c, a
 	jp ApplyMovement
 ; 0x9722e
@@ -1114,11 +1114,11 @@ Script_applymovement2: ; 0x97228
 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 @@ rept 2
 	add a
 endr
 	ld e, a
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
 	ld d, a
 	call ApplyPersonFacing
 	ret
@@ -1140,17 +1140,17 @@ Script_faceperson: ; 0x97248
 
 	call GetScriptByte
 	call GetScriptPerson
-	cp $fe
+	cp LAST_TALKED
-	jr c, .asm_97254 ; 0x97250 $2
+	jr c, .ok
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
-.asm_97254
+.ok
 	ld e, a
 	call GetScriptByte
 	call GetScriptPerson
-	cp $fe
+	cp LAST_TALKED
-	jr nz, .asm_97261 ; 0x9725d $2
+	jr nz, .ok2
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
-.asm_97261
+.ok2
 	ld d, a
 	push de
 	callba GetRelativeFacing
@@ -1174,10 +1174,10 @@ Script_spriteface: ; 0x97274
 
 	call GetScriptByte
 	call GetScriptPerson
-	cp $fe
+	cp LAST_TALKED
-	jr nz, .asm_97280 ; 0x9727c $2
+	jr nz, .ok
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
-.asm_97280
+.ok
 	ld d, a
 	call GetScriptByte
 rept 2
@@ -1271,10 +1271,10 @@ Script_disappear: ; 0x972ee
 
 	call GetScriptByte
 	call GetScriptPerson
-	cp -2
+	cp LAST_TALKED
-	jr nz, .skip ; 0x972f6 $2
+	jr nz, .ok
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
-.skip
+.ok
 	call DeleteObjectStruct
 	ld a, [$ffaf]
 	ld b, 1 ; set
@@ -1354,10 +1354,10 @@ Script_writepersonxy: ; 0x9735b
 
 	call GetScriptByte
 	call GetScriptPerson
-	cp $fe
+	cp LAST_TALKED
-	jr nz, .asm_97367 ; 0x97363 $2
+	jr nz, .ok
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
-.asm_97367
+.ok
 	ld b, a
 	callba Function80a1
 	ret
@@ -1405,10 +1405,10 @@ Script_showemote: ; 0x97396
 	ld [ScriptVar], a
 	call GetScriptByte
 	call GetScriptPerson
-	cp $fe
+	cp LAST_TALKED
-	jr z, .asm_973a8 ; 0x973a4 $2
+	jr z, .ok
-	ld [$ffe0], a
+	ld [hLastTalked], a
-.asm_973a8
+.ok
 	call GetScriptByte
 	ld [ScriptDelay], a
 	ld b, BANK(ShowEmoteScript)
@@ -1454,7 +1454,7 @@ Script_earthquake: ; 0x973c7
 ; 0x973e6
 
 UnknownScript_0x973e6: ; 973e6
-	applymovement $0, wd002
+	applymovement PLAYER, wd002
 	end
 ; 973eb
 

engine/std_scripts.asm

@@ -108,7 +108,7 @@ PokeCenterNurseScript:
 	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 @@ PokeCenterNurseScript:
 	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 @@ PokeCenterNurseScript:
 .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 @@ BugContestResultsWarpScript:
 	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

home.asm

@@ -1457,7 +1457,7 @@ CheckTrainerBattle:: ; 360d
 .startbattle
 	pop de
 	pop af
-	ld [$ffe0], a
+	ld [hLastTalked], a
 	ld a, b
 	ld [CurFruit], a
 	ld a, c
@@ -1474,7 +1474,7 @@ Function3674:: ; 3674
 Function367e:: ; 367e
 	call GetMapScriptHeaderBank
 	ld [EngineBuffer1], a
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
 	call GetMapObject
 	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc

hram.asm

@@ -64,6 +64,8 @@ hBGMapUpdate       EQU $ffdb
 
 hTileAnimFrame     EQU $ffdf
 
+hLastTalked        EQU $ffe0
+
 hRandom            EQU $ffe1
 hRandomAdd         EQU $ffe1
 hRandomSub         EQU $ffe2

main.asm

@@ -3671,14 +3671,14 @@ Function830d: ; 830d
 ; 831e
 
 Function831e: ; 831e
-	ld a, [$ffe0]
+	ld a, [hLastTalked]
 	call Function1b1e
 	ld a, $3e
 	call Function1b3f
 	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 @@ UsedSurfScript: ; c986
 	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 @@ Script_UsedWaterfall: ; 0xcb20
 	loadmovesprites
 	playsound SFX_BUBBLEBEAM
 .loop
-	applymovement $0, WaterfallStep
+	applymovement PLAYER, WaterfallStep
 	callasm CheckContinueWaterfall
 	iffalse .loop
 	end
@@ -5497,13 +5497,13 @@ UsedDigOrEscapeRopeScript: ; 0xcc3c
 	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 @@ Script_UsedTeleport: ; 0xccbb
 	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 @@ GetFacingObject: ; cf0d
 	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 @@ Script_GotABite: ; 0xd035
 	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 @@ Script_FishCastRod: ; 0xd07c
 	loademote $9
 	callasm Functionb84b3
 	loademote $0
-	applymovement $0, MovementData_0xd093
+	applymovement PLAYER, MovementData_0xd093
 	pause 40
 	end
 ; 0xd093
@@ -12317,7 +12317,7 @@ UnknownScript_0x122c1: ; 0x122c1
 FindItemInBallScript:: ; 0x122ce
 	callasm Function122f8
 	iffalse NoRoomForItemInBallScript
-	disappear $fe
+	disappear LAST_TALKED
 	loadfont
 	writetext UnknownText_0x122ee
 	playsound SFX_ITEM
@@ -12729,22 +12729,22 @@ Script_ForcedMovement:: ; 0x1253d
 ; 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
 

maps/AzaleaTown.asm

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

maps/BattleTower1F.asm

@@ -105,14 +105,14 @@ UnknownScript_0x9e454:
 	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
 	warpsound
 	disappear $2
 	stopfollow
-	applymovement $0, MovementData_0x9e576
+	applymovement PLAYER, MovementData_0x9e576
 	warpcheck
 	end
 

maps/BattleTowerBattleRoom.asm

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

maps/BattleTowerElevator.asm

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

maps/BattleTowerHallway.asm

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

maps/BrunosRoom.asm

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

maps/BurnedTower1F.asm

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

maps/BurnedTowerB1F.asm

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

maps/CeladonGameCorner.asm

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

maps/CeruleanGym.asm

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

maps/CherrygroveCity.asm

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