summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-01-09 15:16:05 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-01-09 15:16:05 -0500
commit7d3ea88611efbc2f9b903063e2816b1cae1bad35 (patch)
tree7475d498e4a1695aefd4a7e3356e735a51245d35 /engine/gfx
parentf773fd1dd89782eb1e92b850c7409a8d8be37651 (diff)
Rename GetFarHalfword to GetFarWord
Fixes #796
Diffstat (limited to 'engine/gfx')
-rw-r--r--engine/gfx/load_pics.asm8
-rw-r--r--engine/gfx/pic_animation.asm10
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 98dbdc17b..9b540d86b 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -125,7 +125,7 @@ GetFrontpicPointer:
push af
inc hl
ld a, d
- call GetFarHalfword
+ call GetFarWord
pop bc
ret
@@ -228,7 +228,7 @@ GetMonBackpic:
push af
inc hl
ld a, d
- call GetFarHalfword
+ call GetFarWord
ld de, wDecompressScratch
pop af
call FarDecompress
@@ -301,7 +301,7 @@ GSIntro_GetMonFrontpic: ; unreferenced
push af
inc hl
ld a, BANK(PokemonPicPointers)
- call GetFarHalfword
+ call GetFarWord
pop af
pop de
call FarDecompress
@@ -332,7 +332,7 @@ GetTrainerPic:
push af
inc hl
ld a, BANK(TrainerPicPointers)
- call GetFarHalfword
+ call GetFarWord
pop af
ld de, wDecompressScratch
call FarDecompress
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index 36faf9b7c..62d9ad6d7 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -474,7 +474,7 @@ PokeAnim_GetPointer:
add hl, de
add hl, de
ld a, [wPokeAnimPointerBank]
- call GetFarHalfword
+ call GetFarWord
ld a, l
ld [wPokeAnimCommand], a
ld a, h
@@ -496,7 +496,7 @@ PokeAnim_GetBitmaskIndex:
add hl, bc
add hl, bc
ld a, [wPokeAnimFramesBank]
- call GetFarHalfword
+ call GetFarWord
ld a, [wPokeAnimFramesBank]
call GetFarByte
ld [wPokeAnimCurBitmask], a
@@ -915,7 +915,7 @@ GetMonAnimPointer:
add hl, de
ld a, c
ld [wPokeAnimPointerBank], a
- call GetFarHalfword
+ call GetFarWord
ld a, l
ld [wPokeAnimPointerAddr], a
ld a, h
@@ -982,7 +982,7 @@ GetMonFramesPointer:
add hl, de
add hl, de
ld a, b
- call GetFarHalfword
+ call GetFarWord
ld a, l
ld [wPokeAnimFramesAddr], a
ld a, h
@@ -1020,7 +1020,7 @@ GetMonBitmaskPointer:
add hl, de
add hl, de
ld a, [wPokeAnimBitmaskBank]
- call GetFarHalfword
+ call GetFarWord
ld a, l
ld [wPokeAnimBitmaskAddr], a
ld a, h