ref: 86cdb9e0133b364df8a73ea297881b914577ab8e
parent: 193dbd53a62a5789c26f2a34452170802a317a5f
parent: cf966bb824ce0ffe384291cd51aa96a2dd86e839
author: yenatch <yenatch@gmail.com>
date: Fri Oct 25 14:02:17 EDT 2013
Merge commit 'cf966bb8' into merge-mrwint Conflicts: main.asm
--- a/main.asm
+++ b/main.asm
@@ -335,7 +335,7 @@
inc hl
ld d, [hl]
call Function1cc6
- call Function1d05
+ call GetTileCoord
inc de
ld a, [de]
inc de
@@ -420,7 +420,8 @@
; 1d05
-Function1d05: ; 1d05
+GetTileCoord: ; 1d05
+; Return the address of TileMap(c, b) in hl.
xor a
ld h, a
ld l, b
@@ -446,6 +447,9 @@
ld c, a
ld a, [$cf82]
ld b, a
+
+GetAttrCoord: ; 1d21
+; Return the address of AttrMap(c, b) in hl.
xor a
ld h, a
ld l, b
@@ -1620,7 +1624,7 @@
sub c
ld e, a
push de
- call Function1d05
+ call GetTileCoord
pop bc
jp TextBox
; 354b
@@ -7106,7 +7110,7 @@
jr nc, .asm_5760
ld c, a
push bc
- call Function1d05
+ call GetTileCoord
pop bc
ld a, [hl]
cp $60
@@ -31403,7 +31407,7 @@
ld a, [$d1ec]
dec a
ld b, a
- call Function1d05
+ call GetTileCoord
pop de
ld [hl], d
ld bc, $28
@@ -31556,7 +31560,7 @@
inc hl
ld d, [hl]
call Function1cc6
- call Function1d05
+ call GetTileCoord
call Function240d3
ld b, a
.asm_240eb
@@ -31928,7 +31932,7 @@
ld b, a
ld a, [$cfa2]
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, [$cfa7]
swap a
and $f
@@ -32258,7 +32262,7 @@
ld a, [$cf83]
inc a
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, $80
ld [$ffad], a
ld bc, $0707
@@ -32730,7 +32734,7 @@
ld b, a
ld a, [$cf85]
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $61
.asm_2480d
@@ -32767,7 +32771,7 @@
ld b, a
ld a, [$cf85]
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $ee
.asm_24850
@@ -32844,7 +32848,7 @@
ld a, [$cf83]
add $0
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $ec
.asm_248b7
@@ -122508,7 +122512,7 @@
ld b, a
ld a, [$cfa2]
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, [$cfa7]
swap a
and $f
--
⑨