aboutsummaryrefslogtreecommitdiffstats
path: root/common.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-15 09:22:34 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-15 09:22:34 -0600
commit404043a902a5673f14055f47faa4b08f78197384 (patch)
treeb19c1c8122df414a97656385e3d3456226e743ad /common.asm
parentMerge in stag019's work. (diff)
parentFix a RAM location mis-labeling. At $D4E4 there is the list of current map's ... (diff)
downloadpokeyellow-404043a902a5673f14055f47faa4b08f78197384.tar.gz
pokeyellow-404043a902a5673f14055f47faa4b08f78197384.tar.xz
pokeyellow-404043a902a5673f14055f47faa4b08f78197384.zip
Merge in sawakita's W_PEOPLEMOVEMENTS changes.
hg-commit-id: 047693a39b24
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.asm b/common.asm
index d11fffe5..b3418189 100644
--- a/common.asm
+++ b/common.asm
@@ -1408,7 +1408,7 @@ Function3541: ; 3541
call Function354E
ld [hl],$FF
call Function3558
- ld [hl],$FF
+ ld [hl],$FF ; prevent person from walking?
pop hl
ret
@@ -1422,7 +1422,7 @@ Function354E: ; 354E
Function3558: ; 3558
push de
- ld hl,W_MAPTEXTPTRLIST
+ ld hl,W_PEOPLEMOVEPERMISSIONS
ld a,[$FF8C] ; the sprite to move
dec a
add a