Rename GetFarHalfword to GetFarWord

This commit is contained in:
Rangi 2021-01-09 15:16:20 -05:00
parent 4c43fa538d
commit 51aa06097f
17 changed files with 29 additions and 29 deletions

View File

@ -58,7 +58,7 @@ DoMove:
add hl, bc
add hl, bc
ld a, BANK(MoveEffectsPointers)
call GetFarHalfword
call GetFarWord
ld de, wBattleScriptBuffer
@ -109,7 +109,7 @@ DoMove:
pop bc
ld a, BANK(BattleCommandPointers)
call GetFarHalfword
call GetFarWord
call .DoMoveEffectCommand
@ -6681,7 +6681,7 @@ GetItemHeldEffect:
ld a, ITEMATTR_STRUCT_LENGTH
call AddNTimes
ld a, BANK(ItemAttributes)
call GetFarHalfword
call GetFarWord
ld b, l
ld c, h
pop hl

View File

@ -46,9 +46,9 @@ CheckForHiddenItems:
jr nz, .next
; Has this item already been found? If not, set off the Itemfinder.
ld a, [wCurMapScriptBank]
call GetFarHalfword
call GetFarWord
ld a, [wCurMapScriptBank]
call GetFarHalfword
call GetFarWord
ld d, h
ld e, l
ld b, CHECK_FLAG

View File

@ -102,7 +102,7 @@ GetFrontpic:
push af
inc hl
ld a, d
call GetFarHalfword
call GetFarWord
pop af
.ok
@ -228,7 +228,7 @@ Intro_GetMonFrontpic:
push af
inc hl
ld a, BANK(PokemonPicPointers)
call GetFarHalfword
call GetFarWord
pop af
pop de
call FarDecompress

View File

@ -751,7 +751,7 @@ HeavyBallMultiplier:
add BANK("Pokedex Entries 001-064")
ld d, a
ld a, BANK(PokedexDataPointerTable)
call GetFarHalfword
call GetFarWord
.SkipText:
ld a, d
@ -764,7 +764,7 @@ HeavyBallMultiplier:
push bc
inc hl
inc hl
call GetFarHalfword
call GetFarWord
srl h
rr l
@ -868,7 +868,7 @@ MoonBallMultiplier:
add hl, bc
add hl, bc
ld a, BANK(EvosAttacksPointers)
call GetFarHalfword
call GetFarWord
pop bc
push bc

View File

@ -24,7 +24,7 @@ PrintItemDescription:
add hl, bc
add hl, bc
ld a, BANK(ItemDescriptions)
call GetFarHalfword
call GetFarWord
ld d, h
ld e, l
pop hl

View File

@ -409,7 +409,7 @@ rept SCENE_SCRIPT_SIZE
endr
call GetMapScriptsBank
call GetFarHalfword
call GetFarWord
call GetMapScriptsBank
call CallScript
@ -710,7 +710,7 @@ TryBGEvent:
inc hl
inc hl
call GetMapScriptsBank
call GetFarHalfword
call GetFarWord
call GetMapScriptsBank
call CallScript
scf
@ -727,7 +727,7 @@ CheckBGEventFlag:
ld l, a
push hl
call GetMapScriptsBank
call GetFarHalfword
call GetFarWord
ld e, l
ld d, h
ld b, CHECK_FLAG

View File

@ -1275,7 +1275,7 @@ StdScript:
ld b, a
inc hl
ld a, BANK(StdScripts)
call GetFarHalfword
call GetFarWord
ret
SkipTwoScriptBytes:

View File

@ -894,7 +894,7 @@ RandomPhoneMon:
add hl, bc
add hl, bc
ld a, BANK(TrainerGroups)
call GetFarHalfword
call GetFarWord
.skip_trainer
dec e

View File

@ -113,7 +113,7 @@ DisplayDexEntry:
ld a, b
push af
push hl
call GetFarHalfword
call GetFarWord
ld d, l
ld e, h
pop hl
@ -143,7 +143,7 @@ DisplayDexEntry:
inc hl
push hl
dec hl
call GetFarHalfword
call GetFarWord
ld d, l
ld e, h
ld a, e

View File

@ -649,7 +649,7 @@ PokedexShow2:
add BANK("Pokedex Entries 001-064")
push af
ld a, BANK(PokedexDataPointerTable)
call GetFarHalfword
call GetFarWord
pop af
push af
push hl

View File

@ -426,7 +426,7 @@ GetEggMove:
add hl, bc
add hl, bc
ld a, BANK(EggMovePointers)
call GetFarHalfword
call GetFarWord
.loop
ld a, BANK("Egg Moves")
call GetFarByte
@ -460,7 +460,7 @@ GetEggMove:
add hl, bc
add hl, bc
ld a, BANK(EvosAttacksPointers)
call GetFarHalfword
call GetFarWord
.loop3
ld a, BANK("Evolutions and Attacks")
call GetFarByte

View File

@ -1700,7 +1700,7 @@ GivePoke::
push bc
push hl
ld a, [wScriptBank]
call GetFarHalfword
call GetFarWord
ld bc, MON_NAME_LENGTH
ld a, [wScriptBank]
call FarCopyBytes
@ -1708,7 +1708,7 @@ GivePoke::
inc hl
inc hl
ld a, [wScriptBank]
call GetFarHalfword
call GetFarWord
pop bc
ld a, b
and a

View File

@ -8,7 +8,7 @@ PrintMoveDescription:
add hl, bc
add hl, bc
ld a, BANK(MoveDescriptions)
call GetFarHalfword
call GetFarWord
ld d, h
ld e, l
pop hl

View File

@ -28,7 +28,7 @@ GetDexNumber:: ; unreferenced
call AddNTimes
pop bc
ld a, BANK(BaseData)
call GetFarHalfword
call GetFarWord
ld b, l
ld c, h
pop hl

View File

@ -35,7 +35,7 @@ GetFarByte::
ld a, [wFarByte]
ret
GetFarHalfword::
GetFarWord::
; retrieve a halfword from a:hl, and return it in hl.
; bankswitch to new bank
ld [wTempBank], a

View File

@ -913,7 +913,7 @@ TextCommand_STRINGBUFFER::
add hl, de
add hl, de
ld a, BANK(StringBufferPointers)
call GetFarHalfword
call GetFarWord
ld d, h
ld e, l
ld h, b

View File

@ -116,7 +116,7 @@ LoadTrainer_continue::
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [wSeenTrainerBank]
call GetFarHalfword
call GetFarWord
ld de, wTempTrainer
ld bc, wTempTrainerEnd - wTempTrainer
ld a, [wSeenTrainerBank]
@ -215,7 +215,7 @@ CheckTrainerFlag:: ; unreferenced
ld h, [hl]
ld l, a
call GetMapScriptsBank
call GetFarHalfword
call GetFarWord
ld d, h
ld e, l
push de