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/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -17,8 +17,8 @@ UnknownScript_0x7408d:
 	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