summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.asm26
1 files changed, 15 insertions, 11 deletions
diff --git a/main.asm b/main.asm
index 9449ae6cf..a0d5e2074 100644
--- a/main.asm
+++ b/main.asm
@@ -341,7 +341,7 @@ Function1c89: ; 1c89
inc hl
ld d, [hl]
call Function1cc6
- call Function1d05
+ call GetTileCoord
inc de
ld a, [de]
inc de
@@ -426,7 +426,8 @@ Function1cfd: ; 1cfd
; 1d05
-Function1d05: ; 1d05
+GetTileCoord: ; 1d05
+; Return the address of TileMap(c, b) in hl.
xor a
ld h, a
ld l, b
@@ -452,6 +453,9 @@ Function1d19: ; 1d19
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
@@ -1626,7 +1630,7 @@ Function352f: ; 352f
sub c
ld e, a
push de
- call Function1d05
+ call GetTileCoord
pop bc
jp TextBox
; 354b
@@ -7120,7 +7124,7 @@ Function56cd: ; 56cd
jr nc, .asm_5760
ld c, a
push bc
- call Function1d05
+ call GetTileCoord
pop bc
ld a, [hl]
cp $60
@@ -28090,7 +28094,7 @@ Function240db: ; 240db
inc hl
ld d, [hl]
call Function1cc6
- call Function1d05
+ call GetTileCoord
call Function240d3
ld b, a
.asm_240eb
@@ -28411,7 +28415,7 @@ Function2431a: ; 2431a
ld b, a
ld a, [$cfa2]
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, [$cfa7]
swap a
and $f
@@ -28741,7 +28745,7 @@ Function244e3: ; 244e3
ld a, [$cf83]
inc a
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, $80
ld [$ffad], a
ld bc, $0707
@@ -29131,7 +29135,7 @@ Function247f0: ; 247f0
ld b, a
ld a, [$cf85]
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $61
.asm_2480d
@@ -29168,7 +29172,7 @@ Function247f0: ; 247f0
ld b, a
ld a, [$cf85]
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $ee
.asm_24850
@@ -29245,7 +29249,7 @@ Function2488b: ; 2488b
ld a, [$cf83]
add $0
ld c, a
- call Function1d05
+ call GetTileCoord
ld [hl], $ec
.asm_248b7
@@ -82676,7 +82680,7 @@ Function16d77a: ; 16d77a
ld b, a
ld a, [$cfa2]
ld c, a
- call Function1d05
+ call GetTileCoord
ld a, [$cfa7]
swap a
and $f