diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-15 09:22:34 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-15 09:22:34 -0600 |
| commit | 404043a902a5673f14055f47faa4b08f78197384 (patch) | |
| tree | b19c1c8122df414a97656385e3d3456226e743ad | |
| parent | Merge in stag019's work. (diff) | |
| parent | Fix a RAM location mis-labeling. At $D4E4 there is the list of current map's ... (diff) | |
| download | pokeyellow-404043a902a5673f14055f47faa4b08f78197384.tar.gz pokeyellow-404043a902a5673f14055f47faa4b08f78197384.tar.xz pokeyellow-404043a902a5673f14055f47faa4b08f78197384.zip | |
Merge in sawakita's W_PEOPLEMOVEMENTS changes.
hg-commit-id: 047693a39b24
| -rw-r--r-- | common.asm | 4 | ||||
| -rw-r--r-- | constants.asm | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/constants.asm b/constants.asm index 60325b73..f021dc86 100644 --- a/constants.asm +++ b/constants.asm @@ -162,7 +162,7 @@ W_MAPDATAPTR EQU $D36A W_MAPTEXTPTR EQU $D36C W_MAPSCRIPTPTR EQU $D36E -W_MAPTEXTPTRLIST EQU $D4E4 +W_PEOPLEMOVEPERMISSIONS EQU $D4E4 W_PLAYERCOINS1 EQU $D5A4 W_PLAYERCOINS2 EQU $D5A5 |