diff options
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4d7cd5ca7..d89eeee55 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 |