Merge in sawakita's W_PEOPLEMOVEMENTS changes.

hg-commit-id: 047693a39b24
This commit is contained in:
Bryan Bishop 2012-01-15 09:22:34 -06:00
commit 404043a902
2 changed files with 3 additions and 3 deletions

View file

@ -1408,7 +1408,7 @@ Function3541: ; 3541
call Function354E call Function354E
ld [hl],$FF ld [hl],$FF
call Function3558 call Function3558
ld [hl],$FF ld [hl],$FF ; prevent person from walking?
pop hl pop hl
ret ret
@ -1422,7 +1422,7 @@ Function354E: ; 354E
Function3558: ; 3558 Function3558: ; 3558
push de push de
ld hl,W_MAPTEXTPTRLIST ld hl,W_PEOPLEMOVEPERMISSIONS
ld a,[$FF8C] ; the sprite to move ld a,[$FF8C] ; the sprite to move
dec a dec a
add a add a

View file

@ -162,7 +162,7 @@ W_MAPDATAPTR EQU $D36A
W_MAPTEXTPTR EQU $D36C W_MAPTEXTPTR EQU $D36C
W_MAPSCRIPTPTR EQU $D36E W_MAPSCRIPTPTR EQU $D36E
W_MAPTEXTPTRLIST EQU $D4E4 W_PEOPLEMOVEPERMISSIONS EQU $D4E4
W_PLAYERCOINS1 EQU $D5A4 W_PLAYERCOINS1 EQU $D5A4
W_PLAYERCOINS2 EQU $D5A5 W_PLAYERCOINS2 EQU $D5A5