diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-03-03 23:38:54 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-03-03 23:38:54 -0600 |
| commit | f676c3d357417c81daa33544536213ae85a5472f (patch) | |
| tree | 7a4424aafc11c9f410217062ac0d25c5d48895ac /home/map.asm | |
| parent | 0b6cb7a3b601875b21f6a2e2a1ab20490eb93921 (diff) | |
| parent | 7ab8f76117e13a192a1f4f797ee73c48f6154cff (diff) | |
Merge pull request #237 from yenatch/incbins
Map triggers and egg hatching.
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/map.asm b/home/map.asm index 11e2f4e5a..d581eb6b4 100644 --- a/home/map.asm +++ b/home/map.asm @@ -24,7 +24,7 @@ Function211b:: ; 211b ret ; 212a -Function212a:: ; 212a +GetCurrentMapTrigger:: ; 212a ld a, [MapGroup] ld b, a ld a, [MapNumber] @@ -32,7 +32,7 @@ Function212a:: ; 212a xor a ld [$dbf7], a ld [$dbf8], a - call Function2147 + call GetMapTrigger ret c ld a, e ld [$dbf7], a @@ -42,14 +42,14 @@ Function212a:: ; 212a ret ; 2147 -Function2147:: ; 2147 +GetMapTrigger:: ; 2147 push bc ld a, [hROMBank] push af - ld a, $13 + ld a, BANK(MapTriggers) rst Bankswitch - ld hl, $501e + ld hl, MapTriggers .asm_2151 push hl ld a, [hli] @@ -106,9 +106,9 @@ Function217a:: ; 217a ld bc, TileMapEnd - TileMap call ByteFill - ld a, $13 + ld a, BANK(Function4d15b) rst Bankswitch - call $515b + call Function4d15b pop af rst Bankswitch |