Merge yenatch:map-objects

2015-07-25 20:18:59 -04:00
parent 6c3000efd2 ec10d9dd6f
commit 594253eb30
85 changed files with 423 additions and 419 deletions
--- a/maps/BattleTowerHallway.asm
+++ b/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