diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-01-09 15:16:20 -0500 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-01-09 15:16:20 -0500 |
commit | 51aa06097fd99ecbd431aba32cf8b5120a93e433 (patch) | |
tree | f1dba301f2270543742ad3cd56d875fa5f639cdc | |
parent | 4c43fa538dd8a48408d34307dc2e428084f2bb2a (diff) |
Rename GetFarHalfword to GetFarWord
-rw-r--r-- | engine/battle/effect_commands.asm | 6 | ||||
-rw-r--r-- | engine/events/checkforhiddenitems.asm | 4 | ||||
-rw-r--r-- | engine/gfx/load_pics.asm | 4 | ||||
-rw-r--r-- | engine/items/item_effects.asm | 6 | ||||
-rw-r--r-- | engine/items/print_item_description.asm | 2 | ||||
-rw-r--r-- | engine/overworld/events.asm | 6 | ||||
-rw-r--r-- | engine/overworld/scripting.asm | 2 | ||||
-rw-r--r-- | engine/overworld/wildmons.asm | 2 | ||||
-rw-r--r-- | engine/pokedex/pokedex_2.asm | 4 | ||||
-rw-r--r-- | engine/pokegear/radio.asm | 2 | ||||
-rw-r--r-- | engine/pokemon/breeding.asm | 4 | ||||
-rw-r--r-- | engine/pokemon/move_mon.asm | 4 | ||||
-rw-r--r-- | engine/pokemon/print_move_description.asm | 2 | ||||
-rw-r--r-- | home/battle.asm | 2 | ||||
-rw-r--r-- | home/copy.asm | 2 | ||||
-rw-r--r-- | home/text.asm | 2 | ||||
-rw-r--r-- | home/trainers.asm | 4 |
17 files changed, 29 insertions, 29 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 58d7d016..1791cbdb 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -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 diff --git a/engine/events/checkforhiddenitems.asm b/engine/events/checkforhiddenitems.asm index 0e0e282c..4eafef5b 100644 --- a/engine/events/checkforhiddenitems.asm +++ b/engine/events/checkforhiddenitems.asm @@ -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 diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 34bffdb7..ad9c1f14 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 9f8c14c3..77828b60 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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 diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm index ad6a170e..e2ed8785 100644 --- a/engine/items/print_item_description.asm +++ b/engine/items/print_item_description.asm @@ -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 diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index cd4daa77..6050c44d 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -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 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index ef94fca7..c2909437 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1275,7 +1275,7 @@ StdScript: ld b, a inc hl ld a, BANK(StdScripts) - call GetFarHalfword + call GetFarWord ret SkipTwoScriptBytes: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index fee9675c..f16c196c 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -894,7 +894,7 @@ RandomPhoneMon: add hl, bc add hl, bc ld a, BANK(TrainerGroups) - call GetFarHalfword + call GetFarWord .skip_trainer dec e diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index d869b4af..f7baac7e 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -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 diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index ef410d51..41292f6e 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -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 diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 4b68a1d3..da282b7f 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -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 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index edd7565e..605ac07c 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -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 diff --git a/engine/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm index 1b57b46e..0a20cd15 100644 --- a/engine/pokemon/print_move_description.asm +++ b/engine/pokemon/print_move_description.asm @@ -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 diff --git a/home/battle.asm b/home/battle.asm index f471ba1e..e209682f 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -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 diff --git a/home/copy.asm b/home/copy.asm index c623d335..f72986db 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -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 diff --git a/home/text.asm b/home/text.asm index 19deadb5..5c90be52 100644 --- a/home/text.asm +++ b/home/text.asm @@ -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 diff --git a/home/trainers.asm b/home/trainers.asm index eb1121bc..e6106a77 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -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 |