diff options
Diffstat (limited to 'engine')
80 files changed, 395 insertions, 395 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 62adaca77..0eeb8dc3b 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -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 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 diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 7876fb90e..8015eab4c 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -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 diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index e29bff48b..23a7fc70a 100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -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 diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index f1cc7a5c2..a52ecabed 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -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 diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index b6081a6bd..b67ed9924 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -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 diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index bc8667278..df6d91090 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -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 diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index de6dbc60f..4020aa886 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -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 diff --git a/engine/battle/move_effects/magnitude.asm b/engine/battle/move_effects/magnitude.asm index f8961b668..87510db05 100644 --- a/engine/battle/move_effects/magnitude.asm +++ b/engine/battle/move_effects/magnitude.asm @@ -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 diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index 71eb72c63..a8bc1e11a 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -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 diff --git a/engine/battle/move_effects/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm index 86259d11b..e3ac3e1c6 100644 --- a/engine/battle/move_effects/mirror_move.asm +++ b/engine/battle/move_effects/mirror_move.asm @@ -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 diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index 654fb3f54..aa5410989 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -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 diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 3e1c2f9bd..0244f778c 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -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 diff --git a/engine/battle/move_effects/thief.asm b/engine/battle/move_effects/thief.asm index e588c5ff7..03e3fb6ac 100644 --- a/engine/battle/move_effects/thief.asm +++ b/engine/battle/move_effects/thief.asm @@ -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 diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index 92a13c540..734eedd6c 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -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 diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm index 6db8f4204..85f01f07f 100644 --- a/engine/battle/read_trainer_attributes.asm +++ b/engine/battle/read_trainer_attributes.asm @@ -6,7 +6,7 @@ GetTrainerClassName: ld [wCurSpecies], a ld a, TRAINER_NAME - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a call GetName ld de, wStringBuffer1 ret @@ -32,7 +32,7 @@ GetOTName: ld [wCurSpecies], a ld a, TRAINER_NAME - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a call GetName ld hl, wStringBuffer1 diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 40261a391..502620de5 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -320,9 +320,9 @@ DebugColor_InitScreen: ld a, [wDebugColorCurMon] inc a ld [wCurPartySpecies], a - ld [wDeciramBuffer], a + ld [wTextDecimalByte], a hlcoord 0, 1 - ld de, wDeciramBuffer + ld de, wTextDecimalByte lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum ld a, [wDebugColorIsTrainer] @@ -364,7 +364,7 @@ DebugColor_InitScreen: jr .done .trainer - ld a, [wDeciramBuffer] + ld a, [wTextDecimalByte] ld [wTrainerClass], a callfar GetTrainerAttributes ld de, wStringBuffer1 diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 895de62d5..498b307f3 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -573,9 +573,9 @@ DebugRoom_EditPagedValues: ld a, [hli] ld [wDebugRoomPageCount], a ld a, l - ld [wDebugRoomPagedValuesPtr], a + ld [wDebugRoomPagesPointer], a ld a, h - ld [wDebugRoomPagedValuesPtr+1], a + ld [wDebugRoomPagesPointer+1], a ld hl, hInMenu ld a, [hl] push af @@ -669,7 +669,7 @@ DebugRoom_PageString: db " P @" DebugRoom_IncrementPagedValue: - call DebugRoom_GetCurPagedValuePtr + call DebugRoom_GetCurPagedValuePointer ld e, [hl] ; de = value address inc hl ld d, [hl] @@ -684,7 +684,7 @@ DebugRoom_IncrementPagedValue: ret DebugRoom_DecrementPagedValue: - call DebugRoom_GetCurPagedValuePtr + call DebugRoom_GetCurPagedValuePointer ld e, [hl] ; de = value address inc hl ld d, [hl] @@ -709,7 +709,7 @@ DebugRoom_NextPage: ld [wDebugRoomCurPage], a call DebugRoom_PrintPage ld a, [wDebugRoomCurPage] - call DebugRoom_GetNthPagePtr + call DebugRoom_GetNthPagePointer ld a, [wDebugRoomCurValue] cp [hl] jr c, .skip @@ -731,7 +731,7 @@ DebugRoom_PrevPage: ld [wDebugRoomCurPage], a call DebugRoom_PrintPage ld a, [wDebugRoomCurPage] - call DebugRoom_GetNthPagePtr + call DebugRoom_GetNthPagePointer ld a, [wDebugRoomCurValue] cp [hl] jr c, .skip @@ -747,7 +747,7 @@ DebugRoom_NextPagedValue: ld a, " " call DebugRoom_ShowHideCursor ld a, [wDebugRoomCurPage] - call DebugRoom_GetNthPagePtr + call DebugRoom_GetNthPagePointer ld a, [wDebugRoomCurValue] inc a cp [hl] ; incremented value < paged_value count? @@ -776,15 +776,15 @@ DebugRoom_PrevPagedValue: dec a jr DebugRoom_UpdateValueCursor -DebugRoom_GetNthPagePtr: +DebugRoom_GetNthPagePointer: ; Input: a = page index ; Output: hl = pointer to paged_data list ld h, 0 ld l, a add hl, hl - ld a, [wDebugRoomPagedValuesPtr] + ld a, [wDebugRoomPagesPointer] ld e, a - ld a, [wDebugRoomPagedValuesPtr+1] + ld a, [wDebugRoomPagesPointer+1] ld d, a add hl, de ld a, [hli] @@ -792,10 +792,10 @@ DebugRoom_GetNthPagePtr: ld l, a ret -_DebugRoom_GetPageBValueCPtr: +_DebugRoom_GetPageBValueCPointer: push bc ld a, b - call DebugRoom_GetNthPagePtr + call DebugRoom_GetNthPagePointer pop bc inc hl ld a, c @@ -803,12 +803,12 @@ _DebugRoom_GetPageBValueCPtr: call AddNTimes ret -DebugRoom_GetCurPagedValuePtr: +DebugRoom_GetCurPagedValuePointer: ld a, [wDebugRoomCurPage] ld b, a ld a, [wDebugRoomCurValue] ld c, a - jr _DebugRoom_GetPageBValueCPtr + jr _DebugRoom_GetPageBValueCPointer DebugRoom_ShowHideCursor: push af @@ -837,9 +837,9 @@ DebugRoom_InitializePagedValues: ld h, 0 ld l, a add hl, hl - ld a, [wDebugRoomPagedValuesPtr] + ld a, [wDebugRoomPagesPointer] ld e, a - ld a, [wDebugRoomPagedValuesPtr+1] + ld a, [wDebugRoomPagesPointer+1] ld d, a add hl, de ld a, [hli] @@ -860,9 +860,9 @@ DebugRoom_InitializePagedValues: ld h, 0 ld l, b add hl, hl - ld a, [wDebugRoomPagedValuesPtr] + ld a, [wDebugRoomPagesPointer] ld e, a - ld a, [wDebugRoomPagedValuesPtr+1] + ld a, [wDebugRoomPagesPointer+1] ld d, a add hl, de ld a, [hli] @@ -897,9 +897,9 @@ DebugRoom_PrintPage: ld h, 0 ld l, a add hl, hl - ld a, [wDebugRoomPagedValuesPtr] + ld a, [wDebugRoomPagesPointer] ld e, a - ld a, [wDebugRoomPagedValuesPtr+1] + ld a, [wDebugRoomPagesPointer+1] ld d, a add hl, de ld a, [hli] @@ -927,9 +927,9 @@ DebugRoom_PrintPagedValue: ld h, 0 ld l, b add hl, hl - ld a, [wDebugRoomPagedValuesPtr] + ld a, [wDebugRoomPagesPointer] ld e, a - ld a, [wDebugRoomPagedValuesPtr+1] + ld a, [wDebugRoomPagesPointer+1] ld d, a add hl, de ld a, [hli] @@ -1083,7 +1083,7 @@ DebugRoom_SaveItem: done DebugRoom_PrintItemName: - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc call GetItemName pop hl @@ -1229,19 +1229,19 @@ DebugRoom_SavePokemon: done DebugRoom_PrintPokemonName: - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc call GetPokemonName jr _DebugRoom_FinishGetName DebugRoom_PrintItemName2: - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc call GetItemName jr _DebugRoom_FinishGetName DebugRoom_PrintMoveName: - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc call GetMoveName jr _DebugRoom_FinishGetName diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 50daff895..8eabc71ca 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -269,7 +269,7 @@ ReadBTTrainerParty: jr nc, .skip_mon_1 ld a, [wBT_OTTempMon1] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -283,7 +283,7 @@ ReadBTTrainerParty: farcall CheckStringForErrors jr nc, .skip_mon_2 ld a, [wBT_OTTempMon2] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -297,7 +297,7 @@ ReadBTTrainerParty: farcall CheckStringForErrors jr nc, .skip_mon_3 ld a, [wBT_OTTempMon3] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -1289,7 +1289,7 @@ endr ld a, EGG_TICKET ld [wCurItem], a ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, -1 ld [wCurItemQuantity], a ld hl, wNumItems diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 0368a1268..bcf0583f9 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -168,13 +168,13 @@ LoadRandomBattleTowerMon: ld bc, NICKNAMED_MON_STRUCT_LENGTH call CopyBytes - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] push af push de ld hl, -NICKNAMED_MON_STRUCT_LENGTH add hl, de ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld bc, PARTYMON_STRUCT_LENGTH add hl, bc push hl @@ -187,7 +187,7 @@ LoadRandomBattleTowerMon: pop de pop af - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a pop bc dec c jp nz, .loop diff --git a/engine/events/buena.asm b/engine/events/buena.asm index dca125ece..62cb8bb4a 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -87,7 +87,7 @@ BuenaPrize: ld [wMenuSelectionQuantity], a call Buena_GetPrize ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, .BuenaIsThatRightText call BuenaPrintText @@ -107,7 +107,7 @@ BuenaPrize: push hl ld [wCurItem], a ld a, $1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem pop hl @@ -224,7 +224,7 @@ Buena_PrizeMenu: ld hl, .MenuHeader call CopyMenuHeader ld a, [wMenuSelection] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a xor a ld [wWhichIndexSet], a ldh [hBGMapMode], a @@ -276,7 +276,7 @@ endr call Buena_GetPrize ld a, [hl] push de - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName pop hl call PlaceString diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index b2cc044aa..533eae2b1 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -2,7 +2,7 @@ BugContest_SetCaughtContestMon: ld a, [wContestMon] and a jr z, .firstcatch - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a farcall DisplayAlreadyCaughtText farcall DisplayCaughtContestMonStats lb bc, 14, 7 @@ -12,7 +12,7 @@ BugContest_SetCaughtContestMon: .firstcatch call .generatestats ld a, [wTempEnemyMonSpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, .ContestCaughtMonText call PrintText diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index e35852479..b18aa1cbe 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -36,7 +36,7 @@ DisplayCaughtContestMonStats: call PlaceString ld a, [wContestMon] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld de, wStringBuffer1 hlcoord 1, 2 diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index abb9d60da..3b4e9f1c6 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -5,21 +5,21 @@ _BugContestJudging: ld a, [wBugContestThirdPlaceWinnerID] call LoadContestantName ld a, [wBugContestThirdPlaceMon] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_ThirdPlaceText call PrintText ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_SecondPlaceText call PrintText ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, ContestJudging_FirstPlaceText call PrintText diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm index ea83826a5..932e196b8 100644 --- a/engine/events/haircut.asm +++ b/engine/events/haircut.asm @@ -3,7 +3,7 @@ BillsGrandfather: jr c, .cancel ld a, [wCurPartySpecies] ld [wScriptVar], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName jp CopyPokemonName_Buffer1_Buffer3 diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index d49c7aa1b..45eb7ade5 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -462,7 +462,7 @@ DisplayHOFMon: call Textbox ld a, [wTempMonSpecies] ld [wCurPartySpecies], a - ld [wDeciramBuffer], a + ld [wTextDecimalByte], a ld hl, wTempMonDVs predef GetUnownLetter xor a @@ -477,7 +477,7 @@ DisplayHOFMon: ld [hli], a ld [hl], "<DOT>" hlcoord 3, 13 - ld de, wDeciramBuffer + ld de, wTextDecimalByte lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum call GetBasePokemonName diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index bb2e949cb..ac3e165b9 100644 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -11,7 +11,7 @@ GetFirstPokemonHappiness: jr .loop .done - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld a, [hl] ld [wScriptVar], a call GetPokemonName @@ -19,7 +19,7 @@ GetFirstPokemonHappiness: CheckFirstMonIsEgg: ld a, [wPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a cp EGG ld a, TRUE jr z, .egg diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 03baaed94..9ce7f2e52 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -41,7 +41,7 @@ SelectApricornForKurt: call Kurt_SelectQuantity pop bc jr nc, .loop - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ld [wKurtApricornQuantity], a call Kurt_GiveUpSelectedQuantityOfSelectedApricorn @@ -55,7 +55,7 @@ Kurt_SelectApricorn: ld hl, .MenuHeader call CopyMenuHeader ld a, [wMenuSelection] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a xor a ldh [hBGMapMode], a call InitScrollingMenu @@ -104,7 +104,7 @@ Kurt_SelectApricorn: ld [wCurItem], a call Kurt_GetQuantityOfApricorn ret z - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ld [wMenuSelectionQuantity], a farcall PlaceMenuItemQuantity ret @@ -114,10 +114,10 @@ Kurt_SelectQuantity: ld [wMenuSelection], a call Kurt_GetQuantityOfApricorn jr z, .done - ld a, [wItemQuantityChangeBuffer] - ld [wItemQuantityBuffer], a + ld a, [wItemQuantityChange] + ld [wItemQuantity], a ld a, $1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, .MenuHeader call LoadMenuHeader .loop @@ -137,8 +137,8 @@ Kurt_SelectQuantity: ld a, b cp -1 jr z, .done - ld a, [wItemQuantityChangeBuffer] - ld [wItemQuantityChangeBuffer], a ; What is the point of this operation? + ld a, [wItemQuantityChange] + ld [wItemQuantityChange], a ; What is the point of this operation? scf .done @@ -167,7 +167,7 @@ PlaceApricornQuantity: add hl, de ld [hl], "×" inc hl - ld de, wItemQuantityChangeBuffer + ld de, wItemQuantityChange lb bc, PRINTNUM_LEADINGZEROS | 1, 2 jp PrintNum @@ -198,7 +198,7 @@ Kurt_GetQuantityOfApricorn: .done2 ld a, b - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a and a pop bc ret @@ -309,7 +309,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ld [wCurItemQuantity], a call Kurt_GetRidOfItem pop hl - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] and a jr z, .done push hl @@ -332,7 +332,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: jr .loop4 .done - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] and a pop bc pop de @@ -369,7 +369,7 @@ Kurt_GetRidOfItem: jr z, .done cp c jr nz, .done - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ld c, a ld a, [hl] sub c @@ -382,13 +382,13 @@ Kurt_GetRidOfItem: push bc ld hl, wNumItems ld a, b - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a call TossItem pop bc ld a, c sub b .done - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a pop bc ret diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 66ec205c1..1c2329b37 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -109,7 +109,7 @@ CheckForLuckyNumberWinners: and a push af ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, .LuckyNumberMatchPartyText pop af diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index e90063327..24e4088e3 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -39,14 +39,14 @@ FindItemInBallScript:: xor a ld [wScriptVar], a ld a, [wItemBallItemID] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, wStringBuffer3 call CopyName2 ld a, [wItemBallItemID] ld [wCurItem], a ld a, [wItemBallQuantity] - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem ret nc diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 3ff5f2b3e..9fde8afbd 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -146,7 +146,7 @@ Mom_GiveItemOrDoll: ld a, [hl] ld [wCurItem], a ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumPCItems call ReceiveItem ret diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index f9f83fab6..2d6841e47 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -28,7 +28,7 @@ MoveDeletion: ld a, [wMenuCursorY] push af ld a, [wCurSpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName ld hl, .AskDeleteMoveText call PrintText diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 11d9d3fb0..07c8b8bd4 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -6,9 +6,9 @@ MoveTutor: ld b, SCGB_PACKPALS call GetSGBLayout xor a - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a call .GetMoveTutorMove - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index e2b24c4c7..d3a1dc58f 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -29,7 +29,7 @@ _NameRater: xor a ; PARTYMON ld [wMonType], a ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurSpecies], a call GetBaseData ld b, NAME_MON diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 6b32aff56..36cf380ac 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -21,7 +21,7 @@ NPCTrade:: jr c, .done ld e, NPCTRADE_GIVEMON - call GetTradeAttribute + call GetTradeAttr ld a, [wCurPartySpecies] cp [hl] ld a, TRADE_DIALOG_WRONG @@ -72,7 +72,7 @@ CheckTradeGender: ld [wMonType], a ld e, NPCTRADE_GENDER - call GetTradeAttribute + call GetTradeAttr ld a, [hl] and a ; TRADE_GENDER_EITHER jr z, .matching @@ -106,19 +106,19 @@ TradeFlagAction: Trade_GetDialog: ld e, NPCTRADE_DIALOG - call GetTradeAttribute + call GetTradeAttr ld a, [hl] ld [wTradeDialog], a ret DoNPCTrade: ld e, NPCTRADE_GIVEMON - call GetTradeAttribute + call GetTradeAttr ld a, [hl] ld [wPlayerTrademonSpecies], a ld e, NPCTRADE_GETMON - call GetTradeAttribute + call GetTradeAttr ld a, [hl] ld [wOTTrademonSpecies], a @@ -164,7 +164,7 @@ DoNPCTrade: ld [wPlayerTrademonCaughtData], a ld e, NPCTRADE_DIALOG - call GetTradeAttribute + call GetTradeAttr ld a, [hl] cp TRADE_DIALOGSET_GIRL ld a, CAUGHT_BY_GIRL @@ -187,7 +187,7 @@ DoNPCTrade: predef TryAddMonToParty ld e, NPCTRADE_DIALOG - call GetTradeAttribute + call GetTradeAttr ld a, [hl] cp TRADE_DIALOGSET_GIRL ld b, CAUGHT_BY_UNKNOWN @@ -197,7 +197,7 @@ DoNPCTrade: farcall SetGiftPartyMonCaughtData ld e, NPCTRADE_NICK - call GetTradeAttribute + call GetTradeAttr ld de, wOTTrademonNickname call CopyTradeName @@ -208,7 +208,7 @@ DoNPCTrade: call CopyTradeName ld e, NPCTRADE_OT_NAME - call GetTradeAttribute + call GetTradeAttr push hl ld de, wOTTrademonOTName call CopyTradeName @@ -223,7 +223,7 @@ DoNPCTrade: call CopyTradeName ld e, NPCTRADE_DVS - call GetTradeAttribute + call GetTradeAttr ld de, wOTTrademonDVs call Trade_CopyTwoBytes @@ -234,7 +234,7 @@ DoNPCTrade: call Trade_CopyTwoBytes ld e, NPCTRADE_OT_ID - call GetTradeAttribute + call GetTradeAttr ld de, wOTTrademonID + 1 call Trade_CopyTwoBytesReverseEndian @@ -245,7 +245,7 @@ DoNPCTrade: call Trade_CopyTwoBytes ld e, NPCTRADE_ITEM - call GetTradeAttribute + call GetTradeAttr push hl ld hl, wPartyMon1Item ld bc, PARTYMON_STRUCT_LENGTH @@ -272,7 +272,7 @@ DoNPCTrade: pop af ret -GetTradeAttribute: +GetTradeAttr: ld d, 0 push de ld a, [wJumptableIndex] @@ -302,7 +302,7 @@ Trade_GetAttributeOfLastPartymon: GetTradeMonName: push de - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetBasePokemonName ld hl, wStringBuffer1 pop de @@ -345,7 +345,7 @@ Trade_CopyTwoBytesReverseEndian: GetTradeMonNames: ld e, NPCTRADE_GETMON - call GetTradeAttribute + call GetTradeAttr ld a, [hl] call GetTradeMonName @@ -353,7 +353,7 @@ GetTradeMonNames: call CopyTradeName ld e, NPCTRADE_GIVEMON - call GetTradeAttribute + call GetTradeAttr ld a, [hl] call GetTradeMonName @@ -369,7 +369,7 @@ GetTradeMonNames: dec hl push hl ld e, NPCTRADE_GENDER - call GetTradeAttribute + call GetTradeAttr ld a, [hl] pop hl and a ; TRADE_GENDER_EITHER diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index 406d5242f..9216e0e73 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -51,26 +51,26 @@ _GiveOddEgg: ld a, EGG_TICKET ld [wCurItem], a ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, -1 ld [wCurItemQuantity], a ld hl, wNumItems call TossItem - ; load species in wcd2a + ; load species in wMobileMonSpecies ld a, EGG - ld [wMobileMonSpeciesBuffer], a + ld [wMobileMonSpecies], a - ; load pointer to (wMobileMonSpeciesBuffer - 1) in wMobileMonSpeciesPointerBuffer - ld a, LOW(wMobileMonSpeciesBuffer - 1) - ld [wMobileMonSpeciesPointerBuffer], a - ld a, HIGH(wMobileMonSpeciesBuffer - 1) - ld [wMobileMonSpeciesPointerBuffer + 1], a - ; load pointer to wOddEgg in wMobileMonStructurePointerBuffer + ; load pointer to (wMobileMonSpecies - 1) in wMobileMonSpeciesPointer + ld a, LOW(wMobileMonSpecies - 1) + ld [wMobileMonSpeciesPointer], a + ld a, HIGH(wMobileMonSpecies - 1) + ld [wMobileMonSpeciesPointer + 1], a + ; load pointer to wOddEgg in wMobileMonStructPointer ld a, LOW(wOddEgg) - ld [wMobileMonStructurePointerBuffer], a + ld [wMobileMonStructPointer], a ld a, HIGH(wOddEgg) - ld [wMobileMonStructurePointerBuffer + 1], a + ld [wMobileMonStructPointer + 1], a ; load Odd Egg Name in wTempOddEggNickname ld hl, .Odd @@ -78,16 +78,16 @@ _GiveOddEgg: ld bc, MON_NAME_LENGTH call CopyBytes - ; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer + ; load pointer to wTempOddEggNickname in wMobileMonOTNamePointer ld a, LOW(wTempOddEggNickname) - ld [wMobileMonOTNamePointerBuffer], a + ld [wMobileMonOTNamePointer], a ld a, HIGH(wTempOddEggNickname) - ld [wMobileMonOTNamePointerBuffer + 1], a - ; load pointer to wOddEggName in wMobileMonNicknamePointerBuffer + ld [wMobileMonOTNamePointer + 1], a + ; load pointer to wOddEggName in wMobileMonNicknamePointer ld a, LOW(wOddEggName) - ld [wMobileMonNicknamePointerBuffer], a + ld [wMobileMonNicknamePointer], a ld a, HIGH(wOddEggName) - ld [wMobileMonNicknamePointerBuffer + 1], a + ld [wMobileMonNicknamePointer + 1], a farcall AddMobileMonToParty ret diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 74645a92c..9a8a3334b 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -342,13 +342,13 @@ PlayerWithdrawItemMenu: .Submenu: ; check if the item has a quantity farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr z, .askquantity ; items without quantity are always ×1 ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a jr .withdraw .askquantity @@ -360,15 +360,15 @@ PlayerWithdrawItemMenu: jr c, .done .withdraw - ld a, [wItemQuantityChangeBuffer] - ld [wPCItemQuantityChangeBuffer], a + ld a, [wItemQuantityChange] + ld [wPCItemQuantityChange], a ld a, [wCurItemQuantity] ld [wPCItemQuantity], a ld hl, wNumItems call ReceiveItem jr nc, .PackFull - ld a, [wPCItemQuantityChangeBuffer] - ld [wItemQuantityChangeBuffer], a + ld a, [wPCItemQuantityChange] + ld [wItemQuantityChange], a ld a, [wPCItemQuantity] ld [wCurItemQuantity], a ld hl, wNumPCItems @@ -469,7 +469,7 @@ PlayerDepositItemMenu: ld a, FALSE ld [wSpriteUpdatesEnabled], a farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] ld hl, .dw rst JumpTable pop af @@ -490,7 +490,7 @@ PlayerDepositItemMenu: ret .tossable - ld a, [wPCItemQuantityChangeBuffer] + ld a, [wPCItemQuantityChange] push af ld a, [wPCItemQuantity] push af @@ -498,16 +498,16 @@ PlayerDepositItemMenu: pop af ld [wPCItemQuantity], a pop af - ld [wPCItemQuantityChangeBuffer], a + ld [wPCItemQuantityChange], a ret .DepositItem: farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr z, .AskQuantity ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a jr .ContinueDeposit .AskQuantity: @@ -521,15 +521,15 @@ PlayerDepositItemMenu: jr c, .DeclinedToDeposit .ContinueDeposit: - ld a, [wItemQuantityChangeBuffer] - ld [wPCItemQuantityChangeBuffer], a + ld a, [wItemQuantityChange] + ld [wPCItemQuantityChange], a ld a, [wCurItemQuantity] ld [wPCItemQuantity], a ld hl, wNumPCItems call ReceiveItem jr nc, .NoRoomInPC - ld a, [wPCItemQuantityChangeBuffer] - ld [wItemQuantityChangeBuffer], a + ld a, [wPCItemQuantityChange] + ld [wItemQuantityChange], a ld a, [wPCItemQuantity] ld [wCurItemQuantity], a ld hl, wNumItems @@ -580,7 +580,7 @@ PCItemsJoypad: ld c, 18 call Textbox ld a, [wPCItemsCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wPCItemsScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 1d6648973..09014cc6b 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -34,7 +34,7 @@ GameCornerPrizeMonCheckDex: call SetSeenAndCaughtMon call FadeToMenu ld a, [wScriptVar] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a farcall NewPokedexEntry call ExitAllMenus ret @@ -144,7 +144,7 @@ GetMysteryGiftItem: ld a, [sMysteryGiftItem] ld [wCurItem], a ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem jr nc, .no_room @@ -152,7 +152,7 @@ GetMysteryGiftItem: ld [sMysteryGiftItem], a call CloseSRAM ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, .ReceiveItemText call PrintText diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm index 310deaeb8..16dce8353 100644 --- a/engine/items/buy_sell_toss.asm +++ b/engine/items/buy_sell_toss.asm @@ -29,7 +29,7 @@ SelectQuantityToSell: Toss_Sell_Loop: ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a .loop call BuySellToss_UpdateQuantityDisplay ; update display call BuySellToss_InterpretJoypad ; joy action @@ -71,10 +71,10 @@ BuySellToss_InterpretJoypad: ret .down - ld hl, wItemQuantityChangeBuffer + ld hl, wItemQuantityChange dec [hl] jr nz, .finish_down - ld a, [wItemQuantityBuffer] + ld a, [wItemQuantity] ld [hl], a .finish_down @@ -82,9 +82,9 @@ BuySellToss_InterpretJoypad: ret .up - ld hl, wItemQuantityChangeBuffer + ld hl, wItemQuantityChange inc [hl] - ld a, [wItemQuantityBuffer] + ld a, [wItemQuantity] cp [hl] jr nc, .finish_up ld [hl], 1 @@ -94,7 +94,7 @@ BuySellToss_InterpretJoypad: ret .left - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] sub 10 jr c, .load_1 jr z, .load_1 @@ -104,22 +104,22 @@ BuySellToss_InterpretJoypad: ld a, 1 .finish_left - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a and a ret .right - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] add 10 ld b, a - ld a, [wItemQuantityBuffer] + ld a, [wItemQuantity] cp b jr nc, .finish_right ld b, a .finish_right ld a, b - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a and a ret @@ -130,7 +130,7 @@ BuySellToss_UpdateQuantityDisplay: add hl, de ld [hl], "×" inc hl - ld de, wItemQuantityChangeBuffer + ld de, wItemQuantityChange lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ld a, [wMenuDataPointer] @@ -163,7 +163,7 @@ BuySell_MultiplyPrice: ldh [hMultiplicand + 1], a ld a, [wBuySellItemPrice + 1] ldh [hMultiplicand + 2], a - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ldh [hMultiplier], a push hl call Multiply diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 05cb7fbbd..eaff68fc2 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1,6 +1,6 @@ _DoItemEffect:: ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName call CopyName1 ld a, 1 @@ -566,7 +566,7 @@ PokeBallEffect: call PrintText ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName call YesNoBox @@ -626,7 +626,7 @@ PokeBallEffect: call PrintText ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName call YesNoBox @@ -702,7 +702,7 @@ PokeBallEffect: .toss ld hl, wNumItems inc a - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a jp TossItem .used_park_ball @@ -2333,7 +2333,7 @@ RestorePPEffect: push hl ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName call CopyName1 pop hl @@ -2594,7 +2594,7 @@ UseItemText: UseDisposableItem: ld hl, wNumItems ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a jp TossItem UseBallInTrainerBattle: diff --git a/engine/items/items.asm b/engine/items/items.asm index cfdd4a4c5..1f9cb4437 100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -4,7 +4,7 @@ _ReceiveItem:: push hl call CheckItemPocket pop de - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] dec a ld hl, .Pockets rst JumpTable @@ -45,7 +45,7 @@ _TossItem:: push hl call CheckItemPocket pop de - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] dec a ld hl, .Pockets rst JumpTable @@ -88,7 +88,7 @@ _CheckItem:: push hl call CheckItemPocket pop de - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] dec a ld hl, .Pockets rst JumpTable @@ -172,7 +172,7 @@ PutItemInPocket: sub [hl] add b ld b, a - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] cp b jr z, .ok jr c, .ok @@ -194,8 +194,8 @@ PutItemInPocket: ld l, e ld a, [wCurItem] ld c, a - ld a, [wItemQuantityChangeBuffer] - ld [wItemQuantityBuffer], a + ld a, [wItemQuantityChange] + ld [wItemQuantity], a .loop2 inc hl ld a, [hli] @@ -203,7 +203,7 @@ PutItemInPocket: jr z, .terminator2 cp c jr nz, .loop2 - ld a, [wItemQuantityBuffer] + ld a, [wItemQuantity] add [hl] cp MAX_ITEM_STACK + 1 jr nc, .newstack @@ -213,14 +213,14 @@ PutItemInPocket: .newstack ld [hl], MAX_ITEM_STACK sub MAX_ITEM_STACK - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a jr .loop2 .terminator2 dec hl ld a, [wCurItem] ld [hli], a - ld a, [wItemQuantityBuffer] + ld a, [wItemQuantity] ld [hli], a ld [hl], -1 ld h, d @@ -264,13 +264,13 @@ RemoveItemFromPocket: jr .loop .skip - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ld b, a ld a, [hl] sub b jr c, .nope ld [hl], a - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a and a jr nz, .yup dec hl @@ -406,7 +406,7 @@ ReceiveTMHM: ld b, 0 ld hl, wTMsHMs add hl, bc - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] add [hl] cp MAX_ITEM_STACK + 1 jr nc, .toomany @@ -423,13 +423,13 @@ TossTMHM: ld b, 0 ld hl, wTMsHMs add hl, bc - ld a, [wItemQuantityChangeBuffer] + ld a, [wItemQuantityChange] ld b, a ld a, [hl] sub b jr c, .nope ld [hl], a - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a jr nz, .yup ld a, [wTMHMPocketScrollPosition] and a @@ -492,7 +492,7 @@ GetNumberedTMHM: ret _CheckTossableItem:: -; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be removed from the bag. +; Return 1 in wItemAttributeValue and carry if wCurItem can't be removed from the bag. ld a, ITEMATTR_PERMISSIONS call GetItemAttr bit CANT_TOSS_F, a @@ -501,7 +501,7 @@ _CheckTossableItem:: ret CheckSelectableItem: -; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be selected. +; Return 1 in wItemAttributeValue and carry if wCurItem can't be selected. ld a, ITEMATTR_PERMISSIONS call GetItemAttr bit CANT_SELECT_F, a @@ -510,28 +510,28 @@ CheckSelectableItem: ret CheckItemPocket:: -; Return the pocket for wCurItem in wItemAttributeParamBuffer. +; Return the pocket for wCurItem in wItemAttributeValue. ld a, ITEMATTR_POCKET call GetItemAttr and $f - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a ret CheckItemContext: -; Return the context for wCurItem in wItemAttributeParamBuffer. +; Return the context for wCurItem in wItemAttributeValue. ld a, ITEMATTR_HELP call GetItemAttr and $f - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a ret CheckItemMenu: -; Return the menu for wCurItem in wItemAttributeParamBuffer. +; Return the menu for wCurItem in wItemAttributeValue. ld a, ITEMATTR_HELP call GetItemAttr swap a and $f - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a ret GetItemAttr: @@ -546,7 +546,7 @@ GetItemAttr: add hl, bc xor a - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a ld a, [wCurItem] dec a @@ -562,7 +562,7 @@ GetItemAttr: ItemAttr_ReturnCarry: ld a, 1 - ld [wItemAttributeParamBuffer], a + ld [wItemAttributeValue], a scf ret diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 875e6d5cc..6234cafbe 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -339,7 +339,7 @@ BuyMenu: xor a ld [wMenuScrollPositionBackup], a ld a, 1 - ld [wMenuCursorBufferBackup], a + ld [wMenuCursorPositionBackup], a .loop call BuyMenuLoop ; menu loop jr nc, .loop @@ -431,15 +431,15 @@ BuyMenuLoop: call UpdateSprites ld hl, MenuHeader_Buy call CopyMenuHeader - ld a, [wMenuCursorBufferBackup] - ld [wMenuCursorBuffer], a + ld a, [wMenuCursorPositionBackup] + ld [wMenuCursorPosition], a ld a, [wMenuScrollPositionBackup] ld [wMenuScrollPosition], a call ScrollingMenu ld a, [wMenuScrollPosition] ld [wMenuScrollPositionBackup], a ld a, [wMenuCursorY] - ld [wMenuCursorBufferBackup], a + ld [wMenuCursorPositionBackup], a call SpeechTextbox ld a, [wMenuJoypad] cp B_BUTTON @@ -499,7 +499,7 @@ BuyMenuLoop: StandardMartAskPurchaseQuantity: ld a, MAX_ITEM_STACK - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a ld a, MARTTEXT_HOW_MANY call LoadBuyMenuText farcall SelectQuantityToBuy @@ -515,7 +515,7 @@ MartConfirmPurchase: BargainShopAskPurchaseQuantity: ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, [wMartItemID] ld e, a ld d, 0 @@ -558,7 +558,7 @@ RooftopSaleAskPurchaseQuantity: call LoadBuyMenuText call .GetSalePrice ld a, MAX_ITEM_STACK - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a farcall RooftopSale_SelectQuantityToBuy call ExitMenu ret @@ -734,7 +734,7 @@ SellMenu: .TryToSellItem: farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] ld hl, .dw rst JumpTable ret @@ -753,7 +753,7 @@ SellMenu: .try_sell farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr z, .okay_to_sell ld hl, MartCantBuyText diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 17662cf60..0a50bbb7c 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -74,7 +74,7 @@ Pack: ld hl, ItemsPocketMenuHeader call CopyMenuHeader ld a, [wItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -102,7 +102,7 @@ Pack: ld hl, KeyItemsPocketMenuHeader call CopyMenuHeader ld a, [wKeyItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wKeyItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -135,7 +135,7 @@ Pack: call Pack_InterpretJoypad ret c farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .use_quit ld hl, .MenuHeader2 @@ -224,7 +224,7 @@ Pack: ld hl, BallsPocketMenuHeader call CopyMenuHeader ld a, [wBallsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wBallsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -241,29 +241,29 @@ Pack: .ItemBallsKey_LoadSubmenu: farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .tossable farcall CheckSelectableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .selectable farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .usable jr .unusable .selectable farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .selectable_usable jr .selectable_unusable .tossable farcall CheckSelectableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .tossable_selectable jr .tossable_unselectable @@ -424,7 +424,7 @@ Jumptable_GiveTossQuit: UseItem: farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] ld hl, .dw rst JumpTable ret @@ -529,7 +529,7 @@ ResetPocketCursorPositions: ; unreferenced RegisterItem: farcall CheckSelectableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .cant_register ld a, [wCurPocket] @@ -683,7 +683,7 @@ BattlePack: ld hl, ItemsPocketMenuHeader call CopyMenuHeader ld a, [wItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -711,7 +711,7 @@ BattlePack: ld hl, KeyItemsPocketMenuHeader call CopyMenuHeader ld a, [wKeyItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wKeyItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -762,7 +762,7 @@ BattlePack: ld hl, BallsPocketMenuHeader call CopyMenuHeader ld a, [wBallsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wBallsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -779,7 +779,7 @@ BattlePack: ItemSubmenu: farcall CheckItemContext - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] TMHMSubmenu: and a jr z, .NoUse @@ -834,7 +834,7 @@ TMHMSubmenu: .Use: farcall CheckItemContext - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] ld hl, .ItemFunctionJumptable rst JumpTable ret @@ -951,7 +951,7 @@ DepositSellPack: ld hl, PC_Mart_ItemsPocketMenuHeader call CopyMenuHeader ld a, [wItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -967,7 +967,7 @@ DepositSellPack: ld hl, PC_Mart_KeyItemsPocketMenuHeader call CopyMenuHeader ld a, [wKeyItemsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wKeyItemsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -992,7 +992,7 @@ DepositSellPack: ld hl, PC_Mart_BallsPocketMenuHeader call CopyMenuHeader ld a, [wBallsPocketCursor] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wBallsPocketScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -1415,7 +1415,7 @@ INCBIN "gfx/pack/pack_menu.tilemap" Pack_GetItemName: ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName call CopyName1 ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 2e0cde341..9786b950f 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -15,7 +15,7 @@ TMHMPocket: ld b, 0 add hl, bc ld a, [hl] - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a call .ConvertItemToTMHMNumber scf ret @@ -377,7 +377,7 @@ TMHM_DisplayPocketItems: ld [wTempTMHM], a .okay predef GetTMHMMove - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] ld [wPutativeTMHMMove], a call GetMoveName pop hl diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index 3e16d3494..8f578476b 100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm @@ -38,7 +38,7 @@ InitList: ld de, ItemNames ld a, ITEM_NAME .done - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a ld a, l ld [wListPointer], a ld a, h @@ -49,7 +49,7 @@ InitList: ld [wUnusedNamesPointer + 1], a ld bc, ItemAttributes ld a, c - ld [wItemAttributesPtr], a + ld [wItemAttributesPointer], a ld a, b - ld [wItemAttributesPtr + 1], a + ld [wItemAttributesPointer + 1], a ret diff --git a/engine/link/link.asm b/engine/link/link.asm index 5ea0e10fe..1d8294747 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -990,7 +990,7 @@ Link_ConvertPartyStruct1to2: ld d, h ld e, l ld bc, wLinkOTPartyMonTypes - ld hl, wCurLinkOTPartyMonTypePtr + ld hl, wCurLinkOTPartyMonTypePointer ld a, c ld [hli], a ld [hl], b @@ -1040,7 +1040,7 @@ Link_ConvertPartyStruct1to2: ld a, [de] inc de ld [hl], a - ld hl, wCurLinkOTPartyMonTypePtr + ld hl, wCurLinkOTPartyMonTypePointer ld a, [hli] ld h, [hl] ld l, a @@ -1051,9 +1051,9 @@ Link_ConvertPartyStruct1to2: ld [hli], a inc de ld a, l - ld [wCurLinkOTPartyMonTypePtr], a + ld [wCurLinkOTPartyMonTypePointer], a ld a, h - ld [wCurLinkOTPartyMonTypePtr + 1], a + ld [wCurLinkOTPartyMonTypePointer + 1], a push bc ld hl, MON_ITEM add hl, bc @@ -1504,7 +1504,7 @@ LinkTrade_TradeStatsMenu: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName hlcoord 0, 12 ld b, 4 @@ -1669,7 +1669,7 @@ LinkTrade: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 ld de, wBufferTrademonNick @@ -1681,7 +1681,7 @@ LinkTrade: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, LinkAskTradeForText bccoord 1, 14 @@ -2123,14 +2123,14 @@ CheckTimeCapsuleCompatibility: jr .done .mon_too_new - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld a, $1 jr .done .move_too_new push bc - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName call CopyName1 pop bc @@ -2156,7 +2156,7 @@ GetIncompatibleMonName: ld hl, wPartyCount add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ret diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 00f48e094..6a964396d 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -123,7 +123,7 @@ DoMysteryGift: farcall MysteryGiftGetItem ld a, c ld [sBackupMysteryGiftItem], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call CloseSRAM call GetItemName ld hl, .MysteryGiftSentText ; sent item/decoration @@ -1602,7 +1602,7 @@ DoNameCardSwap: ld de, wNameCardData farcall Function8ac70 ld a, c - ld [wDeciramBuffer], a + ld [wTextDecimalByte], a ld hl, .NameCardNotRegisteredCardText jr c, .PrintTextAndExit ld hl, .NameCardListedCardText diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm index b8c68a32b..fe31d7f3f 100644 --- a/engine/link/time_capsule.asm +++ b/engine/link/time_capsule.asm @@ -122,7 +122,7 @@ PlaceTradePartnerNamesAndParty: ld a, [de] cp -1 ret z - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc push hl push de diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 338a6c8f3..f20a6dceb 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -51,7 +51,7 @@ _InterpretMobileMenu:: ld c, a ld a, [w2DMenuNumRows] call SimpleMultiply - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a and a ret @@ -91,7 +91,7 @@ Mobile_GetMenuSelection: ld c, a ld a, [wMenuCursorX] add c - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a and a ret @@ -172,7 +172,7 @@ Init2DMenuCursorPosition: call .InitFlags_c ld a, [w2DMenuNumCols] ld e, a - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] ld b, a xor a ld d, 0 @@ -780,7 +780,7 @@ _InitVerticalMenuCursor:: .skip_bit_1 ld [hli], a ; wMenuCursorY - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] and a jr z, .load_at_the_top ld c, a diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 5f95832cc..e229f3609 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -1,7 +1,7 @@ PlaceMenuItemName: push de ld a, [wMenuSelection] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName pop hl call PlaceString @@ -12,7 +12,7 @@ PlaceMenuItemQuantity: ld a, [wMenuSelection] ld [wCurItem], a farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] pop hl and a jr nz, .done @@ -169,7 +169,7 @@ StartMenu_PrintBugContestStatus: and a ld de, .NoneString jr z, .no_contest_mon - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName .no_contest_mon diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index c4bae270b..ee1fe7fec 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -91,7 +91,7 @@ NamingScreen: ld e, MONICON_NAMINGSCREEN rst FarCall ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName hlcoord 5, 2 call PlaceString diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 6a8d6fd4e..3b6747548 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -91,7 +91,7 @@ ScrollingMenuJoyAction: ld a, [wMenuSelection] ld [wCurItem], a ld a, [wMenuSelectionQuantity] - ld [wItemQuantityBuffer], a + ld [wItemQuantity], a call ScrollingMenu_GetCursorPosition dec a ld [wScrollingMenuCursorPosition], a @@ -238,7 +238,7 @@ InitScrollingMenuCursor: .skip ld a, [wMenuScrollPosition] ld c, a - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] add c ld b, a ld a, [wScrollingMenuListSize] @@ -251,7 +251,7 @@ InitScrollingMenuCursor: xor a ld [wMenuScrollPosition], a ld a, $1 - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a .done ret @@ -307,7 +307,7 @@ ScrollingMenu_InitFlags: ld [wMenuJoypadFilter], a ld a, [w2DMenuNumRows] ld b, a - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] and a jr z, .reset_cursor cp b diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index dc12767ff..25d3db992 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -27,8 +27,8 @@ StartMenu:: .GotMenuData: call LoadMenuHeader call .SetUpMenuItems - ld a, [wBattleMenuCursorBuffer] - ld [wMenuCursorBuffer], a + ld a, [wBattleMenuCursorPosition] + ld [wMenuCursorPosition], a call .DrawMenuAccount call DrawVariableLengthMenuBox call .DrawBugContestStatusBox @@ -43,15 +43,15 @@ StartMenu:: call UpdateSprites call UpdateTimePals call .SetUpMenuItems - ld a, [wBattleMenuCursorBuffer] - ld [wMenuCursorBuffer], a + ld a, [wBattleMenuCursorPosition] + ld [wMenuCursorPosition], a .Select: call .GetInput jr c, .Exit call ._DrawMenuAccount - ld a, [wMenuCursorBuffer] - ld [wBattleMenuCursorBuffer], a + ld a, [wMenuCursorPosition] + ld [wBattleMenuCursorPosition], a call PlayClickSFX call PlaceHollowCursor call .OpenMenu diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 063ff2285..2cf49578c 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -819,7 +819,7 @@ TradeAnim_GetFrontpic: TradeAnim_GetNickname: push de - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 pop de diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 447ab236f..288e60d4e 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -16,7 +16,7 @@ _PlayerDecorationMenu: ld [wCurDecorationCategory], a .top_loop ld a, [wCurDecorationCategory] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a call .FindCategoriesWithOwnedDecos call DoNthMenu ld a, [wMenuCursorY] @@ -561,7 +561,7 @@ GetDecoName: .getpokename push bc - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName pop bc jr .copy diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 370edb5a2..5d1d0a0fb 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -137,7 +137,7 @@ ScriptCommandTable: dw Script_opentext ; 47 dw Script_refreshscreen ; 48 dw Script_closetext ; 49 - dw Script_writeunusedbytebuffer ; 4a + dw Script_writeunusedbyte ; 4a dw Script_farwritetext ; 4b dw Script_writetext ; 4c dw Script_repeattext ; 4d @@ -434,7 +434,7 @@ Script__2dmenu: ld a, [wScriptBank] ld hl, _2DMenu rst FarCall - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] jr nc, .ok xor a .ok @@ -490,7 +490,7 @@ Script_verbosegiveitemvar: call GetScriptByte call GetVarAction ld a, [de] - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem ld a, TRUE @@ -524,7 +524,7 @@ Script_pocketisfull: Script_specialsound: farcall CheckItemPocket - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] cp TM_HM ld de, SFX_GET_TM jr z, .play @@ -536,7 +536,7 @@ Script_specialsound: GetPocketName: farcall CheckItemPocket - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] dec a ld hl, ItemPocketNames maskbits NUM_POCKETS @@ -555,7 +555,7 @@ INCLUDE "data/items/pocket_names.asm" CurItemName: ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ret @@ -1577,7 +1577,7 @@ Script_getmonname: jr nz, .gotit ld a, [wScriptVar] .gotit - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld de, wStringBuffer1 @@ -1601,7 +1601,7 @@ Script_getitemname: jr nz, .ok ld a, [wScriptVar] .ok - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld de, wStringBuffer1 jr GetStringBuffer @@ -1633,7 +1633,7 @@ Script_gettrainername: Script_getname: call GetScriptByte - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a ContinueToGetName: call GetScriptByte @@ -1644,7 +1644,7 @@ ContinueToGetName: Script_gettrainerclassname: ld a, TRAINER_NAME - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a jr ContinueToGetName Script_getmoney: @@ -1728,7 +1728,7 @@ Script_giveitem: .ok ld [wCurItem], a call GetScriptByte - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem jr nc, .full @@ -1746,7 +1746,7 @@ Script_takeitem: call GetScriptByte ld [wCurItem], a call GetScriptByte - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, -1 ld [wCurItemQuantity], a ld hl, wNumItems @@ -2198,9 +2198,9 @@ Script_refreshscreen: call GetScriptByte ret -Script_writeunusedbytebuffer: +Script_writeunusedbyte: call GetScriptByte - ld [wUnusedScriptByteBuffer], a + ld [wUnusedScriptByte], a ret UnusedClosetextScript: ; unreferenced diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 18532edae..bdd3633ed 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -109,7 +109,7 @@ CheckRegisteredItem: UseRegisteredItem: farcall CheckItemMenu - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] ld hl, .SwitchTo rst JumpTable ret diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 4bddc3292..dfb2632b0 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -4,7 +4,7 @@ _InitializeStartDay: ClearDailyTimers: xor a - ld [wLuckyNumberDayBuffer], a + ld [wLuckyNumberDayTimer], a ld [wUnusedTwoDayTimer], a ld [wDailyResetTimer], a ret @@ -235,7 +235,7 @@ UnusedCheckSwarmFlag: ; unreferenced RestartLuckyNumberCountdown: call .GetDaysUntilNextFriday - ld hl, wLuckyNumberDayBuffer + ld hl, wLuckyNumberDayTimer jp InitNDaysCountdown .GetDaysUntilNextFriday: @@ -253,7 +253,7 @@ RestartLuckyNumberCountdown: ret _CheckLuckyNumberShowFlag: - ld hl, wLuckyNumberDayBuffer + ld hl, wLuckyNumberDayTimer jp CheckDayDependentEventHL DoMysteryGiftIfDayHasPassed: diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 902226041..ed103bfc3 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -28,7 +28,7 @@ LoadWildMonData: FindNest: ; Parameters: ; e: 0 = Johto, 1 = Kanto -; wNamedObjectIndexBuffer: species +; wNamedObjectIndex: species hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a @@ -102,7 +102,7 @@ FindNest: inc hl .ScanMapLoop: push af - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] cp [hl] jr z, .found inc hl @@ -144,7 +144,7 @@ FindNest: .RoamMon1: ld a, [wRoamMon1Species] ld b, a - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] cp b ret nz ld a, [wRoamMon1MapGroup] @@ -160,7 +160,7 @@ FindNest: .RoamMon2: ld a, [wRoamMon2Species] ld b, a - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] cp b ret nz ld a, [wRoamMon2MapGroup] @@ -822,7 +822,7 @@ RandomUnseenWildMon: ld de, wStringBuffer1 call CopyName1 ld a, c - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, .JustSawSomeRareMonText call PrintText @@ -871,7 +871,7 @@ RandomPhoneWildMon: add hl, bc inc hl ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 ld de, wStringBuffer4 @@ -954,7 +954,7 @@ RandomPhoneMon: inc hl ; species ld a, BANK(Trainers) call GetFarByte - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 ld de, wStringBuffer4 diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index fbdd8a178..3cfd30104 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1493,7 +1493,8 @@ Pokedex_PrintListing: .loop push af ld a, [de] - ld [wTempSpecies], a ; also sets wNamedObjectIndexBuffer + ld [wTempSpecies], a ; also sets wNamedObjectIndex + assert wTempSpecies == wNamedObjectIndex push de push hl call .PrintEntry diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index d0ce65a97..cbac4cd9e 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1037,13 +1037,13 @@ PokegearPhone_UpdateDisplayList: ld hl, wPhoneList add hl, de xor a - ld [wPokegearPhoneLoadNameBuffer], a + ld [wPokegearPhoneDisplayPosition], a .loop ld a, [hli] push hl push af hlcoord 2, 4 - ld a, [wPokegearPhoneLoadNameBuffer] + ld a, [wPokegearPhoneDisplayPosition] ld bc, 2 * SCREEN_WIDTH call AddNTimes ld d, h @@ -1052,9 +1052,9 @@ PokegearPhone_UpdateDisplayList: ld b, a call GetCallerClassAndName pop hl - ld a, [wPokegearPhoneLoadNameBuffer] + ld a, [wPokegearPhoneDisplayPosition] inc a - ld [wPokegearPhoneLoadNameBuffer], a + ld [wPokegearPhoneDisplayPosition], a cp PHONE_DISPLAY_HEIGHT jr c, .loop call PokegearPhone_UpdateCursor diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index bc7c3195d..313f23189 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -257,7 +257,7 @@ endr inc hl ; skip level ld a, BANK(JohtoGrassWildMons) call GetFarByte - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurPartySpecies], a call GetPokemonName ld hl, wStringBuffer1 @@ -319,7 +319,7 @@ OPT_OakText3: OaksPKMNTalk7: ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, OPT_MaryText1 ld a, OAKS_POKEMON_TALK_8 @@ -674,7 +674,7 @@ PokedexShow1: inc c ld a, c ld [wCurPartySpecies], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, PokedexShowText ld a, POKEDEX_SHOW_2 @@ -1552,7 +1552,7 @@ GetBuenasPassword: ld l, c add hl, de ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ret .RawString: diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index cdb513242..8c37d3b8f 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -130,7 +130,7 @@ _DepositPKMN: ld hl, BillsPCDepositMenuHeader call CopyMenuHeader ld a, [wMenuCursorY] - call StoreTo_wMenuCursorBuffer + call StoreMenuCursorPosition call VerticalMenu jp c, BillsPCDepositFuncCancel ld a, [wMenuCursorY] @@ -387,7 +387,7 @@ BillsPC_Withdraw: ld hl, .MenuHeader call CopyMenuHeader ld a, [wMenuCursorY] - call StoreTo_wMenuCursorBuffer + call StoreMenuCursorPosition call VerticalMenu jp c, .cancel ld a, [wMenuCursorY] @@ -638,7 +638,7 @@ _MovePKMNWithoutMail: ld hl, .MenuHeader call CopyMenuHeader ld a, [wMenuCursorY] - call StoreTo_wMenuCursorBuffer + call StoreMenuCursorPosition call VerticalMenu jp c, .Cancel ld a, [wMenuCursorY] @@ -2314,9 +2314,9 @@ BillsPC_PrintBoxCountAndCapacity: ld de, .Pokemon call PlaceString call GetBoxCount - ld [wDeciramBuffer], a + ld [wTextDecimalByte], a hlcoord 13, 11 - ld de, wDeciramBuffer + ld de, wTextDecimalByte lb bc, 1, 2 call PrintNum ld de, .out_of_20 diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index e4d82e417..1e4cf8728 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -47,14 +47,14 @@ _BillsPC: call LoadMenuHeader ld a, $1 .loop - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a call SetPalettes xor a ld [wWhichIndexSet], a ldh [hBGMapMode], a call DoNthMenu jr c, .cancel - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] push af ld a, [wMenuSelection] ld hl, .Jumptable diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index fce75963c..d6ffde4fd 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -250,7 +250,7 @@ HatchEggs: ld a, [wCurPartySpecies] dec de ld [de], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurSpecies], a call GetPokemonName xor a @@ -673,7 +673,7 @@ EggHatch_DoAnimFrame: ret EggHatch_AnimationSequence: - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] ld [wJumptableIndex], a ld a, [wCurSpecies] push af diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 84ebf6254..bb115a841 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -38,7 +38,7 @@ CheckPartyFullAfterContest: ld hl, wPlayerName call CopyBytes ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer @@ -105,7 +105,7 @@ CheckPartyFullAfterContest: call CopyBytes callfar InsertPokemonIntoBox ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName call GiveANickname_YesNo ld hl, wStringBuffer1 diff --git a/engine/pokemon/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm index 4e7d1cabe..cc3901096 100644 --- a/engine/pokemon/correct_party_errors.asm +++ b/engine/pokemon/correct_party_errors.asm @@ -123,7 +123,7 @@ CorrectPartyErrors: ; unreferenced cp EGG ld hl, .TAMAGO jr z, .got_nickname - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 .got_nickname diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index d91d741dc..839e2c167 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -236,7 +236,7 @@ EvolveAfterBattle_MasterLoop: ld [wCurSpecies], a ld [wTempMonSpecies], a ld [wEvolutionNewSpecies], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName push hl @@ -348,7 +348,7 @@ UpdateSpeciesNameIfNotNicknamed: ld a, [wCurSpecies] push af ld a, [wBaseDexNo] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName pop af ld [wCurSpecies], a @@ -369,7 +369,7 @@ UpdateSpeciesNameIfNotNicknamed: call AddNTimes push hl ld a, [wCurSpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 pop de @@ -462,7 +462,7 @@ LearnLevelMoves: .learn ld a, d ld [wPutativeTMHMMove], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName call CopyName1 predef LearnMove diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 183551bcf..2c597c7b6 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -36,7 +36,7 @@ LearnMove: push hl push de - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld b, a ld a, [wBattleMode] diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index e3b881465..07030da5f 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -382,7 +382,7 @@ MailboxPC: call UpdateSprites ld a, [wCurMessageIndex] - ld [wMenuCursorBuffer], a + ld [wMenuCursorPosition], a ld a, [wCurMessageScrollPosition] ld [wMenuScrollPosition], a call ScrollingMenu @@ -439,7 +439,7 @@ MailboxPC: dec a call .GetMailType ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem jr c, .put_in_bag diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 70aa2f52e..14db39531 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -26,7 +26,7 @@ TossItemFromPC: push de call PartyMonItemName farcall _CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .key_item ld hl, .ItemsTossOutHowManyText @@ -93,7 +93,7 @@ ItemsOakWarningText: PartyMonItemName: ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName call CopyName1 ret @@ -252,7 +252,7 @@ GiveTakePartyMonItem: jr z, .next call CheckTossableItem - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] and a jr nz, .next @@ -296,17 +296,17 @@ TryGiveItemToPartymon: ret .already_holding_item - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, PokemonAskSwapItemText call StartMenuYesNo jr c, .abort call GiveItemToPokemon - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] push af ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a pop af ld [wCurItem], a call ReceiveItemFromPokemon @@ -314,13 +314,13 @@ TryGiveItemToPartymon: ld hl, PokemonSwapItemText call MenuTextboxBackup - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] ld [wCurItem], a call GivePartyItem ret .bag_full - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] ld [wCurItem], a call ReceiveItemFromPokemon ld hl, ItemStorageFullText @@ -355,7 +355,7 @@ TakePartyItem: farcall ItemIsMail call GetPartyItemLocation ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [hl], NO_ITEM call GetItemName ld hl, PokemonTookItemText @@ -427,13 +427,13 @@ GetPartyItemLocation: ReceiveItemFromPokemon: ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems jp ReceiveItem GiveItemToPokemon: ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems jp TossItem @@ -899,7 +899,7 @@ MoveScreenLoop: .skip_joy call PrepareToPlaceMoveData - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] and a jr nz, .moving_move call PlaceMoveData @@ -920,21 +920,21 @@ MoveScreenLoop: .b_button call PlayClickSFX call WaitSFX - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] and a jp z, .exit - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] ld [wMenuCursorY], a xor a - ld [wMoveSwapBuffer], a + ld [wSwappingMove], a hlcoord 1, 2 lb bc, 8, SCREEN_WIDTH - 2 call ClearBox jp .loop .d_right - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] and a jp nz, .joy_loop @@ -949,7 +949,7 @@ MoveScreenLoop: jp MoveScreenLoop .d_left - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] and a jp nz, .joy_loop ld a, [wCurPartyMon] @@ -1000,11 +1000,11 @@ MoveScreenLoop: .a_button call PlayClickSFX call WaitSFX - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] and a jr nz, .place_move ld a, [wMenuCursorY] - ld [wMoveSwapBuffer], a + ld [wSwappingMove], a call PlaceHollowCursor jp .moving_move @@ -1057,7 +1057,7 @@ MoveScreenLoop: ld d, h ld e, l pop hl - ld a, [wMoveSwapBuffer] + ld a, [wSwappingMove] dec a ld c, a ld b, 0 @@ -1071,7 +1071,7 @@ MoveScreenLoop: .exit xor a - ld [wMoveSwapBuffer], a + ld [wSwappingMove], a ld hl, w2DMenuFlags1 res 6, [hl] call ClearSprites @@ -1137,7 +1137,7 @@ SetUpMoveScreenBG: SetUpMoveList: xor a ldh [hBGMapMode], a - ld [wMoveSwapBuffer], a + ld [wSwappingMove], a ld [wMonType], a predef CopyMonToTempMon ld hl, wTempMonMoves @@ -1202,8 +1202,8 @@ PlaceMoveData: hlcoord 16, 12 cp 2 jr c, .no_power - ld [wDeciramBuffer], a - ld de, wDeciramBuffer + ld [wTextDecimalByte], a + ld de, wTextDecimalByte lb bc, 1, 3 call PrintNum jr .description diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 3262f22e3..caded2875 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -448,7 +448,7 @@ ListMoves: push hl ld [wCurSpecies], a ld a, MOVE_NAME - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a call GetName ld de, wStringBuffer1 pop hl diff --git a/engine/pokemon/mon_submenu.asm b/engine/pokemon/mon_submenu.asm index 09f1ab3f7..61c92d695 100644 --- a/engine/pokemon/mon_submenu.asm +++ b/engine/pokemon/mon_submenu.asm @@ -100,7 +100,7 @@ GetMonMenuString: jr z, .NotMove inc hl ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName ret diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 795fd67a1..fd01ba375 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -54,7 +54,7 @@ TryAddMonToParty: and a jr nz, .skipnickname ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wPartyMonNicknames ldh a, [hMoveMon] @@ -444,7 +444,7 @@ AddTempmonToParty: call CopyBytes ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a cp EGG jr z, .egg dec a @@ -972,7 +972,7 @@ SendMonIntoBox: call CopyBytes ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld de, sBoxMonNicknames @@ -1671,7 +1671,7 @@ GivePoke:: .done ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wTempEnemyMonSpecies], a call GetPokemonName ld hl, wStringBuffer1 diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index f94ee91ba..059732444 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -416,7 +416,7 @@ StatsScreen_InitUpperHalf: xor a ldh [hBGMapMode], a ld a, [wBaseDexNo] - ld [wDeciramBuffer], a + ld [wTextDecimalByte], a ld [wCurSpecies], a hlcoord 8, 0 ld [hl], "№" @@ -425,7 +425,7 @@ StatsScreen_InitUpperHalf: inc hl hlcoord 10, 0 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 - ld de, wDeciramBuffer + ld de, wTextDecimalByte call PrintNum hlcoord 14, 0 call PrintLevel @@ -440,7 +440,7 @@ StatsScreen_InitUpperHalf: ld a, "/" ld [hli], a ld a, [wBaseDexNo] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName call PlaceString call StatsScreen_PlaceHorizontalDivider @@ -748,7 +748,7 @@ LoadGreenPage: ld b, a farcall TimeCapsule_ReplaceTeruSama ld a, b - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ret diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index abeeda840..4abaf672f 100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm @@ -74,9 +74,9 @@ PrintType: jp PlaceString GetTypeName: -; Copy the name of type [wNamedObjectIndexBuffer] to wStringBuffer1. +; Copy the name of type [wNamedObjectIndex] to wStringBuffer1. - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] ld hl, TypeNames ld e, a ld d, 0 diff --git a/engine/predef.asm b/engine/predef.asm index e18765b0a..26c61d960 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -3,9 +3,9 @@ GetPredefPointer:: ; Save hl for later (back in Predef) ld a, h - ld [wPredefTemp], a + ld [wPredefHL], a ld a, l - ld [wPredefTemp + 1], a + ld [wPredefHL + 1], a push de ld a, [wPredefID] diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 4889b6ad8..c29142876 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -170,7 +170,7 @@ PrintPartyMonPage1: lb bc, 2, 3 call PrintNum ld a, [wCurPartySpecies] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurSpecies], a ld hl, wPartyMonNicknames call GetCurPartyMonName @@ -186,7 +186,7 @@ PrintPartyMonPage1: inc hl ld [hl], "." inc hl - ld de, wNamedObjectIndexBuffer + ld de, wNamedObjectIndex lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum hlcoord 1, 9 @@ -297,7 +297,7 @@ PlaceMoveNameString: and a jr z, .no_move - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName jr .got_string diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 8fac5165c..5764b86d7 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -728,7 +728,7 @@ Printer_PrintBoxListSegment: ld a, [de] cp $ff jp z, .finish - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld [wCurPartySpecies], a push bc diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 635f97ddf..476236b23 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -683,8 +683,8 @@ PrintHour: inc hl pop bc call AdjustHourForAMorPM - ld [wDeciramBuffer], a - ld de, wDeciramBuffer + ld [wTextDecimalByte], a + ld de, wTextDecimalByte call PrintTwoDigitNumberLeftAlign ret |