diff options
author | Bryan Bishop <kanzure@gmail.com> | 2014-02-01 17:59:39 -0800 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2014-02-01 17:59:39 -0800 |
commit | 80465fc6e6f1455f4ae65b5c0db54b9953ca0cc5 (patch) | |
tree | 95247b8f85c28ff738d936747c8700b522975e7d /home/map.asm | |
parent | 0a16a7aef04c60ff64dcbded28f7db9c45067125 (diff) | |
parent | 821f2c2ea0f9dc482520f2cf9c45ccfaca8bbb29 (diff) |
Merge pull request #227 from yenatch/master
Map setup scripts
Diffstat (limited to 'home/map.asm')
-rw-r--r-- | home/map.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/home/map.asm b/home/map.asm index 79af8ffc1..6094332e7 100644 --- a/home/map.asm +++ b/home/map.asm @@ -214,7 +214,7 @@ endr Function222a: ; 222a ld a, $fa ld [$ff9f], a - callba Function15363 + callba RunMapSetupScript xor a ld [$ff9f], a ret @@ -1489,7 +1489,7 @@ Function289d: ; 289d .asm_28ce ld b, $6 ld c, $4 - jr .asm_28f7 + jr Function28f7 .asm_28d4 ld de, $dcba @@ -1502,8 +1502,10 @@ Function289d: ; 289d .asm_28dd ld b, $5 ld c, $5 - jr .asm_28f7 + jr Function28f7 + +Function28e3: ; 28e3 ld hl, $d194 ld a, [hli] ld h, [hl] @@ -1515,6 +1517,7 @@ Function289d: ; 289d ld b, $6 ld c, $5 +Function28f7: ; 28f7 .asm_28f7 push bc push hl |