ref: 404043a902a5673f14055f47faa4b08f78197384
parent: e37784f90f23eda6b3b774681cff1c244de8b1fa
parent: 916b31351797bece6510db6128fb7fd24b6ccc3f
author: Bryan Bishop <kanzure@gmail.com>
date: Sun Jan 15 04:22:34 EST 2012
Merge in sawakita's W_PEOPLEMOVEMENTS changes. hg-commit-id: 047693a39b24
--- a/common.asm
+++ b/common.asm
@@ -1408,7 +1408,7 @@
call Function354E
ld [hl],$FF
call Function3558
- ld [hl],$FF
+ ld [hl],$FF ; prevent person from walking?
pop hl
ret
@@ -1422,7 +1422,7 @@
Function3558: ; 3558
push de
- ld hl,W_MAPTEXTPTRLIST
+ ld hl,W_PEOPLEMOVEPERMISSIONS
ld a,[$FF8C] ; the sprite to move
dec a
add a
--- a/constants.asm
+++ b/constants.asm
@@ -162,7 +162,7 @@
W_MAPTEXTPTR EQU $D36C
W_MAPSCRIPTPTR EQU $D36E
-W_MAPTEXTPTRLIST EQU $D4E4
+W_PEOPLEMOVEPERMISSIONS EQU $D4E4
W_PLAYERCOINS1 EQU $D5A4
W_PLAYERCOINS2 EQU $D5A5