pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

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

6
data/text/battle.asm
View File

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

10
data/text/common_2.asm
View File

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

6
data/text/common_3.asm
View File

@ -480,7 +480,7 @@ _MartHowManyText::
done done
_MartFinalPriceText:: _MartFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2 text_decimal wItemQuantityChange, 1, 2
text " @" text " @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text "(S)" text "(S)"
@ -509,7 +509,7 @@ _HerbalLadyHowManyText::
done done
_HerbalLadyFinalPriceText:: _HerbalLadyFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2 text_decimal wItemQuantityChange, 1, 2
text " @" text " @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text "(S)" text "(S)"
@ -592,7 +592,7 @@ _PharmacyHowManyText::
done done
_PharmacyFinalPriceText:: _PharmacyFinalPriceText::
text_decimal wItemQuantityChangeBuffer, 1, 2 text_decimal wItemQuantityChange, 1, 2
text " @" text " @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text "(S)" 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` ## `$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> ## `$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: PrintText_UsedItemOn:
ld a, [wCurEnemyItem] ld a, [wCurEnemyItem]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndex], a
call GetItemName call GetItemName
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer

48
engine/battle/core.asm
View File

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

19
engine/battle/effect_commands.asm
View File

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

16
engine/battle/menu.asm
View File

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

4
engine/battle/move_effects/beat_up.asm
View File

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

2
engine/battle/move_effects/conversion.asm
View File

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

2
engine/battle/move_effects/conversion2.asm
View File

@ -55,7 +55,7 @@ BattleCommand_Conversion2:
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndex], a
predef GetTypeName predef GetTypeName
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextbox 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 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
ld [hl], a ld [hl], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndex], a
call GetMoveName call GetMoveName
ld hl, WasDisabledText ld hl, WasDisabledText
jp StdBattleTextbox jp StdBattleTextbox

2
engine/battle/move_effects/magnitude.asm
View File

@ -18,7 +18,7 @@ BattleCommand_GetMagnitude:
push de push de
inc hl inc hl
ld a, [hl] ld a, [hl]
ld [wDeciramBuffer], a ld [wTextDecimalByte], a
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, MagnitudeText ld hl, MagnitudeText
call StdBattleTextbox 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 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
ld [hl], a ld [hl], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndex], a
ld bc, wBattleMonPP - wBattleMonMoves ld bc, wBattleMonPP - wBattleMonMoves
add hl, bc add hl, bc
ld [hl], 5 ld [hl], 5

2
engine/battle/move_effects/mirror_move.asm
View File

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

2
engine/battle/move_effects/sketch.asm
View File

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

4
engine/battle/move_effects/spite.asm
View File

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

8
engine/battle/move_effects/thief.asm
View File

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

2
engine/battle/move_effects/transform.asm
View File

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

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