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/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