diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /home/map_objects.asm | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 5f3514bd0..a20a06779 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -454,7 +454,7 @@ Function19e9:: ; 19e9 Function1a13:: ; 1a13 push bc push de - ld hl, $d4d6 + ld hl, ObjectStructs ld de, $0028 ld c, $d .asm_1a1d @@ -641,7 +641,7 @@ Function1ad2:: ; 1ad2 Function1ae5:: ; 1ae5 ld bc, $0028 - ld hl, $d4d6 + ld hl, ObjectStructs call AddNTimes ld b, h ld c, l |