summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/home.asm b/home.asm
index dc03faa2c..9601a8c1a 100644
--- a/home.asm
+++ b/home.asm
@@ -532,7 +532,7 @@ ApplyTilemap:: ; 321c
ld a, 1
ld [hBGMapMode], a
- jr LoadEDTile
+ jr CopyTilemapAtOnce
.dmg
; WaitBGMap
@@ -543,21 +543,21 @@ ApplyTilemap:: ; 321c
ret
; 3238
-CGBOnly_LoadEDTile:: ; 3238
+CGBOnly_CopyTilemapAtOnce:: ; 3238
ld a, [hCGB]
and a
jr z, WaitBGMap
-LoadEDTile:: ; 323d
- jr .LoadEDTile
+CopyTilemapAtOnce:: ; 323d
+ jr .CopyTilemapAtOnce
; 323f
; XXX
- callba HDMATransferAttrMapAndTileMapToWRAMBank3
+ farcall HDMATransferAttrMapAndTileMapToWRAMBank3
ret
; 3246
-.LoadEDTile: ; 3246
+.CopyTilemapAtOnce: ; 3246
ld a, [hBGMapMode]
push af
xor a
@@ -574,11 +574,11 @@ LoadEDTile:: ; 323d
jr c, .wait
di
- ld a, 1 ; BANK(VTiles3)
+ ld a, BANK(VTiles3)
ld [rVBK], a
hlcoord 0, 0, AttrMap
call .StackPointerMagic
- ld a, 0 ; BANK(VTiles0)
+ ld a, BANK(VTiles0)
ld [rVBK], a
hlcoord 0, 0
call .StackPointerMagic
@@ -623,7 +623,7 @@ rept SCREEN_WIDTH / 2
inc l
endr
- ld de, $20 - SCREEN_WIDTH
+ ld de, BG_MAP_WIDTH - SCREEN_WIDTH
add hl, de
ld a, [hTilesPerCycle]
dec a
@@ -861,7 +861,7 @@ HandleStoneQueue:: ; 3567
ld l, a
push hl
- call .IsPersonOnWarp
+ call .IsObjectOnWarp
pop hl
jr nc, .nope
ld d, a
@@ -869,7 +869,7 @@ HandleStoneQueue:: ; 3567
call .IsObjectInStoneTable
jr nc, .nope
call CallMapScript
- callba EnableScriptMode
+ farcall EnableScriptMode
scf
ret
@@ -878,7 +878,7 @@ HandleStoneQueue:: ; 3567
ret
; 3599
-.IsPersonOnWarp: ; 3599
+.IsObjectOnWarp: ; 3599
push de
ld hl, OBJECT_NEXT_MAP_X
@@ -1075,7 +1075,7 @@ _PrepMonFrontpic:: ; 378b
push hl
ld de, VTiles2
- predef GetFrontpic
+ predef GetMonFrontpic
pop hl
xor a
ld [hGraphicStartTile], a
@@ -1213,7 +1213,7 @@ GetNick:: ; 38a2
call CopyBytes
pop de
- callab CheckNickErrors
+ callfar CheckNickErrors
pop bc
pop hl