Rename some labels

- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"

Fixes #789
This commit is contained in:
Rangi
2020-12-23 16:29:30 -05:00
parent 1a054661ec
commit 99e66c2557
106 changed files with 584 additions and 578 deletions

View File

@@ -118,7 +118,7 @@ BattleCommand_BeatUp:
ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
jr .got_enemy_nick
@@ -156,7 +156,7 @@ BattleCommand_BeatUp:
.wild
ld a, [wEnemyMonSpecies]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, BeatUpAttackText
call StdBattleTextbox

View File

@@ -89,7 +89,7 @@ BattleCommand_Conversion:
ld [de], a
inc de
ld [de], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
farcall GetTypeName
call AnimateCurrentMove
ld hl, TransformedTypeText

View File

@@ -55,7 +55,7 @@ BattleCommand_Conversion2:
call BattleCommand_SwitchTurn
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
predef GetTypeName
ld hl, TransformedTypeText
jp StdBattleTextbox

View File

@@ -63,7 +63,7 @@ BattleCommand_Disable:
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar
ld [hl], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetMoveName
ld hl, WasDisabledText
jp StdBattleTextbox

View File

@@ -18,7 +18,7 @@ BattleCommand_GetMagnitude:
push de
inc hl
ld a, [hl]
ld [wDeciramBuffer], a
ld [wTextDecimalByte], a
call BattleCommand_MoveDelay
ld hl, MagnitudeText
call StdBattleTextbox

View File

@@ -37,7 +37,7 @@ BattleCommand_Mimic:
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar
ld [hl], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld bc, wBattleMonPP - wBattleMonMoves
add hl, bc
ld [hl], 5

View File

@@ -24,7 +24,7 @@ BattleCommand_MirrorMove:
.use
ld a, b
ld [hl], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
push af
ld a, BATTLE_VARS_MOVE_ANIM

View File

@@ -34,7 +34,7 @@ BattleCommand_Sketch:
.get_last_move
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld b, a
; Fail if move is invalid or is Struggle.
and a

View File

@@ -24,7 +24,7 @@ BattleCommand_Spite:
ld a, [hli]
cp b
jr nz, .loop
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
dec hl
ld b, 0
push bc
@@ -78,7 +78,7 @@ BattleCommand_Spite:
call AnimateCurrentMove
pop de
ld a, d
ld [wDeciramBuffer], a
ld [wTextDecimalByte], a
ld hl, SpiteEffectText
jp StdBattleTextbox

View File

@@ -21,7 +21,7 @@ BattleCommand_Thief:
; Can't steal mail.
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld d, a
farcall ItemIsMail
ret c
@@ -45,7 +45,7 @@ BattleCommand_Thief:
ld [de], a
call .playeritem
ld a, [wNamedObjectIndexBuffer]
ld a, [wNamedObjectIndex]
ld [hl], a
ld [de], a
jr .stole
@@ -68,7 +68,7 @@ BattleCommand_Thief:
; Can't steal mail!
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld d, a
farcall ItemIsMail
ret c
@@ -86,7 +86,7 @@ BattleCommand_Thief:
ld [de], a
call .enemyitem
ld a, [wNamedObjectIndexBuffer]
ld a, [wNamedObjectIndex]
ld [hl], a
ld [de], a

View File

@@ -99,7 +99,7 @@ BattleCommand_Transform:
jr nz, .pp_loop
pop hl
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wEnemyStats
ld de, wPlayerStats