diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
| commit | 9974a2c7014cbe7db3d0e516580fea48001ab3df (patch) | |
| tree | 61c015b170efbe7975650f37d0f15cc775242aa0 /home.asm | |
| parent | b77741ff7020747dbee6b295b87afe6ef0963dd2 (diff) | |
| parent | abf3fc21378ddc6a4028aa1852d256472bc859e0 (diff) | |
Merge pull request #303 from yenatch/map-objects
Add constants for common map object ids.
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1457,7 +1457,7 @@ CheckTrainerBattle:: ; 360d .startbattle pop de pop af - ld [$ffe0], a + ld [hLastTalked], a ld a, b ld [CurFruit], a ld a, c @@ -1474,7 +1474,7 @@ Function3674:: ; 3674 Function367e:: ; 367e call GetMapScriptHeaderBank ld [EngineBuffer1], a - ld a, [$ffe0] + ld a, [hLastTalked] call GetMapObject ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc |