diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
| commit | 594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch) | |
| tree | a2e0a3d80436e1d2279beb1aa07bf8217a586c32 /home.asm | |
| parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
| parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) | |
Merge yenatch:map-objects
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1448,7 +1448,7 @@ CheckTrainerBattle:: ; 360d .startbattle pop de pop af - ld [$ffe0], a + ld [hLastTalked], a ld a, b ld [CurFruit], a ld a, c @@ -1465,7 +1465,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 |