pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename some labels

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@@ -210,7 +210,7 @@ _UpdateSound::
ret
UpdateChannels:
ld hl, .ChannelFnPtrs
ld hl, .ChannelFunctions
ld a, [wCurChannel]
maskbits NUM_CHANNELS
add a
@@ -222,7 +222,7 @@ UpdateChannels:
ld l, a
jp hl
.ChannelFnPtrs:
.ChannelFunctions:
dw .Channel1
dw .Channel2
dw .Channel3

6
data/text/battle.asm
View File

@@ -87,7 +87,7 @@ SandstormHitsText:
PerishCountText:
text "<USER>'s"
line "PERISH count is @"
text_decimal wDeciramBuffer, 1, 1
text_decimal wTextDecimalByte, 1, 1
text "!"
prompt
@@ -670,7 +670,7 @@ SpiteEffectText:
text_ram wStringBuffer1
text " was"
cont "reduced by @"
text_decimal wDeciramBuffer, 1, 1
text_decimal wTextDecimalByte, 1, 1
text "!"
prompt
@@ -1030,7 +1030,7 @@ SafeguardProtectText:
MagnitudeText:
text "Magnitude @"
text_decimal wDeciramBuffer, 1, 1
text_decimal wTextDecimalByte, 1, 1
text "!"
prompt

10
data/text/common_2.asm
View File

@@ -271,7 +271,7 @@ _NameCardListedCardText::
text_ram wMysteryGiftCardHolderName
text "'s CARD was"
line "listed as no.@"
text_decimal wDeciramBuffer, 1, 2
text_decimal wTextDecimalByte, 1, 2
text "."
prompt
@@ -609,7 +609,7 @@ _AskThrowAwayText::
_AskQuantityThrowAwayText::
text "Throw away @"
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text_start
line "@"
text_ram wStringBuffer2
@@ -1110,7 +1110,7 @@ _PlayersPCHowManyWithdrawText::
_PlayersPCWithdrewItemsText::
text "Withdrew @"
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text_start
line "@"
text_ram wStringBuffer2
@@ -1133,7 +1133,7 @@ _PlayersPCHowManyDepositText::
_PlayersPCDepositItemsText::
text "Deposited @"
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text_start
line "@"
text_ram wStringBuffer2
@@ -1390,7 +1390,7 @@ _ItemsTossOutHowManyText::
_ItemsThrowAwayText::
text "Throw away @"
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text_start
line "@"
text_ram wStringBuffer2

6
data/text/common_3.asm
View File

@@ -480,7 +480,7 @@ _MartHowManyText::
done
_MartFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text " @"
text_ram wStringBuffer2
text "(S)"
@@ -509,7 +509,7 @@ _HerbalLadyHowManyText::
done
_HerbalLadyFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text " @"
text_ram wStringBuffer2
text "(S)"
@@ -592,7 +592,7 @@ _PharmacyHowManyText::
done
_PharmacyFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2
text_decimal wItemQuantityChange, 1, 2
text " @"
text_ram wStringBuffer2
text "(S)"

4
docs/event_commands.md
View File

@@ -263,9 +263,9 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$49`: `closetext`
## `$4A`: <code>writeunusedbytebuffer <i>byte</i></code>
## `$4A`: <code>writeunusedbyte <i>byte</i></code>
<code>[<i>wUnusedScriptByteBuffer</i>] = <i>byte</i></code>
<code>[<i>wUnusedScriptByte</i>] = <i>byte</i></code>
## `$4B`: <code>farwritetext <i>text_pointer</i></code>

2
engine/battle/ai/items.asm
View File

@@ -836,7 +836,7 @@ PrintText_UsedItemOn_AND_AIUpdateHUD:
PrintText_UsedItemOn:
ld a, [wCurEnemyItem]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer

48
engine/battle/core.asm
View File

@@ -373,7 +373,7 @@ HandleBerserkGene:
push bc
callfar GetUserItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
sub BERSERK_GENE
pop bc
pop de
@@ -1161,7 +1161,7 @@ HandlePerishSong:
ret z
dec [hl]
ld a, [hl]
ld [wDeciramBuffer], a
ld [wTextDecimalByte], a
push af
ld hl, PerishCountText
call StdBattleTextbox
@@ -1235,7 +1235,7 @@ HandleWrap:
ret nz
ld a, [de]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld [wFXAnimID], a
call GetMoveName
dec [hl]
@@ -1288,7 +1288,7 @@ HandleLeftovers:
callfar GetUserItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
ld a, b
cp HELD_LEFTOVERS
@@ -1434,7 +1434,7 @@ HandleMysteryberry:
.skip_checks
callfar GetUserItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
xor a
ld [hl], a
call GetPartymonItem
@@ -3703,7 +3703,7 @@ TryToRunAwayFromBattle:
push hl
push de
ld a, [wBattleMonItem]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld b, a
callfar GetItemHeldEffect
ld a, b
@@ -4025,7 +4025,7 @@ SendOutPlayerMon:
call GetBattleMonBackpic
xor a
ldh [hGraphicStartTile], a
ld [wBattleMenuCursorBuffer], a
ld [wBattleMenuCursorPosition], a
ld [wCurMoveNum], a
ld [wTypeModifier], a
ld [wPlayerMoveStruct + MOVE_ANIM], a
@@ -4343,7 +4343,7 @@ UseOpponentItem:
call RefreshBattleHuds
callfar GetOpponentItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
callfar ConsumeHeldItem
ld hl, RecoveredUsingText
@@ -4437,7 +4437,7 @@ UseConfusionHealingItem:
.heal_status
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVarAddr
res SUBSTATUS_CONFUSED, [hl]
@@ -4504,7 +4504,7 @@ HandleStatBoostingHeldItems:
jr nz, .loop
pop bc
ld a, [bc]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
push bc
dec hl
dec hl
@@ -4899,7 +4899,7 @@ BattleMenu:
.next
ld a, $1
ldh [hBGMapMode], a
ld a, [wBattleMenuCursorBuffer]
ld a, [wBattleMenuCursorPosition]
cp $1
jp z, BattleMenu_Fight
cp $3
@@ -5003,7 +5003,7 @@ BattleMenu_Pack:
and a
jr nz, .run
callfar CheckItemPocket
ld a, [wItemAttributeParamBuffer]
ld a, [wItemAttributeValue]
cp BALL
jr z, .ball
call ClearBGPalettes
@@ -5427,7 +5427,7 @@ MoveSelectionScreen:
.battle_player_moves
call MoveInfoBox
ld a, [wMoveSwapBuffer]
ld a, [wSwappingMove]
and a
jr z, .interpret_joypad
hlcoord 5, 13
@@ -5451,7 +5451,7 @@ MoveSelectionScreen:
push af
xor a
ld [wMoveSwapBuffer], a
ld [wSwappingMove], a
ld a, [wMenuCursorY]
dec a
ld [wMenuCursorY], a
@@ -5542,7 +5542,7 @@ MoveSelectionScreen:
jp .menu_loop
.pressed_select
ld a, [wMoveSwapBuffer]
ld a, [wSwappingMove]
and a
jr z, .start_swap
ld hl, wBattleMonMoves
@@ -5560,14 +5560,14 @@ MoveSelectionScreen:
ld a, [hl]
and $f
ld b, a
ld a, [wMoveSwapBuffer]
ld a, [wSwappingMove]
swap a
add b
ld [hl], a
jr .swap_moves_in_party_struct
.not_swapping_disabled_move
ld a, [wMoveSwapBuffer]
ld a, [wSwappingMove]
cp b
jr nz, .swap_moves_in_party_struct
ld a, [hl]
@@ -5595,12 +5595,12 @@ MoveSelectionScreen:
.transformed
xor a
ld [wMoveSwapBuffer], a
ld [wSwappingMove], a
jp MoveSelectionScreen
.swap_bytes
push hl
ld a, [wMoveSwapBuffer]
ld a, [wSwappingMove]
dec a
ld c, a
ld b, 0
@@ -5622,7 +5622,7 @@ MoveSelectionScreen:
.start_swap
ld a, [wMenuCursorY]
ld [wMoveSwapBuffer], a
ld [wSwappingMove], a
jp MoveSelectionScreen
MoveInfoBox:
@@ -5717,7 +5717,7 @@ MoveInfoBox:
inc hl
ld [hl], "/"
inc hl
ld de, wNamedObjectIndexBuffer
ld de, wNamedObjectIndex
lb bc, 1, 2
call PrintNum
ret
@@ -6383,7 +6383,7 @@ LoadEnemyMon:
ld [de], a
ld a, [wTempEnemyMonSpecies]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
@@ -8044,7 +8044,7 @@ BattleIntro:
call LoadTrainerOrWildMonPic
xor a
ld [wTempBattleMonSpecies], a
ld [wBattleMenuCursorBuffer], a
ld [wBattleMenuCursorPosition], a
xor a
ldh [hMapAnims], a
farcall PlayBattleMusic
@@ -8300,7 +8300,7 @@ CleanUpBattleRAM:
ld [wPartyMenuCursor], a
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
ld [wBattleMenuCursorBuffer], a
ld [wBattleMenuCursorPosition], a
ld [wCurMoveNum], a
ld [wBallsPocketCursor], a
ld [wLastPocket], a

19
engine/battle/effect_commands.asm
View File

@@ -595,7 +595,7 @@ MoveDisabled:
ld a, BATTLE_VARS_MOVE
call GetBattleVar
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetMoveName
ld hl, DisabledMoveText
@@ -2186,7 +2186,7 @@ BattleCommand_ApplyDamage:
.focus_band_text
call GetOpponentItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
ld hl, HungOnText
jp StdBattleTextbox
@@ -3608,7 +3608,7 @@ UpdateMoveData:
ld a, BATTLE_VARS_MOVE
call GetBattleVar
ld [wCurSpecies], a
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
dec a
call GetMoveData
@@ -3624,7 +3624,7 @@ BattleCommand_SleepTarget:
jr nz, .not_protected_by_item
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
ld hl, ProtectedByText
jr .fail
@@ -3772,7 +3772,7 @@ BattleCommand_Poison:
cp HELD_PREVENT_POISON
jr nz, .do_poison
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
ld hl, ProtectedByText
jr .failed
@@ -4826,7 +4826,6 @@ BattleCommand_TriStatusChance:
; tristatuschance
call BattleCommand_EffectChance
.loop
; 1/3 chance of each status
call BattleRandom
@@ -4834,11 +4833,11 @@ BattleCommand_TriStatusChance:
and %11
jr z, .loop
dec a
ld hl, .ptrs
ld hl, .StatusCommands
rst JumpTable
ret
.ptrs
.StatusCommands:
dw BattleCommand_ParalyzeTarget ; paralyze
dw BattleCommand_FreezeTarget ; freeze
dw BattleCommand_BurnTarget ; burn
@@ -5873,7 +5872,7 @@ BattleCommand_Confuse:
cp HELD_PREVENT_CONFUSE
jr nz, .no_item_protection
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
call AnimateFailedMove
ld hl, ProtectedByText
@@ -5963,7 +5962,7 @@ BattleCommand_Paralyze:
cp HELD_PREVENT_PARALYZE
jr nz, .no_item_protection
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
call AnimateFailedMove
ld hl, ProtectedByText

16
engine/battle/menu.asm
View File

@@ -1,11 +1,11 @@
LoadBattleMenu:
ld hl, BattleMenuHeader
call LoadMenuHeader
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld a, [wBattleMenuCursorPosition]
ld [wMenuCursorPosition], a
call InterpretBattleMenu
ld a, [wMenuCursorBuffer]
ld [wBattleMenuCursorBuffer], a
ld a, [wMenuCursorPosition]
ld [wBattleMenuCursorPosition], a
call ExitMenu
ret
@@ -20,11 +20,11 @@ ContestBattleMenu:
; fallthrough
CommonBattleMenu:
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld a, [wBattleMenuCursorPosition]
ld [wMenuCursorPosition], a
call _2DMenu
ld a, [wMenuCursorBuffer]
ld [wBattleMenuCursorBuffer], a
ld a, [wMenuCursorPosition]
ld [wBattleMenuCursorPosition], a
call ExitMenu
ret

4
engine/battle/move_effects/beat_up.asm
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

2
engine/battle/move_effects/conversion.asm
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

2
engine/battle/move_effects/conversion2.asm
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

2
engine/battle/move_effects/disable.asm
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

2
engine/battle/move_effects/magnitude.asm
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

2
engine/battle/move_effects/mimic.asm
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

2
engine/battle/move_effects/mirror_move.asm
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

2
engine/battle/move_effects/sketch.asm
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

4
engine/battle/move_effects/spite.asm
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

8
engine/battle/move_effects/thief.asm
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

2
engine/battle/move_effects/transform.asm
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

Some files were not shown because too many files have changed in this diff Show More