diff options
author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/town_map.asm | |
parent | b35294752c55b5df88ccfc785279c36f30a43fd6 (diff) | |
parent | 7b7c563c93155e121e05149779cfb78b0bf9d259 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/town_map.asm')
-rwxr-xr-x | engine/town_map.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index dece8d1f..7974cf1a 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -364,10 +364,10 @@ Func_711c4: ; 711c4 (1c:51c4) jp CopyData Func_711ef: ; 711ef (1c:51ef) - callba Func_e9cb + callba FindWildLocationsOfMon call Func_712d9 ld hl, wOAMBuffer - ld de, wHPBarMaxHP + ld de, wBuffer .asm_71200 ld a, [de] cp $ff |